Test: High Order Orography

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

@@ -54,3 +54,42 @@ def upgrade(self, config, meta_config=None):
         )
 
         return config, self.reports
+
+
+class vn31_t180(MacroUpgrade):
+    """Upgrade macro for ticket #180 by Thomas Bendall."""
+
+    BEFORE_TAG = "vn3.1_t238"
+    AFTER_TAG = "vn3.1_t180"
+
+    def upgrade(self, config, meta_config=None):
+        # Commands From: rose-meta/lfric-gungho
+        # Get values
+        n_orog_smooth = self.get_setting_value(
+            config, ["namelist:initialization", "n_orog_smooth"]
+        )
+        w0_mapping = self.get_setting_value(
+            config, ["namelist:initialization", "w0_orography_mapping"]
+        )
+        coord_order = self.get_setting_value(
+            config, ["namelist:finite_element", "coord_order"]
+        )
+        # Add new settings
+        self.add_setting(
+            config, ["namelist:orography", "n_orog_smooth"], n_orog_smooth
+        )
+        self.add_setting(
+            config, ["namelist:orography", "w0_multigrid_mapping"], w0_mapping
+        )
+        self.add_setting(
+            config, ["namelist:orography", "orography_order"], coord_order
+        )
+        # Remove old settings
+        self.remove_setting(
+            config, ["namelist:initialization", "n_orog_smooth"]
+        )
+        self.remove_setting(
+            config, ["namelist:initialization", "w0_orography_mapping"]
+        )
+
+        return config, self.reports

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

@@ -54,3 +54,42 @@ def upgrade(self, config, meta_config=None):
         )
 
         return config, self.reports
+
+
+class vn31_t180(MacroUpgrade):
+    """Upgrade macro for ticket #180 by Thomas Bendall."""
+
+    BEFORE_TAG = "vn3.1_t238"
+    AFTER_TAG = "vn3.1_t180"
+
+    def upgrade(self, config, meta_config=None):
+        # Commands From: rose-meta/lfric-gungho
+        # Get values
+        n_orog_smooth = self.get_setting_value(
+            config, ["namelist:initialization", "n_orog_smooth"]
+        )
+        w0_mapping = self.get_setting_value(
+            config, ["namelist:initialization", "w0_orography_mapping"]
+        )
+        coord_order = self.get_setting_value(
+            config, ["namelist:finite_element", "coord_order"]
+        )
+        # Add new settings
+        self.add_setting(
+            config, ["namelist:orography", "n_orog_smooth"], n_orog_smooth
+        )
+        self.add_setting(
+            config, ["namelist:orography", "w0_multigrid_mapping"], w0_mapping
+        )
+        self.add_setting(
+            config, ["namelist:orography", "orography_order"], coord_order
+        )
+        # Remove old settings
+        self.remove_setting(
+            config, ["namelist:initialization", "n_orog_smooth"]
+        )
+        self.remove_setting(
+            config, ["namelist:initialization", "w0_orography_mapping"]
+        )
+
+        return config, self.reports

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

@@ -54,3 +54,42 @@ def upgrade(self, config, meta_config=None):
         )
 
         return config, self.reports
+
+
+class vn31_t180(MacroUpgrade):
+    """Upgrade macro for ticket #180 by Thomas Bendall."""
+
+    BEFORE_TAG = "vn3.1_t238"
+    AFTER_TAG = "vn3.1_t180"
+
+    def upgrade(self, config, meta_config=None):
+        # Commands From: rose-meta/lfric-gungho
+        # Get values
+        n_orog_smooth = self.get_setting_value(
+            config, ["namelist:initialization", "n_orog_smooth"]
+        )
+        w0_mapping = self.get_setting_value(
+            config, ["namelist:initialization", "w0_orography_mapping"]
+        )
+        coord_order = self.get_setting_value(
+            config, ["namelist:finite_element", "coord_order"]
+        )
+        # Add new settings
+        self.add_setting(
+            config, ["namelist:orography", "n_orog_smooth"], n_orog_smooth
+        )
+        self.add_setting(
+            config, ["namelist:orography", "w0_multigrid_mapping"], w0_mapping
+        )
+        self.add_setting(
+            config, ["namelist:orography", "orography_order"], coord_order
+        )
+        # Remove old settings
+        self.remove_setting(
+            config, ["namelist:initialization", "n_orog_smooth"]
+        )
+        self.remove_setting(
+            config, ["namelist:initialization", "w0_orography_mapping"]
+        )
+
+        return config, self.reports

applications/jedi_lfric_tests/rose-meta/jedi_common/versions.py

@@ -54,3 +54,42 @@ def upgrade(self, config, meta_config=None):
         )
 
         return config, self.reports
+
+
+class vn31_t180(MacroUpgrade):
+    """Upgrade macro for ticket #180 by Thomas Bendall."""
+
+    BEFORE_TAG = "vn3.1_t238"
+    AFTER_TAG = "vn3.1_t180"
+
+    def upgrade(self, config, meta_config=None):
+        # Commands From: rose-meta/lfric-gungho
+        # Get values
+        n_orog_smooth = self.get_setting_value(
+            config, ["namelist:initialization", "n_orog_smooth"]
+        )
+        w0_mapping = self.get_setting_value(
+            config, ["namelist:initialization", "w0_orography_mapping"]
+        )
+        coord_order = self.get_setting_value(
+            config, ["namelist:finite_element", "coord_order"]
+        )
+        # Add new settings
+        self.add_setting(
+            config, ["namelist:orography", "n_orog_smooth"], n_orog_smooth
+        )
+        self.add_setting(
+            config, ["namelist:orography", "w0_multigrid_mapping"], w0_mapping
+        )
+        self.add_setting(
+            config, ["namelist:orography", "orography_order"], coord_order
+        )
+        # Remove old settings
+        self.remove_setting(
+            config, ["namelist:initialization", "n_orog_smooth"]
+        )
+        self.remove_setting(
+            config, ["namelist:initialization", "w0_orography_mapping"]
+        )
+
+        return config, self.reports

applications/jedi_lfric_tests/rose-meta/jedi_forecast/versions.py

@@ -54,3 +54,42 @@ def upgrade(self, config, meta_config=None):
         )
 
         return config, self.reports
+
+
+class vn31_t180(MacroUpgrade):
+    """Upgrade macro for ticket #180 by Thomas Bendall."""
+
+    BEFORE_TAG = "vn3.1_t238"
+    AFTER_TAG = "vn3.1_t180"
+
+    def upgrade(self, config, meta_config=None):
+        # Commands From: rose-meta/lfric-gungho
+        # Get values
+        n_orog_smooth = self.get_setting_value(
+            config, ["namelist:initialization", "n_orog_smooth"]
+        )
+        w0_mapping = self.get_setting_value(
+            config, ["namelist:initialization", "w0_orography_mapping"]
+        )
+        coord_order = self.get_setting_value(
+            config, ["namelist:finite_element", "coord_order"]
+        )
+        # Add new settings
+        self.add_setting(
+            config, ["namelist:orography", "n_orog_smooth"], n_orog_smooth
+        )
+        self.add_setting(
+            config, ["namelist:orography", "w0_multigrid_mapping"], w0_mapping
+        )
+        self.add_setting(
+            config, ["namelist:orography", "orography_order"], coord_order
+        )
+        # Remove old settings
+        self.remove_setting(
+            config, ["namelist:initialization", "n_orog_smooth"]
+        )
+        self.remove_setting(
+            config, ["namelist:initialization", "w0_orography_mapping"]
+        )
+
+        return config, self.reports

applications/jedi_lfric_tests/rose-meta/jedi_forecast_pseudo/versions.py

@@ -54,3 +54,42 @@ def upgrade(self, config, meta_config=None):
         )
 
         return config, self.reports
+
+
+class vn31_t180(MacroUpgrade):
+    """Upgrade macro for ticket #180 by Thomas Bendall."""
+
+    BEFORE_TAG = "vn3.1_t238"
+    AFTER_TAG = "vn3.1_t180"
+
+    def upgrade(self, config, meta_config=None):
+        # Commands From: rose-meta/lfric-gungho
+        # Get values
+        n_orog_smooth = self.get_setting_value(
+            config, ["namelist:initialization", "n_orog_smooth"]
+        )
+        w0_mapping = self.get_setting_value(
+            config, ["namelist:initialization", "w0_orography_mapping"]
+        )
+        coord_order = self.get_setting_value(
+            config, ["namelist:finite_element", "coord_order"]
+        )
+        # Add new settings
+        self.add_setting(
+            config, ["namelist:orography", "n_orog_smooth"], n_orog_smooth
+        )
+        self.add_setting(
+            config, ["namelist:orography", "w0_multigrid_mapping"], w0_mapping
+        )
+        self.add_setting(
+            config, ["namelist:orography", "orography_order"], coord_order
+        )
+        # Remove old settings
+        self.remove_setting(
+            config, ["namelist:initialization", "n_orog_smooth"]
+        )
+        self.remove_setting(
+            config, ["namelist:initialization", "w0_orography_mapping"]
+        )
+
+        return config, self.reports

applications/jedi_lfric_tests/rose-meta/jedi_id_tlm_tests/versions.py

@@ -54,3 +54,42 @@ def upgrade(self, config, meta_config=None):
         )
 
         return config, self.reports
+
+
+class vn31_t180(MacroUpgrade):
+    """Upgrade macro for ticket #180 by Thomas Bendall."""
+
+    BEFORE_TAG = "vn3.1_t238"
+    AFTER_TAG = "vn3.1_t180"
+
+    def upgrade(self, config, meta_config=None):
+        # Commands From: rose-meta/lfric-gungho
+        # Get values
+        n_orog_smooth = self.get_setting_value(
+            config, ["namelist:initialization", "n_orog_smooth"]
+        )
+        w0_mapping = self.get_setting_value(
+            config, ["namelist:initialization", "w0_orography_mapping"]
+        )
+        coord_order = self.get_setting_value(
+            config, ["namelist:finite_element", "coord_order"]
+        )
+        # Add new settings
+        self.add_setting(
+            config, ["namelist:orography", "n_orog_smooth"], n_orog_smooth
+        )
+        self.add_setting(
+            config, ["namelist:orography", "w0_multigrid_mapping"], w0_mapping
+        )
+        self.add_setting(
+            config, ["namelist:orography", "orography_order"], coord_order
+        )
+        # Remove old settings
+        self.remove_setting(
+            config, ["namelist:initialization", "n_orog_smooth"]
+        )
+        self.remove_setting(
+            config, ["namelist:initialization", "w0_orography_mapping"]
+        )
+
+        return config, self.reports

applications/jedi_lfric_tests/rose-meta/jedi_lfric_tests/versions.py

@@ -54,3 +54,42 @@ def upgrade(self, config, meta_config=None):
         )
 
         return config, self.reports
+
+
+class vn31_t180(MacroUpgrade):
+    """Upgrade macro for ticket #180 by Thomas Bendall."""
+
+    BEFORE_TAG = "vn3.1_t238"
+    AFTER_TAG = "vn3.1_t180"
+
+    def upgrade(self, config, meta_config=None):
+        # Commands From: rose-meta/lfric-gungho
+        # Get values
+        n_orog_smooth = self.get_setting_value(
+            config, ["namelist:initialization", "n_orog_smooth"]
+        )
+        w0_mapping = self.get_setting_value(
+            config, ["namelist:initialization", "w0_orography_mapping"]
+        )
+        coord_order = self.get_setting_value(
+            config, ["namelist:finite_element", "coord_order"]
+        )
+        # Add new settings
+        self.add_setting(
+            config, ["namelist:orography", "n_orog_smooth"], n_orog_smooth
+        )
+        self.add_setting(
+            config, ["namelist:orography", "w0_multigrid_mapping"], w0_mapping
+        )
+        self.add_setting(
+            config, ["namelist:orography", "orography_order"], coord_order
+        )
+        # Remove old settings
+        self.remove_setting(
+            config, ["namelist:initialization", "n_orog_smooth"]
+        )
+        self.remove_setting(
+            config, ["namelist:initialization", "w0_orography_mapping"]
+        )
+
+        return config, self.reports

applications/jedi_lfric_tests/rose-meta/jedi_tlm_forecast_tl/versions.py

@@ -54,3 +54,42 @@ def upgrade(self, config, meta_config=None):
         )
 
         return config, self.reports
+
+
+class vn31_t180(MacroUpgrade):
+    """Upgrade macro for ticket #180 by Thomas Bendall."""
+
+    BEFORE_TAG = "vn3.1_t238"
+    AFTER_TAG = "vn3.1_t180"
+
+    def upgrade(self, config, meta_config=None):
+        # Commands From: rose-meta/lfric-gungho
+        # Get values
+        n_orog_smooth = self.get_setting_value(
+            config, ["namelist:initialization", "n_orog_smooth"]
+        )
+        w0_mapping = self.get_setting_value(
+            config, ["namelist:initialization", "w0_orography_mapping"]
+        )
+        coord_order = self.get_setting_value(
+            config, ["namelist:finite_element", "coord_order"]
+        )
+        # Add new settings
+        self.add_setting(
+            config, ["namelist:orography", "n_orog_smooth"], n_orog_smooth
+        )
+        self.add_setting(
+            config, ["namelist:orography", "w0_multigrid_mapping"], w0_mapping
+        )
+        self.add_setting(
+            config, ["namelist:orography", "orography_order"], coord_order
+        )
+        # Remove old settings
+        self.remove_setting(
+            config, ["namelist:initialization", "n_orog_smooth"]
+        )
+        self.remove_setting(
+            config, ["namelist:initialization", "w0_orography_mapping"]
+        )
+
+        return config, self.reports