Skip to content

replace cm_startIter_EDGET with set #2283

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
fbenke-pik wants to merge 7 commits into
base: develop
Choose a base branch
from
Draft

replace cm_startIter_EDGET with set #2283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6becd08
replace cm_startIter_EDGET with set
fbenke-pik Feb 9, 2026
1ddb8da
minor syntax fix
fbenke-pik Feb 11, 2026
2d883d7
fix test config file
fbenke-pik Feb 11, 2026
949b062
add run to scenario_config_quick
fbenke-pik Feb 12, 2026
19a3dd7
fix run configuration
fbenke-pik Feb 13, 2026
75f6a56
move new scenario config to a separate file
fbenke-pik Feb 13, 2026
5f369ad
add reporting config to scenario_config_oneRegiPlus
fbenke-pik Feb 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 26 additions & 26 deletions config/scenario_config_21_EU11_ARIADNE.csv
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions config/tests/scenario_config_oneRegiPlus.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
title;start;cm_nash_mode;cm_iteration_max;optimization;c_magpieIter;c_transportIter;slurmConfig;output
testOneRegiEnhanced;;1;5;testOneRegi;;;--qos=priority --nodes=1 --tasks-per-node=1 --mem=8000 --time=180;reporting
testOneRegiTransport;1;1;5;testOneRegi;;2, 3;--qos=priority --nodes=1 --tasks-per-node=1 --mem=8000 --time=180;reporting
5 changes: 5 additions & 0 deletions core/sets.gms
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2283,6 +2283,11 @@ magpieIter(iteration) "Nash iterations in which MAgPIE runs in core/presolve"
/
%c_magpieIter%
/

transportIter(iteration) "Nash iterations in which EDGE-T runs"
/
%c_transportIter%
/
;

***-----------------------------------------------------------------------------
Expand Down
12 changes: 5 additions & 7 deletions main.gms
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1255,13 +1255,6 @@ parameter
*' This switch changes the assumption about the share of timely realised capacities from sum of announced/planned in 2030 from the IEA CCS data base
*' Default assumption is that only 30% of announced or planned capacities will be realised, either due to discontinuation or delay

parameter
cm_startIter_EDGET "starting iteration of EDGE-T"
;
cm_startIter_EDGET = 10; !! def = 10, by default EDGE-T is run first in iteration 10 !! regexp = [0-9]+
*' EDGE-T transport starting iteration of coupling
*' def 10, EDGE-T coupling starts at 10, if you want to test whether infeasibilities after EDGE-T -> set it to 1 to check after first iteration
*'
parameter
cm_deuCDRmax "switch to limit maximum annual CDR amount in Germany in MtCO2 per y"
;
Expand Down Expand Up @@ -1336,6 +1329,11 @@ parameter
*'
$setglobal c_magpieIter 20,24,28,32 !! def = "20,24,28,32" !! This regular expression works in manual test but not in checkFixCfg [0-9]{1,2}(,[0-9]{1,2})*


*' c_transportIter "Nash iterations in which EDGE-T runs"
*'
$setglobal c_transportIter 14,16,18,20,22,24,27,30,33,36,39,42,45,50,55,60,65,70,75,80,85,90,95 !! def = "14,16,18,20,22,24,27,30,33,36,39,42,45,50,55,60,65,70,75,80,85,90,95"

*' cm_rcp_scen "chooses RCP scenario"
*'
*' * (none): no RCP scenario, standard setting
Expand Down
6 changes: 3 additions & 3 deletions modules/35_transport/edge_esm/presolve.gms
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@
*** | Contact: remind@pik-potsdam.de
*** SOF ./modules/35_transport/edge_esm/presolve.gms
$ifthen.calibrate %CES_parameters% == "load"
if( (ord(iteration) le 25 and ord(iteration) ge cm_startIter_EDGET and (mod(ord(iteration), 2) eq 0))
or (ord(iteration) le 45 and ord(iteration) gt 25 and (mod(ord(iteration), 3) eq 0))
or (ord(iteration) gt 45 and (mod(ord(iteration), 5) eq 0)),
if(transportIter(iteration),

*** Track runtime
putclose runtime gyear(jnow):0:0 "-" gmonth(jnow):0:0 "-" gday(jnow):0:0 " " ghour(jnow):0:0 ":" gminute(jnow):0:0 ":" gsecond(jnow):0:0 ",iterativeEdgeTransport," iteration.val:0;
Expand Down Expand Up @@ -36,3 +34,5 @@ if( (ord(iteration) le 25 and ord(iteration) ge cm_startIter_EDGET and (mod(ord(
$endif.calibrate

*** EOF ./modules/35_transport/edge_esm/presolve.gms


8 changes: 0 additions & 8 deletions standalone/MOFEX/MOFEX.gms
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,6 @@ cm_import_EU "EU switch for different scenarios of EU SE import a
cm_noPeFosCCDeu "switch to suppress Pe2Se Fossil Carbon Capture in Germany"
cm_HeatLim_b "switch to set maximum share of district heating in FE buildings"
cm_ElLim_b "switch to set maximum share of electricity in FE buildings"
cm_startIter_EDGET "starting iteration of EDGE-T"
cm_ARIADNE_FeShareBounds "switch for minimum share of liquids and gases for industry needed for the ARIADNE project"
cm_ariadne_trade_el "switch for enabling electricity imports to Germany for ARIADNE project"
cm_ariadne_trade_h2 "switch for enabling H2 imports to Germany for ARIADNE project"
Expand Down Expand Up @@ -334,15 +333,11 @@ $setGlobal cm_pushCalib none !! def = none
$setGlobal cm_reducCostB none !! def = none
$setGlobal cm_effHP 5 !! def = 5

$setGlobal cm_EDGEtr_scen ConvCase !! def = ConvCase

$setGlobal c_regi_nucscen all !! def = all
$setGlobal c_regi_capturescen all !! def = all
$setGlobal c_regi_synfuelscen all !! def = all
$setGlobal c_regi_sensscen all !! def = all




cm_biotrade_phaseout = 0; !! def 0
cm_bioprod_histlim = -1; !! def -1
Expand Down Expand Up @@ -376,9 +371,6 @@ cm_noPeFosCCDeu = 0; !! def 0
cm_HeatLim_b = 1; !! def 1
cm_ElLim_b = 1; !! def 1

cm_startIter_EDGET = 14; !! def 14, by default EDGE-T is run first in iteration 14


cm_TaxConvCheck = 0; !! def 0, which means tax convergence check is off


Expand Down
10 changes: 1 addition & 9 deletions standalone/trade/trade.gms
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,6 @@ cm_import_EU "EU switch for different scenarios of EU SE import a
cm_noPeFosCCDeu "switch to suppress Pe2Se Fossil Carbon Capture in Germany"
cm_HeatLim_b "switch to set maximum share of district heating in FE buildings"
cm_ElLim_b "switch to set maximum share of electricity in FE buildings"
cm_startIter_EDGET "starting iteration of EDGE-T"
cm_ARIADNE_FeShareBounds "switch for minimum share of liquids and gases for industry needed for the ARIADNE project"
cm_ariadne_trade_el "switch for enabling electricity imports to Germany for ARIADNE project"
cm_ariadne_trade_h2 "switch for enabling H2 imports to Germany for ARIADNE project"
Expand Down Expand Up @@ -340,16 +339,12 @@ $setGlobal cm_pushCalib none !! def = none
$setGlobal cm_reducCostB none !! def = none
$setGlobal cm_effHP 5 !! def = 5

$setGlobal cm_EDGEtr_scen ConvCase !! def = ConvCase

$setGlobal c_regi_nucscen all !! def = all
$setGlobal c_regi_capturescen all !! def = all
$setGlobal c_regi_synfuelscen all !! def = all
$setGlobal c_regi_sensscen all !! def = all





cm_biotrade_phaseout = 0; !! def 0
cm_bioprod_histlim = -1; !! def -1

Expand Down Expand Up @@ -382,9 +377,6 @@ cm_noPeFosCCDeu = 0; !! def 0
cm_HeatLim_b = 1; !! def 1
cm_ElLim_b = 1; !! def 1

cm_startIter_EDGET = 14; !! def 14, by default EDGE-T is run first in iteration 14


cm_TaxConvCheck = 0; !! def 0, which means tax convergence check is off


Expand Down