Skip to content

Changes to apps as a result of decoupling base_mesh_config geology / topology enumerations #757

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Ricky Wong (mo-rickywong) wants to merge 12 commits into
base: main
Choose a base branch
from
Open

Changes to apps as a result of decoupling base_mesh_config geology / topology enumerations #757

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
849c9a6
1st set of changes
mo-rickywong Sep 1, 2026
e7c99f0
Fix to get build working
mo-rickywong Sep 2, 2026
647a229
Merge branch 'main' into AppsDecoupleGeoTop
mo-rickywong Sep 3, 2026
1b95f08
Move access of geometry and topology to mesh object where possible
mo-rickywong Sep 7, 2026
44dff0b
Merge branch 'main' into AppsDecoupleGeoTop
mo-rickywong Sep 7, 2026
7bf7ff3
Merge branch 'main' into AppsDecoupleGeoTop
mo-rickywong Sep 17, 2026
bf9172b
Update science/gungho/source/algorithm/transport/common/flux_precompu…
mo-rickywong Sep 17, 2026
d295671
Update science/gungho/source/algorithm/transport/sl/horizontal_sl_adv…
mo-rickywong Sep 17, 2026
c81ab17
Update science/gungho/source/algorithm/transport/ffsl/ffsl_hori_alg_m…
mo-rickywong Sep 17, 2026
5513404
Update science/linear/source/algorithm/transport/ffsl/tl_ffsl_hori_al…
mo-rickywong Sep 17, 2026
a78a18c
Change requests from reviewer
mo-rickywong Sep 17, 2026
7b3aafa
More reviewer requests
mo-rickywong Sep 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions applications/gravity_wave/source/initialisation/analytic_buoyancy_profiles_mod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,14 @@ module analytic_buoyancy_profiles_mod
log_scratch_space, &
LOG_LEVEL_ERROR
use coord_transform_mod, only : xyz2llr
use base_mesh_config_mod, only : geometry, &
geometry_spherical
use base_mesh_config_mod, only : geometry
use planet_config_mod, only : scaled_radius, gravity
use generate_global_gw_fields_mod, only : generate_global_gw_pert
use reference_profile_mod, only : reference_profile
use idealised_config_mod, only : test_gravity_wave

use mesh_mod, only: geometry_spherical

implicit none

contains
Expand Down
6 changes: 3 additions & 3 deletions applications/gravity_wave/unit-test/initialisation/analytic_buoyancy_profiles_mod_test.pf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ contains
@before
subroutine set_up()

use base_mesh_config_mod, only : geometry_spherical, &
topology_fully_periodic
use mesh_mod, only : geometry_spherical, &
topology_periodic
use extrusion_config_mod, only : method_uniform, &
stretching_method_linear
use feign_config_mod, only : feign_base_mesh_config, &
Expand All @@ -58,7 +58,7 @@ contains
prime_mesh_name='unit_test', &
geometry=geometry_spherical, &
prepartitioned=.false., &
topology=topology_fully_periodic, &
topology=topology_periodic, &
fplane=.false., f_lat_deg=0.0_r_def )

call feign_extrusion_config( method=method_uniform, &
Expand Down
8 changes: 4 additions & 4 deletions applications/gravity_wave/unit-test/kernel/initial_buoyancy_kernel_mod_test.pf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ contains
@before
subroutine set_up()

use base_mesh_config_mod, only : geometry_planar, &
topology_fully_periodic
use mesh_mod, only : geometry_planar, &
topology_periodic
use extrusion_config_mod, only : method_uniform, &
stretching_method_linear
use sci_chi_transform_mod, only : init_chi_transforms
Expand All @@ -46,7 +46,7 @@ contains
prime_mesh_name='unit_test', &
geometry=geometry_planar, &
prepartitioned=.false., &
topology=topology_fully_periodic, &
topology=topology_periodic, &
fplane=.false., f_lat_deg=0.0_r_def )

call feign_extrusion_config( method=method_uniform, &
Expand Down Expand Up @@ -79,7 +79,7 @@ contains
p_zero=100000.0_r_def, &
scaling_factor=1.0_r_def )

call init_chi_transforms(geometry_planar, topology_fully_periodic)
call init_chi_transforms(geometry_planar, topology_periodic)

end subroutine set_up

Expand Down
16 changes: 2 additions & 14 deletions applications/lfric2lfric/source/driver/lfric2lfric_regrid_mod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@
!>
module lfric2lfric_regrid_mod

use base_mesh_config_mod, only: geometry_spherical, &
geometry_planar, &
topology_fully_periodic, &
topology_non_periodic
use constants_mod, only: str_def, i_def
use driver_modeldb_mod, only: modeldb_type
use field_parent_mod, only: field_parent_type
Expand Down Expand Up @@ -125,16 +121,8 @@ subroutine lfric2lfric_regrid( modeldb, oasis_clock, &

! Get the geometry and topology of the destination mesh
mesh_dst => mesh_collection%get_mesh(trim(mesh_names(dst)))
if (mesh_dst%is_geometry_spherical()) then
geometry = geometry_spherical
else if (mesh_dst%is_geometry_planar()) then
geometry = geometry_planar
end if
if (mesh_dst%is_topology_periodic()) then
topology = topology_fully_periodic
else if (mesh_dst%is_topology_non_periodic()) then
topology = topology_non_periodic
end if
geometry = mesh_dst%geometry()
topology = mesh_dst%topology()

! Main loop over fields to be processed
call iter%initialise(source_fields)
Expand Down
11 changes: 6 additions & 5 deletions applications/lfric2lfric/source/initialisation/lfric2lfric_infrastructure_mod.X90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,14 @@ module lfric2lfric_infrastructure_mod
use coupler_exchange_2d_mod, only: coupler_exchange_2d_type
#endif

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 extrusion_config_mod, only: key_from_method, &
method_uniform, &
method_geometric, &
Expand Down Expand Up @@ -273,7 +274,7 @@ contains
select case (source_topology)

case (source_topology_fully_periodic)
topology = topology_fully_periodic
topology = topology_periodic

case (source_topology_non_periodic)
topology = topology_non_periodic
Expand Down
7 changes: 1 addition & 6 deletions ...ns/lfricinputs/source/scintelapi/generators/scintel/scintel_map_um_lbc_inputs_alg_mod.x90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ module scintel_map_um_lbc_inputs_alg_mod

use function_space_collection_mod, only: function_space_collection

use base_mesh_config_mod, only: geometry_spherical, geometry_planar
use finite_element_config_mod, only: coord_system
use planet_config_mod, only: scaled_radius
use extrusion_config_mod, only: planet_radius
Expand Down Expand Up @@ -126,11 +125,7 @@ function scintel_get_height_w3_fv(mesh) result(height)

integer(i_def) :: geometry

if (mesh%is_geometry_spherical()) then
geometry = geometry_spherical
else
geometry = geometry_planar
end if
geometry = mesh%geometry()

! Determine inventory based on W3 space
inventory => height_w3_inventory_fv
Expand Down
6 changes: 3 additions & 3 deletions applications/name_transport/source/driver/name_transport_driver_mod.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,9 @@ module name_transport_driver_mod
LOG_LEVEL_ERROR, &
LOG_LEVEL_INFO, &
LOG_LEVEL_TRACE
use mesh_mod, only: mesh_type
use mesh_mod, only: mesh_type, &
geometry_planar, &
geometry_spherical
use mesh_collection_mod, only: mesh_collection
use model_clock_mod, only: model_clock_type
use runtime_constants_mod, only: create_runtime_constants
Expand All @@ -56,8 +58,6 @@ module name_transport_driver_mod
name_transport_final

! Configuration modules
use base_mesh_config_mod, only: geometry_planar, &
geometry_spherical
use finite_element_config_mod, only: coord_system, &
element_order_h, &
element_order_v
Expand Down
5 changes: 3 additions & 2 deletions applications/name_transport/source/initialisation/analytic_name_field_profiles_mod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ module analytic_name_field_profiles_mod
use log_mod, only : log_event, &
log_scratch_space, &
LOG_LEVEL_ERROR
use mesh_mod, only : geometry_spherical
use coord_transform_mod, only : xyz2llr, central_angle
use idealised_config_mod, only : test_gaussian_hill, &
test_cosine_hill, &
Expand All @@ -34,8 +35,8 @@ module analytic_name_field_profiles_mod
use initial_name_field_config_mod, &
only : r1, x1, y1, z1, r2, x2, y2, z2, &
field_max, field_background
use base_mesh_config_mod, only : geometry, &
geometry_spherical

use base_mesh_config_mod, only : geometry
use planet_config_mod, only : p_zero, Rd, kappa, scaled_radius
use extrusion_config_mod, only : domain_height

Expand Down
8 changes: 4 additions & 4 deletions applications/name_transport/unit-test/kernel/set_name_field_kernel_mod_test.pf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ contains
@before
subroutine set_up()

use base_mesh_config_mod, only : geometry_planar, &
topology_fully_periodic
use mesh_mod, only : geometry_planar, &
topology_periodic
use extrusion_config_mod, only : method_uniform, &
stretching_method_linear
use finite_element_config_mod, only : cellshape_quadrilateral, &
Expand Down Expand Up @@ -61,7 +61,7 @@ contains
prime_mesh_name='unit_test', &
geometry=geometry_planar, &
prepartitioned=.false., &
topology=topology_fully_periodic, &
topology=topology_periodic, &
fplane=.false., f_lat_deg=0.0_r_def )

call feign_finite_element_config( &
Expand Down Expand Up @@ -93,7 +93,7 @@ contains
p_zero=100000.0_r_def, &
scaling_factor=1.0_r_def )

call init_chi_transforms(geometry_planar, topology_fully_periodic)
call init_chi_transforms(geometry_planar, topology_periodic)

end subroutine set_up

Expand Down
4 changes: 2 additions & 2 deletions applications/shallow_water/source/algorithm/swe_rhs_alg_mod.x90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ module swe_rhs_alg_mod
use mesh_mod, only: mesh_type
use operator_mod, only: operator_type
use sci_field_vector_mod, only: field_vector_type
use mesh_mod, only: geometry_spherical

! Quadrature and Psykal Lite
use quadrature_face_mod, only: quadrature_face_type
use quadrature_rule_gaussian_mod, only: quadrature_rule_gaussian_type
use quadrature_xyoz_mod, only: quadrature_xyoz_type

! Configuration Options
use base_mesh_config_mod, only: geometry, &
geometry_spherical
use base_mesh_config_mod, only: geometry
use finite_element_config_mod, only: element_order_h, element_order_v
use formulation_config_mod, only: rotating
use shallow_water_settings_config_mod, &
Expand Down
5 changes: 3 additions & 2 deletions applications/shallow_water/source/initialisation/analytic_geopot_profiles_mod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,10 @@ module analytic_geopot_profiles_mod
use coord_transform_mod, only: xyz2ll
use galewsky_test_case_mod, only: galewsky_profile

use mesh_mod, only: geometry_spherical

! Configurations
use base_mesh_config_mod, only: geometry, &
geometry_spherical
use base_mesh_config_mod, only: geometry
use planet_config_mod, only: scaled_radius, gravity, &
scaled_omega, scaling_factor
use shallow_water_settings_config_mod, &
Expand Down
5 changes: 3 additions & 2 deletions ...ications/shallow_water/source/initialisation/analytic_swe_streamfunction_profiles_mod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@ module analytic_swe_streamfunction_profiles_mod
log_scratch_space, &
LOG_LEVEL_ERROR

use mesh_mod, only: geometry_spherical

! Configuration
use base_mesh_config_mod, only: geometry, &
geometry_spherical
use base_mesh_config_mod, only: geometry
use planet_config_mod, only: scaled_radius, scaled_omega
use shallow_water_settings_config_mod, &
only: swe_test_swe_galewsky, &
Expand Down
4 changes: 2 additions & 2 deletions applications/shallow_water/source/initialisation/analytic_swe_wind_profiles_mod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ module analytic_swe_wind_profiles_mod
use log_mod, only: log_event, &
log_scratch_space, &
LOG_LEVEL_ERROR
use mesh_mod, only: geometry_spherical

! Configuration
use base_mesh_config_mod, only: geometry, &
geometry_spherical
use base_mesh_config_mod, only: geometry
Comment thread
mo-rickywong marked this conversation as resolved.
use planet_config_mod, only: scaled_radius, scaled_omega
use shallow_water_settings_config_mod, &
only: ref_gp, &
Expand Down
5 changes: 3 additions & 2 deletions applications/shallow_water/source/kernel/initial_swe_streamfunc_kernel_mod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,10 @@ module initial_swe_streamfunc_kernel_mod
use fs_continuity_mod, only : W1
use kernel_mod, only : kernel_type

use mesh_mod, only: geometry_spherical

! Configuration modules
use base_mesh_config_mod, only: geometry, topology, &
geometry_spherical
use base_mesh_config_mod, only: geometry, topology
use finite_element_config_mod, only: coord_system
use planet_config_mod, only: scaled_radius

Expand Down
5 changes: 3 additions & 2 deletions applications/shallow_water/source/kernel/initial_swe_u_kernel_mod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,10 @@ module initial_swe_u_kernel_mod
use fs_continuity_mod, only : W2
use kernel_mod, only : kernel_type

use mesh_mod, only: geometry_spherical

! Configuration modules
use base_mesh_config_mod, only: geometry, topology, &
geometry_spherical
use base_mesh_config_mod, only: geometry, topology
use finite_element_config_mod, only: coord_system
use planet_config_mod, only: scaled_radius

Expand Down
5 changes: 3 additions & 2 deletions applications/shallow_water/source/kernel/initial_vorticity_v2_kernel_mod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,9 @@ module initial_vorticity_v2_kernel_mod
use rotation_vector_mod, only: rotation_vector_fplane, &
rotation_vector_sphere

use base_mesh_config_mod, only: geometry, topology, &
geometry_spherical, f_lat
use mesh_mod, only: geometry_spherical

use base_mesh_config_mod, only: geometry, topology, f_lat
use finite_element_config_mod, only: coord_system
use planet_config_mod, only: scaled_radius, scaled_omega

Expand Down
6 changes: 3 additions & 3 deletions applications/shallow_water/unit-test/initialisation/analytic_geopot_profiles_mod_test.pf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ contains
@before
subroutine set_up()

use base_mesh_config_mod, only : geometry_spherical, &
topology_fully_periodic
use mesh_mod, only : geometry_spherical, &
topology_periodic
use extrusion_config_mod, only : method_uniform, &
stretching_method_linear
use feign_config_mod, only : feign_base_mesh_config, &
Expand All @@ -44,7 +44,7 @@ contains
prime_mesh_name='unit_test', &
geometry=geometry_spherical, &
prepartitioned=.false., &
topology=topology_fully_periodic, &
topology=topology_periodic, &
fplane=.false., f_lat_deg=0.0_r_def )

call feign_extrusion_config( method=method_uniform, &
Expand Down
6 changes: 3 additions & 3 deletions ...cations/shallow_water/unit-test/initialisation/analytic_swe_buoyancy_profiles_mod_test.pf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ contains
@before
subroutine set_up()

use base_mesh_config_mod, only : geometry_planar, &
topology_fully_periodic
use mesh_mod, only : geometry_planar, &
topology_periodic
use extrusion_config_mod, only : method_uniform, &
stretching_method_linear
use feign_config_mod, only : feign_base_mesh_config, &
Expand All @@ -45,7 +45,7 @@ contains
prime_mesh_name='unit_test', &
geometry=geometry_planar, &
prepartitioned=.false., &
topology=topology_fully_periodic, &
topology=topology_periodic, &
fplane=.false., f_lat_deg=0.0_r_def )

call feign_extrusion_config( method=method_uniform, &
Expand Down
6 changes: 3 additions & 3 deletions ...s/shallow_water/unit-test/initialisation/analytic_swe_streamfunction_profiles_mod_test.pf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ contains
@before
subroutine set_up()

use base_mesh_config_mod, only : geometry_spherical, &
topology_fully_periodic
use mesh_mod, only : geometry_spherical, &
topology_periodic
use extrusion_config_mod, only : method_uniform, &
stretching_method_linear
use feign_config_mod, only : feign_base_mesh_config, &
Expand All @@ -46,7 +46,7 @@ contains
prime_mesh_name='unit_test', &
geometry=geometry_spherical, &
prepartitioned=.false., &
topology=topology_fully_periodic, &
topology=topology_periodic, &
fplane=.false., f_lat_deg=0.0_r_def )

call feign_extrusion_config( method=method_uniform, &
Expand Down
10 changes: 5 additions & 5 deletions applications/shallow_water/unit-test/initialisation/analytic_swe_wind_profiles_mod_test.pf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ contains
@before
subroutine set_up()

use base_mesh_config_mod, only: geometry_spherical, &
topology_fully_periodic
use extrusion_config_mod, only : method_uniform, &
stretching_method_linear
use mesh_mod, only: geometry_spherical, &
topology_periodic
use extrusion_config_mod, only: method_uniform, &
stretching_method_linear
use feign_config_mod, only: feign_base_mesh_config, &
feign_extrusion_config, &
feign_planet_config, &
Expand All @@ -45,7 +45,7 @@ contains
prime_mesh_name='unit_test', &
geometry=geometry_spherical, &
prepartitioned=.false., &
topology=topology_fully_periodic, &
topology=topology_periodic, &
fplane=.false., f_lat_deg=0.0_r_def )

call feign_extrusion_config( method=method_uniform, &
Expand Down
Loading
Loading