Adding another batch.

tests/test_python/test_check_ruc_lsm.py

@@ -0,0 +1,27 @@
+""" Test for the define_ruc_lsm script. """
+
+#pylint: disable=invalid-name
+
+import os
+import unittest
+
+from python_utils import set_env_var
+
+from check_ruc_lsm import check_ruc_lsm
+
+class Testing(unittest.TestCase):
+    """ Define the tests"""
+
+    def test_check_ruc_lsm(self):
+        """" Read in a CCPP suite definition file and check that it is
+        using RUC LSM as part of the suite. """
+        test_dir = os.path.dirname(os.path.abspath(__file__))
+        USHdir = os.path.join(test_dir, "..", "..", "ush")
+        self.assertTrue(
+            check_ruc_lsm(
+                ccpp_phys_suite_fp=f"{USHdir}{os.sep}test_data{os.sep}suite_FV3_GSD_SAR.xml"
+            )
+        )
+
+    def setUp(self):
+        set_env_var("DEBUG", True)

tests/test_python/test_set_gridparams_GFDLgrid.py

@@ -0,0 +1,35 @@
+""" Defines the tests for set_gridparams_GFDLgrid """
+
+#pylint: disable=invalid-name
+
+import unittest
+
+from set_gridparams_GFDLgrid import set_gridparams_GFDLgrid
+
+class Testing(unittest.TestCase):
+    """ Define the tests """
+
+    def test_set_gridparams_GFDLgrid(self):
+
+        """ Test that grid parameters are set as expected, and that a
+        list is returned with expected values. Some work here is needed
+        to understand why we have a list with these magic numbers."""
+        grid_params = set_gridparams_GFDLgrid(
+            lon_of_t6_ctr=-97.5,
+            lat_of_t6_ctr=38.5,
+            res_of_t6g=96,
+            stretch_factor=1.4,
+            refine_ratio_t6g_to_t7g=3,
+            istart_of_t7_on_t6g=13,
+            iend_of_t7_on_t6g=84,
+            jstart_of_t7_on_t6g=17,
+            jend_of_t7_on_t6g=80,
+            run_envir="community",
+            verbose=True,
+            nh4=4,
+        )
+
+        self.assertEqual(
+            list(grid_params.values()),
+            [-97.5, 38.5, 216, 192, 6, 1.4, 21, 172, 29, 164],
+        )

tests/test_python/test_set_predef_grid_params.py

@@ -0,0 +1,45 @@
+""" Defines tests for setting the predefined grid parameters. """
+
+import os
+import unittest
+
+from set_predef_grid_params import set_predef_grid_params
+
+class Testing(unittest.TestCase):
+
+    "Define the tests"
+
+    def test_set_predef_grid_params(self):
+        """ Check that the method called updates or sets specific entries
+        in the parameter dict."""
+        test_dir = os.path.dirname(os.path.abspath(__file__))
+        ushdir = os.path.join(test_dir, "..", "..", "ush")
+        fcst_config = dict(
+            PREDEF_GRID_NAME="RRFS_CONUS_3km",
+            QUILTING=False,
+            DT_ATMOS=36,
+            LAYOUT_X=18,
+            LAYOUT_Y=36,
+            BLOCKSIZE=28,
+        )
+        params_dict = set_predef_grid_params(
+            ushdir,
+            fcst_config["PREDEF_GRID_NAME"],
+            fcst_config["QUILTING"],
+        )
+        self.assertEqual(params_dict["GRID_GEN_METHOD"], "ESGgrid")
+        self.assertEqual(params_dict["ESGgrid_LON_CTR"], -97.5)
+        fcst_config = dict(
+            PREDEF_GRID_NAME="RRFS_CONUS_3km",
+            QUILTING=True,
+            DT_ATMOS=36,
+            LAYOUT_X=18,
+            LAYOUT_Y=36,
+            BLOCKSIZE=28,
+        )
+        params_dict = set_predef_grid_params(
+            ushdir,
+            fcst_config["PREDEF_GRID_NAME"],
+            fcst_config["QUILTING"],
+        )
+        self.assertEqual(params_dict["WRTCMP_nx"], 1799)

ush/check_ruc_lsm.py

@@ -1,7 +1,6 @@
 #!/usr/bin/env python3
 
 import os
-import unittest
 
 from python_utils import (
     set_env_var,
@@ -26,16 +25,3 @@ def check_ruc_lsm(ccpp_phys_suite_fp):
     tree = load_xml_file(ccpp_phys_suite_fp)
     has_ruc = has_tag_with_value(tree, "scheme", "lsm_ruc")
     return has_ruc
-
-
-class Testing(unittest.TestCase):
-    def test_check_ruc_lsm(self):
-        USHdir = os.path.dirname(os.path.abspath(__file__))
-        self.assertTrue(
-            check_ruc_lsm(
-                ccpp_phys_suite_fp=f"{USHdir}{os.sep}test_data{os.sep}suite_FV3_GSD_SAR.xml"
-            )
-        )
-
-    def setUp(self):
-        set_env_var("DEBUG", True)

ush/set_gridparams_GFDLgrid.py

@@ -1,7 +1,6 @@
 #!/usr/bin/env python3
 
 import os
-import unittest
 
 from python_utils import (
     import_vars,
@@ -478,28 +477,3 @@ def set_gridparams_GFDLgrid(
         "JEND_OF_RGNL_DOM_WITH_WIDE_HALO_ON_T6SG": jend_of_t7_with_halo_on_t6sg,
     }
 
-
-class Testing(unittest.TestCase):
-    def test_set_gridparams_GFDLgrid(self):
-        grid_params = set_gridparams_GFDLgrid(
-            lon_of_t6_ctr=-97.5,
-            lat_of_t6_ctr=38.5,
-            res_of_t6g=96,
-            stretch_factor=1.4,
-            refine_ratio_t6g_to_t7g=3,
-            istart_of_t7_on_t6g=13,
-            iend_of_t7_on_t6g=84,
-            jstart_of_t7_on_t6g=17,
-            jend_of_t7_on_t6g=80,
-            run_envir="community",
-            verbose=True,
-            nh4=4,
-        )
-
-        self.assertEqual(
-            list(grid_params.values()),
-            [-97.5, 38.5, 216, 192, 6, 1.4, 21, 172, 29, 164],
-        )
-
-    def setUp(self):
-        pass

ush/set_predef_grid_params.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 
-import unittest
 import os
 from textwrap import dedent
 
@@ -39,37 +38,3 @@ def set_predef_grid_params(USHdir, grid_name, quilting):
         params_dict = flatten_dict(params_dict)
 
     return params_dict
-
-
-class Testing(unittest.TestCase):
-    def test_set_predef_grid_params(self):
-        ushdir = os.path.dirname(os.path.abspath(__file__))
-        fcst_config = dict(
-            PREDEF_GRID_NAME="RRFS_CONUS_3km",
-            QUILTING=False,
-            DT_ATMOS=36,
-            LAYOUT_X=18,
-            LAYOUT_Y=36,
-            BLOCKSIZE=28,
-        )
-        params_dict = set_predef_grid_params(
-            ushdir,
-            fcst_config["PREDEF_GRID_NAME"],
-            fcst_config["QUILTING"],
-        )
-        self.assertEqual(params_dict["GRID_GEN_METHOD"], "ESGgrid")
-        self.assertEqual(params_dict["ESGgrid_LON_CTR"], -97.5)
-        fcst_config = dict(
-            PREDEF_GRID_NAME="RRFS_CONUS_3km",
-            QUILTING=True,
-            DT_ATMOS=36,
-            LAYOUT_X=18,
-            LAYOUT_Y=36,
-            BLOCKSIZE=28,
-        )
-        params_dict = set_predef_grid_params(
-            ushdir,
-            fcst_config["PREDEF_GRID_NAME"],
-            fcst_config["QUILTING"],
-        )
-        self.assertEqual(params_dict["WRTCMP_nx"], 1799)