Higher-order Orography

applications/adjoint_tests/example/configuration.nml

@@ -76,7 +76,9 @@ start_dump_filename='final_pert',
 /
 &finite_element
 cellshape='quadrilateral',
-coord_order=1,
+coord_order=2,
+coord_order_multigrid=1,
+coord_space='Wchi',
 coord_system='native',
 element_order_h=0,
 element_order_v=0,
@@ -155,11 +157,9 @@ init_option='fd_start_dump',
 lbc_option='none',
 ls_option='file',
 model_eos_height=100,
-n_orog_smooth=0,
 read_w2h_wind=.true.,
 sea_ice_source='ancillary',
 snow_source='start_dump',
-w0_orography_mapping=.false.,
 zero_w2v_wind=.false.,
 /
 &initial_density
@@ -277,6 +277,9 @@ l_esm_couple_test=.false.,
 /
 &orography
 orog_init_option='ancil',
+orography_order=2,
+n_orog_smooth=0,
+w0_multigrid_mapping=.true.
 /
 &partitioning
 generate_inner_halos=.false.,

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

@@ -212,7 +212,7 @@ def upgrade(self, config, meta_config=None):
                 ".true.",
             )
             self.add_setting(
-                config, ["namelist:linear_physics", "Blevs_m"], "15"
+                config, ["namelist:linear_physics", "blevs_m"], "15"
             )
             self.add_setting(
                 config, ["namelist:linear_physics", "e_folding_levs_m"], "10"

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

@@ -31,3 +31,26 @@ def upgrade(self, config, meta_config=None):
         # Add settings
         return config, self.reports
 """
+
+
+class vn31_t238(MacroUpgrade):
+    """Upgrade macro for ticket #238 by Thomas Bendall."""
+
+    BEFORE_TAG = "vn3.1"
+    AFTER_TAG = "vn3.1_t238"
+
+    def upgrade(self, config, meta_config=None):
+        # Commands From: rose-meta/lfric-driver
+        self.add_setting(
+            config, ["namelist:finite_element", "coord_space"], "'Wchi'"
+        )
+        coord_order = self.get_setting_value(
+            config, ["namelist:finite_element", "coord_order"]
+        )
+        self.add_setting(
+            config,
+            ["namelist:finite_element", "coord_order_multigrid"],
+            coord_order,
+        )
+
+        return config, self.reports

applications/adjoint_tests/source/algorithm/linear_physics/atlt_bl_inc_alg_mod.x90

@@ -51,7 +51,7 @@ module atlt_bl_inc_alg_mod
    use tl_bl_inc_kernel_mod,      only : tl_bl_inc_kernel_type
    use atl_bl_inc_kernel_mod,     only : atl_bl_inc_kernel_type
    use linear_physics_config_mod, only : log_layer,            &
-                                         Blevs_m,              &
+                                         blevs_m,              &
                                          e_folding_levs_m,     &
                                          u_land_m,             &
                                          u_sea_m,              &
@@ -130,7 +130,7 @@ module atlt_bl_inc_alg_mod
                                          auv,buv_inv,          &
                                          face_selector_ew,     &
                                          face_selector_ns,     &
-                                         Blevs_m ) )
+                                         blevs_m ) )
     call invoke ( x_innerproduct_x( ip1(1), u_inc ), &
                   x_innerproduct_x( ip1(2), u ) )
 
@@ -151,7 +151,7 @@ module atlt_bl_inc_alg_mod
                                           auv,buv_inv,          &
                                           face_selector_ew,     &
                                           face_selector_ns,     &
-                                          Blevs_m ) )
+                                          blevs_m ) )
 
     call invoke ( x_innerproduct_y( ip2(1), u_inc, u_inc_input ), &
                   x_innerproduct_y( ip2(2), u, u_input ) )

applications/gravity_wave/example/configuration.nml

@@ -32,6 +32,8 @@ start_dump_filename = ''
 &finite_element
 cellshape = 'quadrilateral'
 coord_order = 1
+coord_order_multigrid = 1,
+coord_space = 'Wchi',
 coord_system = 'native'
 element_order_h = 0
 element_order_v = 0

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

@@ -31,3 +31,26 @@ def upgrade(self, config, meta_config=None):
         # Add settings
         return config, self.reports
 """
+
+
+class vn31_t238(MacroUpgrade):
+    """Upgrade macro for ticket #238 by Thomas Bendall."""
+
+    BEFORE_TAG = "vn3.1"
+    AFTER_TAG = "vn3.1_t238"
+
+    def upgrade(self, config, meta_config=None):
+        # Commands From: rose-meta/lfric-driver
+        self.add_setting(
+            config, ["namelist:finite_element", "coord_space"], "'Wchi'"
+        )
+        coord_order = self.get_setting_value(
+            config, ["namelist:finite_element", "coord_order"]
+        )
+        self.add_setting(
+            config,
+            ["namelist:finite_element", "coord_order_multigrid"],
+            coord_order,
+        )
+
+        return config, self.reports

applications/gravity_wave/unit-test/kernel/compute_q_operator_kernel_mod_test.pf

@@ -31,7 +31,7 @@ contains
   subroutine setUp( this )
 
     use finite_element_config_mod, only: cellshape_quadrilateral, &
-                                         coord_system_xyz
+                                         coord_system_xyz, coord_space_wchi
     use feign_config_mod,          only: feign_finite_element_config
 
     implicit none
@@ -42,6 +42,8 @@ contains
              cellshape=cellshape_quadrilateral, &
              coord_order=0_i_def,               &
              coord_system=coord_system_xyz,     &
+             coord_order_multigrid=1_i_def,     &
+             coord_space=coord_space_wchi,      &
              element_order_h=1_i_def,           &
              element_order_v=1_i_def,           &
              rehabilitate=.true.,               &

applications/gravity_wave/unit-test/kernel/initial_buoyancy_kernel_mod_test.pf

@@ -28,7 +28,7 @@ contains
                                         stretching_method_linear
     use sci_chi_transform_mod,     only : init_chi_transforms
     use finite_element_config_mod, only : cellshape_quadrilateral, &
-                                          coord_system_xyz
+                                          coord_system_xyz, coord_space_wchi
     use feign_config_mod,          only : feign_base_mesh_config,           &
                                           feign_extrusion_config,           &
                                           feign_finite_element_config,      &
@@ -60,6 +60,8 @@ contains
     call feign_finite_element_config(           &
              cellshape=cellshape_quadrilateral, &
              coord_order=0_i_def,               &
+             coord_order_multigrid=1_i_def,     &
+             coord_space=coord_space_wchi,      &
              coord_system=coord_system_xyz,     &
              element_order_h=0_i_def,           &
              element_order_v=0_i_def,           &

applications/gungho_model/example/configuration.nml

@@ -47,7 +47,9 @@ start_dump_filename='',
 /
 &finite_element
 cellshape='quadrilateral',
-coord_order=1,
+coord_order=2,
+coord_order_multigrid=1,
+coord_space='Wtheta',
 coord_system='native',
 element_order_h=0,
 element_order_v=0,
@@ -113,11 +115,9 @@ coarse_ozone_ancil=.false.,
 init_option='analytic',
 lbc_option='none',
 ls_option='none',
-n_orog_smooth=0,
 read_w2h_wind=.false.,
 sea_ice_source='ancillary',
 snow_source='start_dump',
-w0_orography_mapping=.false.,
 zero_w2v_wind=.false.,
 /
 &initial_density
@@ -211,6 +211,9 @@ l_esm_couple_test=.false.,
 /
 &orography
 orog_init_option='none',
+orography_order=2,
+n_orog_smooth=0,
+w0_multigrid_mapping=.true.
 /
 &partitioning
 panel_decomposition='auto',

applications/gungho_model/lam_example/baroclinic/config_driver.nml

@@ -43,6 +43,8 @@ lbc_filename='',
 &finite_element
 cellshape='quadrilateral',
 coord_order=1,
+coord_order_multigrid=1,
+coord_space='Wtheta',
 coord_system='native',
 element_order_h=0,
 element_order_v=0,

applications/gungho_model/lam_example/baroclinic/config_lam.nml

@@ -59,6 +59,8 @@ lbc_filename='lbc',
 &finite_element
 cellshape='quadrilateral',
 coord_order=1,
+coord_order_multigrid=1,
+coord_space='Wtheta',
 coord_system='native',
 element_order_h=0,
 element_order_v=0,

applications/gungho_model/lam_example/straka/config_driver.nml

@@ -45,6 +45,8 @@ lbc_filename='',
 &finite_element
 cellshape='quadrilateral',
 coord_order=1,
+coord_order_multigrid=1,
+coord_space='Wtheta',
 coord_system='native',
 element_order_h=0,
 element_order_v=0,

applications/gungho_model/lam_example/straka/config_lam.nml

@@ -57,6 +57,8 @@ lbc_filename='lbc',
 &finite_element
 cellshape='quadrilateral',
 coord_order=1,
+coord_order_multigrid=1,
+coord_space='Wtheta',
 coord_system='native',
 element_order_h=0,
 element_order_v=0,

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

@@ -31,3 +31,26 @@ def upgrade(self, config, meta_config=None):
         # Add settings
         return config, self.reports
 """
+
+
+class vn31_t238(MacroUpgrade):
+    """Upgrade macro for ticket #238 by Thomas Bendall."""
+
+    BEFORE_TAG = "vn3.1"
+    AFTER_TAG = "vn3.1_t238"
+
+    def upgrade(self, config, meta_config=None):
+        # Commands From: rose-meta/lfric-driver
+        self.add_setting(
+            config, ["namelist:finite_element", "coord_space"], "'Wchi'"
+        )
+        coord_order = self.get_setting_value(
+            config, ["namelist:finite_element", "coord_order"]
+        )
+        self.add_setting(
+            config,
+            ["namelist:finite_element", "coord_order_multigrid"],
+            coord_order,
+        )
+
+        return config, self.reports

applications/jedi_lfric_tests/example/configuration.nml

@@ -76,8 +76,10 @@ start_dump_filename='final_pert',
 /
 &finite_element
 cellshape='quadrilateral',
-coord_order=1,
+coord_order=2,
 coord_system='native',
+coord_order_multigrid=1,
+coord_space='Wchi',
 element_order_h=0,
 element_order_v=0,
 rehabilitate=.true.,
@@ -155,11 +157,9 @@ init_option='fd_start_dump',
 lbc_option='none',
 ls_option='file',
 model_eos_height=100,
-n_orog_smooth=0,
 read_w2h_wind=.true.,
 sea_ice_source='ancillary',
 snow_source='start_dump',
-w0_orography_mapping=.false.,
 zero_w2v_wind=.false.,
 /
 &initial_density
@@ -266,6 +266,9 @@ l_esm_couple_test=.false.,
 /
 &orography
 orog_init_option='ancil',
+orography_order=2,
+n_orog_smooth=0,
+w0_multigrid_mapping=.true.
 /
 &partitioning
 generate_inner_halos=.false.,

applications/jedi_lfric_tests/example_forecast/configuration.nml

@@ -75,7 +75,9 @@ start_dump_filename='',
 /
 &finite_element
 cellshape='quadrilateral',
-coord_order=1,
+coord_order=2,
+coord_order_multigrid=1,
+coord_space='Wchi',
 coord_system='native',
 element_order_h=0,
 element_order_v=0,
@@ -144,11 +146,9 @@ coarse_ozone_ancil=.false.,
 init_option='analytic',
 lbc_option='none',
 ls_option='none',
-n_orog_smooth=0,
 read_w2h_wind=.false.,
 sea_ice_source='ancillary',
 snow_source='start_dump',
-w0_orography_mapping=.false.,
 zero_w2v_wind=.false.,
 /
 &initial_density
@@ -232,6 +232,9 @@ l_esm_couple_test=.false.,
 /
 &orography
 orog_init_option='none',
+orography_order=2,
+n_orog_smooth=0,
+w0_multigrid_mapping=.true.
 /
 &partitioning
 panel_decomposition='auto',

applications/jedi_lfric_tests/example_forecast_pseudo/configuration.nml

@@ -47,6 +47,8 @@ stretching_method='smooth',
 &finite_element
 cellshape='quadrilateral',
 coord_order=1,
+coord_order_multigrid=1,
+coord_space='Wchi',
 coord_system='native',
 element_order_h=0,
 element_order_v=0,

applications/jedi_lfric_tests/example_forecast_pseudo/configuration_op.nml

@@ -47,6 +47,8 @@ stretching_method='smooth',
 &finite_element
 cellshape='quadrilateral',
 coord_order=1,
+coord_order_multigrid=1,
+coord_space='Wchi',
 coord_system='native',
 element_order_h=0,
 element_order_v=0,

applications/jedi_lfric_tests/example_id_tlm_tests/configuration.nml

@@ -110,7 +110,9 @@ start_dump_filename='',
 /
 &finite_element
 cellshape='quadrilateral',
-coord_order=1,
+coord_order=2,
+coord_order_multigrid=1,
+coord_space='Wchi',
 coord_system='native',
 element_order_h=0,
 element_order_v=0,
@@ -188,11 +190,9 @@ coarse_ozone_ancil=.false.,
 init_option='analytic',
 lbc_option='none',
 ls_option='analytic',
-n_orog_smooth=0,
 read_w2h_wind=.true.,
 sea_ice_source='ancillary',
 snow_source='start_dump',
-w0_orography_mapping=.false.,
 zero_w2v_wind=.false.,
 /
 &initial_density
@@ -310,6 +310,9 @@ l_esm_couple_test=.false.,
 /
 &orography
 orog_init_option='ancil',
+orography_order=2,
+n_orog_smooth=0,
+w0_multigrid_mapping=.true.
 /
 &partitioning
 generate_inner_halos=.false.,