From 9641dbfe17fd7034e8a0a27d438ff38e1e54e42b Mon Sep 17 00:00:00 2001
From: liuly12 <leyang.liu@hotmail.com>
Date: Wed, 10 Apr 2024 10:24:39 +0100
Subject: [PATCH] Direct assign to self rather than return variables

---
 wsimod/nodes/nutrient_pool.py | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/wsimod/nodes/nutrient_pool.py b/wsimod/nodes/nutrient_pool.py
index 5de1b2a..bd030ed 100644
--- a/wsimod/nodes/nutrient_pool.py
+++ b/wsimod/nodes/nutrient_pool.py
@@ -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()
@@ -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.
 
@@ -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."""