merge validation to main

os-climate · Oct 1, 2024 · 16b8283 · 16b8283
2 parents 7afa6d1 + 17e8ac8
commit 16b8283
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 7 deletions.
diff --git a/energy_models/sos_processes/energy/MDA/energy_mix_optim_sub_process/usecase.py b/energy_models/sos_processes/energy/MDA/energy_mix_optim_sub_process/usecase.py
@@ -89,7 +89,6 @@ def __init__(
         )
         self.year_start = year_start
         self.year_end = year_end
-        self.time_step = 1
         self.years = np.arange(self.year_start, self.year_end + 1)
         self.dict_technos = {}
         self.coupling_name = "MDA"

diff --git a/energy_models/sos_processes/energy/MDA/energy_process_v0/usecase.py b/energy_models/sos_processes/energy/MDA/energy_process_v0/usecase.py
@@ -78,7 +78,6 @@ def __init__(
             self,
             year_start=GlossaryEnergy.YearStartDefault,
             year_end=GlossaryEnergy.YearEndDefault,
-            time_step=1,
             lower_bound_techno=1.0e-6,
             upper_bound_techno=100.0,
             techno_dict=GlossaryEnergy.DEFAULT_TECHNO_DICT,
@@ -90,7 +89,6 @@ def __init__(
     ):
         self.year_start = year_start
         self.year_end = year_end
-        self.time_step = time_step
         self.years = np.arange(self.year_start, self.year_end + 1)
         self.dict_technos = {}
 

diff --git a/energy_models/sos_processes/energy/MDA/energy_process_v0_mda/usecase.py b/energy_models/sos_processes/energy/MDA/energy_process_v0_mda/usecase.py
@@ -39,7 +39,6 @@ def __init__(
             self,
             year_start=GlossaryEnergy.YearStartDefault,
             year_end=GlossaryEnergy.YearEndDefault,
-            time_step=1,
             lower_bound_techno=1.0e-6,
             upper_bound_techno=100.0,
             techno_dict=GlossaryEnergy.DEFAULT_TECHNO_DICT,
@@ -52,7 +51,6 @@ def __init__(
         self.main_study = main_study
         self.year_start = year_start
         self.year_end = year_end
-        self.time_step = time_step
         self.energy_list = None
         self.ccs_list = None
         self.dict_technos = None
@@ -69,7 +67,6 @@ def __init__(
         self.study_v0 = Study_v0(
             year_start=self.year_start,
             year_end=self.year_end,
-            time_step=self.time_step,
             main_study=self.main_study,
             bspline=self.bspline,
             execution_engine=execution_engine,

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
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
diff --git a/energy_models/tests/l1_test_energy_global_values.py b/energy_models/tests/l1_test_energy_global_values.py
@@ -101,7 +101,7 @@ def setUpClass(cls):
              GlossaryEnergy.CO2Tax: 20.0}, index=np.arange(GlossaryEnergy.YearStartDefault, GlossaryEnergy.YearEndDefault + 1))
 
         usecase_agri = agri_study_open(execution_engine=cls.ee, year_start=GlossaryEnergy.YearStartDefault,
-                                       year_end=GlossaryEnergy.YearEndDefault, time_step=1)
+                                       year_end=GlossaryEnergy.YearEndDefault)
         usecase_agri.study_name = cls.name
         usecase_agri.additional_ns = '.InvestmentDistribution'
         values_dict_agri = usecase_agri.setup_usecase()