Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
romainsacchi committed Apr 12, 2024
2 parents feaf18b + 5829ab5 commit f7c9d92
Showing 1 changed file with 24 additions and 22 deletions.
46 changes: 24 additions & 22 deletions pathways/pathways.py
Original file line number Diff line number Diff line change
Expand Up @@ -384,29 +384,31 @@ def calculate(
}
)
else:
results.update({
(model, scenario, year): _calculate_year(
(
model,
scenario,
year,
regions,
variables,
methods,
demand_cutoff,
self.filepaths,
self.mapping,
self.units,
self.lca_results,
self.classifications,
self.scenarios,
self.reverse_classifications,
self.debug,
use_distributions,
results.update(
{
(model, scenario, year): _calculate_year(
(
model,
scenario,
year,
regions,
variables,
methods,
demand_cutoff,
self.filepaths,
self.mapping,
self.units,
self.lca_results,
self.classifications,
self.scenarios,
self.reverse_classifications,
self.debug,
use_distributions,
)
)
)
for year in years
})
for year in years
}
)

# remove None values in results
results = {k: v for k, v in results.items() if v is not None}
Expand Down

0 comments on commit f7c9d92

Please sign in to comment.