Merge pull request #3435 from architecture-building-systems/separatio…

…n_of_releases_to_env_and_grids

Seperating release to envrionment and grids

cea/optimization_new/containerclasses/supplySystemStructure.py

@@ -39,7 +39,8 @@ class SupplySystemStructure(object):
     _system_type = ''
     _main_final_energy_carrier = EnergyCarrier()
     _infinite_energy_carriers = []
-    _releasable_energy_carriers = []
+    _releasable_environmental_energy_carriers = []
+    _releasable_grid_based_energy_carriers = []
     _active_component_classes = []
     _full_component_activation_order = ()
 
@@ -95,9 +96,17 @@ def main_final_energy_carrier(self, new_main_fec):
     def infinite_energy_carriers(self):
         return self._infinite_energy_carriers
 
+    @property
+    def releasable_environmental_energy_carriers(self):
+        return self._releasable_environmental_energy_carriers
+
+    @property
+    def releasable_grid_based_energy_carriers(self):
+        return self._releasable_grid_based_energy_carriers
+
     @property
     def releasable_energy_carriers(self):
-        return self._releasable_energy_carriers
+        return self._releasable_environmental_energy_carriers + self._releasable_grid_based_energy_carriers
 
     @property
     def active_component_classes(self):
@@ -205,9 +214,9 @@ def _get_infinite_ecs(energy_sources_config):
         return infinite_energy_carriers
 
     @staticmethod  # TODO: Adapt this method when typical days are introduced
-    def _get_releasable_ecs(domain):
+    def _get_releasable_environmental_ecs(domain):
         """
-        Get the codes of all energy carriers that can be freely released to a grid or the environment.
+        Get the codes of all energy carriers that can be freely released to the environment.
         """
         avrg_yearly_temp = domain.weather['drybulb_C'].mean()
         typical_air_ec = EnergyCarrier.temp_to_thermal_ec('air', avrg_yearly_temp)
@@ -220,11 +229,16 @@ def _get_releasable_ecs(domain):
         else:
             raise ValueError('Make sure the energy system type is set before allocating environmental energy carriers.')
 
-        releasable_grid_based_ecs = EnergyCarrier.get_all_electrical_ecs()
+        return releasable_environmental_ecs
 
-        releasable_ecs = releasable_environmental_ecs + releasable_grid_based_ecs
+    @staticmethod
+    def _get_releasable_grid_based_ecs():
+        """
+        Get the codes of all energy carriers that can be freely released to a grid.
+        """
+        releasable_grid_based_ecs = EnergyCarrier.get_all_electrical_ecs()
 
-        return releasable_ecs
+        return releasable_grid_based_ecs
 
     @staticmethod
     def _get_component_priorities(optimisation_config):
@@ -835,7 +849,7 @@ def _draw_from_infinite_sources(required_energy_flows):
             required_energy_flows = {required_energy_flows.energy_carrier.code: required_energy_flows}
 
         new_required_energy_flow = {ec_code: flow for ec_code, flow in required_energy_flows.items()
-                                    if ec_code not in SupplySystemStructure._infinite_energy_carriers}
+                                    if ec_code not in SupplySystemStructure().infinite_energy_carriers}
 
         return new_required_energy_flow
 
@@ -849,7 +863,7 @@ def _release_to_grids_or_env(energy_flows_to_release):
             energy_flows_to_release = {energy_flows_to_release.energy_carrier.code: energy_flows_to_release}
 
         remaining_energy_flows_to_release = {ec_code: flow for ec_code, flow in energy_flows_to_release.items()
-                                             if ec_code not in SupplySystemStructure._releasable_energy_carriers}
+                                             if ec_code not in SupplySystemStructure().releasable_energy_carriers}
 
         return remaining_energy_flows_to_release
 
@@ -910,8 +924,10 @@ def initialize_class_variables(domain):
 
         SupplySystemStructure._infinite_energy_carriers \
             = SupplySystemStructure._get_infinite_ecs(config.optimization_new.available_energy_sources)
-        SupplySystemStructure._releasable_energy_carriers \
-            = SupplySystemStructure._get_releasable_ecs(domain)
+        SupplySystemStructure._releasable_environmental_energy_carriers \
+            = SupplySystemStructure._get_releasable_environmental_ecs(domain)
+        SupplySystemStructure._releasable_grid_based_energy_carriers \
+            = SupplySystemStructure._get_releasable_grid_based_ecs()
         SupplySystemStructure._active_component_classes, \
         SupplySystemStructure._full_component_activation_order \
             = SupplySystemStructure._get_component_priorities(config.optimization_new)

cea/optimization_new/supplySystem.py

@@ -340,11 +340,9 @@ def _release_to_grids_or_env(self, energy_flows_to_release, for_sizing=False):
 
         if not for_sizing:
             if not SupplySystem._ec_releases_to_env:
-                SupplySystem._ec_releases_to_env = [ec_code for ec_code in self.structure.releasable_energy_carriers
-                                                    if not (ec_code in self.structure.infinite_energy_carriers)]
+                SupplySystem._ec_releases_to_env = SupplySystemStructure().releasable_environmental_energy_carriers
             if not SupplySystem._ec_releases_to_grids:
-                SupplySystem._ec_releases_to_grids = [ec_code for ec_code in self.structure.releasable_energy_carriers
-                                                      if ec_code in self.structure.infinite_energy_carriers]
+                SupplySystem._ec_releases_to_grids = SupplySystemStructure().releasable_grid_based_energy_carriers
 
             self._add_to_heat_rejection(energy_flows_to_release, SupplySystem._ec_releases_to_env)
             self._deduct_from_system_energy_demand(energy_flows_to_release, SupplySystem._ec_releases_to_grids)