diff --git a/energy_models/tests/jacobian_pkls/jacobian_FossilSimpleTechno_FossilSimpleTechno_construction_delay_0.pkl b/energy_models/tests/jacobian_pkls/jacobian_FossilSimpleTechno_FossilSimpleTechno_construction_delay_0.pkl index 3447681d..8fbdb40f 100644 Binary files a/energy_models/tests/jacobian_pkls/jacobian_FossilSimpleTechno_FossilSimpleTechno_construction_delay_0.pkl and b/energy_models/tests/jacobian_pkls/jacobian_FossilSimpleTechno_FossilSimpleTechno_construction_delay_0.pkl differ diff --git a/energy_models/tests/jacobian_pkls/jacobian_investments_profile_builder_disc_all_years.pkl b/energy_models/tests/jacobian_pkls/jacobian_investments_profile_builder_disc_all_years.pkl index 6b48be73..1141e77f 100644 Binary files a/energy_models/tests/jacobian_pkls/jacobian_investments_profile_builder_disc_all_years.pkl and b/energy_models/tests/jacobian_pkls/jacobian_investments_profile_builder_disc_all_years.pkl differ diff --git a/energy_models/tests/jacobian_pkls/jacobian_investments_profile_builder_disc_poles.pkl b/energy_models/tests/jacobian_pkls/jacobian_investments_profile_builder_disc_poles.pkl index 06e54c8d..d97bddd7 100644 Binary files a/energy_models/tests/jacobian_pkls/jacobian_investments_profile_builder_disc_poles.pkl and b/energy_models/tests/jacobian_pkls/jacobian_investments_profile_builder_disc_poles.pkl differ diff --git a/energy_models/tests/l0_test_compute_energy_mix.py b/energy_models/tests/l0_test_compute_energy_mix.py index 8e56a19c..37d60e17 100644 --- a/energy_models/tests/l0_test_compute_energy_mix.py +++ b/energy_models/tests/l0_test_compute_energy_mix.py @@ -355,7 +355,7 @@ def test_02_energy_mix_discipline(self): f'{name}.{model_name}.{GlossaryEnergy.hydrogen}.{GlossaryEnergy.gaseous_hydrogen}.{GlossaryEnergy.EnergyPricesValue}': self.prices_hydro, f'{name}.{model_name}.{GlossaryEnergy.hydrogen}.{GlossaryEnergy.gaseous_hydrogen}.{GlossaryEnergy.EnergyTypeCapitalDfValue}': self.energy_type_capital, f'{name}.{model_name}.{GlossaryEnergy.hydrogen}.{GlossaryEnergy.gaseous_hydrogen}.{GlossaryEnergy.CO2PerUse}': pd.DataFrame( - {GlossaryEnergy.Years: self.years, GlossaryEnergy.CO2Tax: 0.0, GlossaryEnergy.CO2PerUse: 0.0}), + {GlossaryEnergy.Years: self.years, GlossaryEnergy.CO2PerUse: 0.0}), f'{name}.{model_name}.{GlossaryEnergy.hydrogen}.{GlossaryEnergy.gaseous_hydrogen}.{GlossaryEnergy.CO2EmissionsValue}': pd.DataFrame( {GlossaryEnergy.Years: self.years, f'{GlossaryEnergy.hydrogen}.{GlossaryEnergy.gaseous_hydrogen}': 0.0}), f'{name}.{model_name}.{GlossaryEnergy.hydrogen}.{GlossaryEnergy.gaseous_hydrogen}.{GlossaryEnergy.LandUseRequiredValue}': self.land_use_required_mock, @@ -374,7 +374,7 @@ def test_02_energy_mix_discipline(self): f'{name}.{model_name}.{GlossaryEnergy.methane}.{GlossaryEnergy.EnergyPricesValue}': self.cost_details, f'{name}.{model_name}.{GlossaryEnergy.methane}.{GlossaryEnergy.EnergyTypeCapitalDfValue}': self.energy_type_capital, f'{name}.{model_name}.{GlossaryEnergy.methane}.{GlossaryEnergy.CO2PerUse}': pd.DataFrame( - {GlossaryEnergy.Years: self.years, GlossaryEnergy.CO2Tax: 0.0, GlossaryEnergy.CO2PerUse: 0.0}), + {GlossaryEnergy.Years: self.years, GlossaryEnergy.CO2PerUse: 0.0}), f'{name}.{model_name}.{GlossaryEnergy.methane}.{GlossaryEnergy.CO2EmissionsValue}': pd.DataFrame( {GlossaryEnergy.Years: self.years, GlossaryEnergy.methane: 0.0}), f'{name}.{model_name}.{GlossaryEnergy.methane}.{GlossaryEnergy.LandUseRequiredValue}': self.land_use_required_mock, @@ -447,7 +447,7 @@ def test_03_energy_mix_discipline_exponential_limit(self): f'{name}.{model_name}.{GlossaryEnergy.hydrogen}.{GlossaryEnergy.gaseous_hydrogen}.{GlossaryEnergy.EnergyProcductionWithoutRatioValue}': self.production_hydro, f'{name}.{model_name}.{GlossaryEnergy.hydrogen}.{GlossaryEnergy.gaseous_hydrogen}.{GlossaryEnergy.EnergyPricesValue}': self.prices_hydro, f'{name}.{model_name}.{GlossaryEnergy.hydrogen}.{GlossaryEnergy.gaseous_hydrogen}.{GlossaryEnergy.CO2PerUse}': pd.DataFrame( - {GlossaryEnergy.Years: self.years, GlossaryEnergy.CO2Tax: 0.0, GlossaryEnergy.CO2PerUse: 0.0}), + {GlossaryEnergy.Years: self.years, GlossaryEnergy.CO2PerUse: 0.0}), f'{name}.{model_name}.{GlossaryEnergy.hydrogen}.{GlossaryEnergy.gaseous_hydrogen}.{GlossaryEnergy.CO2EmissionsValue}': pd.DataFrame( {GlossaryEnergy.Years: self.years, f'{GlossaryEnergy.hydrogen}.{GlossaryEnergy.gaseous_hydrogen}': 0.0}), f'{name}.{model_name}.{GlossaryEnergy.hydrogen}.{GlossaryEnergy.gaseous_hydrogen}.{GlossaryEnergy.LandUseRequiredValue}': self.land_use_required_mock, @@ -459,7 +459,7 @@ def test_03_energy_mix_discipline_exponential_limit(self): f'{name}.{model_name}.{GlossaryEnergy.methane}.{GlossaryEnergy.EnergyProcductionWithoutRatioValue}': self.production, f'{name}.{model_name}.{GlossaryEnergy.methane}.{GlossaryEnergy.EnergyPricesValue}': self.cost_details, f'{name}.{model_name}.{GlossaryEnergy.methane}.{GlossaryEnergy.CO2PerUse}': pd.DataFrame( - {GlossaryEnergy.Years: self.years, GlossaryEnergy.CO2Tax: 0.0, GlossaryEnergy.CO2PerUse: 0.0}), + {GlossaryEnergy.Years: self.years, GlossaryEnergy.CO2PerUse: 0.0}), f'{name}.{model_name}.{GlossaryEnergy.methane}.{GlossaryEnergy.CO2EmissionsValue}': pd.DataFrame( {GlossaryEnergy.Years: self.years, GlossaryEnergy.methane: 0.0}), f'{name}.{model_name}.{GlossaryEnergy.methane}.{GlossaryEnergy.LandUseRequiredValue}': self.land_use_required_mock, @@ -530,7 +530,7 @@ def test_04_energy_mix_resource(self): f'{name}.{model_name}.{GlossaryEnergy.hydrogen}.{GlossaryEnergy.gaseous_hydrogen}.{GlossaryEnergy.EnergyProcductionWithoutRatioValue}': self.production_hydro, f'{name}.{model_name}.{GlossaryEnergy.hydrogen}.{GlossaryEnergy.gaseous_hydrogen}.{GlossaryEnergy.EnergyPricesValue}': self.prices_hydro, f'{name}.{model_name}.{GlossaryEnergy.hydrogen}.{GlossaryEnergy.gaseous_hydrogen}.{GlossaryEnergy.CO2PerUse}': pd.DataFrame( - {GlossaryEnergy.Years: self.years, GlossaryEnergy.CO2Tax: 0.0, GlossaryEnergy.CO2PerUse: 0.0}), + {GlossaryEnergy.Years: self.years, GlossaryEnergy.CO2PerUse: 0.0}), f'{name}.{model_name}.{GlossaryEnergy.hydrogen}.{GlossaryEnergy.gaseous_hydrogen}.{GlossaryEnergy.CO2EmissionsValue}': pd.DataFrame( {GlossaryEnergy.Years: self.years, f'{GlossaryEnergy.hydrogen}.{GlossaryEnergy.gaseous_hydrogen}': 0.0}), f'{name}.{model_name}.{GlossaryEnergy.hydrogen}.{GlossaryEnergy.gaseous_hydrogen}.{GlossaryEnergy.LandUseRequiredValue}': self.land_use_required_mock, @@ -542,7 +542,7 @@ def test_04_energy_mix_resource(self): f'{name}.{model_name}.{GlossaryEnergy.methane}.{GlossaryEnergy.EnergyProcductionWithoutRatioValue}': self.production, f'{name}.{model_name}.{GlossaryEnergy.methane}.{GlossaryEnergy.EnergyPricesValue}': self.cost_details, f'{name}.{model_name}.{GlossaryEnergy.methane}.{GlossaryEnergy.CO2PerUse}': pd.DataFrame( - {GlossaryEnergy.Years: self.years, GlossaryEnergy.CO2Tax: 0.0, GlossaryEnergy.CO2PerUse: 0.0}), + {GlossaryEnergy.Years: self.years, GlossaryEnergy.CO2PerUse: 0.0}), f'{name}.{model_name}.{GlossaryEnergy.methane}.{GlossaryEnergy.CO2EmissionsValue}': pd.DataFrame( {GlossaryEnergy.Years: self.years, GlossaryEnergy.methane: 0.0}), f'{name}.{model_name}.{GlossaryEnergy.methane}.{GlossaryEnergy.LandUseRequiredValue}': self.land_use_required_mock,