New function space options for coordinate fields (#179)

Co-authored-by: EdHone <edward.hone@metoffice.gov.uk>

Author: tommbendall

applications/adjoint_tests/example/configuration.nml

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

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

@@ -125,3 +125,26 @@ def upgrade(self, config, meta_config=None):
         )
 
         return config, self.reports
+
+
+class vn31_t238(MacroUpgrade):
+    """Upgrade macro for ticket #238 by Thomas Bendall."""
+
+    BEFORE_TAG = "vn3.1_t368"
+    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_nonprime"],
+            coord_order,
+        )
+
+        return config, self.reports

applications/gravity_wave/example/configuration.nml

@@ -32,6 +32,8 @@ start_dump_filename = ''
 &finite_element
 cellshape = 'quadrilateral'
 coord_order = 1
+coord_order_nonprime = 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

@@ -90,3 +90,26 @@ def upgrade(self, config, meta_config=None):
         )
 
         return config, self.reports
+
+
+class vn31_t238(MacroUpgrade):
+    """Upgrade macro for ticket #238 by Thomas Bendall."""
+
+    BEFORE_TAG = "vn3.1_t368"
+    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_nonprime"],
+            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_nonprime=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_nonprime=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

@@ -48,6 +48,8 @@ start_dump_filename='',
 &finite_element
 cellshape='quadrilateral',
 coord_order=1,
+coord_order_nonprime=1,
+coord_space='Wtheta',
 coord_system='native',
 element_order_h=0,
 element_order_v=0,

applications/gungho_model/lam_example/baroclinic/config_driver.nml

@@ -43,6 +43,8 @@ lbc_filename='',
 &finite_element
 cellshape='quadrilateral',
 coord_order=1,
+coord_order_nonprime=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_nonprime=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_nonprime=1,
+coord_space='Wtheta',
 coord_system='native',
 element_order_h=0,
 element_order_v=0,