Merge pull request #118 from ec-jrc/release_proposal_4.1.1

Release proposal 4.1.1
ec-jrc · Dec 9, 2022 · a728970 · a728970
2 parents b5cdb6f + 6043971
commit a728970
Show file tree

Hide file tree

Showing 11 changed files with 121 additions and 141 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-4.1.0
+4.1.1
diff --git a/src/lisflood/Lisflood_dynamic.py b/src/lisflood/Lisflood_dynamic.py
@@ -196,9 +196,11 @@ def splitlanduse(array1, array2=None, array3=None):
         # sum of both lines
         # CrossSection2Area = pcraster.max(scalar(0.0), (self.Chan2M3Kin - self.Chan2M3Start) / self.ChanLength)
 
+        self.TotalCrossSectionArea = self.ChanM3 * self.InvChanLength
+
         self.sumDis += self.sumDisDay
         self.ChanQAvg = self.sumDisDay/self.NoRoutSteps
-        self.TotalCrossSectionArea = self.ChanM3 * self.InvChanLength
+
         # Total volume of water in channel per inv channel length
         # New cross section area (kinematic wave)
         # This is the value after the kinematic wave, so we use ChanM3Kin here
@@ -256,4 +258,4 @@ def splitlanduse(array1, array2=None, array3=None):
         self.stateVar_module.dynamic()
         if option['wateruse'] and option['indicator'] and self.monthend: 
             self.indicatorcalc_module.dynamic_setzero()
-        # setting monthly and yearly dindicator to zero at the end of the month (year)
+        # setting monthly and yearly dindicator to zero at the end of the month (year)
diff --git a/src/lisflood/global_modules/default_options.py b/src/lisflood/global_modules/default_options.py
diff --git a/src/lisflood/hydrological_modules/routing.py b/src/lisflood/hydrological_modules/routing.py
@@ -390,7 +390,7 @@ def initialSecond(self):
                 self.var.Chan2M3Kin = self.var.CrossSection2Area * self.var.ChanLength + self.var.Chan2M3Start
                 self.var.ChanM3Kin = self.var.ChanM3 - self.var.Chan2M3Kin + self.var.Chan2M3Start
 
-                self.var.ChanM3Kin = np.where((self.var.ChanM3Kin < 0.0) & (self.var.ChanM3Kin > -0.0000001),0.0,self.var.ChanM3Kin)
+                self.var.ChanM3Kin = np.where((self.var.ChanM3Kin < 0.0) & (self.var.ChanM3Kin > -0.0000001),0.0,self.var.ChanM3Kin) # this line prevents the warmstart from failing in case of small numerical imprecisions when writing and reading the maps
 
                 self.var.Chan2QKin = (self.var.Chan2M3Kin * self.var.InvChanLength * self.var.InvChannelAlpha2) ** (self.var.InvBeta)
                 self.var.ChanQKin = (self.var.ChanM3Kin * self.var.InvChanLength * self.var.InvChannelAlpha) ** (self.var.InvBeta)

diff --git a/tests/data/LF_ETRS89_UseCase/settings/base.xml b/tests/data/LF_ETRS89_UseCase/settings/base.xml
@@ -3131,21 +3131,21 @@ LFBINDING: MORE LOW-LEVEL CONTROL OVER MODEL IN- AND OUTPUT
                     SWITCHED ON (DEFAULT: ALL SWITCHED OFF)
                 </comment>
 
-                <textvar name="Theta1Maps" value="$(PathOut)/thtop">
+                <textvar name="Theta1Maps" value="$(PathOut)/tha">
                     <comment>
                         Reported volumetric soil moisture content for
                         soil layer 1 [V/V]
                     </comment>
                 </textvar>
 
-                <textvar name="Theta2Maps" value="$(PathOut)/thsub">
+                <textvar name="Theta2Maps" value="$(PathOut)/thb">
                     <comment>
                         Reported volumetric soil moisture content for
                         soil layer 2 [V/V]
                     </comment>
                 </textvar>
 
-                <textvar name="Theta3Maps" value="$(PathOut)/thbot">
+                <textvar name="Theta3Maps" value="$(PathOut)/thc">
                     <comment>
                         Reported volumetric soil moisture content for
                         soil layer 3 [V/V]
@@ -3263,21 +3263,21 @@ LFBINDING: MORE LOW-LEVEL CONTROL OVER MODEL IN- AND OUTPUT
                     </comment>
                 </textvar>
 
-                <textvar name="Theta1ForestMaps" value="$(PathOut)/thFt">
+                <textvar name="Theta1ForestMaps" value="$(PathOut)/thfa">
                     <comment>
                         Reported volumetric soil moisture content for
                         soil layer 1 [V/V]
                     </comment>
                 </textvar>
 
-                <textvar name="Theta2ForestMaps" value="$(PathOut)/thFs">
+                <textvar name="Theta2ForestMaps" value="$(PathOut)/thfb">
                     <comment>
                         Reported volumetric soil moisture content for both
                         soil layer 2 [V/V]
                     </comment>
                 </textvar>
 
-                <textvar name="Theta3ForestMaps" value="$(PathOut)/thFb">
+                <textvar name="Theta3ForestMaps" value="$(PathOut)/thfc">
                     <comment>
                         Reported volumetric soil moisture content for both
                         soil layer 3 [V/V]
@@ -3527,21 +3527,21 @@ LFBINDING: MORE LOW-LEVEL CONTROL OVER MODEL IN- AND OUTPUT
                     </comment>
                 </textvar>
 
-                <textvar name="Theta1IrrigationMaps" value="$(PathOut)/thIt">
+                <textvar name="Theta1IrrigationMaps" value="$(PathOut)/thia">
                     <comment>
                         Reported volumetric soil moisture content for
                         soil layer 1 [V/V]
                     </comment>
                 </textvar>
 
-                <textvar name="Theta2IrrigationMaps" value="$(PathOut)/thIs">
+                <textvar name="Theta2IrrigationMaps" value="$(PathOut)/thib">
                     <comment>
                         Reported volumetric soil moisture content for both
                         soil layer 2 [V/V]
                     </comment>
                 </textvar>
 
-                <textvar name="Theta3IrrigationMaps" value="$(PathOut)/thIb">
+                <textvar name="Theta3IrrigationMaps" value="$(PathOut)/thic">
                     <comment>
                         Reported volumetric soil moisture content for both
                         soil layer 3 [V/V]

diff --git a/tests/data/LF_ETRS89_UseCase/settings/full.xml b/tests/data/LF_ETRS89_UseCase/settings/full.xml
@@ -5169,7 +5169,7 @@ LFBINDING: MORE LOW-LEVEL CONTROL OVER MODEL IN- AND OUTPUT
                 </comment>
 
 
-                <textvar name="Theta1Maps" value="$(PathOut)/thtop">
+                <textvar name="Theta1Maps" value="$(PathOut)/tha">
 
                     <comment>
 
@@ -5182,7 +5182,7 @@ LFBINDING: MORE LOW-LEVEL CONTROL OVER MODEL IN- AND OUTPUT
                 </textvar>
 
 
-                <textvar name="Theta2Maps" value="$(PathOut)/thsub">
+                <textvar name="Theta2Maps" value="$(PathOut)/thb">
 
                     <comment>
 
@@ -5195,7 +5195,7 @@ LFBINDING: MORE LOW-LEVEL CONTROL OVER MODEL IN- AND OUTPUT
                 </textvar>
 
 
-                <textvar name="Theta3Maps" value="$(PathOut)/thbot">
+                <textvar name="Theta3Maps" value="$(PathOut)/thc">
 
                     <comment>
 
@@ -5375,7 +5375,7 @@ LFBINDING: MORE LOW-LEVEL CONTROL OVER MODEL IN- AND OUTPUT
                 </textvar>
 
 
-                <textvar name="Theta1ForestMaps" value="$(PathOut)/thFt">
+                <textvar name="Theta1ForestMaps" value="$(PathOut)/thfa">
 
                     <comment>
 
@@ -5388,7 +5388,7 @@ LFBINDING: MORE LOW-LEVEL CONTROL OVER MODEL IN- AND OUTPUT
                 </textvar>
 
 
-                <textvar name="Theta2ForestMaps" value="$(PathOut)/thFs">
+                <textvar name="Theta2ForestMaps" value="$(PathOut)/thfb">
 
                     <comment>
 
@@ -5401,7 +5401,7 @@ LFBINDING: MORE LOW-LEVEL CONTROL OVER MODEL IN- AND OUTPUT
                 </textvar>
 
 
-                <textvar name="Theta3ForestMaps" value="$(PathOut)/thFb">
+                <textvar name="Theta3ForestMaps" value="$(PathOut)/thfc">
 
                     <comment>
 
@@ -5858,7 +5858,7 @@ LFBINDING: MORE LOW-LEVEL CONTROL OVER MODEL IN- AND OUTPUT
                 </textvar>
 
 
-                <textvar name="Theta1IrrigationMaps" value="$(PathOut)/thIt">
+                <textvar name="Theta1IrrigationMaps" value="$(PathOut)/thia">
 
                     <comment>
 
@@ -5871,7 +5871,7 @@ LFBINDING: MORE LOW-LEVEL CONTROL OVER MODEL IN- AND OUTPUT
                 </textvar>
 
 
-                <textvar name="Theta2IrrigationMaps" value="$(PathOut)/thIs">
+                <textvar name="Theta2IrrigationMaps" value="$(PathOut)/thib">
 
                     <comment>
 
@@ -5884,7 +5884,7 @@ LFBINDING: MORE LOW-LEVEL CONTROL OVER MODEL IN- AND OUTPUT
                 </textvar>
 
 
-                <textvar name="Theta3IrrigationMaps" value="$(PathOut)/thIb">
+                <textvar name="Theta3IrrigationMaps" value="$(PathOut)/thic">
 
                     <comment>
 

diff --git a/tests/data/LF_ETRS89_UseCase/settings/inflow.xml b/tests/data/LF_ETRS89_UseCase/settings/inflow.xml
@@ -3129,21 +3129,21 @@ LFBINDING: MORE LOW-LEVEL CONTROL OVER MODEL IN- AND OUTPUT
                     SWITCHED ON (DEFAULT: ALL SWITCHED OFF)
                 </comment>
 
-                <textvar name="Theta1Maps" value="$(PathOut)/thtop">
+                <textvar name="Theta1Maps" value="$(PathOut)/tha">
                     <comment>
                         Reported volumetric soil moisture content for
                         soil layer 1 [V/V]
                     </comment>
                 </textvar>
 
-                <textvar name="Theta2Maps" value="$(PathOut)/thsub">
+                <textvar name="Theta2Maps" value="$(PathOut)/thb">
                     <comment>
                         Reported volumetric soil moisture content for
                         soil layer 2 [V/V]
                     </comment>
                 </textvar>
 
-                <textvar name="Theta3Maps" value="$(PathOut)/thbot">
+                <textvar name="Theta3Maps" value="$(PathOut)/thc">
                     <comment>
                         Reported volumetric soil moisture content for
                         soil layer 3 [V/V]
@@ -3261,21 +3261,21 @@ LFBINDING: MORE LOW-LEVEL CONTROL OVER MODEL IN- AND OUTPUT
                     </comment>
                 </textvar>
 
-                <textvar name="Theta1ForestMaps" value="$(PathOut)/thFt">
+                <textvar name="Theta1ForestMaps" value="$(PathOut)/thfa">
                     <comment>
                         Reported volumetric soil moisture content for
                         soil layer 1 [V/V]
                     </comment>
                 </textvar>
 
-                <textvar name="Theta2ForestMaps" value="$(PathOut)/thFs">
+                <textvar name="Theta2ForestMaps" value="$(PathOut)/thfb">
                     <comment>
                         Reported volumetric soil moisture content for both
                         soil layer 2 [V/V]
                     </comment>
                 </textvar>
 
-                <textvar name="Theta3ForestMaps" value="$(PathOut)/thFb">
+                <textvar name="Theta3ForestMaps" value="$(PathOut)/thfc">
                     <comment>
                         Reported volumetric soil moisture content for both
                         soil layer 3 [V/V]
@@ -3525,21 +3525,21 @@ LFBINDING: MORE LOW-LEVEL CONTROL OVER MODEL IN- AND OUTPUT
                     </comment>
                 </textvar>
 
-                <textvar name="Theta1IrrigationMaps" value="$(PathOut)/thIt">
+                <textvar name="Theta1IrrigationMaps" value="$(PathOut)/thia">
                     <comment>
                         Reported volumetric soil moisture content for
                         soil layer 1 [V/V]
                     </comment>
                 </textvar>
 
-                <textvar name="Theta2IrrigationMaps" value="$(PathOut)/thIs">
+                <textvar name="Theta2IrrigationMaps" value="$(PathOut)/thib">
                     <comment>
                         Reported volumetric soil moisture content for both
                         soil layer 2 [V/V]
                     </comment>
                 </textvar>
 
-                <textvar name="Theta3IrrigationMaps" value="$(PathOut)/thIb">
+                <textvar name="Theta3IrrigationMaps" value="$(PathOut)/thic">
                     <comment>
                         Reported volumetric soil moisture content for both
                         soil layer 3 [V/V]

diff --git a/tests/data/LF_ETRS89_UseCase/settings/prerun.xml b/tests/data/LF_ETRS89_UseCase/settings/prerun.xml
@@ -3127,21 +3127,21 @@ LFBINDING: MORE LOW-LEVEL CONTROL OVER MODEL IN- AND OUTPUT
                     SWITCHED ON (DEFAULT: ALL SWITCHED OFF)
                 </comment>
 
-                <textvar name="Theta1Maps" value="$(PathOut)/thtop">
+                <textvar name="Theta1Maps" value="$(PathOut)/tha">
                     <comment>
                         Reported volumetric soil moisture content for
                         soil layer 1 [V/V]
                     </comment>
                 </textvar>
 
-                <textvar name="Theta2Maps" value="$(PathOut)/thsub">
+                <textvar name="Theta2Maps" value="$(PathOut)/thb">
                     <comment>
                         Reported volumetric soil moisture content for
                         soil layer 2 [V/V]
                     </comment>
                 </textvar>
 
-                <textvar name="Theta3Maps" value="$(PathOut)/thbot">
+                <textvar name="Theta3Maps" value="$(PathOut)/thc">
                     <comment>
                         Reported volumetric soil moisture content for
                         soil layer 3 [V/V]
@@ -3259,21 +3259,21 @@ LFBINDING: MORE LOW-LEVEL CONTROL OVER MODEL IN- AND OUTPUT
                     </comment>
                 </textvar>
 
-                <textvar name="Theta1ForestMaps" value="$(PathOut)/thFt">
+                <textvar name="Theta1ForestMaps" value="$(PathOut)/thfa">
                     <comment>
                         Reported volumetric soil moisture content for
                         soil layer 1 [V/V]
                     </comment>
                 </textvar>
 
-                <textvar name="Theta2ForestMaps" value="$(PathOut)/thFs">
+                <textvar name="Theta2ForestMaps" value="$(PathOut)/thfb">
                     <comment>
                         Reported volumetric soil moisture content for both
                         soil layer 2 [V/V]
                     </comment>
                 </textvar>
 
-                <textvar name="Theta3ForestMaps" value="$(PathOut)/thFb">
+                <textvar name="Theta3ForestMaps" value="$(PathOut)/thfc">
                     <comment>
                         Reported volumetric soil moisture content for both
                         soil layer 3 [V/V]
@@ -3523,21 +3523,21 @@ LFBINDING: MORE LOW-LEVEL CONTROL OVER MODEL IN- AND OUTPUT
                     </comment>
                 </textvar>
 
-                <textvar name="Theta1IrrigationMaps" value="$(PathOut)/thIt">
+                <textvar name="Theta1IrrigationMaps" value="$(PathOut)/thia">
                     <comment>
                         Reported volumetric soil moisture content for
                         soil layer 1 [V/V]
                     </comment>
                 </textvar>
 
-                <textvar name="Theta2IrrigationMaps" value="$(PathOut)/thIs">
+                <textvar name="Theta2IrrigationMaps" value="$(PathOut)/thib">
                     <comment>
                         Reported volumetric soil moisture content for both
                         soil layer 2 [V/V]
                     </comment>
                 </textvar>
 
-                <textvar name="Theta3IrrigationMaps" value="$(PathOut)/thIb">
+                <textvar name="Theta3IrrigationMaps" value="$(PathOut)/thic">
                     <comment>
                         Reported volumetric soil moisture content for both
                         soil layer 3 [V/V]