Remove global scope access of namelist configurations from science component kernels with feigners (tranche 1)

applications/io_demo/source/driver/io_demo_checkpoint_mod.f90

@@ -25,11 +25,6 @@ module io_demo_checkpoint_mod
                                     LOG_LEVEL_DEBUG, LOG_LEVEL_ERROR
   use mesh_mod,               only: mesh_type
 
-  use base_mesh_config_mod, only: geometry_spherical,      &
-                                  geometry_planar,         &
-                                  topology_fully_periodic, &
-                                  topology_non_periodic
-
   implicit none
 
   private
@@ -71,21 +66,9 @@ subroutine setup_checkpoint_io(modeldb, chi, panel_id)
     call log_event( 'io_demo: Setting up checkpoint I/O', LOG_LEVEL_DEBUG )
 
     mesh => chi(1)%get_mesh()
-    if (mesh%is_geometry_spherical()) then
-      geometry = geometry_spherical
-    else
-      geometry = geometry_planar
-    end if
-
-    if (mesh%is_topology_periodic()) then
-      topology = topology_fully_periodic
-    else if (mesh%is_topology_non_periodic()) then
-      topology = topology_non_periodic
-    else
-      call log_event( 'Unsupported mesh topology', &
-                      log_level_error )
-    end if
 
+    geometry = mesh%geometry()
+    topology = mesh%topology()
     coord_system  = modeldb%config%finite_element%coord_system()
     scaled_radius = modeldb%config%planet%scaled_radius()
 

applications/lbc_demo/source/kernel/set_lbc_int_kernel_mod.F90

@@ -14,7 +14,7 @@ module set_lbc_int_kernel_mod
   use constants_mod, only: r_def, i_def, l_def, radians_to_degrees
   use kernel_mod,    only: kernel_type
 
-  use base_mesh_config_mod, only: geometry_spherical
+  use mesh_mod, only: geometry_spherical
 
   implicit none
 

applications/lbc_demo/source/kernel/set_lbc_real_kernel_mod.F90

@@ -14,7 +14,7 @@ module set_lbc_real_kernel_mod
   use constants_mod, only: r_def, i_def, l_def, radians_to_degrees
   use kernel_mod,    only: kernel_type
 
-  use base_mesh_config_mod, only: geometry_spherical
+  use mesh_mod, only: geometry_spherical
 
   implicit none
 

applications/skeleton/source/algorithm/skeleton_constants_mod.x90

@@ -15,7 +15,7 @@
 module skeleton_constants_mod
 
   ! Infrastructure
-  use constants_mod,                      only: str_def, i_def, l_def
+  use constants_mod,                      only: str_def, r_def, i_def, l_def
   use driver_modeldb_mod,                 only: modeldb_type
   use field_mod,                          only: field_type
   use fs_continuity_mod,                  only: W0, W1, W2, W2broken, &
@@ -80,7 +80,7 @@ contains
     ! Arguments
     type(modeldb_type), intent(in) :: modeldb
 
-    type(mesh_type),  pointer, intent(in) :: mesh
+    type(mesh_type),           intent(in) :: mesh
     type(field_type),  target, intent(in) :: chi(:)
     type(field_type),  target, intent(in) :: panel_id
 
@@ -109,17 +109,26 @@ contains
 
     integer(i_def) :: order_h, order_v
     integer(i_def) :: nqp_h_exact, nqp_v_exact
+    integer(i_def) :: geometry
+    integer(i_def) :: topology
+    integer(i_def) :: coord_system
+    real(r_def)    :: scaled_radius
 
     integer(tik) :: id
 
     if ( LPROF ) call start_timing( id, 'skeleton_constants_alg' )
 
     call log_event( "Skeleton: creating runtime constants", LOG_LEVEL_INFO )
 
-    order_h     = modeldb%config%finite_element%element_order_h()
-    order_v     = modeldb%config%finite_element%element_order_v()
-    nqp_h_exact = modeldb%config%finite_element%nqp_h_exact()
-    nqp_v_exact = modeldb%config%finite_element%nqp_v_exact()
+    geometry = mesh%geometry()
+    topology = mesh%topology()
+
+    order_h       = modeldb%config%finite_element%element_order_h()
+    order_v       = modeldb%config%finite_element%element_order_v()
+    nqp_h_exact   = modeldb%config%finite_element%nqp_h_exact()
+    nqp_v_exact   = modeldb%config%finite_element%nqp_v_exact()
+    coord_system  = modeldb%config%finite_element%coord_system()
+    scaled_radius = modeldb%config%planet%scaled_radius()
 
     !=========== Create function spaces required for setup ==================!
 
@@ -167,13 +176,16 @@ contains
     call curl_inventory%add_operator( curl, w2_fs, w1_fs, mesh )
     call broken_div_inventory%add_operator( broken_div, w3_fs, w2b_fs, mesh )
 
-    call invoke( name = "create_de_rham_matrices",                      &
-                 compute_derham_matrices_kernel_type(mm_w0, mm_w1,      &
-                                                     mm_w2, mm_w2b,     &
-                                                     mm_w3, mm_wtheta,  &
-                                                     grad, curl,        &
-                                                     div, broken_div,   &
-                                                     chi, panel_id, qr) )
+    call invoke( name = "create_de_rham_matrices",                       &
+                 compute_derham_matrices_kernel_type(mm_w0, mm_w1,       &
+                                                     mm_w2, mm_w2b,      &
+                                                     mm_w3, mm_wtheta,   &
+                                                     grad, curl,         &
+                                                     div, broken_div,    &
+                                                     chi, panel_id,      &
+                                                     geometry, topology, &
+                                                     coord_system,       &
+                                                     scaled_radius, qr) )
 
     !===================== Add operators to inventories =======================!
 

components/driver/source/driver_coordinates_mod.F90

@@ -18,11 +18,12 @@ module driver_coordinates_mod
                                  schmidt_transform_xyz,            &
                                  inverse_schmidt_transform_xyz
 
+  use mesh_mod,  only: geometry_planar,    &
+                       geometry_spherical, &
+                       topology_periodic,  &
+                       topology_non_periodic
+
   ! Configuration modules
-  use base_mesh_config_mod, only: geometry_planar,         &
-                                  geometry_spherical,      &
-                                  topology_fully_periodic, &
-                                  topology_non_periodic
   use finite_element_config_mod, only: coord_system_xyz
 
   implicit none
@@ -64,7 +65,7 @@ subroutine assign_coordinate_field(config, mesh, chi, panel_id)
     implicit none
 
     type(config_type), intent(in) :: config
-    type(mesh_type),   intent(in), pointer :: mesh
+    type(mesh_type),   intent(in) :: mesh
     type(field_type),  intent(inout) :: chi(3)
     type(field_type),  intent(inout) :: panel_id
 
@@ -108,18 +109,8 @@ subroutine assign_coordinate_field(config, mesh, chi, panel_id)
 
     nullify( map, map_pid, dof_coords, reference_element )
 
-    if (mesh%is_geometry_spherical()) then
-      geometry = geometry_spherical
-    else
-      geometry = geometry_planar
-    end if
-
-    if (mesh%is_topology_periodic()) then
-      topology = topology_fully_periodic
-    else
-      topology = topology_non_periodic
-    end if
-
+    geometry = mesh%geometry()
+    topology = mesh%topology()
     coord_system  = config%finite_element%coord_system()
     scaled_radius = config%planet%scaled_radius()
 
@@ -178,7 +169,7 @@ subroutine assign_coordinate_field(config, mesh, chi, panel_id)
     ! Throw an error if stretching factor is not 1 and not on cubed-sphere
     if ( abs(stretch_factor - 1.0_r_def) > eps .and. .not.                     &
          (geometry == geometry_spherical .and.                                 &
-          topology == topology_fully_periodic) ) then
+          topology == topology_periodic) ) then
       call log_event(                                                          &
         'driver_coordinates: Cannot determine coordinates if Schmidt ' //      &
         'stretching factor is not 1 and mesh is not cubed-sphere',             &
@@ -228,7 +219,7 @@ subroutine assign_coordinate_field(config, mesh, chi, panel_id)
       end do
 
     else if ( geometry == geometry_spherical .and. &
-              topology /= topology_fully_periodic ) then
+              topology /= topology_periodic ) then
 
       do cell = 1,chi_proxy(1)%vspace%get_ncell()
 
@@ -263,7 +254,7 @@ subroutine assign_coordinate_field(config, mesh, chi, panel_id)
       end do
 
     else if ( geometry == geometry_spherical .and. &
-              topology == topology_fully_periodic ) then
+              topology == topology_periodic ) then
 
       do cell = 1,chi_proxy(1)%vspace%get_ncell()
 
@@ -352,7 +343,7 @@ subroutine calc_panel_id( nlayers,            &
     integer(kind=i_def) :: vert, k
 
     if ( geometry == geometry_spherical .and. &
-         topology == topology_fully_periodic ) then
+         topology == topology_periodic ) then
 
       ! The following code assumes that the mesh generator has ordered the
       ! global cell ids panel-by-panel. If this is ever not the case, the
@@ -451,7 +442,7 @@ subroutine assign_coordinate_xyz( nlayers,       &
         end if
         ! Domain does not have N-S boundaries only if topology completely periodic
         if ( column_coords(2,SWB,k+1) > column_coords(2,NWB,k+1) .and. &
-             topology == topology_fully_periodic ) then
+             topology == topology_periodic ) then
         ! On y boundary
           vertex_local_coords(2,SWB) = domain_y
           vertex_local_coords(2,SEB) = domain_y

components/driver/source/driver_fem_mod.f90

@@ -26,17 +26,17 @@ module driver_fem_mod
   use sci_chi_transform_mod,         only: init_chi_transforms, &
                                            final_chi_transforms
 
+  use mesh_mod, only: geometry_spherical, &
+                      geometry_planar,    &
+                      topology_non_periodic
+
   ! Object types
   use config_mod, only: config_type
   use field_mod,  only: field_type
   use mesh_mod,   only: mesh_type
   use inventory_by_mesh_mod, only: inventory_by_mesh_type
 
   ! Configuration modules
-  use base_mesh_config_mod,      only: geometry_spherical,    &
-                                       geometry_planar,       &
-                                       topology_non_periodic, &
-                                       topology_fully_periodic
   use finite_element_config_mod, only: coord_system_xyz, &
                                        coord_space_W0,   &
                                        coord_space_Wchi, &
@@ -121,17 +121,8 @@ subroutine init_fem(config, chi_inventory, panel_id_inventory)
       mesh => mesh_collection%get_mesh(all_mesh_names(i))
       mesh_name = mesh%get_mesh_name()
 
-      if (mesh%is_geometry_spherical()) then
-        geometry = geometry_spherical
-      else
-        geometry = geometry_planar
-      end if
-
-      if (mesh%is_topology_periodic()) then
-        topology = topology_fully_periodic
-      else
-        topology = topology_non_periodic
-      end if
+      geometry = mesh%geometry()
+      topology = mesh%topology()
 
       ! Initialise coordinate transformations
       call init_chi_transforms( geometry, topology, &

components/driver/source/driver_mesh_mod.f90

@@ -51,11 +51,11 @@ module driver_mesh_mod
 
   use global_mesh_collection_mod, only: global_mesh_collection
   use local_mesh_collection_mod,  only: local_mesh_collection
+  use mesh_mod,                   only: geometry_spherical, &
+                                        topology_periodic
 
   ! Configuration modules
   use finite_element_config_mod, only: cellshape_quadrilateral
-  use base_mesh_config_mod,      only: geometry_spherical, &
-                                       topology_fully_periodic
 
   implicit none
 
@@ -287,7 +287,7 @@ subroutine init_mesh( config,                  &
     generate_inner_halos = config%partitioning%generate_inner_halos()
 
     if ( geometry == geometry_spherical .and. &
-         topology == topology_fully_periodic ) then
+         topology == topology_periodic ) then
       mesh_selection = mesh_cubedsphere
       call log_event( "Setting up cubed-sphere partition mesh(es)", &
                       log_level_debug )

components/driver/unit-test/assign_coordinate_alphabetaz_mod_test.pf

@@ -31,7 +31,7 @@ contains
     real(kind=r_def), parameter :: radius = 104.0_r_def
 
     integer(kind=i_def) :: nlayers, ndf_chi, undf_chi, ndf_pid, undf_pid
-    integer(kind=i_def) :: map_chi(1), map_pid(1), nverts, i
+    integer(kind=i_def) :: map_chi(1), map_pid(1), nverts
     real(kind=r_def) :: alpha(2), beta(2), panel_rho(4)
     real(kind=r_def) :: alpha_out(1), beta_out(1), height_out(1), panel_id(1)
     real(kind=r_def) :: verts_XYZ(3,8,1), verts_ref(8,3), nodal_coord(3,1)

components/driver/unit-test/assign_coordinate_xyz_mod_test.pf

@@ -9,7 +9,7 @@ module assign_coordinate_xyz_mod_test
 
   use constants_mod, only : r_def, i_def
 
-  use base_mesh_config_mod, only: geometry_planar, topology_fully_periodic
+  use mesh_mod, only: geometry_planar, topology_periodic
   use funit
 
   implicit none
@@ -33,7 +33,7 @@ contains
                                    one = 1.0_r_def
 
     integer(i_def), parameter :: geometry = geometry_planar
-    integer(i_def), parameter :: topology = topology_fully_periodic
+    integer(i_def), parameter :: topology = topology_periodic
     real(r_def),    parameter :: scaled_radius = 1.0_r_def
 
     integer(kind=i_def) :: nlayers, ndf, nverts, i, undf, ndf_pid, undf_pid

components/science/Makefile

@@ -71,9 +71,7 @@ document-api: api-documentation
 #
 unit-tests/%: export BIN_DIR ?= $(PROJECT_DIR)/test
 unit-tests/%: export CXX_LINK = TRUE
-#unit-tests/%: export EXTERNAL_STATIC_LIBRARIES += pfunit
 unit-tests/%: export IMPORT_PARTS = $(CORE_ROOT_DIR)/infrastructure \
-#                                    $(CORE_ROOT_DIR)/components/lfric-xios \
                                     $(CORE_ROOT_DIR)/components/inventory \
                                     $(CORE_ROOT_DIR)/components/driver
 unit-tests/%: export META_FILE_DIR = rose-meta/lfric-science/HEAD