From 579cdc0fab1f6b38e46db50f91c8bcfdb77d5714 Mon Sep 17 00:00:00 2001 From: Carlo Russo Date: Fri, 2 Dec 2022 17:42:14 +0100 Subject: [PATCH] Fix xml files and test_results.py for wb_fore_output changes --- .../global_modules/default_options.py | 2 +- .../data/LF_ETRS89_UseCase/settings/base.xml | 18 ++++----- .../data/LF_ETRS89_UseCase/settings/full.xml | 18 ++++----- .../LF_ETRS89_UseCase/settings/inflow.xml | 18 ++++----- .../LF_ETRS89_UseCase/settings/prerun.xml | 18 ++++----- .../LF_lat_lon_UseCase/prerun_lat_lon.xml | 38 ++++++------------- tests/data/LF_lat_lon_UseCase/run_lat_lon.xml | 38 ++++++------------- tests/test_results.py | 17 ++++++--- 8 files changed, 72 insertions(+), 95 deletions(-) diff --git a/src/lisflood/global_modules/default_options.py b/src/lisflood/global_modules/default_options.py index 9b21e0be..37c03a4c 100644 --- a/src/lisflood/global_modules/default_options.py +++ b/src/lisflood/global_modules/default_options.py @@ -32,8 +32,8 @@ 'repE2O2': False, 'repESActMaps': False, 'repESRefMaps': False, - 'repETRefMaps': False, 'repETActMaps': False, + 'repETRefMaps': False, 'repEWIntMaps': False, 'repEWRefMaps': False, 'repEndMaps': True, diff --git a/tests/data/LF_ETRS89_UseCase/settings/base.xml b/tests/data/LF_ETRS89_UseCase/settings/base.xml index f2375610..380c2a10 100644 --- 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) - + Reported volumetric soil moisture content for soil layer 1 [V/V] - + Reported volumetric soil moisture content for soil layer 2 [V/V] - + 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 - + Reported volumetric soil moisture content for soil layer 1 [V/V] - + Reported volumetric soil moisture content for both soil layer 2 [V/V] - + 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 - + Reported volumetric soil moisture content for soil layer 1 [V/V] - + Reported volumetric soil moisture content for both soil layer 2 [V/V] - + 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 index 7fb96a81..298a65b5 100644 --- 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 - + @@ -5182,7 +5182,7 @@ LFBINDING: MORE LOW-LEVEL CONTROL OVER MODEL IN- AND OUTPUT - + @@ -5195,7 +5195,7 @@ LFBINDING: MORE LOW-LEVEL CONTROL OVER MODEL IN- AND OUTPUT - + @@ -5375,7 +5375,7 @@ LFBINDING: MORE LOW-LEVEL CONTROL OVER MODEL IN- AND OUTPUT - + @@ -5388,7 +5388,7 @@ LFBINDING: MORE LOW-LEVEL CONTROL OVER MODEL IN- AND OUTPUT - + @@ -5401,7 +5401,7 @@ LFBINDING: MORE LOW-LEVEL CONTROL OVER MODEL IN- AND OUTPUT - + @@ -5858,7 +5858,7 @@ LFBINDING: MORE LOW-LEVEL CONTROL OVER MODEL IN- AND OUTPUT - + @@ -5871,7 +5871,7 @@ LFBINDING: MORE LOW-LEVEL CONTROL OVER MODEL IN- AND OUTPUT - + @@ -5884,7 +5884,7 @@ LFBINDING: MORE LOW-LEVEL CONTROL OVER MODEL IN- AND OUTPUT - + diff --git a/tests/data/LF_ETRS89_UseCase/settings/inflow.xml b/tests/data/LF_ETRS89_UseCase/settings/inflow.xml index e1a36962..003b3b85 100644 --- 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) - + Reported volumetric soil moisture content for soil layer 1 [V/V] - + Reported volumetric soil moisture content for soil layer 2 [V/V] - + 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 - + Reported volumetric soil moisture content for soil layer 1 [V/V] - + Reported volumetric soil moisture content for both soil layer 2 [V/V] - + 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 - + Reported volumetric soil moisture content for soil layer 1 [V/V] - + Reported volumetric soil moisture content for both soil layer 2 [V/V] - + 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 index 1f58152f..9abfd1cc 100644 --- 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) - + Reported volumetric soil moisture content for soil layer 1 [V/V] - + Reported volumetric soil moisture content for soil layer 2 [V/V] - + 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 - + Reported volumetric soil moisture content for soil layer 1 [V/V] - + Reported volumetric soil moisture content for both soil layer 2 [V/V] - + 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 - + Reported volumetric soil moisture content for soil layer 1 [V/V] - + Reported volumetric soil moisture content for both soil layer 2 [V/V] - + Reported volumetric soil moisture content for both soil layer 3 [V/V] diff --git a/tests/data/LF_lat_lon_UseCase/prerun_lat_lon.xml b/tests/data/LF_lat_lon_UseCase/prerun_lat_lon.xml index 82f9259d..e784cbf1 100644 --- a/tests/data/LF_lat_lon_UseCase/prerun_lat_lon.xml +++ b/tests/data/LF_lat_lon_UseCase/prerun_lat_lon.xml @@ -3037,48 +3037,27 @@ LFBINDING: MORE LOW-LEVEL CONTROL OVER MODEL IN- AND OUTPUT SWITCHED ON (DEFAULT: ALL SWITCHED OFF) - + Reported volumetric soil moisture content for soil layer 1 [V/V] - + Reported volumetric soil moisture content for soil layer 2 [V/V] - + Reported volumetric soil moisture content for soil layer 3 [V/V] - - - Reported volumetric soil moisture content for - forest soil layer 1 [V/V] - - - - - - Reported volumetric soil moisture content for - forest soil layer 2 [V/V] - - - - - - Reported volumetric soil moisture content for - forest soil layer 3 [V/V] - - - Reported volumetric soil moisture content for combined @@ -3172,20 +3151,27 @@ LFBINDING: MORE LOW-LEVEL CONTROL OVER MODEL IN- AND OUTPUT - + Reported volumetric soil moisture content for soil layer 1 [V/V] - + Reported volumetric soil moisture content for both soil layer 2 [V/V] + + + Reported volumetric soil moisture content for + forest soil layer 3 [V/V] + + + Reported storage in upper response box [mm] diff --git a/tests/data/LF_lat_lon_UseCase/run_lat_lon.xml b/tests/data/LF_lat_lon_UseCase/run_lat_lon.xml index bd58ebda..8ac848c1 100644 --- a/tests/data/LF_lat_lon_UseCase/run_lat_lon.xml +++ b/tests/data/LF_lat_lon_UseCase/run_lat_lon.xml @@ -3002,48 +3002,27 @@ LFBINDING: MORE LOW-LEVEL CONTROL OVER MODEL IN- AND OUTPUT SWITCHED ON (DEFAULT: ALL SWITCHED OFF) - + Reported volumetric soil moisture content for soil layer 1 [V/V] - + Reported volumetric soil moisture content for soil layer 2 [V/V] - + Reported volumetric soil moisture content for soil layer 3 [V/V] - - - Reported volumetric soil moisture content for - forest soil layer 1 [V/V] - - - - - - Reported volumetric soil moisture content for - forest soil layer 2 [V/V] - - - - - - Reported volumetric soil moisture content for - forest soil layer 3 [V/V] - - - Reported volumetric soil moisture content for combined @@ -3137,20 +3116,27 @@ LFBINDING: MORE LOW-LEVEL CONTROL OVER MODEL IN- AND OUTPUT - + Reported volumetric soil moisture content for soil layer 1 [V/V] - + Reported volumetric soil moisture content for both soil layer 2 [V/V] + + + Reported volumetric soil moisture content for + forest soil layer 3 [V/V] + + + Reported storage in upper response box [mm] diff --git a/tests/test_results.py b/tests/test_results.py index 83b71dc1..b4dd7f76 100644 --- a/tests/test_results.py +++ b/tests/test_results.py @@ -113,12 +113,17 @@ def test_initvars(self): 'StepEnd': '05/02/2016 06:00', 'PathOut': output_dir}) lisfloodexe(settings) - initcond_files = ('ch2cr.end.nc', 'chcro.end.nc', 'chside.end.nc', 'cseal.end.nc', 'cum.end.nc', 'cumf.end.nc', - 'cumi.end.nc', 'dis.end.nc', 'dslf.end.nc', 'dsli.end.nc', 'dslr.end.nc', 'frost.end.nc', - 'lz.end.nc', - 'rsfil.end.nc', 'scova.end.nc', 'scovb.end.nc', 'scovc.end.nc', 'tha.end.nc', 'thb.end.nc', - 'thc.end.nc', 'thfa.end.nc', 'thfb.end.nc', 'thfc.end.nc', 'thia.end.nc', 'thib.end.nc', - 'thic.end.nc', 'uz.end.nc', 'uzf.end.nc', 'uzi.end.nc', 'wdept.end.nc') + initcond_files = ('ch2cr.end.nc', 'chanq.end.nc', 'chcro.end.nc', + 'chside.end.nc', 'cseal.end.nc', 'cum.end.nc', + 'cumf.end.nc', 'cumi.end.nc', 'dslf.end.nc', + 'dsli.end.nc', 'dslr.end.nc', 'frost.end.nc', + 'lakeh.end.nc', 'lz.end.nc', 'ofdir.end.nc', + 'offor.end.nc', 'ofoth.end.nc', 'rsfil.end.nc', + 'scova.end.nc', 'scovb.end.nc', 'scovc.end.nc', + 'tha.end.nc', 'thb.end.nc', 'thc.end.nc', + 'thfa.end.nc', 'thfb.end.nc', 'thfc.end.nc', + 'thia.end.nc', 'thib.end.nc', 'thic.end.nc', + 'uz.end.nc', 'uzf.end.nc', 'uzi.end.nc') for f in initcond_files: assert os.path.exists(os.path.join(output_dir, f))