Merge branch 'dev' into #124_commodity_use_limitations

4d_postProcess_invest2schedule_temp.gms

@@ -5,6 +5,9 @@
 * Output file streams
 file f_changes /'output\changes.inc'/;
 
+f_changes.lw = 26; // Field width of set label output, default in GAMS is 12, increase as needed
+f_changes.pw = 500; // Number of characters that may be placed on a single row of the page, default in GAMS is 255, increase as needed
+
 put f_changes
 
 * Do not allow investments in the child setups
@@ -22,6 +25,18 @@ loop(gnu(grid, node, unit)${r_invest(unit)},
     tmp = round(r_invest(unit), 0) * p_gnu(grid, node, unit, 'unitSize');
     put "p_gnu('", grid.tl, "', '", node.tl, "', '", unit.tl, "', 'capacity') = p_gnu('", grid.tl, "', '", node.tl, "', '", unit.tl, "', 'capacity') + ", tmp, ";"/;);
 
+* Example updates for storage units (commented out at the moment, use names etc. that work in your case)
+*p_gnBoundaryPropertiesForStates('battery_grid', 'battery_node', 'upwardLimit', 'useConstant') = 1;
+*p_gnBoundaryPropertiesForStates('battery_grid', 'battery_node', 'upwardLimit', 'multiplier') = 1;
+*p_gnBoundaryPropertiesForStates('battery_grid', 'battery_node', 'upwardLimit', 'constant')
+*    = p_gnu('battery_grid', 'battery_node', 'battery_charge', 'upperLimitCapacityRatio') * p_gnu('battery_grid', 'battery_node', 'battery_charge', 'capacity');
+*p_gnu('battery_grid', 'battery_node', 'battery_charge', 'upperLimitCapacityRatio') = 0;
+*uGroup('battery_charge', 'battery_online_group1') = yes;
+*uGroup('battery_discharge', 'battery_online_group1') = yes;
+*p_groupPolicy('battery_online_group1', 'constrainedOnlineTotalMax') = p_unit('battery_charge', 'unitCount');
+*p_groupPolicy3D('battery_online_group1', 'constrainedOnlineMultiplier', 'battery_charge') = 1;
+*p_groupPolicy3D('battery_online_group1', 'constrainedOnlineMultiplier', 'battery_discharge') = 1;
+
 * Do not allow investments in the child setups (commented out at the moment)
 *loop(gn2n_directional(grid, node, node_),
 *    put "p_gnn('", grid.tl, "', '", node.tl, "', '", node_.tl, "', 'transferCapMax') = 0;"/;

Backbone.gms

@@ -59,7 +59,10 @@ GAMS command line arguments
 --output_dir=<path>
     Directory to write output to. Defaults to './output'.
 
+--output_file=<filename.gdx>
+    Filename of the results file. Defaults to 'results.gdx'
 
+    
 References
 ----------
 [1] N. Helist et al., Backbone---An Adaptable Energy Systems Modelling Framework,
@@ -162,7 +165,9 @@ $include 'inc/4c_outputQuickFile.gms'
 * Post-process results
 $if exist '%input_dir%/4d_postProcess.gms' $include '%input_dir%/4d_postProcess.gms'
 
-execute_unload '%output_dir%/results.gdx',
+$if not set output_file $setglobal output_file 'results.gdx'
+
+execute_unload '%output_dir%/%output_file%',
     $$include 'defOutput/resultSymbols.inc'
 ;
 

Backbone_base_sets_to_gdx.gms

+set
+s "Samples from historical periods" / s000 * s010 /
+f "Forecasts for the short term" / f00 * f20 /
+scenario /scen01*scen10/
+up_down /up, down/
+input_output /input, output/
+effLevel "Pre-defined levels for efficiency representation that can start from t_solve + x"
+    / level1*level9 /
+effSelector "Select equations and lambdas/slope for efficiency calculations"
+    / lambda01*lambda12, directOff, directOnLP, directOnMIP , incHR/
+;
+
+execute_unload 'Backbone_base_sets.gdx';

CHANGELOG.md

@@ -45,6 +45,28 @@ All notable changes to this project will be documented in this file.
 - Limiting the provision of online reserve based on the online variable
 - Sample probability bug from scenario reduction (probability of single scenario above one)
 
+
+## 1.1.5 - 2020-11-28
+### Fixed
+- Long-term scenario data when using only one scenario
+- Bug with scenario smooting which caused wrong values on later than first solve
+
+
+## 1.1.4 - 2019-11-02
+### Fixed
+- Sample probability bug from scenario reduction
+
+
+## 1.1.3 - 2019-10-24
+### Changed 
+- Scenario reduction is done based on total available energy
+
+
+## 1.1.2 - 2019-10-23
+### Changed 
+- Maintain original scenario labels after reduction
+
+
 ## [1.1] - 2019-04-17
 ### Added
 - New model setting 't_perfectForesight' tells the number of time steps (from 

README.md

 # Backbone
 
-Backbone is a generic energy network optimization tool written in [GAMS](https://www.gams.com/). It has been designed to be highly adaptable in different dimensions: temporal, spatial, technology representation and market design. The model can represent stochastics with a [model predictive control method](https://doi.org/10.1016/j.automatica.2008.03.002), with short-term forecasts and longer-term statistical uncertainties. Backbone can support multiple different models due to the modifiable temporal structure and varying lengths of the time steps.
+Backbone is a generic energy network optimization tool written in [GAMS](https://www.gams.com/). It has been designed to be highly adaptable in different dimensions: temporal, spatial, technology representation and market design. The model can represent stochastics with a [model predictive control method](https://doi.org/10.1016/j.automatica.2008.03.002), with short-term forecasts and longer-term statistical uncertainties. Backbone can support multiple different models (e.g. investment or unit commitment) due to the modifiable temporal structure and varying lengths of the time steps.
 
 If you use Backbone in a published work, please cite the [following publication](https://doi.org/10.3390/en12173388), which describes the Backbone energy systems modelling framework.
 
 ## Getting Started
 
-Make sure that you have [Git](https://git-scm.com/) version control system and a Git interface, such as [TortoiseGit](https://tortoisegit.org/) or [SourceTree](https://www.sourcetreeapp.com/), installed on your computer. You also need to have [GAMS](https://www.gams.com/) installed.
+Make sure that you have [Git](https://git-scm.com/) version control system and a Git interface, such as [TortoiseGit](https://tortoisegit.org/) or [SourceTree](https://www.sourcetreeapp.com/), installed on your computer. 
+You also need to have [GAMS](https://www.gams.com/) version 24.0 or later installed.
 
 In order to get a copy of the Backbone project, you need to clone it using Git. Copy and paste the URL of the original Backbone repository and select the directory where you want Backbone to be cloned. The URL of the original Backbone repository is https://gitlab.vtt.fi/backbone/backbone. 
 

defModels/building.gms

@@ -83,6 +83,7 @@ Model building /
 *    q_capacityMargin
 *    q_constrainedCapMultiUnit
 *    q_emissioncap
+*    q_energyMax 
 *    q_energyShareMax
 *    q_energyShareMin
 *    q_ReserveShareMax

defModels/invest.gms

@@ -83,6 +83,7 @@ Model invest /
     q_capacityMargin
     q_constrainedCapMultiUnit
     q_emissioncap
+    q_energyMax
     q_energyShareMax
     q_energyShareMin
     q_ReserveShareMax

defModels/investInit_temp.gms

@@ -49,6 +49,9 @@ if (mType('invest'),
     ms_central('invest', s) = no;
 
     // Define time span of samples
+    // For selecting the samples, see, for example, https://doi.org/10.1016/j.energy.2020.118585.
+    // The duration of the samples can be, for example, 1 day or 1 week (24 h or 168 h).
+    // The samples can have different durations.
     msStart('invest', 's000') = 1;
     msEnd('invest', 's000') = msStart('invest', 's000') + 168;
     msStart('invest', 's001') = 1 + 18*168;
@@ -56,15 +59,27 @@ if (mType('invest'),
     msStart('invest', 's002') = 1 + 35*168;
     msEnd('invest', 's002') = msStart('invest', 's002') + 168;
 
-    // Define the probability (weight) of samples
+    // Define the probability of samples
+    // Probabilities are 1 in deterministic model runs.
+    // It is also possible to include, for example, 3 samples from a cold year with a probability of 1/10
+    // and 3 samples from a normal year year with a probability of 9/10.
     p_msProbability('invest', s) = 0;
     p_msProbability('invest', 's000') = 1;
     p_msProbability('invest', 's001') = 1;
     p_msProbability('invest', 's002') = 1;
+    // Define the weight of samples
+    // Weights describe how many times the samples are repeated in order to get the (typically) annual results.
+    // For example, 3 samples with equal weights and with a duration of 1 week should be repeated 17.38 times in order
+    // to cover the 52.14 weeks of the year.
+    // Weights are used for scaling energy production and consumption results and for estimating node state evolution.
     p_msWeight('invest', s) = 0;
-    p_msWeight('invest', 's000') = 8760/504;
-    p_msWeight('invest', 's001') = 8760/504;
-    p_msWeight('invest', 's002') = 8760/504;
+    p_msWeight('invest', 's000') = 8760/168/3;
+    p_msWeight('invest', 's001') = 8760/168/3;
+    p_msWeight('invest', 's002') = 8760/168/3;
+    // Define the weight of samples in the calculation of fixed costs
+    // The sum of p_msAnnuityWeight should be 1 over the samples belonging to the same year.
+    // The p_msAnnuityWeight parameter is used for describing which samples belong to the same year so that the model
+    // is able to calculate investment costs and fixed operation and maintenance costs once per year.
     p_msAnnuityWeight('invest', s) = 0;
     p_msAnnuityWeight('invest', 's000') = 1/3;
     p_msAnnuityWeight('invest', 's001') = 1/3;
@@ -129,7 +144,7 @@ if (mType('invest'),
     mSettingsEff('invest', 'level1') = inf;
 
     // Define the horizon when start-up and shutdown trajectories are considered
-    mSettings('invest', 't_trajectoryHorizon') = 8760;
+    mSettings('invest', 't_trajectoryHorizon') = 0;
 
 * --- Define output settings for results --------------------------------------
 

defModels/schedule.gms

@@ -83,6 +83,7 @@ Model schedule /
     q_capacityMargin
 *    q_constrainedCapMultiUnit
 *    q_emissioncap
+*    q_energyMax 
 *    q_energyShareMax
 *    q_energyShareMin
     q_ReserveShareMax

defModels/scheduleInit_temp.gms

@@ -140,6 +140,9 @@ if (mType('schedule'),
     mf_realization('schedule', 'f00') = yes;
     mf_central('schedule', f) = no;
     mf_central('schedule', 'f02') = yes;
+    
+    // Define special forecast label that holds scenario data
+    //mf_scenario('schedule', 'scen') = yes;
 
     // Define forecast probabilities (weights)
     p_mfProbability('schedule', f) = 0;

defOutput/debugSymbols.inc

@@ -46,9 +46,9 @@ p_gnn
 p_gnu
 p_groupReserves
 p_gnuReserves
-p_gnPolicy
 p_groupPolicy
-p_groupPolicy3D
+p_groupPolicyUnit
+p_groupPolicyEmission
 p_nEmission
 p_unitEmissionCost
 p_effUnit

defOutput/resultSymbols.inc

@@ -19,6 +19,9 @@ $offtext
 * --- Results Symbols Included in Output --------------------------------------
 * =============================================================================
 
+* --- Symbols related to the simulation setup ---------------------------------
+t_realized = t
+
 * --- Cost Result Symbols -----------------------------------------------------
 
 // Total Objective Function
@@ -124,6 +127,17 @@ r_uTotalOnlinePerUnit
 r_uTotalStartup
 r_uTotalShutdown
 
+* --- Emissions Results -----------------------------------------------
+
+// Unit level emissions
+r_emissions
+
+// Emission sums
+r_nuTotalEmissions
+r_nTotalEmissions
+r_uTotalEmissions
+r_totalEmissions
+
 * --- Reserve Provision Result Symbols ----------------------------------------
 
 // Reserve provision results required for model structure !!!!!!!!!!!!!!!!!!!!!

inc/1a_definitions.gms

@@ -32,36 +32,36 @@ Sets
     mSetting "setting categories for models" /
 
         // General Time Structure
-        t_start, // First time step for the start of simulation
-        t_jump, // Number of time steps realized with each solve
-        t_horizon, // Length of the simulation horizon in time steps (central forecast)
-        t_end, // Last time step of the simulation
-        loadPoint, // Load advanced basis; 0 = no basis, 1 = latest solve, 2 = all solves, 3 = first solve
-        savePoint, // Save advanced basis; 0 = no basis, 1 = latest solve, 2 = all solves, 3 = first solve
-        lastStepInIntervalBlock, // Last time step in the block of intervals with the same length
-        stepsPerInterval, // Number of time steps aggregated within interval
-        stepLengthInHours, // Length of one time step in hours
+        t_start "First time step for the start of simulation"
+        t_jump "Number of time steps realized with each solve"
+        t_horizon "Length of the simulation horizon in time steps (central forecast)"
+        t_end "Last time step of the simulation"
+        loadPoint "Load advanced basis; 0 = no basis, 1 = latest solve, 2 = all solves, 3 = first solve"
+        savePoint "Save advanced basis; 0 = no basis, 1 = latest solve, 2 = all solves, 3 = first solve"
+        lastStepInIntervalBlock "Last time step in the block of intervals with the same length"
+        stepsPerInterval "Number of time steps aggregated within interval"
+        stepLengthInHours "Length of a time step in hours"
 
         // Samples and Forecasts
-        samples, // Number of active samples
-        forecasts, // Number of active forecasts
-        t_forecastLengthUnchanging, // Length of forecasts in time steps - this does not decrease when the solve moves forward (requires forecast data that is longer than the horizon at first)
-        t_forecastLengthDecreasesFrom, // Length of forecasts in time steps - this decreases when the solve moves forward until the new forecast data is read (then extends back to full length)
-        t_forecastStart, // Time step for first reading the forecasts (not necessarily t_start)
-        t_forecastJump, // Number of time steps between each update of the forecasts
+        samples "Number of active samples"
+        forecasts "Number of active forecasts"
+        t_forecastLengthUnchanging "Length of forecasts in time steps - this does not decrease when the solve moves forward (requires forecast data that is longer than the horizon at first)"
+        t_forecastLengthDecreasesFrom "Length of forecasts in time steps - this decreases when the solve moves forward until the new forecast data is read (then extends back to full length)"
+        t_forecastStart "Time step for first reading the forecasts (not necessarily t_start)"
+        t_forecastJump "Number of time steps between each update of the forecasts"
         t_improveForecast "Number of time steps ahead of time on which the forecast is improved on each solve"
         t_perfectForesight "Number of time steps for which realized data is used instead of forecasts"
         onlyExistingForecasts "Use only existing forecast values when reading updated forecasts. Note: zero values need to be saved as Eps in the gdx file."
         scenarios        "Number of long-term scenarios used"
-        scenarioLength   "Length of scenario in time steps for creating stocahstic scenarios from time series data"
+        scenarioLength   "Length of scenario in time steps for creating stochastic scenarios from time series data"
 
         // Features
-        t_trajectoryHorizon, // Length of the horizon when start-up and shutdown trajectories are considered (in time steps)
-        t_initializationPeriod,  // Number of time steps in the beginning of the simulation which are solved but the results of which are not stored
-        dataLength, // The maximum number of time steps in any input data time series (recommended for correctly circulating data)
-        red_num_leaves "Desired number of preserved scenarios or leaves (SCENRED)"
+        t_trajectoryHorizon "Length of the horizon when start-up and shutdown trajectories are considered (in time steps)"
+        t_initializationPeriod "Number of time steps in the beginning of the simulation which are solved but the results of which are not stored"
+        dataLength "The maximum number of time steps in any input data time series (recommended for correctly circulating data)"
+        red_num_leaves "Desired number of preserved scenarios or leaves of scenario reduction (SCENRED)"
         red_percentage "Desired relative distance (accuracy) of scenario reduction (SCENRED)"
-        incHRAdditionalConstraints // Method to include the two additional constraints for incremental heat rates;
+        incHRAdditionalConstraints "Method to include the two additional constraints for incremental heat rates"
                                    // 0 = include for units with non-convex fuel use, 1 = include for all units
         /
 
@@ -226,11 +226,11 @@ param_gn  "Possible parameters for grid, node" /
 /
 
 param_gnBoundaryTypes "Types of boundaries that can be set for a node with a state variable" /
-    upwardLimit   "Absolute maximum state of the node (unit depends on energyCapacity)"
-    downwardLimit "Absolute minimum energy in the node (unit depends on energyCapacity)"
-    upwardSlack01*upwardSlack20 "A threshold after which a specific cost co-efficient is applied (unit depends on energyCapacity)"
-    downwardSlack01*downwardSlack20 "A threshold after which a specific cost co-efficient is applied (unit depends on energyCapacity)"
-    reference     "Reference value for a state that can be used to bound a state (unit depends on energyCapacity)"
+    upwardLimit   "Absolute maximum state of the node (unit of measure depends on energyStoredPerUnitOfState)"
+    downwardLimit "Absolute minimum energy in the node (unit of measure depends on energyStoredPerUnitOfState)"
+    upwardSlack01*upwardSlack20 "A threshold after which a specific cost co-efficient is applied (unit of measure depends on energyStoredPerUnitOfState)"
+    downwardSlack01*downwardSlack20 "A threshold after which a specific cost co-efficient is applied (unit of measure depends on energyStoredPerUnitOfState)"
+    reference     "Reference value for a state that can be used to bound a state (unit of measure depends on energyStoredPerUnitOfState)"
     maxSpill      "Maximum spill rate from the node (MWh/h)"
     minSpill      "Minimum spill rate from the node (MWh/h)"
     balancePenalty "Penalty value for violating the energy balance of that particular node (EUR/MWh) (can be interpretated as the energy price in certain settings)"
@@ -252,7 +252,7 @@ param_gnn "Set of possible data parameters for grid, node, node (nodal interconn
     diffCoeff     "Coefficients for energy diffusion between nodes (MW/[v_state])"
     boundStateMaxDiff "Maximum difference of node state pairs ([v_state])"
     transferCapInvLimit "Capacity limit for investments (MW)"
-    investMIP     "A flag to make integer investment instead of continous investment (MW versus number of links)"
+    investMIP     "A flag to make integer investment instead of continuous investment (MW versus number of links)"
     unitSize      "Size of one link for integer investments (MW)"
     invCost       "Investment cost (EUR/MW)"
     annuity       "Investment annuity"
@@ -317,7 +317,6 @@ param_unit "Set of possible data parameters for units" /
     hrop00 * hrop12   "Right border of the incremental heat rates"
     section       "Possibility to define a no load fuel use for units with zero minimum output"
     hrsection     "no load fuel use to be defined when using incremental heat rates"
-    level1 * level9 "Level of simplification in the part-load efficiency representation"
     useTimeseries "A flag to use time series form input for unit parameters whenever possible"
     investMIP     "A flag to make integer investment instead of continous investment"
     maxUnitCount  "Maximum number of units when making integer investments"
@@ -354,6 +353,8 @@ param_policy "Set of possible data parameters for groups or grid, node, regulati
     emissionTax   "Emission tax (EUR/tonne)"
     emissionCap   "Emission limit (tonne)"
     instantaneousShareMax "Maximum instantaneous share of generation and import from a particular group of units and transfer links"
+    energyMax      "Maximum energy production or consumption from a particular group of units over samples"
+    energyMaxVgenSign "Sign for v_gen in the maximum energy constraint - use -1 when you need a minimum energy constraint (then also energyMax should be negative)"
     energyShareMax "Maximum energy share of generation from a particular group of units"
     energyShareMin "Minimum energy share of generation from a particular group of units"
     constrainedCapMultiplier "Multiplier a(i) for unit investments in equation Sum(i, a(i)*v_invest(i)) <= b"
@@ -363,6 +364,8 @@ param_policy "Set of possible data parameters for groups or grid, node, regulati
 *    minCons "minimum consumption of storage unit when charging" // NOT USED, PENDING REMOVAL
     ROCOF "Maximum rate of change of frequency (Hz/s)"
     defaultFrequency "Nominal frequency in the system (Hz)"
+    staticInertia "A flag to indicate static inertia constraint should be implemented - q_inertiaMin"
+    dynamicInertia "A flag to indicate dynamic inertia constraint should be implemented - q_rateOfChangeOfFrequencyUnit/Transfer"
     // Reserve related parameters, currently without a proper parameter set
     update_frequency "Frequency of updating reserve contributions"
     update_offset "Optional offset for delaying the reserve update frequency"

inc/1b_sets.gms

@@ -27,6 +27,7 @@ Sets
 
 * --- Energy generation and consumption ---------------------------------------
     unit "Set of generators, storages and loads"
+    unittype "Unit technology types"
     unit_flow(unit) "Unit that depend directly on variable energy flows (RoR, solar PV, etc.)"
     unit_commodity(unit) "Units using an exogenous commodity with a price"
     unit_fail(unit) "Units that might fail"
@@ -40,14 +41,13 @@ Sets
     unit_slope(unit) "Units with piecewise linear efficiency constraints"
     unit_noSlope(unit) "Units without piecewise linear efficiency constraints"
     unitAggregator_unit(unit, unit) "Aggregate unit linked to aggregated units"
-    unitUnitEffLevel(unit, unit, EffLevel) "Aggregator unit linke to aggreted units with a definition when to start the aggregation"
-    flowUnit(flow, *) "Units or storages linked to a certain energy flow time series"
-    unitUnittype(unit, *) "Link generation technologies to types"
+    unitUnitEffLevel(unit, unit, EffLevel) "Aggregator unit linked to aggreted units with a definition when to start the aggregation"
+    flowUnit(flow, unit) "Units linked to a certain energy flow time series"
+    unitUnittype(unit, unittype) "Link generation technologies to types"
     unitStarttype(unit, starttype) "Units with special startup properties"
     un_commodity(unit, node) "Units linked with commodities"
     un_commodity_in(unit, node) "Units linked with input commodities"
     un_commodity_out(unit, node) "Units linked with output commodities"
-    unittype "Unit technology types"
     unit_investLP(unit) "Units with continuous investments allowed"
     unit_investMIP(unit) "Units with integer investments allowed"
     unit_timeseries(unit) "Units with time series enabled"
@@ -96,6 +96,7 @@ Sets
     t_current(t) "Set of time steps within the current solve horizon"
     t_active(t) "Set of active t:s within the current solve horizon, including necessary history"
     t_invest(t) "Time steps when investments can be made"
+    t_realized(t) "Set of realized time steps in the simulation"
     tt(t) "Temporary subset for time steps used for calculations"
     tt_(t) "Another temporary subset for time steps used for calculations"
     tt_block(counter, t) "Temporary time step subset for storing the time interval blocks"
@@ -157,7 +158,7 @@ $if defined scenario
     effGroupSelector(effSelector, effSelector) "Efficiency selectors included in efficiency groups, e.g. Lambda02 contains Lambda01 and Lambda02."
     effLevelGroupUnit(effLevel, effSelector, unit) "What efficiency selectors are in use for each unit at each efficiency representation level"
     effGroupSelectorUnit(effSelector, unit, effSelector) "Group name for efficiency selector set, e.g. Lambda02 contains Lambda01 and Lambda02"
-    mSettingsReservesInUse(mType, *, up_down) "Reserves that are used in each model type"
+    mSettingsReservesInUse(mType, restype, up_down) "Reserves that are used in each model type"
     unitCounter(unit, counter) "Counter used for restricting excessive looping over the counter set when defining unit startup/shutdown/online time restrictions"
     runUpCounter(unit, counter) "Counter used for unit run-up intervals"
     shutdownCounter(unit, counter) "Counter used for unit shutdown intervals"

inc/1c_parameters.gms

@@ -62,9 +62,9 @@ Parameters
     p_gnuReserves(grid, node, unit, restype, param_policy) "Reserve provision data for units"
     p_gnnReserves(grid, node, node, restype, up_down) "Reserve provision data for node node connections"
     p_gnuRes2Res(grid, node, unit, restype, up_down, restype) "The first type of reserve can be used also in the second reserve category (with a possible multiplier)"
-    p_gnPolicy(grid, node, param_policy, *) "Policy data for grid, node"
     p_groupPolicy(group, param_policy) "Two-dimensional policy data for groups"
-    p_groupPolicy3D(group, param_policy, *) "Three-dimensional policy data for groups"
+    p_groupPolicyUnit(group, param_policy, unit) "Three-dimensional policy data for groups and units"
+    p_groupPolicyEmission(group, param_policy, emission) "Three-dimensional policy data for groups and emissions"
     p_price(node, param_price) "Commodity price parameters"
     p_nEmission(node, emission) "Emission content (kg/MWh)"
     p_uStartupfuel(unit, node, param_unitStartupfuel) "Parameters for startup fuels"
@@ -102,7 +102,7 @@ Parameters
 Parameters
     p_msWeight(mType, s) "Temporal weight of sample: number of similar periods represented by sample s"
     p_msAnnuityWeight(mType, s) "Temporal weight of sample: used when calculating annuities"
-    p_msProbability(mType, s) "Probability to reach sample conditioned on anchestor samples"
+    p_msProbability(mType, s) "Probability to reach sample conditioned on ancestor samples"
     p_mfProbability(mType, f) "Probability of forecast"
     p_msft_probability(mType, s, f, t) "Probability of forecast"
     p_sProbability(s) "Probability of sample"

inc/1d_results.gms

@@ -119,6 +119,19 @@ Parameters
     r_gnTotalConsumptionShare(grid, node) "Total consumption gn/g share"
     r_gTotalConsumption(grid) "Total consumption of energy in g over the simulation (MWh)"
 
+
+* --- Emissions Results -------------------------------------------------------
+
+    // Unit level emissions
+    r_emissions (node, emission, unit, f, t) "Emissions from units (tCO2)"
+
+    // Emission sums
+    r_nuTotalEmissions (node, unit, emission) "Total emissions from units (tCO2)"
+    r_nTotalEmissions(node, emission) "Emissions in gn (tCO2)"
+    r_uTotalEmissions(unit, emission) "Emissions in gn (tCO2)"
+    r_totalEmissions (emission) "Summed emissions (tCO2)"
+
+
 * --- Unit Online State Results -----------------------------------------------
 
     // Online results required for model structure

inc/1e_inputs.gms

@@ -37,7 +37,7 @@ $ifthen exist '%input_dir%/inputData.gdx'
     $$loaddc p_gnu_io
     $$loaddc p_gnuBoundaryProperties
     $$loaddc p_unit
-        $$loaddc ts_unit
+    $$loaddc ts_unit
     $$loaddc p_unitConstraint
     $$loaddc p_unitConstraintNode
     $$loaddc restype
@@ -52,7 +52,6 @@ $ifthen exist '%input_dir%/inputData.gdx'
     $$loaddc p_gnuRes2Res
     $$loaddc ts_reserveDemand
     $$loaddc p_gnBoundaryPropertiesForStates
-    $$loaddc p_gnPolicy
     $$loaddc p_uStartupfuel
     $$loaddc flowUnit
     $$loaddc emission
@@ -73,7 +72,8 @@ $ifthen exist '%input_dir%/inputData.gdx'
     $$loaddc gnGroup
     $$loaddc sGroup
     $$loaddc p_groupPolicy
-    $$loaddc p_groupPolicy3D
+    $$loaddc p_groupPolicyUnit
+    $$loaddc p_groupPolicyEmission
     $$loaddc gnss_bound
     $$loaddc uss_bound
     $$gdxin
@@ -266,8 +266,8 @@ p_uShutdown(unit, 'cost')
 p_unitEmissionCost(unit, node, emission)${nu(node, unit) and p_nEmission(node, emission)}
     = p_nEmission(node, emission)
         / 1e3 // NOTE!!! Conversion to t/MWh from kg/MWh in data
-        * sum(gnu_input(grid, node, unit),
-            + p_gnPolicy(grid, node, 'emissionTax', emission)
+        * sum(gnGroup(grid, node, group)$gnu_input(grid, node, unit),
+            + p_groupPolicyEmission(group, 'emissionTax', emission)
           )
 ;
 

inc/1e_scenChanges.gms

@@ -374,18 +374,6 @@ $ifthen exist '%input_dir%/p_gnBoundaryPropertiesForStates3.gdx'
     $$gdxin
 $endif
 
-$ifthen exist '%input_dir%/p_gnPolicy2.gdx'
-    $$gdxin '%input_dir%/p_gnPolicy2.gdx'
-    $$loaddcm p_gnPolicy
-    $$gdxin
-$endif
-
-$ifthen exist '%input_dir%/p_gnPolicy3.gdx'
-    $$gdxin '%input_dir%/p_gnPolicy3.gdx'
-    $$loaddcm p_gnPolicy
-    $$gdxin
-$endif
-
 $ifthen exist '%input_dir%/p_uStartupFuel2.gdx'
     $$gdxin '%input_dir%/p_uStartupFuel2.gdx'
     $$loaddcm p_uStartupFuel
@@ -614,15 +602,27 @@ $ifthen exist '%input_dir%/p_groupPolicy3.gdx'
     $$gdxin
 $endif
 
-$ifthen exist '%input_dir%/p_groupPolicy3D2.gdx'
-    $$gdxin '%input_dir%/p_groupPolicy3D2.gdx'
-    $$loaddcm p_groupPolicy3D
+$ifthen exist '%input_dir%/p_groupPolicyUnit2.gdx'
+    $$gdxin '%input_dir%/p_groupPolicyUnit2.gdx'
+    $$loaddcm p_groupPolicyUnit
+    $$gdxin
+$endif
+
+$ifthen exist '%input_dir%/p_groupPolicyUnit3.gdx'
+    $$gdxin '%input_dir%/p_groupPolicyUnit3.gdx'
+    $$loaddcm p_groupPolicyUnit
+    $$gdxin
+$endif
+
+$ifthen exist '%input_dir%/p_groupPolicyEmission2.gdx'
+    $$gdxin '%input_dir%/p_groupPolicyEmission2.gdx'
+    $$loaddcm p_groupPolicyEmission
     $$gdxin
 $endif
 
-$ifthen exist '%input_dir%/p_groupPolicy3D3.gdx'
-    $$gdxin '%input_dir%/p_groupPolicy3D3.gdx'
-    $$loaddcm p_groupPolicy3D
+$ifthen exist '%input_dir%/p_groupPolicyEmission3.gdx'
+    $$gdxin '%input_dir%/p_groupPolicyEmission3.gdx'
+    $$loaddcm p_groupPolicyEmission
     $$gdxin
 $endif
 

inc/2b_eqDeclarations.gms

@@ -116,6 +116,7 @@ equations
     q_capacityMargin(grid, node, s, f, t) "There needs to be enough capacity to cover energy demand plus a margin"
     q_constrainedCapMultiUnit(group) "Constrained unit number ratios and sums for a group of units"
     q_emissioncap(group, emission) "Limit for emissions"
+    q_energyMax(group) "Maximum energy production or consumption from a group of units"
     q_energyShareMax(group) "Maximum energy share of generation and import from a group of units"
     q_energyShareMin(group) "Minimum energy share of generation and import from a group of units"
     q_ReserveShareMax(group, restype, up_down, group, s, f, t) "Maximum reserve share of a group of units"

inc/2c_objective.gms

@@ -61,7 +61,7 @@ q_obj ..
                             + sum(gn(grid, node),
                                 + vq_gen(inc_dec, grid, node, s, f, t)
                                     *( PENALTY_BALANCE(grid, node)${not p_gnBoundaryPropertiesForStates(grid, node, 'balancePenalty', 'useTimeSeries')}
-                                    + ts_node(grid, node, 'balancePenalty', f, t)${p_gnBoundaryPropertiesForStates(grid, node, 'balancePenalty', 'useTimeSeries')}
+                                    + ts_node_(grid, node, 'balancePenalty', s, f, t)${p_gnBoundaryPropertiesForStates(grid, node, 'balancePenalty', 'useTimeSeries')}
                                       )
                                 ) // END sum(gn)
                             ) // END sum(inc_dec)