Merge branch 'develop' into integration

os-climate · Oct 10, 2024 · d706495 · d706495
2 parents 225926b + 0805218
commit d706495
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 151 deletions.
diff --git a/energy_models/models/clean_energy/clean_energy_simple_techno/clean_energy_simple_techno.py b/energy_models/models/clean_energy/clean_energy_simple_techno/clean_energy_simple_techno.py
@@ -14,11 +14,18 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 '''
+import pandas as pd
 
 from energy_models.core.techno_type.base_techno_models.renewable_techno import (
     RenewableTechno,
 )
+from energy_models.glossaryenergy import GlossaryEnergy
 
 
 class CleanEnergySimpleTechno(RenewableTechno):
-    pass
+
+    def compute_specifif_costs_of_technos(self):
+        self.specific_costs = pd.DataFrame({
+            GlossaryEnergy.Years: self.years,
+            GlossaryEnergy.ResourcesPriceValue: self.techno_infos_dict['resource_price']
+        })
diff --git a/energy_models/tests/jacobian_pkls/jacobian_investments_profile_builder_disc.pkl b/energy_models/tests/jacobian_pkls/jacobian_investments_profile_builder_disc.pkl
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_mix.pkl b/energy_models/tests/jacobian_pkls/jacobian_investments_profile_builder_disc_mix.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_gradient_investments_profile_builder.py b/energy_models/tests/l1_test_gradient_investments_profile_builder.py