Commit 42b5db64 authored by Niina Helistö's avatar Niina Helistö
Browse files

Updating the order in which 1e_scenChanges.gms and changes.inc are read....

Updating the order in which 1e_scenChanges.gms and changes.inc are read. Updating the contents of 1e_scenChanges.gms to match with the current naming of sets and parameters.
parent ce97db6d
......@@ -75,14 +75,14 @@ $ifthen exist '%input_dir%/inputData.gdx'
$$gdxin
$endif
* Read changes to inputdata through gdx files (e.g. node2.gdx, unit2.gdx, unit3.gdx) - allows scenarios through Sceleton Titan Excel files.
$include 'inc/1e_scenChanges.gms'
* Reads changes or additions to the inputdata through changes.inc file.
$ifthen exist '%input_dir%/changes.inc'
$$include '%input_dir%/changes.inc'
$endif
* Read changes to inputdata through gdx files (e.g. node2.gdx, unit2.gdx, unit3.gdx) - allows scenarios through Sceleton Titan Excel files.
$include 'inc/1e_scenChanges.gms'
$ontext
......
......@@ -134,6 +134,18 @@ $ifthen exist '%input_dir%/effLevelGroupUnit3.gdx'
$$gdxin
$endif
$ifthen exist '%input_dir%/group2.gdx'
$$gdxin '%input_dir%/group2.gdx'
$$loaddcm group
$$gdxin
$endif
$ifthen exist '%input_dir%/group3.gdx'
$$gdxin '%input_dir%/group3.gdx'
$$loaddcm group
$$gdxin
$endif
$ifthen exist '%input_dir%/p_gn2.gdx'
$$gdxin '%input_dir%/p_gn2.gdx'
$$loaddcm p_gn
......@@ -242,51 +254,75 @@ $ifthen exist '%input_dir%/restypeReleasedForRealization3.gdx'
$$gdxin
$endif
$ifthen exist '%input_dir%/p_nReserves2.gdx'
$$gdxin '%input_dir%/p_nReserves2.gdx'
$$loaddcm p_nReserves
$ifthen exist '%input_dir%/p_groupReserves2.gdx'
$$gdxin '%input_dir%/p_groupReserves2.gdx'
$$loaddcm p_groupReserves
$$gdxin
$endif
$ifthen exist '%input_dir%/p_groupReserves3.gdx'
$$gdxin '%input_dir%/p_groupReserves3.gdx'
$$loaddcm p_groupReserves
$$gdxin
$endif
$ifthen exist '%input_dir%/p_groupReserves3D2.gdx'
$$gdxin '%input_dir%/p_groupReserves3D2.gdx'
$$loaddcm p_groupReserves3D
$$gdxin
$endif
$ifthen exist '%input_dir%/p_groupReserves3D3.gdx'
$$gdxin '%input_dir%/p_groupReserves3D3.gdx'
$$loaddcm p_groupReserves3D
$$gdxin
$endif
$ifthen exist '%input_dir%/p_nReserves3.gdx'
$$gdxin '%input_dir%/p_nReserves3.gdx'
$$loaddcm p_nReserves
$ifthen exist '%input_dir%/p_groupReserves4D2.gdx'
$$gdxin '%input_dir%/p_groupReserves4D2.gdx'
$$loaddcm p_groupReserves4D
$$gdxin
$endif
$ifthen exist '%input_dir%/p_nuReserves2.gdx'
$$gdxin '%input_dir%/p_nuReserves2.gdx'
$$loaddcm p_nuReserves
$ifthen exist '%input_dir%/p_groupReserves4D3.gdx'
$$gdxin '%input_dir%/p_groupReserves4D3.gdx'
$$loaddcm p_groupReserves4D
$$gdxin
$endif
$ifthen exist '%input_dir%/p_nuReserves3.gdx'
$$gdxin '%input_dir%/p_nuReserves3.gdx'
$$loaddcm p_nuReserves
$ifthen exist '%input_dir%/p_gnuReserves2.gdx'
$$gdxin '%input_dir%/p_gnuReserves2.gdx'
$$loaddcm p_gnuReserves
$$gdxin
$endif
$ifthen exist '%input_dir%/p_nnReserves2.gdx'
$$gdxin '%input_dir%/p_nnReserves2.gdx'
$$loaddcm p_nnReserves
$ifthen exist '%input_dir%/p_gnuReserves3.gdx'
$$gdxin '%input_dir%/p_gnuReserves3.gdx'
$$loaddcm p_gnuReserves
$$gdxin
$endif
$ifthen exist '%input_dir%/p_nnReserves3.gdx'
$$gdxin '%input_dir%/p_nnReserves3.gdx'
$$loaddcm p_nnReserves
$ifthen exist '%input_dir%/p_gnnReserves2.gdx'
$$gdxin '%input_dir%/p_gnnReserves2.gdx'
$$loaddcm p_gnnReserves
$$gdxin
$endif
$ifthen exist '%input_dir%/p_nuRes2Res2.gdx'
$$gdxin '%input_dir%/p_nuRes2Res2.gdx'
$$loaddcm p_nuRes2Res
$ifthen exist '%input_dir%/p_gnnReserves3.gdx'
$$gdxin '%input_dir%/p_gnnReserves3.gdx'
$$loaddcm p_gnnReserves
$$gdxin
$endif
$ifthen exist '%input_dir%/p_nuRes2Res3.gdx'
$$gdxin '%input_dir%/p_nuRes2Res3.gdx'
$$loaddcm p_nuRes2Res
$ifthen exist '%input_dir%/p_gnuRes2Res2.gdx'
$$gdxin '%input_dir%/p_gnuRes2Res2.gdx'
$$loaddcm p_gnuRes2Res
$$gdxin
$endif
$ifthen exist '%input_dir%/p_gnuRes2Res3.gdx'
$$gdxin '%input_dir%/p_gnuRes2Res3.gdx'
$$loaddcm p_gnuRes2Res
$$gdxin
$endif
......@@ -470,18 +506,6 @@ $ifthen exist '%input_dir%/p_storageValue3.gdx'
$$gdxin
$endif
$ifthen exist '%input_dir%/group2.gdx'
$$gdxin '%input_dir%/group2.gdx'
$$loaddcm group
$$gdxin
$endif
$ifthen exist '%input_dir%/group3.gdx'
$$gdxin '%input_dir%/group3.gdx'
$$loaddcm group
$$gdxin
$endif
$ifthen exist '%input_dir%/uGroup2.gdx'
$$gdxin '%input_dir%/uGroup2.gdx'
$$loaddcm uGroup
......@@ -566,3 +590,15 @@ $ifthen exist '%input_dir%/gnss_bound3.gdx'
$$gdxin
$endif
$ifthen exist '%input_dir%/uss_bound2.gdx'
$$gdxin '%input_dir%/uss_bound2.gdx'
$$loaddcm uss_bound
$$gdxin
$endif
$ifthen exist '%input_dir%/uss_bound3.gdx'
$$gdxin '%input_dir%/uss_bound3.gdx'
$$loaddcm uss_bound
$$gdxin
$endif
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment