Merge pull request #44 from openstreams/fix_massbal_kinwave

fix issue #43
openstreams · Feb 3, 2021 · 60e9def · 60e9def
2 parents 6ea979c + 1c49225
commit 60e9def
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/wflow/wflow_sbm.py b/wflow/wflow_sbm.py
@@ -632,9 +632,9 @@ def updateKinWaveVolume(self):
       Updates the kinematic wave reservoir. Should be run after updates to Q
       """
         self.OldKinWaveVolumeR = self.KinWaveVolumeR
-        self.KinWaveVolumeR = self.WaterLevelR * self.Bw * self.DCL
+        self.KinWaveVolumeR = self.WaterLevelRsub * self.Bw * self.DCL
         self.OldKinWaveVolumeL = self.KinWaveVolumeL
-        self.KinWaveVolumeL = self.WaterLevelL * self.SW * self.DL
+        self.KinWaveVolumeL = self.WaterLevelLsub * self.SW * self.DL
 
 
     def stateVariables(self):
@@ -2127,11 +2127,11 @@ def resume(self):
         self.dyn['AlphaL'] = pcr.pcr2numpy(self.AlphaL, self.mv).ravel()
 
         # Determine initial kinematic wave volume overland
-        self.KinWaveVolumeL = self.WaterLevelL * self.SW * self.DL
+        self.KinWaveVolumeL = self.WaterLevelLsub * self.SW * self.DL
         self.OldKinWaveVolumeL = self.KinWaveVolumeL
 
         # Determine initial kinematic wave volume
-        self.KinWaveVolumeR = self.WaterLevelR * self.Bw * self.DCL
+        self.KinWaveVolumeR = self.WaterLevelRsub * self.Bw * self.DCL
         self.OldKinWaveVolumeR = self.KinWaveVolumeR
 
         self.InitialStorage = (