Residential and commercial floor space.

remindmodel · Jan 27, 2023 · 5d31267 · 5d31267
1 parent 6a36fda
commit 5d31267
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 2 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -59,7 +59,7 @@ Imports:
     raster,
     readr,
     readxl,
-    remind2 (>= 1.104.1),
+    remind2 (>= 1.106.3),
     renv,
     reshape2,
     rlang,

diff --git a/modules/36_buildings/simple/datainput.gms b/modules/36_buildings/simple/datainput.gms
@@ -35,15 +35,31 @@ pm_cesdata_sigma(ttot,"enhgab")$ (ttot.val eq 2040) = 3;
 
 
 *** floor space demand for reporting
+
+* awk checks number of columns of input data (4: old data, 5: new data)
+$call "awk -F ',' '$0 !~ /^\*/ { exit NF }' ./modules/36_buildings/simple/input/p36_floorspace_scen.cs4r"
+
+* RH, Jan 2023: if clauses to maintain backwards compatibility with old input data for a while
 Parameter
+$ifthenE.resComFloor1 (errorLevel)eq(5)
+p36_floorspace_scen(tall, all_regi, all_demScen, secBuild36) "floorspace, in buildings simple realization only used for reporting at the moment, not in optimization itself"
+$else.resComFloor1
 p36_floorspace_scen(tall, all_regi, all_demScen) "floorspace, in buildings simple realization only used for reporting at the moment, not in optimization itself"
+$endif.resComFloor1
 /
 $ondelim
 $include "./modules/36_buildings/simple/input/p36_floorspace_scen.cs4r"
 $offdelim
 /
+$ifthenE.resComFloor2 (errorLevel)eq(5)
+p36_floorspace(tall,all_regi,secBuild36) "buildings floorspace, billion m2, in simple realization only used for reporting"
+;
+p36_floorspace(ttot,regi,secBuild36) = p36_floorspace_scen(ttot,regi,"%cm_demScen%",secBuild36) * 1e-3; !! from million to billion m2
+$else.resComFloor2
+p36_floorspace(tall,all_regi) "buildings floorspace, billion m2, in simple realization only used for reporting"
 ;
 p36_floorspace(ttot,regi) = p36_floorspace_scen(ttot,regi,"%cm_demScen%") * 1e-3; !! from million to billion m2
+$endif.resComFloor2
 
 
 *** UE demand for reporting

diff --git a/modules/36_buildings/simple/declarations.gms b/modules/36_buildings/simple/declarations.gms
@@ -8,7 +8,6 @@
 
 Parameters
   p36_CESMkup(ttot,all_regi,all_in)        "parameter for those CES markup cost accounted as investment cost in the budget [trUSD/CES input]"
-  p36_floorspace(tall,all_regi)            "buildings floorspace, billion m2, in simple realization only used for reporting"
   p36_uedemand_build(tall,all_regi,all_in) "useful energy demand in buildings in TWh/a, in simple realization only used for reporting"
 ;
 

diff --git a/modules/36_buildings/simple/sets.gms b/modules/36_buildings/simple/sets.gms
@@ -81,6 +81,13 @@ Sets
     feelhpb
     feheb
   /
+
+  secBuild36 "Buildings subsectors, only for floor space reporting"
+  /
+    buildings
+    residential
+    commercial
+  /
 ;
 
 cal_ppf_buildings_dyn36(ppfen_buildings_dyn36) = YES;