Remove module scope access from LFRic Core driver/applications

Makefile

@@ -22,6 +22,7 @@ OPERATE_ON ?= infrastructure                \
               mesh_tools                    \
               applications/skeleton         \
               applications/simple_diffusion \
+              applications/coupled          \
               applications/lbc_demo         \
               applications/io_demo
 

applications/coupled/example/configuration_glo.nml

@@ -58,6 +58,9 @@ coord_system='native'
 &partitioning
   partitioner='cubedsphere',
   panel_decomposition = 'auto',
+  tile_size_x=1,
+  tile_size_y=1,
+  inner_halo_tiles=.false.
 /
 
 &planet

applications/coupled/example/configuration_lam.nml

@@ -57,6 +57,9 @@ coord_system='native'
 &partitioning
   partitioner='planar',
   panel_decomposition = 'auto',
+  tile_size_x=1,
+  tile_size_y=1,
+  inner_halo_tiles=.false.
 /
 
 &planet

applications/coupled/source/coupled.f90

@@ -50,7 +50,8 @@ program coupled
   call init_config( filename, coupled_required_namelists, &
                     config=modeldb%config )
 
-  call init_logger( modeldb%mpi%get_comm(), &
+  call init_logger( modeldb%config, &
+                    modeldb%mpi%get_comm(), &
                     program_name//"_"//cpl_component_name )
 
   write(log_scratch_space,'(A)')                          &

applications/coupled/source/driver/coupled_driver_mod.f90

@@ -75,11 +75,17 @@ subroutine initialise( program_name, modeldb, calendar )
     integer(i_def) :: geometry
     integer(i_def) :: method
     integer(i_def) :: number_of_layers
+    integer(i_def) :: tile_size_x
+    integer(i_def) :: tile_size_y
     real(r_def)    :: domain_bottom
     real(r_def)    :: domain_height
     real(r_def)    :: scaled_radius
     logical        :: check_partitions
 
+    logical :: inner_halo_tiles
+    logical :: prepartitioned
+
+    integer(i_def), allocatable :: tile_size(:,:)
     integer(i_def) :: i
     integer(i_def), parameter :: one_layer = 1_i_def
 
@@ -91,6 +97,17 @@ subroutine initialise( program_name, modeldb, calendar )
     domain_height    = modeldb%config%extrusion%domain_height()
     number_of_layers = modeldb%config%extrusion%number_of_layers()
     scaled_radius    = modeldb%config%planet%scaled_radius()
+    prepartitioned   = modeldb%config%base_mesh%prepartitioned()
+
+    if (prepartitioned) then
+      tile_size_x = 1
+      tile_size_y = 1
+      inner_halo_tiles = .false.
+    else
+      tile_size_x = maxval([1,modeldb%config%partitioning%tile_size_x()])
+      tile_size_y = maxval([1,modeldb%config%partitioning%tile_size_y()])
+      inner_halo_tiles = modeldb%config%partitioning%inner_halo_tiles()
+    end if
 
     ! Initialise mesh
     ! Determine the required meshes
@@ -120,23 +137,29 @@ subroutine initialise( program_name, modeldb, calendar )
     ! Create the required meshes
     stencil_depth = 1
     check_partitions = .false.
+    allocate(tile_size(2,size(base_mesh_names)))
+    tile_size(1,:) = tile_size_x
+    tile_size(2,:) = tile_size_y
     call init_mesh( modeldb%config,              &
                     modeldb%mpi%get_comm_rank(), &
                     modeldb%mpi%get_comm_size(), &
                     base_mesh_names, extrusion,  &
+                    inner_halo_tiles, tile_size, &
                     stencil_depth, check_partitions )
 
     allocate( twod_names, source=base_mesh_names )
     do i=1, size(twod_names)
       twod_names(i) = trim(twod_names(i))//'_2d'
     end do
+
     call create_mesh( base_mesh_names, extrusion_2d, &
+                      inner_halo_tiles, tile_size,   &
                       alt_name=twod_names )
     call assign_mesh_maps( twod_names )
 
 
     ! Build the FEM function spaces and coordinate fields
-    call init_fem( mesh_collection, chi_inventory, panel_id_inventory )
+    call init_fem( modeldb%config, chi_inventory, panel_id_inventory )
 
     ! Create and initialise prognostic fields
     mesh => mesh_collection%get_mesh(prime_mesh_name)

applications/coupled/source/driver/init_coupled_mod.X90

@@ -76,15 +76,24 @@ module init_coupled_mod
     procedure(write_interface), pointer :: tmp_ptr
 
     integer(i_def) :: order_h, order_v
+    integer(i_def) :: coord_system
+    integer(i_def) :: geometry
+    integer(i_def) :: topology
+    real(r_def)    :: scaled_radius
+
     type(function_space_type), pointer :: fs
 
     call log_event( 'coupled: Initialising app ...', LOG_LEVEL_INFO )
 
     ! Get the name of the coupling component
     call modeldb%values%get_value("cpl_name", cpl_component_name)
 
-    order_h = modeldb%config%finite_element%element_order_h()
-    order_v = modeldb%config%finite_element%element_order_v()
+    order_h       = modeldb%config%finite_element%element_order_h()
+    order_v       = modeldb%config%finite_element%element_order_v()
+    coord_system  = modeldb%config%finite_element%coord_system()
+    geometry      = modeldb%config%base_mesh%geometry()
+    topology      = modeldb%config%base_mesh%topology()
+    scaled_radius = modeldb%config%planet%scaled_radius()
 
     fs => function_space_collection%get_fs(mesh, order_h, order_v, W3)
 
@@ -122,8 +131,10 @@ module init_coupled_mod
         call depository%get_field( trim(name),  field_1_ptr)
         ! Initialise the values in the field that will be sent to the coupler.
         ! Set them to the longitude of the cell-centre (converted to degrees)
-        call invoke(compute_latlon_kernel_type(field_2, field_1_ptr, &
-                                               chi, panel_id),       &
+        call invoke(compute_latlon_kernel_type(field_2, field_1_ptr,    &
+                                               chi, panel_id, geometry, &
+                                               topology, coord_system,  &
+                                               scaled_radius),          &
                     inc_a_times_X(radians_to_degrees, field_1_ptr))
         ! Add that field to the coupling 2d "send" field collection
         abs_field_ptr => field_1_ptr

applications/io_demo/example/configuration.nml

@@ -82,6 +82,9 @@ coord_system='native'
 &partitioning
   partitioner='cubedsphere',
   panel_decomposition = 'auto',
+  tile_size_x=1,
+  tile_size_y=1,
+  inner_halo_tiles=.false.
 /
 
 &planet

applications/io_demo/rose-meta/lfric-io_demo/vn3.1/rose-meta.conf

@@ -1,13 +1,41 @@
 import=lfric-driver/vn3.1
 
-[namelist:io=multifile_io]
+[namelist:io_demo]
+compulsory=true
+description=Provides options for configuring the runtime behaviour of the IO_Demo app
+ns=namelist/io_demo
+sort-key=Section-A02
+title=IO_Demo
+
+[namelist:io_demo=benchmark_sleep_time]
+compulsory=true
+description=Number of seconds to sleep for each timestep in I/O benchmark mode
+!kind=default
+type=integer
+
+[namelist:io_demo=io_benchmark]
+compulsory=true
+description=Configure application to run as an I/O benchmarking tool
+help=Configure application to run as an I/O benchmarking tool
+!kind=default
+trigger=namelist:io_demo=benchmark_sleep_time: .true. ;
+       =namelist:io_demo=n_benchmark_fields: .true. ;
+type=logical
+
+[namelist:io_demo=multifile_io]
 compulsory=true
 description=Use multifile_io functionality
 help=This is used to turn the multifile_io functionality in the io_demo app
     =on and off
 !kind=default
 type=logical
 
+[namelist:io_demo=n_benchmark_fields]
+compulsory=true
+description=Number of fields created in I/O benchmark
+!kind=default
+type=integer
+
 [namelist:multifile_io]
 compulsory=false
 duplicate=true

applications/io_demo/source/driver/io_demo_driver_mod.f90

@@ -86,15 +86,22 @@ subroutine initialise(program_name, modeldb)
 
     integer(i_def) :: stencil_depth(1)
     integer(i_def) :: geometry
+    integer(i_def) :: topology
     integer(i_def) :: method
     integer(i_def) :: number_of_layers
+    integer(i_def) :: tile_size_x
+    integer(i_def) :: tile_size_y
     real(r_def)    :: domain_bottom
     real(r_def)    :: domain_height
     real(r_def)    :: scaled_radius
-    logical        :: check_partitions
-    logical        :: multifile_io
-    logical        :: io_benchmark
 
+    logical :: check_partitions
+    logical :: inner_halo_tiles
+    logical :: prepartitioned
+    logical :: multifile_io
+    logical :: io_benchmark
+
+    integer(i_def), allocatable :: tile_size(:,:)
     integer(i_def), parameter :: one_layer = 1_i_def
     integer(i_def) :: i
 
@@ -107,13 +114,25 @@ subroutine initialise(program_name, modeldb)
     !=======================================================================
     prime_mesh_name  = modeldb%config%base_mesh%prime_mesh_name()
     geometry         = modeldb%config%base_mesh%geometry()
+    topology         = modeldb%config%base_mesh%topology()
     method           = modeldb%config%extrusion%method()
     domain_height    = modeldb%config%extrusion%domain_height()
     number_of_layers = modeldb%config%extrusion%number_of_layers()
     scaled_radius    = modeldb%config%planet%scaled_radius()
+    prepartitioned   = modeldb%config%base_mesh%prepartitioned()
     multifile_io     = modeldb%config%io_demo%multifile_io()
     io_benchmark     = modeldb%config%io_demo%io_benchmark()
 
+    if (prepartitioned) then
+      tile_size_x = 1
+      tile_size_y = 1
+      inner_halo_tiles = .false.
+    else
+      tile_size_x = maxval([1,modeldb%config%partitioning%tile_size_x()])
+      tile_size_y = maxval([1,modeldb%config%partitioning%tile_size_y()])
+      inner_halo_tiles = modeldb%config%partitioning%inner_halo_tiles()
+    end if
+
     !=======================================================================
     ! Mesh
     !=======================================================================
@@ -161,24 +180,29 @@ subroutine initialise(program_name, modeldb)
     ! ---------------------------------------------------------
     stencil_depth = 1
     check_partitions = .false.
+    allocate(tile_size(2,size(base_mesh_names)))
+    tile_size(1,:) = tile_size_x
+    tile_size(2,:) = tile_size_y
     call init_mesh( modeldb%config,              &
                     modeldb%mpi%get_comm_rank(), &
                     modeldb%mpi%get_comm_size(), &
                     base_mesh_names, extrusion,  &
+                    inner_halo_tiles, tile_size, &
                     stencil_depth, check_partitions )
 
     allocate( twod_names, source=base_mesh_names )
     do i=1, size(twod_names)
       twod_names(i) = trim(twod_names(i))//'_2d'
     end do
     call create_mesh( base_mesh_names, extrusion_2d, &
+                      inner_halo_tiles, tile_size,   &
                       alt_name=twod_names )
     call assign_mesh_maps(twod_names)
 
     !=======================================================================
     ! Build the FEM function spaces and coordinate fields
     !=======================================================================
-    call init_fem( mesh_collection, chi_inventory, panel_id_inventory )
+    call init_fem( modeldb%config, chi_inventory, panel_id_inventory )
 
     !=======================================================================
     ! Setup multifile reading
@@ -201,10 +225,11 @@ subroutine initialise(program_name, modeldb)
     if (associated(files_init_ptr)) then
       call init_io( program_name, prime_mesh_name, modeldb, &
                     chi_inventory, panel_id_inventory,      &
-                    populate_filelist=files_init_ptr )
+                    geometry, topology, populate_filelist=files_init_ptr )
     else
       call init_io( program_name, prime_mesh_name, modeldb, &
-                    chi_inventory, panel_id_inventory )
+                    chi_inventory, panel_id_inventory,      &
+                    geometry, topology )
     end if
 
 

applications/io_demo/source/driver/multifile_io/multifile_io_mod.F90

@@ -9,7 +9,7 @@
 module multifile_io_mod
 
   use calendar_mod,            only: calendar_type
-  use constants_mod,           only: str_def, i_def
+  use constants_mod,           only: str_def, i_def, r_def
   use driver_model_data_mod,   only: model_data_type
   use driver_modeldb_mod,      only: modeldb_type
   use empty_io_context_mod,    only: empty_io_context_type
@@ -123,11 +123,21 @@ subroutine step_multifile_io(modeldb, chi_inventory, panel_id_inventory)
     procedure(event_action), pointer :: context_advance
     procedure(callback_clock_arg), pointer :: before_close
 
+    integer(i_def) :: geometry
+    integer(i_def) :: topology
+    integer(i_def) :: coord_system
+    real(r_def)    :: scaled_radius
+
     nullify(mesh)
     nullify(chi)
     nullify(panel_id)
     nullify(before_close)
 
+    geometry      = modeldb%config%base_mesh%geometry()
+    topology      = modeldb%config%base_mesh%topology()
+    coord_system  = modeldb%config%finite_element%coord_system()
+    scaled_radius = modeldb%config%planet%scaled_radius()
+
     call iter%initialise(modeldb%config%multifile_io)
     do while (iter%has_next())
 
@@ -163,6 +173,8 @@ subroutine step_multifile_io(modeldb, chi_inventory, panel_id_inventory)
                                                  chi, panel_id,               &
                                                  modeldb%clock, tmp_calendar, &
                                                  before_close,                &
+                                                 geometry, topology,          &
+                                                 coord_system, scaled_radius, &
                                                  start_at_zero=.true. )
 
         ! Attach context advancement to the model's clock

applications/io_demo/source/io_demo.f90

@@ -60,7 +60,9 @@ program io_demo
 
   deallocate( filename )
 
-  call init_logger(modeldb%mpi%get_comm(), program_name)
+  call init_logger( modeldb%config, &
+                    modeldb%mpi%get_comm(), &
+                    program_name )
 
   subroutine_timers = modeldb%config%io%subroutine_timers()
   timer_output_path = modeldb%config%io%timer_output_path()

applications/lbc_demo/rose-meta/lfric-lbc_demo/version22_30.py

@@ -39,9 +39,8 @@ class vn22_t4231(MacroUpgrade):
     def upgrade(self, config, meta_config=None):
         # Add settings
         return config, self.reports
-"""
-
 
+"""
 class vn22_t34(MacroUpgrade):
     # Upgrade macro for 34 by jennifer hickson
 
@@ -50,3 +49,4 @@ class vn22_t34(MacroUpgrade):
 
     def upgrade(self, config, meta_config=None):
         return config, self.reports
+"""