Merge branch 'develop' into integration

os-climate · Nov 6, 2024 · 6aa396b · 6aa396b
2 parents 6ddac4d + 8e6b8d5
commit 6aa396b
Show file tree

Hide file tree

Showing 11 changed files with 44 additions and 1 deletion.
diff --git a/energy_models/core/techno_type/techno_disc.py b/energy_models/core/techno_type/techno_disc.py
@@ -247,7 +247,8 @@ def update_default_values(self):
 
         if 'initial_production' in self.get_data_in() and GlossaryEnergy.YearStart in self.get_data_in():
             year_start = self.get_sosdisc_inputs(GlossaryEnergy.YearStart)
-            if year_start is not None:
+            initial_production = self.get_sosdisc_inputs('initial_production')
+            if year_start is not None and initial_production is None:
                 initial_production, _ = DatabaseWitnessEnergy.get_techno_prod(self.techno_name, year=year_start - 1)
                 self.update_default_value('initial_production', 'in', initial_production)
 

diff --git a/energy_models/tests/jacobian_pkls/jacobian_liquid_fuel_fischer_tropsch_RWGS.pkl b/energy_models/tests/jacobian_pkls/jacobian_liquid_fuel_fischer_tropsch_RWGS.pkl
diff --git a/energy_models/tests/jacobian_pkls/jacobian_liquid_fuel_fischer_tropsch_RWGS_and_WGS.pkl b/energy_models/tests/jacobian_pkls/jacobian_liquid_fuel_fischer_tropsch_RWGS_and_WGS.pkl
diff --git a/energy_models/tests/jacobian_pkls/jacobian_liquid_fuel_fischer_tropsch_RWGS_and_WGS_bis.pkl b/energy_models/tests/jacobian_pkls/jacobian_liquid_fuel_fischer_tropsch_RWGS_and_WGS_bis.pkl
diff --git a/...models/tests/jacobian_pkls/jacobian_liquid_fuel_fischer_tropsch_RWGS_and_WGS_negative.pkl b/...models/tests/jacobian_pkls/jacobian_liquid_fuel_fischer_tropsch_RWGS_and_WGS_negative.pkl
diff --git a/energy_models/tests/jacobian_pkls/jacobian_liquid_fuel_fischer_tropsch_WGS.pkl b/energy_models/tests/jacobian_pkls/jacobian_liquid_fuel_fischer_tropsch_WGS.pkl
diff --git a/...gy_models/tests/jacobian_pkls/jacobian_liquid_fuel_fischer_tropsch_ratio_available_cc.pkl b/...gy_models/tests/jacobian_pkls/jacobian_liquid_fuel_fischer_tropsch_ratio_available_cc.pkl
diff --git a/energy_models/tests/jacobian_pkls/jacobian_syngas_ReversedWaterGasShift.pkl b/energy_models/tests/jacobian_pkls/jacobian_syngas_ReversedWaterGasShift.pkl
diff --git a/energy_models/tests/to_fix/CalciumLoopingDiscipline.py b/energy_models/tests/to_fix/CalciumLoopingDiscipline.py
@@ -1,4 +1,18 @@
+'''
+Copyright 2024 Capgemini
 
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+'''
 import pickle
 from os.path import dirname
 

diff --git a/energy_models/tests/to_fix/MonoEthanolAmineDiscipline.py b/energy_models/tests/to_fix/MonoEthanolAmineDiscipline.py
@@ -1,4 +1,18 @@
+'''
+Copyright 2024 Capgemini
 
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+'''
 import pickle
 from os.path import dirname
 

diff --git a/energy_models/tests/to_fix/PiperazineProcessDiscipline.py b/energy_models/tests/to_fix/PiperazineProcessDiscipline.py
@@ -1,4 +1,18 @@
+'''
+Copyright 2024 Capgemini
 
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+'''
 import pickle
 from os.path import dirname