diff --git a/defOutput/resultSymbols.inc b/defOutput/resultSymbols.inc
index 6df9db91da0f2b2e54eaf68170650aed195c199e..27245349beb692366c9e13ee8b8afa2bbdd9b875 100644
--- a/defOutput/resultSymbols.inc
+++ b/defOutput/resultSymbols.inc
@@ -141,7 +141,7 @@ r_uTotalShutdown
* --- Emissions Results -----------------------------------------------
-// Unit level emissions from normal operation inputs
+// Unit level emissions from normal operation
r_emissions
// Unit level emissions from start-ups
@@ -180,7 +180,6 @@ r_groupTotalReserve
// Interesting investment results
r_invest
-r_investCapacity
r_investTransfer
* --- Sum results for groups --------------------------------------------------
diff --git a/inc/1a_definitions.gms b/inc/1a_definitions.gms
index b2e5815abb1c6495a2da5384ead71dfd871c4704..06e5509640e8e4dbe14b0e472f1ec9144e0fe4d4 100644
--- a/inc/1a_definitions.gms
+++ b/inc/1a_definitions.gms
@@ -262,7 +262,7 @@ param_gnn "Set of possible data parameters for grid, node, node (nodal interconn
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)"
- annuityFactor "Investment annuity"
+ annuity "Investment annuity"
portion_of_transfer_to_reserve "Portion of the infeed from the unit that needs to be available as reserve if the unit fails"
rampLimit "Maximum ramp speed (p.u./min). NOTE: does not apply to reserve tranfer at the moment."
variableTransCost "Variable cost applied to transfers (EUR/MW)"
@@ -281,7 +281,7 @@ param_gnu "Set of possible data parameters for grid, node, unit" /
upperLimitCapacityRatio "Ratio of the upper limit of the node state and the unit capacity investment ([v_state]/MW)"
unitSize "Input/Output capacity of one subunit for integer investments (MW)"
invCosts "Investment costs (EUR/MW)"
- annuityFactor "Investment annuity factor"
+ annuity "Investment annuity factor"
fomCosts "Fixed operation and maintenance costs (EUR/MW/a)"
vomCosts "Variable operation and maintenance costs (EUR/MWh)"
inertia "Inertia of the unit (s)"
diff --git a/inc/1d_results.gms b/inc/1d_results.gms
index cbe669e370018726412c9c06db59a8498ade8582..e2f32dd9f900a60783301848d7373139580851f7 100644
--- a/inc/1d_results.gms
+++ b/inc/1d_results.gms
@@ -190,7 +190,6 @@ Parameters
// Interesting investment results
r_invest(unit) "Number/amount of invested sub-units"
- r_investCapacity(grid, node, unit) "Total amount of invested capacity in units (MW)"
r_investTransfer(grid, node, node, t) "Amount of invested transfer link capacity"
* --- Group results -----------------------------------------------------------
diff --git a/inc/1e_inputs.gms b/inc/1e_inputs.gms
index 56e85bcb814e69656fb84e2b6f1fc80a41ac0dc2..fee92fc94a6c7f06557f15d419a8ae35d4d3d3c3 100644
--- a/inc/1e_inputs.gms
+++ b/inc/1e_inputs.gms
@@ -21,12 +21,7 @@ $offtext
* If input_file excel has been set in the command line arguments, then Gdxxrw will be run to convert the Excel into a GDX file
* using the sheet defined by input_excel_index command line argument (default: 'INDEX').
-$if set input_file_excel
- $$ifthen exist '%input_dir%/%input_file_excel%'
- $$call 'gdxxrw Input="%input_dir%/%input_file_excel%" Output="%input_dir%/%input_file_gdx%" Index=%input_excel_index%! %input_excel_checkdate%'
- $$else
- $$call 'gdxxrw Input="%input_file_excel%" Output="%input_dir%/%input_file_gdx%" Index=%input_excel_index%! %input_excel_checkdate%'
- $$endif
+$if set input_file_excel $call 'gdxxrw Input="%input_dir%/%input_file_excel%" Output="%input_dir%/%input_file_gdx%" Index=%input_excel_index%! %input_excel_checkdate%'
$ife %system.errorlevel%>0 $abort gdxxrw failed! Check that your input Excel is valid and that your file path and file name are correct.
* --input_file_gdx=nameOfInputFile.gdx for input_file_gdx in input_dir
diff --git a/inc/2c_objective.gms b/inc/2c_objective.gms
index 821f6b1f4c7894294b4e785c8e8c8245badc4658..c28ad32f6673fc7bd55fa3fb2100449dcc1745f0 100644
--- a/inc/2c_objective.gms
+++ b/inc/2c_objective.gms
@@ -159,13 +159,13 @@ q_obj ..
+ v_invest_LP(unit)${ unit_investLP(unit) and sum(msft(m, s, f, t_), uft(unit, f, t_))} // consider unit only if it is active in the sample
* p_gnu(grid, node, unit, 'unitSize')
* [
- + p_gnu(grid, node, unit, 'invCosts') * p_gnu(grid, node, unit, 'annuityFactor')
+ + p_gnu(grid, node, unit, 'invCosts') * p_gnu(grid, node, unit, 'annuity')
+ p_gnu(grid, node, unit, 'fomCosts')
]
+ v_invest_MIP(unit)${ unit_investMIP(unit) and sum(msft(m, s, f, t_), uft(unit, f, t_))} // consider unit only if it is active in the sample
* p_gnu(grid, node, unit, 'unitSize')
* [
- + p_gnu(grid, node, unit, 'invCosts') * p_gnu(grid, node, unit, 'annuityFactor')
+ + p_gnu(grid, node, unit, 'invCosts') * p_gnu(grid, node, unit, 'annuity')
+ p_gnu(grid, node, unit, 'fomCosts')
]
) // END sum(gnu)
@@ -176,18 +176,18 @@ q_obj ..
+ v_investTransfer_LP(grid, from_node, to_node, t)${ gn2n_directional_investLP(grid, from_node, to_node) }
* [
+ p_gnn(grid, from_node, to_node, 'invCost')
- * p_gnn(grid, from_node, to_node, 'annuityFactor')
+ * p_gnn(grid, from_node, to_node, 'annuity')
+ p_gnn(grid, to_node, from_node, 'invCost')
- * p_gnn(grid, to_node, from_node, 'annuityFactor')
+ * p_gnn(grid, to_node, from_node, 'annuity')
] // END * v_investTransfer_LP
+ v_investTransfer_MIP(grid, from_node, to_node, t)${ gn2n_directional_investMIP(grid, from_node, to_node) }
* [
+ p_gnn(grid, from_node, to_node, 'unitSize')
* p_gnn(grid, from_node, to_node, 'invCost')
- * p_gnn(grid, from_node, to_node, 'annuityFactor')
+ * p_gnn(grid, from_node, to_node, 'annuity')
+ p_gnn(grid, to_node, from_node, 'unitSize')
* p_gnn(grid, to_node, from_node, 'invCost')
- * p_gnn(grid, to_node, from_node, 'annuityFactor')
+ * p_gnn(grid, to_node, from_node, 'annuity')
] // END * v_investTransfer_MIP
) // END sum(gn2n_directional)
) // END sum(t_invest)
diff --git a/inc/4a_outputVariant.gms b/inc/4a_outputVariant.gms
index f231d24d1ea3c7a83fd0ddb1c51a8f669b540d6f..e0a63e4a512094dfff8381b1bcdc12d92c2abf94 100644
--- a/inc/4a_outputVariant.gms
+++ b/inc/4a_outputVariant.gms
@@ -160,14 +160,6 @@ r_invest(unit)${ (unit_investLP(unit) or unit_investMIP(unit))
}
= v_invest_LP.l(unit) + v_invest_MIP.l(unit)
;
-
-// Capacity of unit investments
-r_investCapacity(grid, node, unit)${ (unit_investLP(unit) or unit_investMIP(unit))
- and p_unit(unit, 'becomeAvailable') <= tSolveFirst + mSettings(mSolve, 't_jump')
- }
- = (v_invest_LP.l(unit) + v_invest_MIP.l(unit))*p_gnu(grid, node, unit, 'unitSize')
-;
-
// Link investments
r_investTransfer(grid, node, node_, t_invest(t))${ p_gnn(grid, node, node_, 'transferCapInvLimit')
* and t_current(t)
diff --git a/inc/4b_outputInvariant.gms b/inc/4b_outputInvariant.gms
index 8d964838372458ccee5b6849bf7b24dbc71f8e1d..351ff4729e10d8ac335f56ba1217b7c1f99feb10 100644
--- a/inc/4b_outputInvariant.gms
+++ b/inc/4b_outputInvariant.gms
@@ -238,7 +238,7 @@ loop(m,
) // END * sum(ms)
* p_gnu(grid, node, unit, 'unitSize')
* p_gnu(grid, node, unit, 'invCosts')
- * p_gnu(grid, node, unit, 'annuityFactor');
+ * p_gnu(grid, node, unit, 'annuity');
// Transfer link investment costs
r_gnnLinkInvestmentCost(gn2n_directional(grid, from_node, to_node)) // gn2n_directional only, as in q_obj
@@ -252,9 +252,9 @@ loop(m,
) // END * sum(ms)
* [
+ p_gnn(grid, from_node, to_node, 'invCost')
- * p_gnn(grid, from_node, to_node, 'annuityFactor')
+ * p_gnn(grid, from_node, to_node, 'annuity')
+ p_gnn(grid, to_node, from_node, 'invCost')
- * p_gnn(grid, to_node, from_node, 'annuityFactor')
+ * p_gnn(grid, to_node, from_node, 'annuity')
]; // END * r_investTransfer;
* --- Realized Nodal System Costs ---------------------------------------------
@@ -489,7 +489,7 @@ loop(m,
// Approximate utilization rates for gnus over the simulation
r_gnuUtilizationRate(gnu(grid, node, unit))${ r_gnuTotalGen(grid, node, unit)
and ( p_gnu(grid, node, unit, 'capacity')
- or (r_invest(unit) and p_gnu(grid, node, unit, 'unitSize'))
+ or r_invest(unit)
)
}
= r_gnuTotalGen(grid, node, unit)