diff --git a/CHANGELOG.md b/CHANGELOG.md index e9b8f89457..32ed4215ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,12 +10,26 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ### input data/calibration ### changed -- **45_carbonprice** Use ScenarioMIP settings as new default for regional carbon price differentiation in 45_carbonprice/functionalForm +- **45_carbonprice** Use ScenarioMIP settings as new default for regional carbon price differentiation in `45_carbonprice/functionalForm` [[#2229](https://github.com/remindmodel/remind/pull/2229)] - **11_aerosols** Move calculation of air pollutant emissions from REMIND module 11_aerosols to remind2. [[#2231](https://github.com/remindmodel/remind/pull/2231)] - **scripts** Forward `reporting` dir to `reportEmiForClimateAssessement` [[#2287](https://github.com/remindmodel/remind/pull/2229)] +- **core** replaced `execute_load` with `execute_loadpoint` in `core/preloop.gms` + [[#2237](https://github.com/remindmodel/remind/pull/2207)] +- **21_tax** replaced `execute_load` with `execute_loadpoint` in `21_tax/on/datainput.gms` + [[#2237](https://github.com/remindmodel/remind/pull/2207)] +- **24_trade** replaced `execute_load` with `execute_loadpoint` in `24_trade/se_trade/datainput.gms` + [[#2237](https://github.com/remindmodel/remind/pull/2207)] +- **29_CES_parameters** replaced `execute_load` with `execute_loadpoint` in `29_CES_parameters/calibrate/datainput.gms` and `29_CES_parameters/calibrate/preloop.gms` + [[#2237](https://github.com/remindmodel/remind/pull/2207)] +- **30_biomass** replaced `execute_load` with `execute_loadpoint` in `30_biomass/magpie_40/datainput.gms` + [[#2237](https://github.com/remindmodel/remind/pull/2207)] +- **36_buildings** replaced `execute_load` with `execute_loadpoint` in `36_buildings/simple/datainput.gms` + [[#2237](https://github.com/remindmodel/remind/pull/2207)] +- **37_industry** replaced `execute_load` with `execute_loadpoint` in `37_industry/subsectors/datainput.gms` + [[#2237](https://github.com/remindmodel/remind/pull/2207)] ### added - **40_techpol** implement renewable energy share targets for NPi2025 realization based on NewClimate policy protocol diff --git a/core/preloop.gms b/core/preloop.gms index 640d35f332..5af7e4f43d 100644 --- a/core/preloop.gms +++ b/core/preloop.gms @@ -88,7 +88,7 @@ $ENDIF.out *** load PE, SE, FE price parameters from reference gdx to have prices in time steps before cm_startyear if (cm_startyear gt 2005, -execute_load "input_ref.gdx", pm_PEPrice, pm_SEPrice, pm_FEPrice; + Execute_Loadpoint "input_ref.gdx", pm_PEPrice, pm_SEPrice, pm_FEPrice; ); *** load vm_capEarlyReti(ttot,regi,te) from reference gdx to have a reference point for q_smoothphaseoutCapEarlyReti and q_limitCapEarlyReti diff --git a/modules/21_tax/on/datainput.gms b/modules/21_tax/on/datainput.gms index 0fd7d0f65a..2feb13ece1 100644 --- a/modules/21_tax/on/datainput.gms +++ b/modules/21_tax/on/datainput.gms @@ -150,8 +150,8 @@ Execute_Loadpoint 'input_ref' p21_ref_costInvTeAdj_RE = vm_costInvTeAdj.l; $endif.importtaxrc if (cm_startyear gt 2005, -execute_load "input_ref.gdx", pm_taxrevCO2LUC0; -execute_load "input_ref.gdx", pm_taxrevGHG0; +Execute_Loadpoint "input_ref.gdx", pm_taxrevCO2LUC0; +Execute_Loadpoint "input_ref.gdx", pm_taxrevGHG0; ); ***initialize co2 market taxes diff --git a/modules/24_trade/se_trade/datainput.gms b/modules/24_trade/se_trade/datainput.gms index 0964c75235..52be871a2d 100644 --- a/modules/24_trade/se_trade/datainput.gms +++ b/modules/24_trade/se_trade/datainput.gms @@ -186,8 +186,8 @@ $endif.import_h2_EU p24_seAggReference(ttot,regi,seAgg) = sum(enty$seAgg2se(seAgg,enty), sum(se2fe(enty,enty2,te), pm_prodFEReference(ttot,regi,enty,enty2,te))); p24_FEregiShareInRegiGroup(ttot,ext_regi,regi,seAgg)$(regi_group(ext_regi,regi) and p24_seAggReference(ttot,regi,seAgg)) = p24_seAggReference(ttot,regi,seAgg) / sum(regi2$regi_group(ext_regi,regi2), p24_seAggReference(ttot,regi2,seAgg)); -execute_load "input_ref.gdx", p24_demFeForEsReference = vm_demFeForEs.l; -execute_load "input_ref.gdx", p24_demFeIndSubReference = o37_demFeIndSub; +Execute_Loadpoint "input_ref.gdx", p24_demFeForEsReference = vm_demFeForEs.l; +Execute_Loadpoint "input_ref.gdx", p24_demFeIndSubReference = o37_demFeIndSub; *** calculate regional share of each region in the total of region group ext_regi with respect to FE demand, for chemicals + aviation liquids p24_aviationAndChemicalsFE(ttot,regi) = p24_demFeForEsReference(ttot,regi,"fedie","esdie_pass_lo","te_esdie_pass_lo") + !! aviation FE demand diff --git a/modules/29_CES_parameters/calibrate/datainput.gms b/modules/29_CES_parameters/calibrate/datainput.gms index a8dced29c7..361ab61eb7 100644 --- a/modules/29_CES_parameters/calibrate/datainput.gms +++ b/modules/29_CES_parameters/calibrate/datainput.gms @@ -195,7 +195,7 @@ p29_capitalQuantity(tall,all_regi,"kap") *** Substract the end-use capital quantities from the aggregate capital *** Load CES parameters from the last run -Execute_Load 'input' p29_cesdata_load = pm_cesdata; +Execute_Loadpoint 'input' p29_cesdata_load = pm_cesdata; $ifthen.testOneRegi "%optimization%" == "testOneRegi" !! optimization !! carry along CES parameters for other regions in testOneRegi runs pm_cesdata(t,regi,in,cesParameter)$( NOT regi_dyn29(regi) ) diff --git a/modules/29_CES_parameters/calibrate/preloop.gms b/modules/29_CES_parameters/calibrate/preloop.gms index 4df3d8e840..b74642df9f 100644 --- a/modules/29_CES_parameters/calibrate/preloop.gms +++ b/modules/29_CES_parameters/calibrate/preloop.gms @@ -26,7 +26,7 @@ display "check starting pm_cesdata", pm_cesdata; *** Abort if new structure flag is not set but should be $ifthen.old_structure %c_CES_calibration_new_structure% == "0" -Execute_Load 'input' ces2_29=cesOut2cesIn; +Execute_Loadpoint 'input' ces2_29=cesOut2cesIn; sm_tmp = 0; loop ( ces2_29(out,in)$( NOT cesOut2cesIn2(out,in) ), sm_tmp = 1); loop (cesOut2cesIn2(out,in)$( NOT ces2_29(out,in) ), sm_tmp = 1); @@ -35,7 +35,7 @@ if (sm_tmp, abort "CES structure does not match. Enable c_CES_calibration_new_structure"; ); -Execute_Load 'input' regi_29_load=regi; +Execute_Loadpoint 'input' regi_29_load=regi; sm_tmp = 0; loop ( regi_29_load(regi2)$( NOT regi(regi2) ), sm_tmp = 1); loop (regi(regi2)$( NOT regi_29_load(regi2) ), sm_tmp = 1); diff --git a/modules/30_biomass/magpie/datainput.gms b/modules/30_biomass/magpie/datainput.gms index 43a17cf63e..8f1e7fe825 100644 --- a/modules/30_biomass/magpie/datainput.gms +++ b/modules/30_biomass/magpie/datainput.gms @@ -62,7 +62,7 @@ $offdelim *** Why is this necessary? Isn't pm_pebiolc_costs_emu_preloop ALWAYS calculated in preloop, overwriting what has been loaded here? if (cm_startyear gt 2005, -execute_load "input_ref.gdx", pm_pebiolc_costs_emu_preloop; +Execute_Loadpoint "input_ref.gdx", pm_pebiolc_costs_emu_preloop; ); *** Select bioenergy bioenergy supply curve according to SSP scenario diff --git a/modules/36_buildings/simple/datainput.gms b/modules/36_buildings/simple/datainput.gms index 8f6c307469..c138a1a4cd 100644 --- a/modules/36_buildings/simple/datainput.gms +++ b/modules/36_buildings/simple/datainput.gms @@ -60,7 +60,7 @@ $offdelim *** load UE demand for reporting from input_ref.gdx cm_startyear if (cm_startyear gt 2005, - execute_load "input_ref.gdx", p36_uedemand_build; + Execute_Loadpoint "input_ref.gdx", p36_uedemand_build; ); p36_uedemand_build(t,regi,in) = f36_uedemand_build(t,regi,"%cm_demScen%","%cm_rcp_scen_build%",in); diff --git a/modules/37_industry/subsectors/datainput.gms b/modules/37_industry/subsectors/datainput.gms index 7e0d2c36eb..3cbfeedb8a 100644 --- a/modules/37_industry/subsectors/datainput.gms +++ b/modules/37_industry/subsectors/datainput.gms @@ -648,7 +648,7 @@ $offdelim *' load baseline industry ETS solids demand if (cm_startyear ne 2005, !! not a BAU scenario -execute_load "input_ref.gdx", vm_demFeSector_afterTax; +Execute_Loadpoint "input_ref.gdx", vm_demFeSector_afterTax; p37_BAU_industry_ETS_solids(t,regi) = sum(se2fe(entySe,"fesos",te), vm_demFeSector_afterTax.l(t,regi,entySe,"fesos","indst","ETS") @@ -869,7 +869,7 @@ if (cm_startyear gt 2005, ); if (cm_startyear gt 2005, - execute_load "input_ref.gdx" v37_plasticWaste.l = v37_plasticWaste.l; + Execute_Loadpoint "input_ref.gdx" v37_plasticWaste.l = v37_plasticWaste.l; ); *** EOF ./modules/37_industry/subsectors/datainput.gms