Merge branch 'develop' into integration

os-climate · Sep 2, 2024 · 59131fc · 59131fc
2 parents b05d638 + a887d1d
commit 59131fc
Show file tree

Hide file tree

Showing 54 changed files with 1 addition and 1 deletion.
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/energy_models/tests/jacobian_pkls/jacobian_carbon_capture_amine_scrubbing.pkl b/energy_models/tests/jacobian_pkls/jacobian_carbon_capture_amine_scrubbing.pkl
diff --git a/energy_models/tests/jacobian_pkls/jacobian_carbon_capture_calcium_potassium_scrubbing.pkl b/energy_models/tests/jacobian_pkls/jacobian_carbon_capture_calcium_potassium_scrubbing.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_flue_gas_CO2_membranes.pkl b/energy_models/tests/jacobian_pkls/jacobian_flue_gas_CO2_membranes.pkl
diff --git a/energy_models/tests/jacobian_pkls/jacobian_flue_gas_CalciumLooping.pkl b/energy_models/tests/jacobian_pkls/jacobian_flue_gas_CalciumLooping.pkl
diff --git a/energy_models/tests/jacobian_pkls/jacobian_flue_gas_chilled_ammonia_process.pkl b/energy_models/tests/jacobian_pkls/jacobian_flue_gas_chilled_ammonia_process.pkl
diff --git a/energy_models/tests/jacobian_pkls/jacobian_flue_gas_mono_ethanol_amine.pkl b/energy_models/tests/jacobian_pkls/jacobian_flue_gas_mono_ethanol_amine.pkl
diff --git a/energy_models/tests/jacobian_pkls/jacobian_flue_gas_piperazine_process.pkl b/energy_models/tests/jacobian_pkls/jacobian_flue_gas_piperazine_process.pkl
diff --git a/energy_models/tests/jacobian_pkls/jacobian_flue_gas_pressure_swing_adsorption.pkl b/energy_models/tests/jacobian_pkls/jacobian_flue_gas_pressure_swing_adsorption.pkl
diff --git a/energy_models/tests/jacobian_pkls/jacobian_hydrogen_AWE.pkl b/energy_models/tests/jacobian_pkls/jacobian_hydrogen_AWE.pkl
diff --git a/energy_models/tests/jacobian_pkls/jacobian_hydrogen_PEM.pkl b/energy_models/tests/jacobian_pkls/jacobian_hydrogen_PEM.pkl
diff --git a/energy_models/tests/jacobian_pkls/jacobian_hydrogen_SOEC.pkl b/energy_models/tests/jacobian_pkls/jacobian_hydrogen_SOEC.pkl
diff --git a/energy_models/tests/jacobian_pkls/jacobian_hydrogen_WGS.pkl b/energy_models/tests/jacobian_pkls/jacobian_hydrogen_WGS.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_poles.pkl b/energy_models/tests/jacobian_pkls/jacobian_investments_profile_builder_disc_poles.pkl
diff --git a/energy_models/tests/jacobian_pkls/jacobian_liquid_fuel_Transesterification.pkl b/energy_models/tests/jacobian_pkls/jacobian_liquid_fuel_Transesterification.pkl
diff --git a/energy_models/tests/jacobian_pkls/jacobian_liquid_fuel_Transesterification_negative.pkl b/energy_models/tests/jacobian_pkls/jacobian_liquid_fuel_Transesterification_negative.pkl
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_liquid_fuel_refinery.pkl b/energy_models/tests/jacobian_pkls/jacobian_liquid_fuel_refinery.pkl
diff --git a/energy_models/tests/jacobian_pkls/jacobian_liquid_hydrogen_hydrogen_liquefaction.pkl b/energy_models/tests/jacobian_pkls/jacobian_liquid_hydrogen_hydrogen_liquefaction.pkl
diff --git a/energy_models/tests/jacobian_pkls/jacobian_methane_fossil_gas.pkl b/energy_models/tests/jacobian_pkls/jacobian_methane_fossil_gas.pkl
diff --git a/energy_models/tests/jacobian_pkls/jacobian_methane_methanation.pkl b/energy_models/tests/jacobian_pkls/jacobian_methane_methanation.pkl
diff --git a/energy_models/tests/jacobian_pkls/jacobian_methane_upgrading_biogas.pkl b/energy_models/tests/jacobian_pkls/jacobian_methane_upgrading_biogas.pkl
diff --git a/energy_models/tests/jacobian_pkls/jacobian_ratio_CoalExtraction.pkl b/energy_models/tests/jacobian_pkls/jacobian_ratio_CoalExtraction.pkl
diff --git a/energy_models/tests/jacobian_pkls/jacobian_ratio_Electrolysis.PEM.pkl b/energy_models/tests/jacobian_pkls/jacobian_ratio_Electrolysis.PEM.pkl
diff --git a/energy_models/tests/jacobian_pkls/jacobian_ratio_FischerTropsch.pkl b/energy_models/tests/jacobian_pkls/jacobian_ratio_FischerTropsch.pkl
diff --git a/energy_models/tests/jacobian_pkls/jacobian_ratio_FossilGas.pkl b/energy_models/tests/jacobian_pkls/jacobian_ratio_FossilGas.pkl
diff --git a/energy_models/tests/jacobian_pkls/jacobian_ratio_HydrogenLiquefaction.pkl b/energy_models/tests/jacobian_pkls/jacobian_ratio_HydrogenLiquefaction.pkl
diff --git a/energy_models/tests/jacobian_pkls/jacobian_ratio_Refinery.pkl b/energy_models/tests/jacobian_pkls/jacobian_ratio_Refinery.pkl
diff --git a/energy_models/tests/jacobian_pkls/jacobian_ratio_SMR.pkl b/energy_models/tests/jacobian_pkls/jacobian_ratio_SMR.pkl
diff --git a/energy_models/tests/jacobian_pkls/jacobian_ratio_WaterGasShift.pkl b/energy_models/tests/jacobian_pkls/jacobian_ratio_WaterGasShift.pkl
diff --git a/energy_models/tests/jacobian_pkls/jacobian_ratio_hydrogen.gaseous_hydrogen.pkl b/energy_models/tests/jacobian_pkls/jacobian_ratio_hydrogen.gaseous_hydrogen.pkl
diff --git a/energy_models/tests/jacobian_pkls/jacobian_solid_fuel_coal_extraction.pkl b/energy_models/tests/jacobian_pkls/jacobian_solid_fuel_coal_extraction.pkl
diff --git a/energy_models/tests/jacobian_pkls/jacobian_solid_fuel_pelletizing.pkl b/energy_models/tests/jacobian_pkls/jacobian_solid_fuel_pelletizing.pkl
diff --git a/energy_models/tests/jacobian_pkls/jacobian_syngas_ATR.pkl b/energy_models/tests/jacobian_pkls/jacobian_syngas_ATR.pkl
diff --git a/energy_models/tests/jacobian_pkls/jacobian_syngas_RWGS.pkl b/energy_models/tests/jacobian_pkls/jacobian_syngas_RWGS.pkl
diff --git a/energy_models/tests/jacobian_pkls/jacobian_syngas_SMR.pkl b/energy_models/tests/jacobian_pkls/jacobian_syngas_SMR.pkl
diff --git a/energy_models/tests/jacobian_pkls/jacobian_syngas_biomass_gasification.pkl b/energy_models/tests/jacobian_pkls/jacobian_syngas_biomass_gasification.pkl
diff --git a/energy_models/tests/jacobian_pkls/jacobian_syngas_coal_gasification.pkl b/energy_models/tests/jacobian_pkls/jacobian_syngas_coal_gasification.pkl
diff --git a/energy_models/tests/jacobian_pkls/jacobian_syngas_coelectrolysis.pkl b/energy_models/tests/jacobian_pkls/jacobian_syngas_coelectrolysis.pkl
diff --git a/platform_version_required.txt b/platform_version_required.txt
@@ -1 +1 @@
-v4.1.0
+v4.1.1