Skip to content

Commit e84f1b9

Browse files
committed
Add constant_gwr option
1 parent 72bf9e5 commit e84f1b9

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

src/dscim/menu/main_recipe.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class MainRecipe(StackedDamages, ABC):
2626
Parameters
2727
----------
2828
discounting_type : str
29-
Choice of discounting: ``euler_gwr``, ``euler_ramsey``, ``constant``, ``naive_ramsey``,
29+
Choice of discounting: ``euler_gwr``, ``euler_ramsey``, ``constant``, ``constant_gwr``, ``naive_ramsey``,
3030
``naive_gwr``, ``gwr_gwr``.
3131
discrete_discounting: boolean
3232
Discounting is discrete if ``True``, else continuous (default is ``False``).
@@ -52,6 +52,7 @@ class MainRecipe(StackedDamages, ABC):
5252
DISCOUNT_TYPES = [
5353
"constant",
5454
"constant_model_collapsed",
55+
"constant_gwr",
5556
"naive_ramsey",
5657
"euler_ramsey",
5758
"naive_gwr",
@@ -253,7 +254,7 @@ def __init__(
253254
# 'constant_model_collapsed' should be here except that we allow
254255
# for a collapsed-model Ramsey rate to be calculated (for labour
255256
# and energy purposes)
256-
if self.discounting_type in ["constant", "constant_model_collapsed"]:
257+
if self.discounting_type in ["constant", "constant_model_collapsed", "constant_gwr"]:
257258
self.stream_discount_factors = None
258259

259260
# assert formulas for which clip_gmsl is implemented
@@ -1093,7 +1094,7 @@ def discounted_damages(self, damages, discrate):
10931094
xr.Dataset
10941095
"""
10951096

1096-
if discrate in ["constant", "constant_model_collapsed"]:
1097+
if discrate in ["constant", "constant_model_collapsed", "constant_gwr"]:
10971098
if self.discrete_discounting:
10981099
discrate_damages = [
10991100
damages * (1 / (1 + r)) ** (damages.year - self.climate.pulse_year)

0 commit comments

Comments
 (0)