Skip to content

Update daily_run.bat #690

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

Merged
alextsimp merged 4 commits into from
Sep 30, 2026
Merged

Update daily_run.bat #690

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
31e3288
update: enhance config.json generation for daily integration test wit…
Sep 28, 2026
35254aa
Bug fix: correct activity elasticities references from "ELL" to "LAM"
Sep 29, 2026
830ee7b
Merge remote-tracking branch 'origin/main' into Update-daily
Sep 30, 2026
5860bb5
Add validation to abort execution if input table is empty and include…
Sep 30, 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
15 changes: 12 additions & 3 deletions core/input.gms
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ $ondelim
$include "iElastA.csv"
$offdelim
;
imElastA.L(runCy, SBS, ETYPES, YTIME) = imElastAL("ELL", SBS, ETYPES, YTIME);
imElastA.L(runCy, SBS, ETYPES, YTIME) = imElastAL("LAM", SBS, ETYPES, YTIME);
imElastA.LO(runCy, SBS, posElast, YTIME) = 0.001;
imElastA.UP(runCy, SBS, posElast, YTIME) = 5 * imElastAL("ELL", SBS, posElast, YTIME);
imElastA.UP(runCy, SBS, posElast, YTIME) = 5 * imElastAL("LAM", SBS, posElast, YTIME);
imElastA.LO(runCy, SBS, negElast, YTIME) = -10;
imElastA.UP(runCy, SBS, negElast, YTIME) = -0.001;

Expand All @@ -54,10 +54,19 @@ $ondelim
$include "iElastA.csv"
$offdelim
;
imElastA(runCy,SBS,ETYPES,YTIME) = imElastA("ELL",SBS,ETYPES,YTIME);
imElastA(runCy,SBS,ETYPES,YTIME) = imElastA("LAM",SBS,ETYPES,YTIME);
imElastA(runCy,DSBS,"b1",YTIME)$(not TRANSE(DSBS)) = imElastA(runCy,DSBS,"b1",YTIME) / 4;
imElastA(runCy,DSBS,"b2",YTIME)$(not TRANSE(DSBS)) = imElastA(runCy,DSBS,"b2",YTIME) / 4;
$ENDIF.calib
* Stop if the entire input table is empty or zero; individual zeros are allowed.
abort$(sum((allCy,SBS,ETYPES,YTIME),
$IFTHEN.calibCheck %Calibration% == Calibration
abs(imElastAL(allCy,SBS,ETYPES,YTIME))
$ELSE.calibCheck
abs(imElastA(allCy,SBS,ETYPES,YTIME))
$ENDIF.calibCheck
) = 0)
"ERROR: iElastA.csv contains no nonzero activity elasticities. Execution stopped.";
*---
parameter iDiscData(SBS) "Discount rates per subsector ()" /
PCH 0.12
Expand Down
2 changes: 2 additions & 0 deletions core/sets.gms
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,6 +351,8 @@ UPT_200
UPT_400
UPT_600
UPT_800
SSP1_800f
SSP2_800f
/

RegulaPolicies(POLICIES_set) Set of policies entering in the regula falsi loops
Expand Down
2 changes: 1 addition & 1 deletion scripts/tools/daily_run.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ REM ---- 4. Write the daily-run config.json (also sets scenario 1 = NPi) -------
REM Paths read from the SET vars above; non-path settings mirror root config.json.
call :blank
call :say [5/9] Writing config.json ...
Rscript -e "library(jsonlite); cfg<-list(paths=list(model_runs_path=Sys.getenv('model_runs_path'), gams_path=Sys.getenv('gams_path')), behavior=list(withRunFolder=TRUE, withSync=TRUE, withReport=TRUE, uploadGDX=FALSE), scenario=list(scenario_name='DAILY_NPi', description='Daily main-branch integration test (mrprom + open-prom + postprom).', gams_flags=list(fScenario=1L, fEndY=2100L, CountrySolveMode='serial', Transport='simple', Industry='technology', RestOfEnergy='legacy', PowerGeneration='simple', Hydrogen='legacy', CO2='legacy', Emissions='legacy', Prices='legacy', Heat='heat', Curves='off', Economy='economy'))); write(toJSON(cfg, auto_unbox=TRUE, pretty=TRUE), 'config.json')" || goto :fail
Rscript -e "library(jsonlite); cfg<-list(paths=list(model_runs_path=Sys.getenv('model_runs_path'), magpie_path=Sys.getenv('magpie_path'), gams_path=Sys.getenv('gams_path')), behavior=list(withRunFolder=TRUE, withSync=TRUE, withReport=TRUE, uploadGDX=TRUE), scenario=list(scenario_name='DAILY_NPi', description='Daily main-branch integration test (mrprom + open-prom + postprom).', gams_flags=list(fScenario=1L, fEndY=2100L, CountrySolveMode='serial', biomassReferenceEJ=150, ccsStorageReferenceGtCO2=400), land_use_emulator=list(source='magpie', carbon_price_scenario='Npi_Default'), maturity_factors=list(levels=list(low=0.5, def=1, high=2), changes=list(solar=list(tech='PGSOL', mult='def'), windOffLam=list(tech='PGAWNO', mult='def', region='LAM'), bmsccsMid=list(tech='ATHBMSCCS', mult='def', from=2030L, to=2050L), bmsccsLate=list(tech='ATHBMSCCS', mult='def', from=2051L), lpgCars=list(sector='PC', tech='TLPG', mult='def'))), soft_link_magpie=list(project='uptake', existing_prom_run=NULL, max_iter=1L, price_tol=0.05, quant_tol=0.05))); write(toJSON(cfg, auto_unbox=TRUE, pretty=TRUE, null='null'), 'config.json')" || goto :fail

REM ---- 5. NPi: task 3 rebuilds data/+targets/ (via mrprom) then runs NPi -----
call :blank
Expand Down
Loading