Rename meshes for benefit of lfric2lfric

applications/solver/rose-meta/lfric-solver/versions.py

@@ -31,3 +31,148 @@ def upgrade(self, config, meta_config=None):
         # Add settings
         return config, self.reports
 """
+
+class vn32_t551(MacroUpgrade):
+    """Upgrade macro for ticket #551 by Christine Johnson."""
+
+    BEFORE_TAG = "vn3.2"
+    AFTER_TAG = "vn3.2_t551"
+
+    def upgrade(self, config, meta_config=None):
+        # Commands From: rose-meta/lfric-gungho
+        partitioner = self.get_setting_value(
+            config, ["namelist:partitioning", "partitioner"]
+        )
+        multigrid_chain_nitems = self.get_setting_value(
+            config, ["namelist:multigrid", "multigrid_chain_nitems"]
+        )
+        if partitioner == "'planar'":
+            self.add_setting(
+                config,
+                ["namelist:base_mesh", "prime_mesh_name"],
+                "'l0_planar'",
+                forced=True,
+            )
+            if multigrid_chain_nitems == "4":
+                self.add_setting(
+                    config,
+                    ["namelist:multigrid", "chain_mesh_tags"],
+                    "'l0_planar','l1_planar','l2_planar','l3_planar'",
+                    forced=True,
+                )
+            elif multigrid_chain_nitems == "3":
+                self.add_setting(
+                    config,
+                    ["namelist:multigrid", "chain_mesh_tags"],
+                    "'l0_planar','l1_planar','l2_planar'",
+                    forced=True,
+                )
+            elif multigrid_chain_nitems == "2":
+                self.add_setting(
+                    config,
+                    ["namelist:multigrid", "chain_mesh_tags"],
+                    "'l0_planar','l1_planar'",
+                    forced=True,
+                )
+        else:
+            self.add_setting(
+                config,
+                ["namelist:base_mesh", "prime_mesh_name"],
+                "'l0_cubedsphere'",
+                forced=True,
+            )
+            if multigrid_chain_nitems == "4":
+                self.add_setting(
+                    config,
+                    ["namelist:multigrid", "chain_mesh_tags"],
+                    "'l0_cubedsphere','l1_cubedsphere','l2_cubedsphere','l3_cubedsphere'",
+                    forced=True,
+                )
+            elif multigrid_chain_nitems == "3":
+                self.add_setting(
+                    config,
+                    ["namelist:multigrid", "chain_mesh_tags"],
+                    "'l0_cubedsphere','l1_cubedsphere','l2_cubedsphere'",
+                    forced=True,
+                )
+            elif multigrid_chain_nitems == "2":
+                self.add_setting(
+                    config,
+                    ["namelist:multigrid", "chain_mesh_tags"],
+                    "'l0_cubedsphere','l1_cubedsphere'",
+                    forced=True,
+                )
+        partitioner_dest = self.get_setting_value(
+            config, ["namelist:partitioning(destination)", "partitioner"]
+        )
+        destination_mesh_name = self.get_setting_value(
+            config, ["namelist:lfric2lfric", "destination_mesh_name"]
+        )
+        if partitioner_dest == "'planar'":
+            if destination_mesh_name == "'dynamics'":
+                self.add_setting(
+                    config,
+                    ["namelist:lfric2lfric", "destination_mesh_name"],
+                    "'l0_planar",
+                    forced=True,
+                )
+            elif destination_mesh_name == "'multigrid_l1'":
+                self.add_setting(
+                    config,
+                    ["namelist:lfric2lfric", "destination_mesh_name"],
+                    "'l1_planar",
+                    forced=True,
+                )
+        elif partitioner_dest == "'cubedsphere'":
+            if destination_mesh_name == "'dynamics'":
+                self.add_setting(
+                    config,
+                    ["namelist:lfric2lfric", "destination_mesh_name"],
+                    "'l0_planar",
+                    forced=True,
+                )
+            elif destination_mesh_name == "'multigrid_l1'":
+                self.add_setting(
+                    config,
+                    ["namelist:lfric2lfric", "destination_mesh_name"],
+                    "'l1_cubedsphere",
+                    forced=True,
+                )
+        partitioner_source = self.get_setting_value(
+            config, ["namelist:partitioning(source)", "partitioner"]
+        )
+        source_mesh_name = self.get_setting_value(
+            config, ["namelist:lfric2lfric", "source_mesh_name"]
+        )
+        if partitioner_source == "'planar'":
+            if source_mesh_name == "'dynamics'":
+                self.add_setting(
+                    config,
+                    ["namelist:lfric2lfric", "source_mesh_name"],
+                    "'l0_planar",
+                    forced=True,
+                )
+            elif source_mesh_name == "'multigrid_l1'":
+                self.add_setting(
+                    config,
+                    ["namelist:lfric2lfric", "source_mesh_name"],
+                    "'l1_planar",
+                    forced=True,
+                )
+        elif partitioner_source == "'cubedsphere'":
+            if source_mesh_name == "'dynamics'":
+                self.add_setting(
+                    config,
+                    ["namelist:lfric2lfric", "source_mesh_name"],
+                    "'l0_cubedsphere",
+                    forced=True,
+                )
+            elif source_mesh_name == "'multigrid_l1'":
+                self.add_setting(
+                    config,
+                    ["namelist:lfric2lfric", "source_mesh_name"],
+                    "'l1_cubedsphere",
+                    forced=True,
+                )
+
+        return config, self.reports

rose-stem/app/lfric2lfric/opt/rose-app-C24_C12.conf

@@ -1,5 +1,5 @@
 [namelist:lfric2lfric]
-destination_mesh_name='C24'
+destination_mesh_name='l0_cubedsphere'
 destination_meshfile_prefix='${MESH_DIR}/C24_C12/mesh_C24_C12'
-source_mesh_name='C12'
+source_mesh_name='l1_cubedsphere'
 source_meshfile_prefix='${MESH_DIR}/C24_C12/mesh_C24_C12'

rose-stem/app/lfric2lfric/opt/rose-app-clim_gal9_ral_seuk.conf

@@ -13,6 +13,7 @@ checkpoint_stem_name='restart_lfric2lfric_ral_seuk_MG'
 start_dump_filename='lfric2lfric_clim_gal9_C12_MG'
 
 [namelist:lfric2lfric]
+destination_mesh_name='l0_planar'
 destination_topology='non_periodic'
 target_domain='LAM'
 

rose-stem/site/common/lfric2lfric/tasks_lfric2lfric.cylc

@@ -38,10 +38,10 @@
         "opt_confs": ["ral_seuk","oasis"],
         "resolution": "seuk_MG",
         "dst_mesh": "seuk_MG",
-        "dst_name": "multigrid_l1",
+        "dst_name": "l1_planar",
         "dst_type": "regional",
         "src_mesh": "seuk_MG",
-        "src_name": "dynamics",
+        "src_name": "l0_planar",
         "src_type": "regional",
     }) %}
 
@@ -51,10 +51,10 @@
         "opt_confs": ["ral_seuk","oasis"],
         "resolution": "seuk_MG",
         "dst_mesh": "seuk_MG",
-        "dst_name": "multigrid_l1",
+        "dst_name": "l1_planar",
         "dst_type": "regional",
         "src_mesh": "seuk_MG",
-        "src_name": "dynamics",
+        "src_name": "l0_planar",
         "src_type": "regional",
         "mpi_parts": 4,
     }) %}
@@ -130,10 +130,10 @@
         "opt_confs": ["clim_gal9","oasis"],
         "resolution": "C24_C12",
         "dst_mesh": "C24_C12",
-        "dst_name": "C24",
+        "dst_name": "l0_cubedsphere",
         "dst_type": "global",
         "src_mesh": "C24_C12",
-        "src_name": "C12",
+        "src_name": "l1_cubedsphere",
         "src_type": "global",
     }) %}
 
@@ -143,10 +143,10 @@
         "opt_confs": ["clim_gal9","oasis"],
         "resolution": "C24_C12",
         "dst_mesh": "C24_C12",
-        "dst_name": "C24",
+        "dst_name": "l0_cubedsphere",
         "dst_type": "global",
         "src_mesh": "C24_C12",
-        "src_name": "C12",
+        "src_name": "l1_cubedsphere",
         "src_type": "global",
         "mpi_parts": 6,
     }) %}
@@ -157,10 +157,10 @@
         "opt_confs": ["clim_gal9_ral_seuk","oasis"],
         "resolution": "C12_C16_lam",
         "dst_mesh": "seuk_MG",
-        "dst_name": "dynamics",
+        "dst_name": "l0_planar",
         "dst_type": "regional",
         "src_mesh": "C24_C12",
-        "src_name": "C12",
+        "src_name": "l1_cubedsphere",
         "src_type": "global",
     }) %}
 
@@ -170,10 +170,10 @@
         "opt_confs": ["clim_gal9_ral_seuk","oasis", "multi-cpu"],
         "resolution": "C12_C16_lam",
         "dst_mesh": "seuk_MG",
-        "dst_name": "dynamics",
+        "dst_name": "l0_planar",
         "dst_type": "regional",
         "src_mesh": "C24_C12",
-        "src_name": "C12",
+        "src_name": "l1_cubedsphere",
         "src_type": "global",
         "mpi_parts": 4,
     }) %}
@@ -184,10 +184,10 @@
         "opt_confs": ["clim_gal9_ral_seuk","oasis","lbc"],
         "resolution": "C12_C16_lam",
         "dst_mesh": "seuk_MG",
-        "dst_name": "dynamics-lbc",
+        "dst_name": "l0_planar-lbc",
         "dst_type": "regional",
         "src_mesh": "C24_C12",
-        "src_name": "C12",
+        "src_name": "l1_cubedsphere",
         "src_type": "global",
     }) %}
 
@@ -197,10 +197,10 @@
         "opt_confs": ["clim_gal9_ral_seuk","oasis","lbc", "multi-cpu"],
         "resolution": "C12_C16_lam",
         "dst_mesh": "seuk_MG",
-        "dst_name": "dynamics-lbc",
+        "dst_name": "l0_planar-lbc",
         "dst_type": "regional",
         "src_mesh": "C24_C12",
-        "src_name": "C12",
+        "src_name": "l1_cubedsphere",
         "src_type": "global",
         "mpi_parts": 4,
     }) %}

rose-stem/site/common/lfricinputs/tasks_lfric2um.cylc

@@ -10,7 +10,7 @@
     {% do task_dict.update({
         "opt_confs": [],
         "resolution": "C48",
-        "mesh_name": "dynamics",
+        "mesh_name": "l0_cubedsphere",
         "source_grid_res": "C48",
         "source_grid_levs": "38",
         "source_grid_type": "global",
@@ -26,7 +26,7 @@
     {% do task_dict.update({
         "opt_confs": ["performance"],
         "resolution": "C224",
-        "mesh_name": "dynamics",
+        "mesh_name": "l0_cubedsphere",
         "source_grid_res": "C224",
         "source_grid_levs": "70",
         "source_grid_type": "global",
@@ -43,7 +43,7 @@
     {% do task_dict.update({
         "opt_confs": ["um_lam"],
         "resolution": "C48",
-        "mesh_name": "dynamics",
+        "mesh_name": "l0_cubedsphere",
         "source_grid_res": "C48",
         "source_grid_levs": "70",
         "source_grid_type": "global",

rose-stem/site/common/lfricinputs/tasks_scintelapi.cylc

@@ -10,7 +10,7 @@
     {% do task_dict.update({
         "opt_confs": ["basic"],
         "resolution": "C48",
-        "mesh_name": "dynamics",
+        "mesh_name": "l0_cubedsphere",
         "source_grid_res": "C48",
         "source_grid_levs": "38",
         "source_grid_type": "global",
@@ -25,7 +25,7 @@
     {% do task_dict.update({
         "opt_confs": ["mixingratio"],
         "resolution": "C12",
-        "mesh_name": "dynamics",
+        "mesh_name": "l0_cubedsphere",
         "source_grid_res": "C12",
         "source_grid_levs": "70",
         "source_grid_type": "global",