Skip to content

Commit 35b4ecd

Browse files
authored
Allow carbon method options to be empty (#569)
1 parent 44fff01 commit 35b4ecd

1 file changed

Lines changed: 5 additions & 9 deletions

File tree

src/muse/mca.py

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -173,19 +173,15 @@ def __init__(
173173
)
174174
else:
175175
self.carbon_budget = DataArray([], dims="year")
176-
self.carbon_price = (
177-
carbon_price if carbon_price is not None else zeros_like(self.carbon_budget)
178-
)
179-
self.carbon_commodities = (
180-
carbon_commodities if carbon_commodities is not None else []
181-
)
176+
self.carbon_price = carbon_price or zeros_like(self.carbon_budget)
177+
self.carbon_commodities = carbon_commodities or []
182178
self.debug = debug
183179
self.control_undershoot = control_undershoot
184180
self.control_overshoot = control_overshoot
185181
self.carbon_method = CARBON_BUDGET_METHODS[carbon_method]
186-
self.method_options = method_options
187-
self.outputs = ofactory() if outputs is None else outputs
188-
self.outputs_cache = OutputCache() if outputs_cache is None else outputs_cache
182+
self.method_options = method_options or {}
183+
self.outputs = outputs or ofactory()
184+
self.outputs_cache = outputs_cache or OutputCache()
189185

190186
def find_equilibrium(
191187
self,

0 commit comments

Comments
 (0)