Skip to content

Commit

Permalink
Fix xml files and test_results.py for wb_fore_output changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@doc78
doc78 committed Dec 2, 2022
1 parent 4a8850a commit 579cdc0
Show file tree
Hide file tree
Showing 8 changed files with 72 additions and 95 deletions.
2 changes: 1 addition & 1 deletion src/lisflood/global_modules/default_options.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
'repE2O2': False,
'repESActMaps': False,
'repESRefMaps': False,
'repETRefMaps': False,
'repETActMaps': False,
'repETRefMaps': False,
'repEWIntMaps': False,
'repEWRefMaps': False,
'repEndMaps': True,
Expand Down
18 changes: 9 additions & 9 deletions tests/data/LF_ETRS89_UseCase/settings/base.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down Expand Up @@ -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]
Expand Down Expand Up @@ -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]
Expand Down
18 changes: 9 additions & 9 deletions tests/data/LF_ETRS89_UseCase/settings/full.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -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>

Expand All @@ -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>

Expand Down Expand Up @@ -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>

Expand All @@ -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>

Expand All @@ -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>

Expand Down Expand Up @@ -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>

Expand All @@ -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>

Expand All @@ -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>

Expand Down
18 changes: 9 additions & 9 deletions tests/data/LF_ETRS89_UseCase/settings/inflow.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down Expand Up @@ -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]
Expand Down Expand Up @@ -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]
Expand Down
18 changes: 9 additions & 9 deletions tests/data/LF_ETRS89_UseCase/settings/prerun.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down Expand Up @@ -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]
Expand Down Expand Up @@ -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]
Expand Down
38 changes: 12 additions & 26 deletions tests/data/LF_lat_lon_UseCase/prerun_lat_lon.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3037,48 +3037,27 @@ 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)/th3">
<textvar name="Theta3Maps" value="$(PathOut)/thc">
<comment>
Reported volumetric soil moisture content for
soil layer 3 [V/V]
</comment>
</textvar>

<textvar name="Theta1ForestMaps" value="$(PathOut)/thf1">
<comment>
Reported volumetric soil moisture content for
forest soil layer 1 [V/V]
</comment>
</textvar>

<textvar name="Theta2ForestMaps" value="$(PathOut)/thf2">
<comment>
Reported volumetric soil moisture content for
forest soil layer 2 [V/V]
</comment>
</textvar>

<textvar name="Theta3ForestMaps" value="$(PathOut)/thf3">
<comment>
Reported volumetric soil moisture content for
forest soil layer 3 [V/V]
</comment>
</textvar>

<textvar name="ThetaMaps" value="$(PathOut)/th">
<comment>
Reported volumetric soil moisture content for combined
Expand Down Expand Up @@ -3172,20 +3151,27 @@ 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)/thfc">
<comment>
Reported volumetric soil moisture content for
forest soil layer 3 [V/V]
</comment>
</textvar>

<textvar name="UZForestMaps" value="$(PathOut)/uzF">
<comment>
Reported storage in upper response box [mm]
Expand Down
Loading

0 comments on commit 579cdc0

Please sign in to comment.