File tree Expand file tree Collapse file tree 1 file changed +35
-0
lines changed
Expand file tree Collapse file tree 1 file changed +35
-0
lines changed Original file line number Diff line number Diff line change @@ -1311,6 +1311,41 @@ def stream_discount_factors(self):
13111311 discounting_type = self .discounting_type ,
13121312 fair_aggregation = self .fair_aggregation ,
13131313 )
1314+
1315+ @cachedproperty
1316+ @save ("uncollapsed_discount_factors" )
1317+ def uncollapsed_discount_factors (self ):
1318+ pop = self .collapsed_pop .sum ("region" )
1319+ pop = pop .reindex (
1320+ year = range (pop .year .min ().values , self .ext_end_year + 1 ),
1321+ method = "ffill" ,
1322+ )
1323+ f = self .calculate_discount_factors (
1324+ self .global_consumption_no_pulse / pop
1325+ ).to_dataset (name = "discount_factor" )
1326+ for var in f .variables :
1327+ f [var ].encoding .clear ()
1328+
1329+ return f
1330+
1331+ @cachedproperty
1332+ @save ("uncollapsed_marginal_damages" )
1333+ def uncollapsed_marginal_damages (self ):
1334+
1335+ md = (
1336+ (
1337+ (self .global_consumption_no_pulse - self .global_consumption_pulse )
1338+ * self .climate .conversion
1339+ )
1340+ .rename ("marginal_damages" )
1341+ .to_dataset ()
1342+ )
1343+
1344+ for var in md .variables :
1345+ md [var ].encoding .clear ()
1346+
1347+ return md
1348+
13141349
13151350 @cachedproperty
13161351 @save ("uncollapsed_discount_factors" )
You can’t perform that action at this time.
0 commit comments