merge post_integration to validation

energy_models/core/energy_mix/energy_mix.py

@@ -78,7 +78,6 @@ class EnergyMix(BaseStream):
     RESOURCE_LIST = ['natural_gas_resource', 'uranium_resource',
                      'coal_resource', 'oil_resource', 'copper_resource']  # , 'platinum_resource',]
     RESOURCE_CONSUMPTION_UNIT = ResourceGlossary.UNITS['consumption']
-    CARBON_STORAGE_CONSTRAINT = 'carbon_storage_constraint'
     energy_class_dict = {GaseousHydrogen.name: GaseousHydrogen,
                          LiquidFuel.name: LiquidFuel,
                          HydrotreatedOilFuel.name: HydrotreatedOilFuel,

energy_models/core/energy_mix/energy_mix_disc.py

@@ -783,12 +783,6 @@ def compute_sos_jacobian(self):
                             -scaling_factor_energy_consumption * np.identity(
                                 len(years)) / scaling_factor_energy_production * scaling_factor_energy_production * 0)
 
-            self.set_partial_derivative_for_other_types(
-                (GlossaryEnergy.StreamProductionDetailedValue, f'production {GlossaryEnergy.carbon_storage} ({GlossaryEnergy.unit_dicts[GlossaryEnergy.carbon_storage]})'),
-                (f'{GlossaryEnergy.carbon_storage}.{GlossaryEnergy.StreamConsumptionValue}', f'{GlossaryEnergy.carbon_capture} ({GlossaryEnergy.unit_dicts[GlossaryEnergy.carbon_capture]})'),
-                -scaling_factor_energy_consumption * np.identity(
-                    len(years)) / scaling_factor_energy_production * scaling_factor_energy_production)
-
         # -------------------------#
         # ---- Prices gradients----#
         # -------------------------#

energy_models/core/techno_type/base_techno_models/carbon_storage_techno.py

@@ -28,9 +28,6 @@ def __init__(self, name):
     def compute_capital_recovery_factor(self, data_config):
         return 1
 
-    def compute_other_streams_needs(self):
-        self.cost_details[f'{GlossaryEnergy.carbon_capture}_needs'] = 1.
-
     def check_capex_unity(self, data_tocheck):
         """
         Put all capex in $/kgCO2

energy_models/glossaryenergy.py

@@ -1128,13 +1128,13 @@ class GlossaryEnergy(GlossaryWitnessCore):
         WetCropResidues: [electricity], # transport fuel in stead of elec
         Geothermal: [f"{heat}.{mediumtemperatureheat}"],  # just electricity
         BiomassBuryingFossilization: [biomass_dry],  # add transport fuel
-        DeepOceanInjection: [carbon_capture],  # add transport fuel
-        DeepSalineFormation: [carbon_capture],  # add transport fuel
-        DepletedOilGas: [carbon_capture],  # add transport fuel
-        EnhancedOilRecovery: [carbon_capture],  # add transport fuel
-        GeologicMineralization: [carbon_capture],  # add transport fuel
-        CarbonStorageTechno: [carbon_capture],
-        CropEnergy: [carbon_capture],
+        DeepOceanInjection: [],  # add transport fuel
+        DeepSalineFormation: [],  # add transport fuel
+        DepletedOilGas: [],  # add transport fuel
+        EnhancedOilRecovery: [],  # add transport fuel
+        GeologicMineralization: [],  # add transport fuel
+        CarbonStorageTechno: [],
+        CropEnergy: [],
     }
 
     # dict of resources used by technos

energy_models/sos_processes/energy/MDA/energy_process_v0/usecase.py

@@ -184,14 +184,6 @@ def setup_constraints(self):
                 list_aggr_type.append(FunctionManager.AGGR_TYPE_SMAX)
                 list_namespaces.append(GlossaryEnergy.NS_FUNCTIONS)
 
-        if GlossaryEnergy.carbon_storage in self.ccs_list:
-            list_var.extend(["carbon_storage_constraint"])
-            list_parent.extend([""])
-            list_ftype.extend([FunctionManagerDisc.INEQ_CONSTRAINT])
-            list_weight.extend([0.0])
-            list_aggr_type.append(FunctionManager.AGGR_TYPE_SMAX)
-            list_namespaces.append(GlossaryEnergy.NS_FUNCTIONS)
-
         list_var.extend([EnergyMix.TOTAL_PROD_MINUS_MIN_PROD_CONSTRAINT_DF])
         list_parent.extend(["Energy_constraints"])
         list_ftype.extend([FunctionManagerDisc.INEQ_CONSTRAINT])

energy_models/tests/l0_test_compute_ccus_disc.py

@@ -114,9 +114,6 @@ def test_01_CCUS_discipline(self):
             f'{self.name}.{GlossaryEnergy.YearStart}': self.year_start,
             f'{self.name}.{GlossaryEnergy.YearEnd}': self.year_end,
             f'{self.name}.{GlossaryEnergy.energy_list}': self.energy_list,
-            f'{self.name}.{GlossaryEnergy.ccs_list}': [GlossaryEnergy.carbon_capture, GlossaryEnergy.carbon_storage],
-            f'{self.name}.scaling_factor_energy_production': self.scaling_factor_energy_production,
-            f'{self.name}.scaling_factor_energy_consumption': self.scaling_factor_energy_consumption,
             f'{self.name}.{GlossaryEnergy.StreamProductionDetailedValue}': self.energy_production_detailed,
         }
         for energy in self.energy_list:
@@ -146,10 +143,9 @@ def test_01_CCUS_discipline(self):
             f'{self.name}.{self.model_name}')[0]
         filters = disc.get_chart_filter_list()
         graph_list = disc.get_post_processing_list(filters)
-
-
-#        for graph in graph_list:
-#            graph.to_plotly().show()
+        for graph in graph_list:
+            #graph.to_plotly().show()
+            pass
 
 
 if '__main__' == __name__:

energy_models/tests/l1_test_gradient_ccus_disc.py

@@ -182,8 +182,7 @@ def test_01_Consumption_ccus_disciplinejacobian(self):
             f'{self.name}.{GlossaryEnergy.carbon_storage}.{GlossaryEnergy.LandUseRequiredValue}',
         ]
         coupled_outputs = [f'{self.name}.co2_emissions_ccus_Gt',
-                           f'{self.name}.CCS_price',
-                           f'{self.name}.carbon_storage_constraint']
+                           f'{self.name}.CCS_price',]
 
         self.check_jacobian(location=dirname(__file__), filename=f'jacobian_{self.model_name}.pkl',
                             discipline=disc, step=1.0e-18, derr_approx='complex_step', threshold=1e-5,