fixed calculation error with project costs

rl-institut · Jun 12, 2019 · d743a26 · d743a26
1 parent df688ca
commit d743a26
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/D_process_input.py b/D_process_input.py
@@ -65,7 +65,6 @@ def economic_values(experiment):
                           'project']
 
         for item in component_list:
-            print(item)
             # --------------------------------------------------#
             # CAPEX without opex/a                              #
             # --------------------------------------------------#
@@ -86,8 +85,7 @@ def economic_values(experiment):
             # costs. Includes project_cost_annuity, distribution_grid_cost_annuity, maingrid_extension_cost_annuity for
             # consistency eventhough these are not used in optimization.
             experiment.update({item + '_cost_annuity': experiment[item + '_cost_annuity'] / 365*experiment['evaluated_days']})
-            if item == 'project':
-                print(experiment[item + '_cost_investment'], experiment[item + '_cost_capex'], experiment[item + '_cost_annuity']*365/experiment['evaluated_days'])
+
         return experiment
 
     def add_timeseries(experiment_s):

diff --git a/Z_economic_functions.py b/Z_economic_functions.py
@@ -30,8 +30,6 @@ def capex_from_investment(investment_t0, lifetime, project_life, wacc, tax):
 
         # Substraction of component value at end of life with last replacement (= number_of_investments - 1)
         if number_of_investments * lifetime > project_life:
-            print(number_of_investments * lifetime)
-            print(investment_t0)
             last_investment = first_time_investment / ((1 + wacc) ** ((number_of_investments - 1) * lifetime))
             linear_depreciation_last_investment = last_investment / lifetime
             capex = capex -  linear_depreciation_last_investment * (number_of_investments * lifetime - project_life)