Move nus list to cfg

MPAS-Dev · Jan 30, 2023 · 5d379d4 · 5d379d4
1 parent 6d71658
commit 5d379d4
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/compass/ocean/tests/overflow/overflow.cfg b/compass/ocean/tests/overflow/overflow.cfg
@@ -6,3 +6,6 @@ width = 40
 
 # The length of the domain in the along-slope dimension (km)
 length = 200
+
+# Viscosity values to test for rpe test case
+viscosities = 1, 5, 10, 100, 1000
diff --git a/compass/ocean/tests/overflow/rpe_test/__init__.py b/compass/ocean/tests/overflow/rpe_test/__init__.py
@@ -32,15 +32,27 @@ def __init__(self, test_group, resolution='1km'):
         super().__init__(test_group=test_group, name=name,
                          subdir=subdir)
 
-        nus = [1, 5, 10, 100, 1000]
-
         self.resolution = resolution
+        self.nus = None
+
+
+    def configure(self):
+        """
+        Modify the configuration options for this test case.
+        """
+        config = self.config
+        resolution = self.resolution
+
+        overflow.configure(resolution, config)
+
+        nus = config.getlist('overflow', 'viscosities', dtype=float)
+        self.nus = nus
 
         self.add_step(
             InitialState(test_case=self))
 
         for index, nu in enumerate(nus):
-            name = f'rpe_test_{index + 1}_nu_{nu}'
+            name = f'rpe_test_{index + 1}_nu_{int(nu)}'
             step = Forward(
                 test_case=self, name=name, subdir=name,
                 ntasks=64, min_tasks=16, openmp_threads=1,
@@ -56,11 +68,4 @@ def __init__(self, test_group, resolution='1km'):
 
         self.add_step(
             Analysis(test_case=self, resolution=resolution, nus=nus))
-
-    def configure(self):
-        """
-        Modify the configuration options for this test case.
-        """
-        overflow.configure(self.resolution, self.config)
-
     # no run() is needed because we're doing the default: running all steps