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

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, &
@@ -31,6 +31,7 @@ module skeleton_constants_mod
   use quadrature_rule_gaussian_mod,       only: quadrature_rule_gaussian_type
   use timing_mod,                         only: start_timing, stop_timing, &
                                                 tik, LPROF
+  use sci_mesh_enums_mod,                 only: get_mesh_enums
 
   ! Kernels
   use sci_compute_derham_matrices_kernel_mod, only: compute_derham_matrices_kernel_type
@@ -109,17 +110,25 @@ 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()
+    call get_mesh_enums(mesh, geometry, 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

@@ -17,12 +17,13 @@ module driver_coordinates_mod
                                  xyz2alphabetar, alphabetar2xyz,   &
                                  schmidt_transform_xyz,            &
                                  inverse_schmidt_transform_xyz
-
-  ! Configuration modules
-  use base_mesh_config_mod, only: geometry_planar,         &
+  use sci_mesh_enums_mod,   only: get_mesh_enums,          &
+                                  geometry_planar,         &
                                   geometry_spherical,      &
                                   topology_fully_periodic, &
                                   topology_non_periodic
+
+  ! Configuration modules
   use finite_element_config_mod, only: coord_system_xyz
 
   implicit none
@@ -108,17 +109,7 @@ 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
+    call get_mesh_enums(mesh, geometry, topology)
 
     coord_system  = config%finite_element%coord_system()
     scaled_radius = config%planet%scaled_radius()

components/driver/source/driver_fem_mod.f90

@@ -25,6 +25,11 @@ module driver_fem_mod
   use mesh_collection_mod,           only: mesh_collection
   use sci_chi_transform_mod,         only: init_chi_transforms, &
                                            final_chi_transforms
+  use sci_mesh_enums_mod,            only: get_mesh_enums,         &
+                                           geometry_spherical,     &
+                                           geometry_planar,        &
+                                           topology_non_periodic,  &
+                                           topology_fully_periodic
 
   ! Object types
   use config_mod, only: config_type
@@ -33,10 +38,6 @@ module driver_fem_mod
   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 +122,7 @@ 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
+      call get_mesh_enums(mesh, geometry, 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 sci_mesh_enums_mod,         only: geometry_spherical, &
+                                        topology_fully_periodic
 
   ! Configuration modules
   use finite_element_config_mod, only: cellshape_quadrilateral
-  use base_mesh_config_mod,      only: geometry_spherical, &
-                                       topology_fully_periodic
 
   implicit none
 

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 sci_mesh_enums_mod, only: geometry_planar, topology_fully_periodic
   use funit
 
   implicit none

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