Skip to content

Commit bda6f41

Browse files
committed
fix 'UE|Buildings*' on ref run, fix some warnings
1 parent 2f008e7 commit bda6f41

File tree

4 files changed

+10
-4
lines changed

4 files changed

+10
-4
lines changed

modules/36_buildings/simple/datainput.gms

+7-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,13 @@ $include "./modules/36_buildings/simple/input/f36_uedemand_build.cs4r"
5555
$offdelim
5656
/
5757
;
58-
p36_uedemand_build(ttot,regi,in) = f36_uedemand_build(ttot,regi,"%cm_demScen%","%cm_rcp_scen_build%",in);
58+
59+
*** load UE demand for reporting from input_ref.gdx cm_startyear
60+
if (cm_startyear gt 2005,
61+
execute_load "input_ref.gdx", p36_uedemand_build;
62+
);
63+
64+
p36_uedemand_build(t,regi,in) = f36_uedemand_build(t,regi,"%cm_demScen%","%cm_rcp_scen_build%",in);
5965

6066
*** Scale UE demand and floor space in the building sector
6167
$ifthen.scaleDemand not "%cm_scaleDemand%" == "off"

scripts/output/single/MAGICC7_AR6.R

+1-1
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,6 @@ if (dir.exists(workersFolder)) {
242242
}
243243
}
244244

245-
logmsg <- paste0(logmsg, date(), "MAGICC7_AR6.R finished\n")
245+
logmsg <- paste0(logmsg, date(), " MAGICC7_AR6.R finished\n")
246246
cat(logmsg)
247247
capture.output(cat(logmsg), file = logFile, append = TRUE)

scripts/output/single/checkProjectSummations.R

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ scen <- lucode2::getScenNames(outputdir)
1919
mif <- file.path(outputdir, paste0("REMIND_generic_", scen, ".mif"))
2020
mifdata <- as.quitte(mif)
2121
envi <- new.env()
22-
load(file.path(outputdir, "config.Rdata"), env = envi)
22+
load(file.path(outputdir, "config.Rdata"), envir = envi)
2323

2424
stopmessage <- NULL
2525

scripts/output/single/fixOnRef.R

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ fixOnMif <- function(outputdir) {
7878

7979
# load config of first outputdir (the folder we are checking)
8080
envi <- new.env()
81-
load(configs[[1]], env = envi)
81+
load(configs[[1]], envir = envi)
8282
title <- envi$cfg$title
8383
stopifnot(title == scens[[1]])
8484
startyear <- envi$cfg$gms$cm_startyear

0 commit comments

Comments
 (0)