Skip to content

Commit

Permalink
Direct assign to self rather than return variables
Browse files Browse the repository at this point in the history
  • Loading branch information
liuly12 committed Apr 10, 2024
1 parent 4b32b9b commit 9641dbf
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions wsimod/nodes/nutrient_pool.py
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,10 @@ def __init__(
self.disfpar = disfpar
self.immobdpar = immobdpar

self.fraction_manure_to_fast, self.fraction_residue_to_humus, self.fraction_dry_n_to_fast = self.calculate_fraction_parameters()
self.fraction_manure_to_fast = None
self.fraction_residue_to_humus = None
self.fraction_dry_n_to_fast = None
self.calculate_fraction_parameters()

# Initialise different pools
self.fast_pool = NutrientStore()
Expand All @@ -138,17 +141,15 @@ def calculate_fraction_parameters(self):
(dict): fraction of plant residue to humus pool
(float): fraction of dry nitrogen deposition to fast pool
'''
fraction_manure_to_fast = {
self.fraction_manure_to_fast = {
x: 1 - self.fraction_manure_to_dissolved_inorganic[x]
for x in constants.NUTRIENTS
}
fraction_residue_to_humus = {
self.fraction_residue_to_humus = {
x: 1 - self.fraction_residue_to_fast[x] for x in constants.NUTRIENTS
}
fraction_dry_n_to_fast = 1 - self.fraction_dry_n_to_dissolved_inorganic
self.fraction_dry_n_to_fast = 1 - self.fraction_dry_n_to_dissolved_inorganic

return fraction_manure_to_fast, fraction_residue_to_humus, fraction_dry_n_to_fast

def apply_overrides(self, overrides = Dict[str, Any]):
"""Override parameters.
Expand All @@ -169,7 +170,7 @@ def apply_overrides(self, overrides = Dict[str, Any]):
self.disfpar.update(overrides.pop("disfpar", {}))
self.immobdpar.update(overrides.pop("immobdpar", {}))

self.fraction_manure_to_fast, self.fraction_residue_to_humus, self.fraction_dry_n_to_fast = self.calculate_fraction_parameters()
self.calculate_fraction_parameters()

def init_empty(self):
"""Initialise an empty nutrient to be copied."""
Expand Down

0 comments on commit 9641dbf

Please sign in to comment.