Merge pull request #471 from NREL/develop

Hot fix: Fuel loads profile input
NREL · Jun 29, 2023 · c138e2e · c138e2e
2 parents 04e5b3b + c94e92e
commit c138e2e
Showing 1 changed file with 22 additions and 22 deletions.
diff --git a/job/validators.py b/job/validators.py
@@ -424,9 +424,11 @@ def update_pv_defaults_offgrid(self):
 
             if len(self.models["CoolingLoad"].thermal_loads_ton) > 0:
                 self.clean_time_series("CoolingLoad", "thermal_loads_ton")
-
-            if len(self.models["CoolingLoad"].per_time_step_fractions_of_electric_load) > 0:
+            elif len(self.models["CoolingLoad"].per_time_step_fractions_of_electric_load) > 0:
                 self.clean_time_series("CoolingLoad", "per_time_step_fractions_of_electric_load")
+            else:  # Using DOE commercial reference buildings
+                if self.models["CoolingLoad"].doe_reference_name == None and not self.models["CoolingLoad"].blended_doe_reference_names:
+                    assign_ref_buildings_from_electric_load(self, "CoolingLoad")                
 
         """
         ExistingBoiler
@@ -495,34 +497,32 @@ def update_pv_defaults_offgrid(self):
         if "DomesticHotWaterLoad" in self.models.keys():
             self.clean_time_series("DomesticHotWaterLoad", "fuel_loads_mmbtu_per_hour")
 
-            # If empty key is provided, then check if doe_reference_names are provided in ElectricLoad
-            if self.models["DomesticHotWaterLoad"].doe_reference_name == None and not self.models["DomesticHotWaterLoad"].blended_doe_reference_names:
-                if self.models["ElectricLoad"].doe_reference_name != "":
-                    self.models["DomesticHotWaterLoad"].__setattr__("doe_reference_name", self.models["ElectricLoad"].__getattribute__("doe_reference_name"))
-                elif len(self.models["ElectricLoad"].blended_doe_reference_names) > 0:
-                    self.models["DomesticHotWaterLoad"].__setattr__("blended_doe_reference_names", self.models["ElectricLoad"].__getattribute__("blended_doe_reference_names"))
-                    self.models["DomesticHotWaterLoad"].__setattr__("blended_doe_reference_percents", self.models["ElectricLoad"].__getattribute__("blended_doe_reference_percents"))
-                else:
-                    self.add_validation_error("DomesticHotWaterLoad", "doe_reference_name",
-                                              f"Must provide DOE commercial reference building profiles either under SpaceHeatingLoad or ElectricLoad")
+            # If using DOE reference building input(s) (not fuel_load_mmbtu_per_hour), and no reference building(s) provided, assign to electric load building(s)
+            if not self.models["DomesticHotWaterLoad"].fuel_loads_mmbtu_per_hour:
+                if self.models["DomesticHotWaterLoad"].doe_reference_name == None and not self.models["DomesticHotWaterLoad"].blended_doe_reference_names:
+                    assign_ref_buildings_from_electric_load(self, "DomesticHotWaterLoad")
 
         """
         SpaceHeatingLoad
         """
         if "SpaceHeatingLoad" in self.models.keys():
             self.clean_time_series("SpaceHeatingLoad", "fuel_loads_mmbtu_per_hour")
 
-            # If empty key is provided, then check if doe_reference_names are provided in ElectricLoad
-            if self.models["SpaceHeatingLoad"].doe_reference_name == None and not self.models["SpaceHeatingLoad"].blended_doe_reference_names:
-                if self.models["ElectricLoad"].doe_reference_name != "":
-                    self.models["SpaceHeatingLoad"].__setattr__("doe_reference_name", self.models["ElectricLoad"].__getattribute__("doe_reference_name"))
-                elif len(self.models["ElectricLoad"].blended_doe_reference_names) > 0:
-                    self.models["SpaceHeatingLoad"].__setattr__("blended_doe_reference_names", self.models["ElectricLoad"].__getattribute__("blended_doe_reference_names"))
-                    self.models["SpaceHeatingLoad"].__setattr__("blended_doe_reference_percents", self.models["ElectricLoad"].__getattribute__("blended_doe_reference_percents"))
-                else:
-                    self.add_validation_error("SpaceHeatingLoad", "doe_reference_name",
-                                              f"Must provide DOE commercial reference building profiles either under SpaceHeatingLoad or ElectricLoad")
+            # If using DOE reference building input(s) (not fuel_load_mmbtu_per_hour), and no reference building(s) provided, assign to electric load building(s)
+            if not self.models["SpaceHeatingLoad"].fuel_loads_mmbtu_per_hour:
+                if self.models["SpaceHeatingLoad"].doe_reference_name == None and not self.models["SpaceHeatingLoad"].blended_doe_reference_names:
+                    assign_ref_buildings_from_electric_load(self, "SpaceHeatingLoad")
 
+        def assign_ref_buildings_from_electric_load(self, load_to_assign):
+            if self.models["ElectricLoad"].doe_reference_name != "":
+                self.models[load_to_assign].__setattr__("doe_reference_name", self.models["ElectricLoad"].__getattribute__("doe_reference_name"))
+            elif len(self.models["ElectricLoad"].blended_doe_reference_names) > 0:
+                self.models[load_to_assign].__setattr__("blended_doe_reference_names", self.models["ElectricLoad"].__getattribute__("blended_doe_reference_names"))
+                self.models[load_to_assign].__setattr__("blended_doe_reference_percents", self.models["ElectricLoad"].__getattribute__("blended_doe_reference_percents"))
+            else:
+                self.add_validation_error(load_to_assign, "doe_reference_name",
+                                        f"Must provide DOE commercial reference building profiles either under {load_to_assign} or ElectricLoad")
+
         """
         Off-grid input keys validation
         """