delete realization "exogenous of the module "70_water", set "heat" as…

… default
remindmodel · Dec 8, 2023 · bffa9a8 · bffa9a8
1 parent 66f1091
commit bffa9a8
Show file tree

Hide file tree

Showing 12 changed files with 59 additions and 412 deletions.
diff --git a/config/scenario_config.csv b/config/scenario_config.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/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