Skip to content

Commit 7043c1b

Browse files
author
JMGilbert
committed
Final changes before PR
1 parent ea692a4 commit 7043c1b

File tree

2 files changed

+2
-12
lines changed

2 files changed

+2
-12
lines changed

dscim/menu/main_recipe.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,8 @@ def __init__(
161161
"discount_factors",
162162
"uncollapsed_sccs",
163163
"scc",
164+
"uncollapsed_discount_factors",
165+
"uncollapsed_marginal_damages",
164166
],
165167
**kwargs,
166168
):

dscim/utils/menu_runs.py

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -117,12 +117,6 @@ def run_ssps(
117117
f"{save_path}/{menu_option}_{discount_type}_eta{menu_item.eta}_rho{menu_item.rho}_global_consumption.nc4"
118118
)
119119

120-
if marginal_damages == True:
121-
md = menu_item.uncollapsed_marginal_damages
122-
123-
if factors == True:
124-
df = menu_item.uncollapsed_discount_factors
125-
126120

127121
def run_rff(
128122
sectors,
@@ -189,9 +183,3 @@ def run_rff(
189183
menu_item.global_consumption.to_netcdf(
190184
f"{save_path}/{menu_option}_{discount_type}_eta{menu_item.eta}_rho{menu_item.rho}_global_consumption.nc4"
191185
)
192-
193-
if marginal_damages == True:
194-
md = menu_item.uncollapsed_marginal_damages
195-
196-
if factors == True:
197-
f = menu_item.uncollapsed_discount_factors

0 commit comments

Comments
 (0)