Add boundaries to config

regional_mom6/regional_mom6.py

@@ -140,6 +140,7 @@ def create_experiment_from_config(
     expt.layout = None
     expt.minimum_depth = config_dict["minimum_depth"]
     expt.tidal_constituents = config_dict["tidal_constituents"]
+    expt.boundaries = config_dict["boundaries"]
 
     if create_hgrid_and_vgrid:
         print("Creating hgrid and vgrid....")
@@ -1089,6 +1090,7 @@ def write_config_file(self, path=None, export=True, quiet=False):
             "layout": self.layout,
             "minimum_depth": self.minimum_depth,
             "tidal_constituents": self.tidal_constituents,
+            "boundaries": self.boundaries,
         }
         if export:
             if path is not None:
@@ -1555,6 +1557,10 @@ def setup_ocean_state_boundaries(
                 Either ``'A'`` (default), ``'B'``, or ``'C'``.
             boundary_type (Optional[str]): Type of box around region. Currently, only ``'rectangular'`` is supported.
         """
+        if boundary_type != "rectangular":
+            raise ValueError(
+                "Only rectangular boundaries are supported by this method. To set up more complex boundary shapes you can manually call the 'simple_boundary' method for each boundary."
+            )
         for i in self.boundaries:
             if i not in ["south", "north", "west", "east"]:
                 raise ValueError(
@@ -1570,10 +1576,6 @@ def setup_ocean_state_boundaries(
             raise ValueError(
                 "This method only supports up to four boundaries. To set up more complex boundary shapes you can manually call the 'simple_boundary' method for each boundary."
             )
-        if boundary_type != "rectangular":
-            raise ValueError(
-                "Only rectangular boundaries are supported by this method. To set up more complex boundary shapes you can manually call the 'simple_boundary' method for each boundary."
-            )
 
         # Now iterate through our four boundaries
         for orientation in self.boundaries:

tests/test_config.py

@@ -47,6 +47,7 @@ def test_write_config():
         mom_input_dir=input_dir,
         toolpath_dir="",
         expt_name="test",
+        boundaries=["south", "north"],
     )
     config_dict = expt.write_config_file()
     assert config_dict["longitude_extent"] == tuple(longitude_extent)
@@ -62,6 +63,7 @@ def test_write_config():
     assert config_dict["repeat_year_forcing"] == False
     assert config_dict["tidal_constituents"] == ["M2"]
     assert config_dict["expt_name"] == "test"
+    assert config_dict["boundaries"] == ["south", "north"]
     shutil.rmtree(run_dir)
     shutil.rmtree(input_dir)
     shutil.rmtree(data_path)