Merge branch 'develop' into integration

os-climate · Oct 28, 2024 · b0a1aeb · b0a1aeb
2 parents be4680c + 2d0e1ae
commit b0a1aeb
Show file tree

Hide file tree

Showing 14 changed files with 0 additions and 0 deletions.
diff --git a/...y_models/tests/jacobian_pkls/jacobian_CleanEnergySimpleTechno_CleanEnergySimpleTechno.pkl b/...y_models/tests/jacobian_pkls/jacobian_CleanEnergySimpleTechno_CleanEnergySimpleTechno.pkl
diff --git a/...an_pkls/jacobian_CleanEnergySimpleTechno_CleanEnergySimpleTechno_construction_delay_0.pkl b/...an_pkls/jacobian_CleanEnergySimpleTechno_CleanEnergySimpleTechno_construction_delay_0.pkl
diff --git a/energy_models/tests/jacobian_pkls/jacobian_FossilSimpleTechno_FossilSimpleTechno.pkl b/energy_models/tests/jacobian_pkls/jacobian_FossilSimpleTechno_FossilSimpleTechno.pkl
diff --git a/...sts/jacobian_pkls/jacobian_FossilSimpleTechno_FossilSimpleTechno_construction_delay_0.pkl b/...sts/jacobian_pkls/jacobian_FossilSimpleTechno_FossilSimpleTechno_construction_delay_0.pkl
diff --git a/energy_models/tests/jacobian_pkls/jacobian_dac_direct_air_capture.DirectAirCaptureTechno.pkl b/energy_models/tests/jacobian_pkls/jacobian_dac_direct_air_capture.DirectAirCaptureTechno.pkl
diff --git a/energy_models/tests/jacobian_pkls/jacobian_electricity_coal_gen.pkl b/energy_models/tests/jacobian_pkls/jacobian_electricity_coal_gen.pkl
diff --git a/energy_models/tests/jacobian_pkls/jacobian_electricity_geothermal_high_heat_zz.pkl b/energy_models/tests/jacobian_pkls/jacobian_electricity_geothermal_high_heat_zz.pkl
diff --git a/energy_models/tests/jacobian_pkls/jacobian_electricity_nuclear.pkl b/energy_models/tests/jacobian_pkls/jacobian_electricity_nuclear.pkl
diff --git a/energy_models/tests/jacobian_pkls/jacobian_electricity_oil_gen.pkl b/energy_models/tests/jacobian_pkls/jacobian_electricity_oil_gen.pkl
diff --git a/energy_models/tests/jacobian_pkls/jacobian_electricity_solar_pv.pkl b/energy_models/tests/jacobian_pkls/jacobian_electricity_solar_pv.pkl
diff --git a/energy_models/tests/jacobian_pkls/jacobian_electricity_solar_thermal.pkl b/energy_models/tests/jacobian_pkls/jacobian_electricity_solar_thermal.pkl
diff --git a/energy_models/tests/jacobian_pkls/jacobian_electricity_wind_off_shore.pkl b/energy_models/tests/jacobian_pkls/jacobian_electricity_wind_off_shore.pkl
diff --git a/energy_models/tests/jacobian_pkls/jacobian_electricity_wind_on_shore.pkl b/energy_models/tests/jacobian_pkls/jacobian_electricity_wind_on_shore.pkl
diff --git a/energy_models/tests/jacobian_pkls/jacobian_ratio_FossilGas.pkl b/energy_models/tests/jacobian_pkls/jacobian_ratio_FossilGas.pkl