Commit bb57b111 authored by Topi Rasku's avatar Topi Rasku
Browse files

Issue #59: Model features can now only be activated through the model...

Issue #59: Model features can now only be activated through the model definition file. Commented out the features that have not bee implemented for clarity.
parent 1dae14af
......@@ -140,12 +140,12 @@ Sets
// Other Features
feature "Set of optional model features" /
findStorageStart "Solve for optimal storage start levels"
* findStorageStart "Solve for optimal storage start levels" // NOT IMPLEMENTED
storageValue "Use storage value instead of fixed control"
storageEnd "Expected storage end levels greater than starting levels"
addOn "Use StoSSch as a storage add-on to a larger model"
extraRes "Use extra tertiary reserves for error in elec. load during time step"
rampSched "Use power based scheduling"
* storageEnd "Expected storage end levels greater than starting levels" // NOT IMPLEMENTED
* addOn "Use StoSSch as a storage add-on to a larger model" // NOT IMPLEMENTED
* extraRes "Use extra tertiary reserves for error in elec. load during time step" // NOT IMPLEMENTED
* rampSched "Use power based scheduling" // PARTIALLY IMPLEMENTED
scenRed "Reduce number of long-tem scenarios using GAMS SCENRED2"
/
......@@ -185,19 +185,6 @@ Parameter params(*) /
$if exist 'params.inc' $include 'params.inc'
/;
// Activate model features if found
Set active(mType, feature) "Set membership tells active model features" /
$if exist 'features.inc' $include 'features.inc'
/;
// Parse command line options and store values for features
$if set findStorageStart active('findStorageStart') = %findStorageStart%;
$if set storageValue active('storageValue') = %storageValue%;
$if set storageEnd active('storageEnd') = %storageEnd%;
$if set addOn active('addOn') = %addOn%;
$if set extraRes active('extraRes') = %extraRes%;
$if set rampSched active('rampSched') = %rampSched%;
* =============================================================================
* --- Parameter Set Definitions -----------------------------------------------
* =============================================================================
......
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