Lfric2lfric multi cpu

applications/lfric2lfric/example/configuration.nml

@@ -73,13 +73,13 @@ coord_order             = 1,
 /
 
 &partitioning
-  mesh_type             = 'destination',
+  mesh_target           = 'destination',
   partitioner           = 'cubedsphere',
   panel_decomposition   = 'auto',
 /
 
 &partitioning
-  mesh_type             = 'source',
+  mesh_target           = 'source',
   partitioner           = 'cubedsphere',
   panel_decomposition   = 'auto',
 /

applications/lfric2lfric/rose-meta/lfric-lfric2lfric/HEAD/rose-meta.conf

@@ -278,15 +278,17 @@ type=character
 
 [namelist:partitioning]
 duplicate=true
-!instance_key_member=mesh_type
+!instance_key_member=mesh_target
 
-[namelist:partitioning=mesh_type]
+[namelist:partitioning=mesh_target]
 compulsory=true
 description=The purpose of the mesh
-!enumeration=true
-help=The mesh can be used to perform a LFRic forecast (Dynamics),
-    =or to describe the source and the destination grids in
-    =the lfric2lfric regridding program.
+help=The designation of the mesh to which this
+    =partitioning profile is to be applied.
+    =
+    =Recognised designations are:
+    =  * 'source'
+    =  * 'destination'
 ns=namelist/lfric2lfric/configuration
-value-titles=Dynamics, Source, Destination
-values='dynamics', 'source', 'destination'
+!string_length=default
+type=character

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

@@ -187,3 +187,24 @@ def upgrade(self, config, meta_config=None):
         )
 
         return config, self.reports
+
+class vn30_t192(MacroUpgrade):
+    """Upgrade macro for ticket #192 by Juan M. Castillo."""
+
+    BEFORE_TAG = "vn3.0_t214"
+    AFTER_TAG = "vn3.0_t192"
+
+    def upgrade(self, config, meta_config=None):
+        # Commands From: rose-meta/lfric-lfric2lfric
+        self.rename_setting(
+            config,
+            ["namelist:partitioning(source)", "mesh_type"],
+            ["namelist:partitioning(source)", "mesh_target"],
+        )
+        self.rename_setting(
+            config,
+            ["namelist:partitioning(destination)", "mesh_type"],
+            ["namelist:partitioning(destination)", "mesh_target"],
+        )
+
+        return config, self.reports

applications/lfric2lfric/source/algorithm/lfric2lfric_oasis_regrid_mod.X90

@@ -123,7 +123,7 @@ contains
                                                  field_src, l, k))
 
           ! send the layer via OASIS
-          ! Extract the version that was actaully placed in the collection
+          ! Extract the version that was actually placed in the collection
           coupling_ptr => get_coupling_from_collection(modeldb%values, "coupling" )
           local_index => coupling_ptr%get_local_index()
           call coupler_exchange_2d%initialise(src_field, local_index)
@@ -132,7 +132,7 @@ contains
           call coupler_exchange_2d%clear()
 
           ! receive the layer via OASIS
-          ! Extract the version that was actaully placed in the collection
+          ! Extract the version that was actually placed in the collection
           coupling_ptr => get_coupling_from_collection(modeldb%values, "coupling_dst" )
           local_index => coupling_ptr%get_local_index()
           call coupler_exchange_2d%initialise(dst_field, local_index)

applications/lfric2lfric/source/initialisation/lfric2lfric_init_mesh.f90

@@ -139,11 +139,21 @@ subroutine init_mesh( configuration,           &
   ! Extract and check configuration variables
   !============================================================================
   ! Read partitioning namelist for source and destination meshes
+  if (.not. configuration%namelist_exists('partitioning', 'source')) then
+    write( log_scratch_space, '(A)' )                                     &
+         'Source mesh partitioning namelist (partitioning:source) not found.'
+    call log_event(log_scratch_space, log_level_error)
+  end if
   src_partitioning_nml  => configuration%get_namelist('partitioning', &
                                                       'source')
   call src_partitioning_nml%get_value( 'generate_inner_halos', &
                                         generate_inner_halos(src) )
 
+  if (.not. configuration%namelist_exists('partitioning', 'destination')) then
+    write( log_scratch_space, '(A)' )                                          &
+         'Destination mesh partitioning namelist (partitioning:destination) not found.'
+    call log_event(log_scratch_space, log_level_error)
+  end if
   dst_partitioning_nml  => configuration%get_namelist('partitioning', &
                                                       'destination')
   call dst_partitioning_nml%get_value( 'generate_inner_halos', &

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

@@ -835,15 +835,15 @@ wavelength=0
 
 [namelist:partitioning(destination)]
 generate_inner_halos=.false.
-mesh_type='destination'
+mesh_target='destination'
 panel_decomposition='auto'
 !!panel_xproc=0
 !!panel_yproc=0
 partitioner='cubedsphere'
 
 [namelist:partitioning(source)]
 generate_inner_halos=.false.
-mesh_type='source'
+mesh_target='source'
 panel_decomposition='auto'
 !!panel_xproc=0
 !!panel_yproc=0