Merge branch 'develop' of https://github.com/remindmodel/remind into …

…develop
dklein-pik · Dec 11, 2023 · 79ecd5a · 79ecd5a
2 parents b7f5cc9 + 9f6a2cb
commit 79ecd5a
Show file tree

Hide file tree

Showing 21 changed files with 144 additions and 11,354 deletions.
diff --git a/.github/workflows/size-check b/.github/workflows/size-check
@@ -14,4 +14,4 @@ maxfilesize <- function(max) {
   message("All files are smaller than ", max, "kB\n")
 }
 
-maxfilesize(600)
+maxfilesize(250)
diff --git a/CITATION.cff b/CITATION.cff
@@ -246,8 +246,8 @@ authors:
   affiliation: "Potsdam Institute for Climate Impact Research"
 
 title: REMIND - REgional Model of INvestments and Development
-version: "3.2.1.dev493"
-date-released: 2023-12-07
+version: "3.2.1.dev504"
+date-released: 2023-12-08
 repository-code: https://github.com/remindmodel/remind
 keywords:
   - energy

diff --git a/config/default.cfg b/config/default.cfg
@@ -63,7 +63,7 @@ cfg$validationmodel_name <- "VALIDATIONREMIND"
 
 #### model version of the overall model (used for run statistics only).
 # automatically generated for development versions, updated by hand for releases
-cfg$model_version <- "3.2.1.dev493"
+cfg$model_version <- "3.2.1.dev504"
 
 #### settings ####
 cfg$gms <- list()

diff --git a/config/scenario_config.csv b/config/scenario_config.csv
diff --git a/config/scenario_config_NGFS_v4.csv b/config/scenario_config_NGFS_v4.csv
diff --git a/core/sets.gms b/core/sets.gms
@@ -916,7 +916,6 @@ $endif.altFeEmiFac
 ***######################## R SECTION START (MODULES) ###############################
 *** THIS CODE IS CREATED AUTOMATICALLY, DO NOT MODIFY THESE LINES DIRECTLY
 *** ANY DIRECT MODIFICATION WILL BE LOST AFTER NEXT MODEL START
-*** CHANGES CAN BE DONE USING THE RESPECTIVE LINES IN scripts/start/prepare.R
 
 sets
 
@@ -956,7 +955,7 @@ sets
        codePerformance
        /
 
-module2realisation(modules,*) "mapping of modules and active realisations" /
+      module2realisation(modules,*) "mapping of modules and active realisations" /
        macro . %macro%
        welfare . %welfare%
        PE_FE_parameters . %PE_FE_parameters%

diff --git a/main.gms b/main.gms
@@ -419,9 +419,8 @@ $setGlobal internalizeDamages  off               !! def = off
 *'---------------------    70_water  -------------------------------------------
 *'
 *' * (off): no water demand taken into account
-*' * (exogenous): exogenous water demand is calculated based on data on water demand coefficients and cooling shares
 *' * (heat): as exogenous only that vintage structure in combination with time dependent cooling shares as vintages and efficiency factors are also considered and demand is a function of excess heat as opposed to electricity output
-$setglobal water  off                 !! def = off
+$setglobal water  heat                 !! def = heat
 *'---------------------    80_optimization    ----------------------------------
 *'
 *' * (nash): Nash solution. Adjust cm_nash_autoconverge to needs.

diff --git a/modules/31_fossil/exogenous/datainput.gms b/modules/31_fossil/exogenous/datainput.gms
@@ -7,9 +7,9 @@
 *** SOF ./modules/31_fossil/exogenous/datainput.gms
 
 p31_fix_costfu_ex(tall,regi,enty) = 0;
-$include "./modules/31_fossil/exogenous/input/p31_fix_costfu_ex.put";
+*** $include "./modules/31_fossil/exogenous/input/p31_fix_costfu_ex.put";  
 p31_fix_fuelex(tall,regi,enty,rlf) = 0;
-$include "./modules/31_fossil/exogenous/input/p31_fix_fuelex.put";
+*** $include "./modules/31_fossil/exogenous/input/p31_fix_fuelex.put";
 
 *LB* preliminary dummy for $ condition in core/equations.gms
 p31_grades(regi,"xi3",enty,rlf) = 0.0001;

diff --git a/modules/31_fossil/exogenous/input/p31_fix_costfu_ex.put b/modules/31_fossil/exogenous/input/p31_fix_costfu_ex.put
diff --git a/modules/31_fossil/exogenous/input/p31_fix_fuelex.put b/modules/31_fossil/exogenous/input/p31_fix_fuelex.put
diff --git a/modules/70_water/exogenous/datainput.gms b/modules/70_water/exogenous/datainput.gms
diff --git a/modules/70_water/exogenous/declarations.gms b/modules/70_water/exogenous/declarations.gms
diff --git a/modules/70_water/exogenous/input/WaterConsCoef.cs4r b/modules/70_water/exogenous/input/WaterConsCoef.cs4r
diff --git a/modules/70_water/exogenous/input/WaterWithCoef.cs4r b/modules/70_water/exogenous/input/WaterWithCoef.cs4r
diff --git a/modules/70_water/exogenous/not_used.txt b/modules/70_water/exogenous/not_used.txt