complete PRMS tests overhaul; add notebook 03_compare_pws_prms

EC-USGS · Oct 23, 2023 · 8471e2e · 8471e2e
1 parent a065eaf
commit 8471e2e
Show file tree

Hide file tree

Showing 9 changed files with 95 additions and 322 deletions.
diff --git a/autotest/test_prms_atmosphere.py b/autotest/test_prms_atmosphere.py
@@ -11,7 +11,7 @@
 from utils_compare import compare_in_memory, compare_netcdfs
 
 # compare in memory (faster) or full output files? or both!
-do_compare_output_files = True
+do_compare_output_files = False
 do_compare_in_memory = True
 rtol = 1.0e-5
 atol = 1.0e-5  # why is this relatively low accuracy?

diff --git a/autotest/test_prms_canopy.py b/autotest/test_prms_canopy.py
@@ -9,7 +9,7 @@
 from utils_compare import compare_in_memory, compare_netcdfs
 
 # compare in memory (faster) or full output files? or both!
-do_compare_output_files = True
+do_compare_output_files = False
 do_compare_in_memory = True
 rtol = atol = 1.0e-5
 

diff --git a/autotest/test_prms_canopy_runoff.py b/autotest/test_prms_canopy_runoff.py
diff --git a/autotest/test_prms_channel.py b/autotest/test_prms_channel.py
@@ -55,9 +55,8 @@ def test_compare_prms(
         )
 
     tmp_path = pl.Path(tmp_path)
-
-    # load csv files into dataframes
     output_dir = domain["prms_output_dir"]
+
     input_variables = {}
     for key in PRMSChannel.get_inputs():
         nc_path = output_dir / f"{key}.nc"

diff --git a/autotest/test_prms_runoff.py b/autotest/test_prms_runoff.py
@@ -9,7 +9,7 @@
 from utils_compare import compare_in_memory, compare_netcdfs
 
 # compare in memory (faster) or full output files? or both!
-do_compare_output_files = False
+do_compare_output_files = True
 do_compare_in_memory = True
 rtol = atol = 1.0e-10
 
@@ -88,6 +88,7 @@ def test_compare_prms(
         control.advance()
         runoff.advance()
         runoff.calculate(1.0)
+        runoff.output()
         if do_compare_in_memory:
             compare_in_memory(
                 runoff, answers, atol=atol, rtol=rtol, skip_missing_ans=True