Commit ff47b078 authored by Erkka Rinne's avatar Erkka Rinne
Browse files

Fix to custom input dir command line parameter

Not all paths were replaced by custom input dir.
parent c5da0674
......@@ -179,7 +179,7 @@ q_obj ..
) // END sum(gn2n_directional)
) // END sum(t_invest)
$ifthen exist 'input/2c_additional_objective_terms.gms'
$$include 'input/2c_additional_objective_terms.gms';
$ifthen exist '%input_dir%/2c_additional_objective_terms.gms'
$$include '%input_dir%/2c_additional_objective_terms.gms';
$endif
;
......@@ -26,35 +26,35 @@ putclose log;
if (ord(tSolve) >= tForecastNext(mSolve),
// Read data defined to be updated
if (mTimeseries_loop_read(mSolve, 'ts_effUnit'),
put_utility 'gdxin' / 'input/ts_effUnit/' tSolve.tl:0 '.gdx';
put_utility 'gdxin' / '%input_dir%/ts_effUnit/' tSolve.tl:0 '.gdx';
execute_load ts_effUnit
);
if (mTimeseries_loop_read(mSolve, 'ts_effGroupUnit'),
put_utility 'gdxin' / 'input/ts_effGroupUnit/' tSolve.tl:0 '.gdx';
put_utility 'gdxin' / '%input_dir%/ts_effGroupUnit/' tSolve.tl:0 '.gdx';
execute_load ts_effGroupUnit
);
if (mTimeseries_loop_read(mSolve, 'ts_influx'),
put_utility 'gdxin' / 'input/ts_influx/' tSolve.tl:0 '.gdx';
put_utility 'gdxin' / '%input_dir%/ts_influx/' tSolve.tl:0 '.gdx';
execute_load ts_influx
);
if (mTimeseries_loop_read(mSolve, 'ts_cf'),
put_utility 'gdxin' / 'input/ts_cf/' tSolve.tl:0 '.gdx';
put_utility 'gdxin' / '%input_dir%/ts_cf/' tSolve.tl:0 '.gdx';
execute_load ts_cf
);
if (mTimeseries_loop_read(mSolve, 'ts_reserveDemand'),
put_utility 'gdxin' / 'input/ts_reserveDemand/' tSolve.tl:0 '.gdx';
put_utility 'gdxin' / '%input_dir%/ts_reserveDemand/' tSolve.tl:0 '.gdx';
execute_load ts_reserveDemand
);
if (mTimeseries_loop_read(mSolve, 'ts_node'),
put_utility 'gdxin' / 'input/ts_node/' tSolve.tl:0 '.gdx';
put_utility 'gdxin' / '%input_dir%/ts_node/' tSolve.tl:0 '.gdx';
execute_load ts_node
);
if (mTimeseries_loop_read(mSolve, 'ts_fuelPriceChange'),
put_utility 'gdxin' / 'input/ts_fuelPriceChange/' tSolve.tl:0 '.gdx';
put_utility 'gdxin' / '%input_dir%/ts_fuelPriceChange/' tSolve.tl:0 '.gdx';
execute_load ts_fuelPriceChange
);
if (mTimeseries_loop_read(mSolve, 'ts_unavailability'),
put_utility 'gdxin' / 'input/ts_unavailability/' tSolve.tl:0 '.gdx';
put_utility 'gdxin' / '%input_dir%/ts_unavailability/' tSolve.tl:0 '.gdx';
execute_load ts_unavailability
);
......@@ -88,7 +88,7 @@ $ontext
* --- Read the Tertiary Reserve Requirements ----------------------------------
put_utility 'gdxin' / 'input/tertiary/' tSolve.tl:0 '.gdx';
put_utility 'gdxin' / '%input_dir%/tertiary/' tSolve.tl:0 '.gdx';
execute_load ts_tertiary;
ts_reserveDemand(restypeDirectionNode('tertiary', up_down, node), f_solve(f), tt_forecast(t))${ mf(mSolve, f)
and not mf_realization(mSolve, f)
......
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