update to latest mom6_bathy

visualCaseGen/custom_widget_types/mom6_bathy_launcher.py

@@ -220,15 +220,15 @@ def _create_notebook_object():
             nbf.v4.new_markdown_cell(
                 "# mom6_bathy\n"
                 "This notebook is auto-generated by visualCaseGen. "
-                "Please review and execute the cells below to create the new MOM6 grid and bathymetry."
+                "Please review and execute the cells below to create the new MOM6 grid and bathymetry. "
                 "You can modify the cells as needed, unless otherwise noted, to customize the grid "
                 "and bathymetry."
             ),
             nbf.v4.new_markdown_cell("## 1. Import mom6_bathy"),
             nbf.v4.new_code_cell(
                 "%%capture\n"
-                "from mom6_bathy.mom6grid import mom6grid\n"
-                "from mom6_bathy.mom6bathy import mom6bathy"
+                "from mom6_bathy.grid import Grid\n"
+                "from mom6_bathy.topo import Topo"
             ),
             nbf.v4.new_markdown_cell("## 2. Create horizontal grid\n"),
         ]
@@ -237,15 +237,12 @@ def _create_notebook_object():
             nb["cells"].extend([
                 nbf.v4.new_code_cell(
                 f'# Do NOT modify this cell!\n'
-                f'grd = mom6grid(\n'
+                f'grid = Grid(\n'
                 f'  nx         = {nx},          # Number of grid points in x direction\n'
                 f'  ny         = {ny},          # Number of grid points in y direction\n'
-                f'  config     = "spherical",\n'
-                f'  axis_units = "degrees",\n'
                 f'  lenx       = {lenx},        # grid length in x direction (degrees).\n'
                 f'  leny       = {leny},        # grid length in y direction (degrees).\n'
                 f'  cyclic_x   = {True if cyclic_x == "True" else False},\n'
-                f'  cyclic_y   = False,\n'
                 f')'
                 )
             ])
@@ -269,11 +266,11 @@ def _create_notebook_object():
                     ),
                     nbf.v4.new_code_cell(
                         "# Instantiate the bathymetry object\n"
-                        "bathy = mom6bathy(grd, min_depth = 10.0)"
+                        "topo = Topo(grid, min_depth = 10.0)"
                     ),
                     nbf.v4.new_code_cell(
                         "# Set the bathymetry to be a flat bottom with a uniform depth of 2000m\n"
-                        "bathy.set_flat(D=2000.0)"
+                        "topo.set_flat(D=2000.0)"
                     ),
                 ]
             )
@@ -286,37 +283,38 @@ def _create_notebook_object():
 
         nb["cells"].extend(
             [
-                nbf.v4.new_code_cell("bathy.depth.plot()"),
+                nbf.v4.new_code_cell("topo.depth.plot()"),
                 nbf.v4.new_code_cell(
                     "# Manually modify the bathymetry\n"
                     "%matplotlib ipympl\n"
-                    "from mom6_bathy.depth_modifier import DepthModifier\n"
-                    "DepthModifier(bathy)"
+                    "from mom6_bathy.topo_editor import TopoEditor\n"
+                    "TopoEditor(topo)"
                 ),
             ]
         )
 
         save_files_cmd = (
-            "# Save MOM6 supergrid file. Do NOT modify this cell!\n"
-            f'grd.to_netcdf(supergrid_path = f"{custom_ocn_grid_path}/ocean_grid_{ocn_grid_name}_{attempt_id}.nc")\n\n'
+            "# Do NOT modify this cell!\n\n"
+            "# MOM6 supergrid file.\n"
+            f'grid.write_supergrid(f"{custom_ocn_grid_path}/ocean_grid_{ocn_grid_name}_{attempt_id}.nc")\n\n'
             "# Save MOM6 topography file:\n"
-            f'bathy.to_topog(f"{custom_ocn_grid_path}/ocean_topog_{ocn_grid_name}_{attempt_id}.nc")\n\n'
+            f'topo.write_topo(f"{custom_ocn_grid_path}/ocean_topog_{ocn_grid_name}_{attempt_id}.nc")\n\n'
         )
 
         if "CICE" in cvars["COMP_ICE_PHYS"].value:
             save_files_cmd += (
-                "# Save CICE grid file:\n"
-                f'bathy.to_cice_grid(f"{custom_ocn_grid_path}/cice_grid.{ocn_grid_name}_{attempt_id}.nc")\n\n'
+                "# CICE grid file:\n"
+                f'topo.write_cice_grid(f"{custom_ocn_grid_path}/cice_grid.{ocn_grid_name}_{attempt_id}.nc")\n\n'
             )
 
         save_files_cmd += (
             "# Save ESMF mesh file:\n"
-            f'bathy.to_ESMF_mesh(f"{custom_ocn_grid_path}/ESMF_mesh_{ocn_grid_name}_{attempt_id}.nc")'
+            f'topo.write_esmf_mesh(f"{custom_ocn_grid_path}/ESMF_mesh_{ocn_grid_name}_{attempt_id}.nc")'
         )
 
         nb["cells"].extend(
             [
-                nbf.v4.new_markdown_cell("## 4. Save the grid and bathymetry files"),
+                nbf.v4.new_markdown_cell("## 4. Save the grid, bathymetry, and mesh files"),
                 nbf.v4.new_code_cell(save_files_cmd),
             ]
         )

visualCaseGen/widgets/compset_widgets.py

@@ -24,7 +24,7 @@ def initialize_compset_widgets(cime):
 
     cv_support_level = cvars["SUPPORT_LEVEL"]
     cv_support_level.widget = widgets.ToggleButtons(
-        description="Include all compsets or scientifically supported only?",
+        description="Browse all compsets or scientifically supported only?",
         layout={"display": "flex", "width": "max-content", "padding": "10px"},
         style={"button_width": button_width, "description_width": "max-content"},
     )