diff --git a/applications/gravity_wave/source/initialisation/analytic_buoyancy_profiles_mod.F90 b/applications/gravity_wave/source/initialisation/analytic_buoyancy_profiles_mod.F90 index 75162398c0..07a012a5b7 100644 --- a/applications/gravity_wave/source/initialisation/analytic_buoyancy_profiles_mod.F90 +++ b/applications/gravity_wave/source/initialisation/analytic_buoyancy_profiles_mod.F90 @@ -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 diff --git a/applications/gravity_wave/unit-test/initialisation/analytic_buoyancy_profiles_mod_test.pf b/applications/gravity_wave/unit-test/initialisation/analytic_buoyancy_profiles_mod_test.pf index de1a177402..6139442487 100644 --- a/applications/gravity_wave/unit-test/initialisation/analytic_buoyancy_profiles_mod_test.pf +++ b/applications/gravity_wave/unit-test/initialisation/analytic_buoyancy_profiles_mod_test.pf @@ -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, & @@ -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, & diff --git a/applications/gravity_wave/unit-test/kernel/initial_buoyancy_kernel_mod_test.pf b/applications/gravity_wave/unit-test/kernel/initial_buoyancy_kernel_mod_test.pf index 77ed9f749c..28d9e6119f 100644 --- a/applications/gravity_wave/unit-test/kernel/initial_buoyancy_kernel_mod_test.pf +++ b/applications/gravity_wave/unit-test/kernel/initial_buoyancy_kernel_mod_test.pf @@ -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 @@ -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, & @@ -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 diff --git a/applications/lfric2lfric/source/driver/lfric2lfric_regrid_mod.F90 b/applications/lfric2lfric/source/driver/lfric2lfric_regrid_mod.F90 index 4859100c77..080688e38d 100644 --- a/applications/lfric2lfric/source/driver/lfric2lfric_regrid_mod.F90 +++ b/applications/lfric2lfric/source/driver/lfric2lfric_regrid_mod.F90 @@ -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 @@ -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) diff --git a/applications/lfric2lfric/source/initialisation/lfric2lfric_infrastructure_mod.X90 b/applications/lfric2lfric/source/initialisation/lfric2lfric_infrastructure_mod.X90 index 9a090f6342..30fa5db787 100644 --- a/applications/lfric2lfric/source/initialisation/lfric2lfric_infrastructure_mod.X90 +++ b/applications/lfric2lfric/source/initialisation/lfric2lfric_infrastructure_mod.X90 @@ -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, & @@ -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 diff --git a/applications/lfricinputs/source/scintelapi/generators/scintel/scintel_map_um_lbc_inputs_alg_mod.x90 b/applications/lfricinputs/source/scintelapi/generators/scintel/scintel_map_um_lbc_inputs_alg_mod.x90 index 784eb0572b..82fb452d7d 100644 --- a/applications/lfricinputs/source/scintelapi/generators/scintel/scintel_map_um_lbc_inputs_alg_mod.x90 +++ b/applications/lfricinputs/source/scintelapi/generators/scintel/scintel_map_um_lbc_inputs_alg_mod.x90 @@ -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 @@ -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 diff --git a/applications/name_transport/source/driver/name_transport_driver_mod.f90 b/applications/name_transport/source/driver/name_transport_driver_mod.f90 index 9c8057cf52..5d80c9f7f5 100644 --- a/applications/name_transport/source/driver/name_transport_driver_mod.f90 +++ b/applications/name_transport/source/driver/name_transport_driver_mod.f90 @@ -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 @@ -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 diff --git a/applications/name_transport/source/initialisation/analytic_name_field_profiles_mod.F90 b/applications/name_transport/source/initialisation/analytic_name_field_profiles_mod.F90 index 1260098d1b..cb1a808a68 100644 --- a/applications/name_transport/source/initialisation/analytic_name_field_profiles_mod.F90 +++ b/applications/name_transport/source/initialisation/analytic_name_field_profiles_mod.F90 @@ -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, & @@ -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 diff --git a/applications/name_transport/unit-test/kernel/set_name_field_kernel_mod_test.pf b/applications/name_transport/unit-test/kernel/set_name_field_kernel_mod_test.pf index 88a7b96c6e..c29d7f0073 100644 --- a/applications/name_transport/unit-test/kernel/set_name_field_kernel_mod_test.pf +++ b/applications/name_transport/unit-test/kernel/set_name_field_kernel_mod_test.pf @@ -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, & @@ -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( & @@ -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 diff --git a/applications/shallow_water/source/algorithm/swe_rhs_alg_mod.x90 b/applications/shallow_water/source/algorithm/swe_rhs_alg_mod.x90 index 98b4b19ec0..61184bbbfc 100644 --- a/applications/shallow_water/source/algorithm/swe_rhs_alg_mod.x90 +++ b/applications/shallow_water/source/algorithm/swe_rhs_alg_mod.x90 @@ -28,6 +28,7 @@ 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 @@ -35,8 +36,7 @@ module swe_rhs_alg_mod 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, & diff --git a/applications/shallow_water/source/initialisation/analytic_geopot_profiles_mod.F90 b/applications/shallow_water/source/initialisation/analytic_geopot_profiles_mod.F90 index 2cff150e49..3c6fd12252 100644 --- a/applications/shallow_water/source/initialisation/analytic_geopot_profiles_mod.F90 +++ b/applications/shallow_water/source/initialisation/analytic_geopot_profiles_mod.F90 @@ -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, & diff --git a/applications/shallow_water/source/initialisation/analytic_swe_streamfunction_profiles_mod.F90 b/applications/shallow_water/source/initialisation/analytic_swe_streamfunction_profiles_mod.F90 index d9040cc307..97cbe601af 100644 --- a/applications/shallow_water/source/initialisation/analytic_swe_streamfunction_profiles_mod.F90 +++ b/applications/shallow_water/source/initialisation/analytic_swe_streamfunction_profiles_mod.F90 @@ -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, & diff --git a/applications/shallow_water/source/initialisation/analytic_swe_wind_profiles_mod.F90 b/applications/shallow_water/source/initialisation/analytic_swe_wind_profiles_mod.F90 index e9885fc5ba..c650353821 100644 --- a/applications/shallow_water/source/initialisation/analytic_swe_wind_profiles_mod.F90 +++ b/applications/shallow_water/source/initialisation/analytic_swe_wind_profiles_mod.F90 @@ -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 use planet_config_mod, only: scaled_radius, scaled_omega use shallow_water_settings_config_mod, & only: ref_gp, & diff --git a/applications/shallow_water/source/kernel/initial_swe_streamfunc_kernel_mod.F90 b/applications/shallow_water/source/kernel/initial_swe_streamfunc_kernel_mod.F90 index ccfe7b5d90..98f0ea883a 100644 --- a/applications/shallow_water/source/kernel/initial_swe_streamfunc_kernel_mod.F90 +++ b/applications/shallow_water/source/kernel/initial_swe_streamfunc_kernel_mod.F90 @@ -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 diff --git a/applications/shallow_water/source/kernel/initial_swe_u_kernel_mod.F90 b/applications/shallow_water/source/kernel/initial_swe_u_kernel_mod.F90 index 1d007057f9..4b33b08b78 100644 --- a/applications/shallow_water/source/kernel/initial_swe_u_kernel_mod.F90 +++ b/applications/shallow_water/source/kernel/initial_swe_u_kernel_mod.F90 @@ -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 diff --git a/applications/shallow_water/source/kernel/initial_vorticity_v2_kernel_mod.F90 b/applications/shallow_water/source/kernel/initial_vorticity_v2_kernel_mod.F90 index f5a5b5c266..15bfeb2338 100644 --- a/applications/shallow_water/source/kernel/initial_vorticity_v2_kernel_mod.F90 +++ b/applications/shallow_water/source/kernel/initial_vorticity_v2_kernel_mod.F90 @@ -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 diff --git a/applications/shallow_water/unit-test/initialisation/analytic_geopot_profiles_mod_test.pf b/applications/shallow_water/unit-test/initialisation/analytic_geopot_profiles_mod_test.pf index b6ef9f9755..be23b0b755 100644 --- a/applications/shallow_water/unit-test/initialisation/analytic_geopot_profiles_mod_test.pf +++ b/applications/shallow_water/unit-test/initialisation/analytic_geopot_profiles_mod_test.pf @@ -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, & @@ -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, & diff --git a/applications/shallow_water/unit-test/initialisation/analytic_swe_buoyancy_profiles_mod_test.pf b/applications/shallow_water/unit-test/initialisation/analytic_swe_buoyancy_profiles_mod_test.pf index ae0fc9ecbb..a99ccaf2ce 100644 --- a/applications/shallow_water/unit-test/initialisation/analytic_swe_buoyancy_profiles_mod_test.pf +++ b/applications/shallow_water/unit-test/initialisation/analytic_swe_buoyancy_profiles_mod_test.pf @@ -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, & @@ -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, & diff --git a/applications/shallow_water/unit-test/initialisation/analytic_swe_streamfunction_profiles_mod_test.pf b/applications/shallow_water/unit-test/initialisation/analytic_swe_streamfunction_profiles_mod_test.pf index be54919c6c..c7d21e8837 100644 --- a/applications/shallow_water/unit-test/initialisation/analytic_swe_streamfunction_profiles_mod_test.pf +++ b/applications/shallow_water/unit-test/initialisation/analytic_swe_streamfunction_profiles_mod_test.pf @@ -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, & @@ -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, & diff --git a/applications/shallow_water/unit-test/initialisation/analytic_swe_wind_profiles_mod_test.pf b/applications/shallow_water/unit-test/initialisation/analytic_swe_wind_profiles_mod_test.pf index 7bd513eeba..d1a0618f4c 100644 --- a/applications/shallow_water/unit-test/initialisation/analytic_swe_wind_profiles_mod_test.pf +++ b/applications/shallow_water/unit-test/initialisation/analytic_swe_wind_profiles_mod_test.pf @@ -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, & @@ -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, & diff --git a/applications/shallow_water/unit-test/initialisation/galewsky_test_case_mod_test.pf b/applications/shallow_water/unit-test/initialisation/galewsky_test_case_mod_test.pf index 3ee3b91858..71dc39332e 100644 --- a/applications/shallow_water/unit-test/initialisation/galewsky_test_case_mod_test.pf +++ b/applications/shallow_water/unit-test/initialisation/galewsky_test_case_mod_test.pf @@ -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, & @@ -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, & diff --git a/applications/shallow_water/unit-test/kernel/initial_geopot_kernel_mod_test.pf b/applications/shallow_water/unit-test/kernel/initial_geopot_kernel_mod_test.pf index c5f0d26a3f..8b2fbc9996 100644 --- a/applications/shallow_water/unit-test/kernel/initial_geopot_kernel_mod_test.pf +++ b/applications/shallow_water/unit-test/kernel/initial_geopot_kernel_mod_test.pf @@ -41,8 +41,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, & @@ -63,7 +63,7 @@ contains call feign_base_mesh_config( file_prefix='foo', & prime_mesh_name='unit_test', & geometry=geometry_planar, & - topology=topology_fully_periodic, & + topology=topology_periodic, & prepartitioned=.false., & fplane=.false., f_lat_deg=0.0_r_def ) @@ -98,7 +98,7 @@ contains swe_test = swe_test_swe_geostr_balance, & thermal_swe = .false. ) - call init_chi_transforms(geometry_planar, topology_fully_periodic) + call init_chi_transforms(geometry_planar, topology_periodic) end subroutine set_up diff --git a/applications/shallow_water/unit-test/kernel/initial_swe_buoyancy_kernel_mod_test.pf b/applications/shallow_water/unit-test/kernel/initial_swe_buoyancy_kernel_mod_test.pf index 55b413ea95..4f051f3e65 100644 --- a/applications/shallow_water/unit-test/kernel/initial_swe_buoyancy_kernel_mod_test.pf +++ b/applications/shallow_water/unit-test/kernel/initial_swe_buoyancy_kernel_mod_test.pf @@ -41,8 +41,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, & @@ -64,7 +64,7 @@ contains call feign_base_mesh_config( file_prefix='foo', & prime_mesh_name='unit_test', & geometry=geometry_planar, & - topology=topology_fully_periodic, & + topology=topology_periodic, & prepartitioned=.false., & fplane=.false., f_lat_deg=0.0_r_def ) @@ -99,7 +99,7 @@ contains swe_test = swe_test_swe_gaussian_hill, & thermal_swe = .false.) - call init_chi_transforms(geometry_planar, topology_fully_periodic) + call init_chi_transforms(geometry_planar, topology_periodic) end subroutine set_up diff --git a/applications/shallow_water/unit-test/kernel/initial_swe_tracer_kernel_mod_test.pf b/applications/shallow_water/unit-test/kernel/initial_swe_tracer_kernel_mod_test.pf index 674008fed6..c69fc3dd75 100644 --- a/applications/shallow_water/unit-test/kernel/initial_swe_tracer_kernel_mod_test.pf +++ b/applications/shallow_water/unit-test/kernel/initial_swe_tracer_kernel_mod_test.pf @@ -41,8 +41,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, & @@ -63,7 +63,7 @@ contains call feign_base_mesh_config( file_prefix='foo', & prime_mesh_name='unit_test', & geometry=geometry_planar, & - topology=topology_fully_periodic, & + topology=topology_periodic, & prepartitioned=.false., & fplane=.false., f_lat_deg=0.0_r_def ) @@ -98,7 +98,7 @@ contains swe_test = swe_test_swe_geostr_balance, & thermal_swe = .false. ) - call init_chi_transforms(geometry_planar, topology_fully_periodic) + call init_chi_transforms(geometry_planar, topology_periodic) end subroutine set_up diff --git a/applications/shallow_water/unit-test/kernel/initial_swe_u_kernel_mod_test.pf b/applications/shallow_water/unit-test/kernel/initial_swe_u_kernel_mod_test.pf index 45491d3015..13203e59e9 100644 --- a/applications/shallow_water/unit-test/kernel/initial_swe_u_kernel_mod_test.pf +++ b/applications/shallow_water/unit-test/kernel/initial_swe_u_kernel_mod_test.pf @@ -49,8 +49,8 @@ contains !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! subroutine setUp( this ) - use base_mesh_config_mod, only: geometry_planar, & - topology_fully_periodic + use mesh_mod, only: geometry_planar, & + topology_periodic use sci_chi_transform_mod, only: init_chi_transforms use feign_config_mod, only: feign_base_mesh_config, & feign_finite_element_config, & @@ -70,7 +70,7 @@ contains call feign_base_mesh_config( file_prefix='foo', & prime_mesh_name='unit_test', & geometry=geometry_planar, & - topology=topology_fully_periodic, & + topology=topology_periodic, & prepartitioned=.false., & fplane=.false., f_lat_deg=0.0_r_def ) @@ -99,7 +99,7 @@ contains swe_test = swe_test_swe_gaussian_hill, & ref_gp = 10000.0_r_def ) - call init_chi_transforms(geometry_planar, topology_fully_periodic) + call init_chi_transforms(geometry_planar, topology_periodic) end subroutine setUp diff --git a/applications/transport/source/initialisation/analytic_tracer_field_profiles_mod.F90 b/applications/transport/source/initialisation/analytic_tracer_field_profiles_mod.F90 index 37343f30e0..d56687439e 100644 --- a/applications/transport/source/initialisation/analytic_tracer_field_profiles_mod.F90 +++ b/applications/transport/source/initialisation/analytic_tracer_field_profiles_mod.F90 @@ -34,8 +34,9 @@ module analytic_tracer_field_profiles_mod use initial_tracer_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 mesh_mod, only: 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 diff --git a/applications/transport/unit-test/kernel/initial_tracer_field_sample_kernel_mod_test.pf b/applications/transport/unit-test/kernel/initial_tracer_field_sample_kernel_mod_test.pf index 22e8c24683..8952f79a74 100644 --- a/applications/transport/unit-test/kernel/initial_tracer_field_sample_kernel_mod_test.pf +++ b/applications/transport/unit-test/kernel/initial_tracer_field_sample_kernel_mod_test.pf @@ -38,8 +38,8 @@ contains !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! subroutine setUp( this ) - use base_mesh_config_mod, only : geometry_planar, & - topology_fully_periodic + use mesh_mod, only : geometry_planar, & + topology_periodic use sci_chi_transform_mod, only : init_chi_transforms use feign_config_mod, only : feign_base_mesh_config, & feign_finite_element_config, & @@ -59,7 +59,7 @@ contains prime_mesh_name='unit_test', & geometry=geometry_planar, & prepartitioned=.false., & - topology=topology_fully_periodic, & + topology=topology_periodic, & fplane=.false., f_lat_deg=45.0_r_def ) call feign_finite_element_config( & @@ -84,7 +84,7 @@ contains f_lon_deg=0.0_r_def, perturb_init=.false., & perturb_magnitude=0, perturb_seed=0 ) - call init_chi_transforms(geometry_planar, topology_fully_periodic) + call init_chi_transforms(geometry_planar, topology_periodic) end subroutine setUp diff --git a/applications/transport/unit-test/kernel/set_tracer_field_kernel_mod_test.pf b/applications/transport/unit-test/kernel/set_tracer_field_kernel_mod_test.pf index b54a4f2927..f28b5cb25c 100644 --- a/applications/transport/unit-test/kernel/set_tracer_field_kernel_mod_test.pf +++ b/applications/transport/unit-test/kernel/set_tracer_field_kernel_mod_test.pf @@ -44,8 +44,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, & @@ -73,7 +73,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( & @@ -105,7 +105,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 diff --git a/dependencies.yaml b/dependencies.yaml index 1218384448..1d9455f8b9 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -30,8 +30,8 @@ lfric_apps: ref: lfric_core: - source: git@github.com:MetOffice/lfric_core.git - ref: 3e965e8cea0211728a6bd1e793b4018d782a19d3 + source: git@github.com:mo-rickywong/lfric_core.git + ref: DecoupleGeoTop moci: source: git@github.com:MetOffice/moci.git diff --git a/interfaces/physics_schemes_interface/source/algorithm/skeb_ndisp_alg_mod.x90 b/interfaces/physics_schemes_interface/source/algorithm/skeb_ndisp_alg_mod.x90 index d03a990a06..b340c246d4 100644 --- a/interfaces/physics_schemes_interface/source/algorithm/skeb_ndisp_alg_mod.x90 +++ b/interfaces/physics_schemes_interface/source/algorithm/skeb_ndisp_alg_mod.x90 @@ -24,8 +24,6 @@ module skeb_ndisp_alg_mod use io_config_mod, only: write_diag, use_xios_io use timing_mod, only: start_timing, stop_timing, tik, LPROF ! configs and loging - use base_mesh_config_mod, only: geometry, & - geometry_spherical use initialise_diagnostics_mod, only: diagnostic_to_be_sampled implicit none diff --git a/science/adjoint/source/algorithm/solver/adj_pressure_operator_alg_mod.x90 b/science/adjoint/source/algorithm/solver/adj_pressure_operator_alg_mod.x90 index 6fae394238..a91a956672 100644 --- a/science/adjoint/source/algorithm/solver/adj_pressure_operator_alg_mod.x90 +++ b/science/adjoint/source/algorithm/solver/adj_pressure_operator_alg_mod.x90 @@ -16,8 +16,7 @@ module adj_pressure_operator_alg_mod LOG_LEVEL_ERROR, & LOG_LEVEL_DEBUG use boundaries_config_mod, only: limited_area - use base_mesh_config_mod, only: topology, topology_non_periodic - + use mesh_mod, only: mesh_type, topology_non_periodic use invoke_adj_a_h_o_lookup_kernel_mod, only: invoke_adj_a_h_o_lookup_kernel use adj_solver_lookup_cache_mod, only: adj_solver_lookup_cache_type use adj_lookup_table_mod, only: adj_lookup_table_type @@ -106,9 +105,10 @@ contains real(kind=r_solver), parameter :: one = 1.0_r_solver integer(kind=i_def), parameter :: stencil_extent = 1_i_def - integer(kind=i_def) :: mesh_id logical(kind=l_def) :: lam_mesh + type(mesh_type), pointer :: mesh + ! Lookup table type(adj_lookup_table_type), pointer :: lookup type(integer_field_type), pointer :: lookup_field @@ -123,7 +123,7 @@ contains select type (x) type is (r_solver_field_vector_type) - mesh_id = x%vector(1)%get_mesh_id() + mesh => x%vector(1)%get_mesh() select type (y) type is (r_solver_field_vector_type) @@ -139,7 +139,9 @@ contains if (element_order_h == 0 .and. element_order_v == 0) then Helmholtz_operator => get_helmholtz_operator(self%level) lam_mesh = .false. - if (limited_area .and. topology==topology_non_periodic) lam_mesh=.true. + if (limited_area .and. mesh%topology()==topology_non_periodic) then + lam_mesh=.true. + end if call invoke( name="adj_apply_h_zeroing", & setval_c( y_vec, 0.0_r_solver ) ) diff --git a/science/adjoint/source/algorithm/transport/common/atl_end_transport_step_alg_mod.x90 b/science/adjoint/source/algorithm/transport/common/atl_end_transport_step_alg_mod.x90 index 7f135041b5..3bc0fdf21c 100644 --- a/science/adjoint/source/algorithm/transport/common/atl_end_transport_step_alg_mod.x90 +++ b/science/adjoint/source/algorithm/transport/common/atl_end_transport_step_alg_mod.x90 @@ -8,7 +8,7 @@ module atl_end_transport_step_alg_mod - use base_mesh_config_mod, only: topology, topology_non_periodic + use base_mesh_config_mod, only: topology use boundaries_config_mod, only: limited_area use constants_mod, only: i_def, r_tran, l_def use adj_end_transport_step_alg_mod, only: adj_build_up_flux @@ -18,7 +18,7 @@ module atl_end_transport_step_alg_mod use function_space_mod, only: function_space_type use function_space_collection_mod, only: function_space_collection use log_mod, only: log_event, LOG_LEVEL_ERROR - use mesh_mod, only: mesh_type + use mesh_mod, only: mesh_type, topology_non_periodic use mesh_collection_mod, only: mesh_collection use operator_mod, only: operator_type use adj_dg_matrix_vector_kernel_mod, & diff --git a/science/adjoint/source/algorithm/transport/mol/atl_mol_conservative_alg_mod.x90 b/science/adjoint/source/algorithm/transport/mol/atl_mol_conservative_alg_mod.x90 index 8b9820ee98..0c6b53c3d6 100644 --- a/science/adjoint/source/algorithm/transport/mol/atl_mol_conservative_alg_mod.x90 +++ b/science/adjoint/source/algorithm/transport/mol/atl_mol_conservative_alg_mod.x90 @@ -14,7 +14,7 @@ module atl_mol_conservative_alg_mod use log_mod, only: log_event, & LOG_LEVEL_ERROR, & LOG_LEVEL_INFO - use mesh_mod, only: mesh_type + use mesh_mod, only: mesh_type, topology_non_periodic use operator_mod, only: operator_type use timing_mod, only: start_timing, stop_timing, & tik, LPROF @@ -42,7 +42,7 @@ module atl_mol_conservative_alg_mod ! Configuration use boundaries_config_mod, only: limited_area - use base_mesh_config_mod, only: topology, topology_non_periodic + use base_mesh_config_mod, only: topology use linear_config_mod, only: transport_efficiency use transport_config_mod, only: runge_kutta_method, & dry_field_name, & diff --git a/science/adjoint/source/algorithm/transport/mol/atl_wt_advective_update_alg_mod.x90 b/science/adjoint/source/algorithm/transport/mol/atl_wt_advective_update_alg_mod.x90 index bb62859c1b..d84ddaebe4 100644 --- a/science/adjoint/source/algorithm/transport/mol/atl_wt_advective_update_alg_mod.x90 +++ b/science/adjoint/source/algorithm/transport/mol/atl_wt_advective_update_alg_mod.x90 @@ -69,7 +69,6 @@ contains use adj_trans_lookup_cache_mod, only : adj_trans_lookup_cache_type use reference_element_mod, only : reference_element_type - use mesh_mod, only : mesh_type use adj_wt_advective_update_alg_mod, only : adj_hori_wt_update_alg use adj_split_w2_field_kernel_mod, only : adj_split_w2_field_kernel_type diff --git a/science/gungho/integration-test/cma_test/cma_test.f90 b/science/gungho/integration-test/cma_test/cma_test.f90 index f8a8cf8712..f0ed9f7a34 100644 --- a/science/gungho/integration-test/cma_test/cma_test.f90 +++ b/science/gungho/integration-test/cma_test/cma_test.f90 @@ -55,9 +55,8 @@ program cma_test finalise_logging, & LOG_LEVEL_ERROR, & LOG_LEVEL_INFO - use mesh_mod, only : mesh_type + use mesh_mod, only : mesh_type, geometry_spherical use mesh_collection_mod, only : mesh_collection - use base_mesh_config_mod, only : GEOMETRY_SPHERICAL use create_mesh_mod, only : create_mesh use add_mesh_map_mod, only : assign_mesh_maps use sci_chi_transform_mod, only : init_chi_transforms, & @@ -329,7 +328,7 @@ program cma_test ncells_2d_local = mesh%get_ncells_2d() ! Ensure that a spherical geometry is used (otherwise tests are too simple) - if (geometry /= GEOMETRY_SPHERICAL) then + if (geometry /= geometry_spherical) then call log_event( "Geometry has to be spherical", & LOG_LEVEL_ERROR ) end if diff --git a/science/gungho/source/algorithm/diagnostics/diagnostic_alg_mod.x90 b/science/gungho/source/algorithm/diagnostics/diagnostic_alg_mod.x90 index f5821aaa16..f7d853e0f5 100644 --- a/science/gungho/source/algorithm/diagnostics/diagnostic_alg_mod.x90 +++ b/science/gungho/source/algorithm/diagnostics/diagnostic_alg_mod.x90 @@ -9,7 +9,7 @@ module diagnostic_alg_mod use config_mod, only: config_type use constants_mod, only: i_def, r_def, l_def, str_max_filename - use mesh_mod, only: mesh_type + use mesh_mod, only: mesh_type, geometry_spherical use function_space_collection_mod, only: function_space_collection use fs_continuity_mod, only: W1, W2, W3, Wtheta, W2H use field_mod, only: field_type @@ -35,8 +35,7 @@ module diagnostic_alg_mod use initialise_diagnostics_mod, only: init_diag => init_diagnostic_field ! 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, coord_system_native use planet_config_mod, only: scaled_radius, cp diff --git a/science/gungho/source/algorithm/initialisation/init_gungho_prognostics_alg_mod.x90 b/science/gungho/source/algorithm/initialisation/init_gungho_prognostics_alg_mod.x90 index 2e91798561..b7641e1548 100644 --- a/science/gungho/source/algorithm/initialisation/init_gungho_prognostics_alg_mod.x90 +++ b/science/gungho/source/algorithm/initialisation/init_gungho_prognostics_alg_mod.x90 @@ -71,7 +71,9 @@ module init_gungho_prognostics_alg_mod ! Derived Types use field_mod, only: field_type use field_collection_mod, only: field_collection_type - use mesh_mod, only: mesh_type + use mesh_mod, only: mesh_type, & + geometry_spherical, & + geometry_planar use quadrature_xyoz_mod, only: quadrature_xyoz_type use operator_mod, only: operator_type use function_space_collection_mod, only: function_space_collection @@ -82,9 +84,7 @@ module init_gungho_prognostics_alg_mod use moist_dyn_mod, only: num_moist_factors, gas_law ! Configuration modules - use base_mesh_config_mod, only: geometry, & - geometry_spherical, & - geometry_planar + use base_mesh_config_mod, only: geometry use planet_config_mod, only: gravity, cp, rd, & p_zero, kappa, recip_epsilon diff --git a/science/gungho/source/algorithm/limited_area/limited_area_lbc_alg_mod.x90 b/science/gungho/source/algorithm/limited_area/limited_area_lbc_alg_mod.x90 index 8fe316a3a9..a1d74cc93a 100644 --- a/science/gungho/source/algorithm/limited_area/limited_area_lbc_alg_mod.x90 +++ b/science/gungho/source/algorithm/limited_area/limited_area_lbc_alg_mod.x90 @@ -17,7 +17,6 @@ module limited_area_lbc_alg_mod use mesh_mod, only: mesh_type use mr_indices_mod, only: nummr, mr_names, imr_v, & imr_cl, imr_s, imr_r - use mesh_mod, only: mesh_type use limited_area_constants_mod, only: get_boundary_mask_fe, & get_boundary_mask_fv, & get_blend_mask, & diff --git a/science/gungho/source/algorithm/limited_area/limited_area_masks_alg_mod.x90 b/science/gungho/source/algorithm/limited_area/limited_area_masks_alg_mod.x90 index a5cbfb514c..153d56fe8b 100644 --- a/science/gungho/source/algorithm/limited_area/limited_area_masks_alg_mod.x90 +++ b/science/gungho/source/algorithm/limited_area/limited_area_masks_alg_mod.x90 @@ -24,7 +24,10 @@ module limited_area_masks_alg_mod LOG_LEVEL_WARNING use function_space_mod, only: function_space_type use function_space_collection_mod, only: function_space_collection - use mesh_mod, only: mesh_type + use mesh_mod, only: mesh_type, & + geometry_spherical, & + geometry_planar, & + topology_non_periodic use create_edge_mask_kernel_mod, only: create_edge_mask_kernel_type use propagate_onion_layers_kernel_mod, only: propagate_onion_layers_kernel_type use create_threshold_mask_kernel_mod, only: create_threshold_mask_kernel_type @@ -195,9 +198,9 @@ contains domain ) use boundaries_config_mod, only: edge_cells_ns, edge_cells_ew - use base_mesh_config_mod, only: geometry, geometry_spherical, & - geometry_planar, topology, & - topology_non_periodic + use base_mesh_config_mod, only: geometry, topology + + implicit none diff --git a/science/gungho/source/algorithm/physics/calc_phys_predictors_alg_mod.x90 b/science/gungho/source/algorithm/physics/calc_phys_predictors_alg_mod.x90 index d50fad7356..a36af167c5 100644 --- a/science/gungho/source/algorithm/physics/calc_phys_predictors_alg_mod.x90 +++ b/science/gungho/source/algorithm/physics/calc_phys_predictors_alg_mod.x90 @@ -25,7 +25,8 @@ module calc_phys_predictors_alg_mod use limited_area_lbc_alg_mod, only: overwrite_blending_zone use boundaries_config_mod, only: limited_area, transport_boundary_depth - use base_mesh_config_mod, only: topology, topology_non_periodic + use mesh_mod, only: topology_non_periodic + use base_mesh_config_mod, only: topology implicit none diff --git a/science/gungho/source/algorithm/physics/map_fd_to_prognostics_alg_mod.x90 b/science/gungho/source/algorithm/physics/map_fd_to_prognostics_alg_mod.x90 index 904f0f37b4..f31562b7ca 100644 --- a/science/gungho/source/algorithm/physics/map_fd_to_prognostics_alg_mod.x90 +++ b/science/gungho/source/algorithm/physics/map_fd_to_prognostics_alg_mod.x90 @@ -19,7 +19,9 @@ module map_fd_to_prognostics_alg_mod use field_mod, only: field_type use integer_field_mod, only: integer_field_type use field_collection_mod, only: field_collection_type - use mesh_mod, only: mesh_type + use mesh_mod, only: mesh_type, & + geometry_spherical, & + topology_periodic use operator_mod, only: operator_type use function_space_mod, only: function_space_type use function_space_collection_mod, only: function_space_collection @@ -57,10 +59,7 @@ module map_fd_to_prognostics_alg_mod use config_mod, only: config_type ! Configuration modules - use base_mesh_config_mod, only: geometry, & - geometry_spherical, & - topology, & - topology_fully_periodic + use base_mesh_config_mod, only: geometry, topology use formulation_config_mod, only: rotating, shallow use finite_element_config_mod, only: coord_system, coord_system_native use physics_config_mod, only: sample_physics_winds, & @@ -296,7 +295,7 @@ contains if (sample_physics_winds_correction & .and. geometry == geometry_spherical & - .and. topology == topology_fully_periodic) then + .and. topology == topology_periodic) then w2_fs => u%get_function_space() call u_lon_w2%initialise( w2_fs ) diff --git a/science/gungho/source/algorithm/physics/physics_mappings_alg_mod.x90 b/science/gungho/source/algorithm/physics/physics_mappings_alg_mod.x90 index 25891d6223..6eddcd6844 100644 --- a/science/gungho/source/algorithm/physics/physics_mappings_alg_mod.x90 +++ b/science/gungho/source/algorithm/physics/physics_mappings_alg_mod.x90 @@ -22,7 +22,7 @@ module physics_mappings_alg_mod use integer_field_mod, only: integer_field_type use log_mod, only: LOG_LEVEL_ERROR, log_event, & LOG_LEVEL_DEBUG - use mesh_mod, only: mesh_type + use mesh_mod, only: mesh_type, geometry_spherical use quadrature_xyoz_mod, only: quadrature_xyoz_type use quadrature_rule_gaussian_mod, only: quadrature_rule_gaussian_type use physics_config_mod, only: sample_physics_scalars, & @@ -46,8 +46,7 @@ module physics_mappings_alg_mod use sci_field_minmax_alg_mod, only: log_field_minmax ! 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, & coord_system_native use planet_config_mod, only: scaled_radius diff --git a/science/gungho/source/algorithm/runtime_constants/limited_area_constants_mod.x90 b/science/gungho/source/algorithm/runtime_constants/limited_area_constants_mod.x90 index ed1fca058c..947b02a6eb 100644 --- a/science/gungho/source/algorithm/runtime_constants/limited_area_constants_mod.x90 +++ b/science/gungho/source/algorithm/runtime_constants/limited_area_constants_mod.x90 @@ -34,12 +34,12 @@ module limited_area_constants_mod LOG_LEVEL_ERROR, & LOG_LEVEL_DEBUG use mesh_collection_mod, only: mesh_collection - use mesh_mod, only: mesh_type + use mesh_mod, only: mesh_type, geometry_spherical use timing_mod, only: start_timing, stop_timing, & tik, LPROF ! Configuration - use base_mesh_config_mod, only: geometry, geometry_spherical + use base_mesh_config_mod, only: geometry use boundaries_config_mod, only: normal_only, lbc_method, & lbc_method_coordinate_based use finite_element_config_mod, only: element_order_h, & diff --git a/science/gungho/source/algorithm/runtime_constants/transport_constants_mod.x90 b/science/gungho/source/algorithm/runtime_constants/transport_constants_mod.x90 index f9e7b48671..1e45774375 100644 --- a/science/gungho/source/algorithm/runtime_constants/transport_constants_mod.x90 +++ b/science/gungho/source/algorithm/runtime_constants/transport_constants_mod.x90 @@ -36,7 +36,10 @@ module transport_constants_mod LOG_LEVEL_ERROR, & LOG_LEVEL_WARNING use mesh_collection_mod, only: mesh_collection - use mesh_mod, only: mesh_type + use mesh_mod, only: mesh_type, & + geometry_spherical, & + geometry_planar, & + topology_periodic use operator_mod, only: operator_type, & r_tran_operator_type use quadrature_edge_mod, only: quadrature_edge_type @@ -56,11 +59,7 @@ module transport_constants_mod use panel_edge_support_mod, only: FAR_AWAY ! Configuration modules - use base_mesh_config_mod, only: geometry, & - geometry_spherical, & - geometry_planar, & - topology, & - topology_fully_periodic + use base_mesh_config_mod, only: geometry, topology use finite_element_config_mod, only: coord_system, & coord_system_xyz @@ -287,7 +286,7 @@ contains panel_edge_dist, fs, 4, local_mesh, halo_depth=field_depth & ) - if (geometry == geometry_spherical .and. topology == topology_fully_periodic) then + if (geometry == geometry_spherical .and. topology == topology_periodic) then ! Check if the mesh is too coarse for this stencil ! If the stencil is too long for the mesh, it could overlap with ! two panel edges, and will not give a sensible answer diff --git a/science/gungho/source/algorithm/solver/pressure_operator_alg_mod.x90 b/science/gungho/source/algorithm/solver/pressure_operator_alg_mod.x90 index a93ce877f3..70435d0e78 100644 --- a/science/gungho/source/algorithm/solver/pressure_operator_alg_mod.x90 +++ b/science/gungho/source/algorithm/solver/pressure_operator_alg_mod.x90 @@ -34,6 +34,7 @@ module pressure_operator_alg_mod LOG_LEVEL_ERROR, & LOG_LEVEL_INFO, & log_scratch_space + use mesh_mod, only: topology_non_periodic use solver_constants_mod, only: get_normalisation_r_solver use limited_area_constants_mod, only: get_mask_r_solver use fs_continuity_mod, only: W2, W3, Wtheta @@ -44,8 +45,9 @@ module pressure_operator_alg_mod get_p3theta, & get_helm_diag, & get_hb_lumped_inv + use boundaries_config_mod, only: limited_area - use base_mesh_config_mod, only: topology, topology_non_periodic + use base_mesh_config_mod, only: topology use function_space_mod, only: function_space_type use multigrid_mod, only: multigrid_function_space_chain diff --git a/science/gungho/source/algorithm/solver/si_operators_alg_mod.x90 b/science/gungho/source/algorithm/solver/si_operators_alg_mod.x90 index 031008b871..490de32aab 100644 --- a/science/gungho/source/algorithm/solver/si_operators_alg_mod.x90 +++ b/science/gungho/source/algorithm/solver/si_operators_alg_mod.x90 @@ -394,7 +394,6 @@ contains use planet_config_mod, only: kappa, cp, rd, p_zero use timestepping_config_mod, only: tau_r, tau_t, tau_u use reference_element_mod, only: reference_element_type - use mesh_mod, only: mesh_type use matrix_vector_kernel_mod, only: matrix_vector_kernel_type use dg_inc_matrix_vector_kernel_mod, only: dg_inc_matrix_vector_kernel_type use formulation_config_mod, only: dlayer_on, & diff --git a/science/gungho/source/algorithm/transport/common/calc_dep_pts_alg_mod.x90 b/science/gungho/source/algorithm/transport/common/calc_dep_pts_alg_mod.x90 index 3ac25d3f55..3e042aa110 100644 --- a/science/gungho/source/algorithm/transport/common/calc_dep_pts_alg_mod.x90 +++ b/science/gungho/source/algorithm/transport/common/calc_dep_pts_alg_mod.x90 @@ -27,14 +27,15 @@ module calc_dep_pts_alg_mod use log_mod, only: log_event, & LOG_LEVEL_DEBUG, & LOG_LEVEL_ERROR - use mesh_mod, only: mesh_type + use mesh_mod, only: mesh_type, & + geometry_spherical, & + topology_periodic use r_tran_field_mod, only: r_tran_field_type use timing_mod, only: start_timing, stop_timing, & tik, LPROF ! Configs - use base_mesh_config_mod, only: geometry, geometry_spherical, & - topology, topology_fully_periodic + use base_mesh_config_mod, only: geometry, topology use departure_points_config_mod, only: horizontal_method, & horizontal_method_euler, & horizontal_method_timeaverage, & @@ -367,7 +368,7 @@ contains cap_dep_points = (horizontal_limit == horizontal_limit_cap) is_cubed_sphere = ( & - geometry == geometry_spherical .and. topology == topology_fully_periodic & + geometry == geometry_spherical .and. topology == topology_periodic & ) if (is_cubed_sphere) then diff --git a/science/gungho/source/algorithm/transport/common/end_of_transport_step_alg_mod.x90 b/science/gungho/source/algorithm/transport/common/end_of_transport_step_alg_mod.x90 index 3cd55d7336..d3f0376c07 100644 --- a/science/gungho/source/algorithm/transport/common/end_of_transport_step_alg_mod.x90 +++ b/science/gungho/source/algorithm/transport/common/end_of_transport_step_alg_mod.x90 @@ -8,7 +8,7 @@ module end_of_transport_step_alg_mod - use base_mesh_config_mod, only: topology, topology_non_periodic + use base_mesh_config_mod, only: topology use boundaries_config_mod, only: limited_area, & transport_boundary_depth, & transport_overwrite_freq, & @@ -50,8 +50,8 @@ module end_of_transport_step_alg_mod LOG_LEVEL_INFO, & LOG_LEVEL_ERROR - use mesh_mod, only: mesh_type use mesh_collection_mod, only: mesh_collection + use mesh_mod, only: mesh_type, topology_non_periodic use operator_mod, only: operator_type use r_tran_field_mod, only: r_tran_field_type use r_tran_operator_mod, only: r_tran_operator_type diff --git a/science/gungho/source/algorithm/transport/common/flux_precomputations_mod.x90 b/science/gungho/source/algorithm/transport/common/flux_precomputations_mod.x90 index eada1ca879..1dbdb92e0a 100644 --- a/science/gungho/source/algorithm/transport/common/flux_precomputations_mod.x90 +++ b/science/gungho/source/algorithm/transport/common/flux_precomputations_mod.x90 @@ -24,10 +24,7 @@ module flux_precomputations_alg_mod - use base_mesh_config_mod, only: topology, geometry, & - topology_non_periodic, & - topology_fully_periodic, & - geometry_spherical + use base_mesh_config_mod, only: topology, geometry use boundaries_config_mod, only: limited_area, & transport_boundary_depth, & transport_overwrite_freq, & @@ -58,7 +55,9 @@ module flux_precomputations_alg_mod LOG_LEVEL_INFO, & LOG_LEVEL_WARNING, & log_at_level - use mesh_mod, only: mesh_type + use mesh_mod, only: mesh_type, & + topology_non_periodic, & + geometry_spherical use mesh_collection_mod, only: mesh_collection use psykal_lite_transport_mod, only: invoke_deep_shift_mass, & invoke_deep_X_divideby_Y, & diff --git a/science/gungho/source/algorithm/transport/control/tracer_collection_transport_alg_mod.x90 b/science/gungho/source/algorithm/transport/control/tracer_collection_transport_alg_mod.x90 index 4217681381..0c234c9f27 100644 --- a/science/gungho/source/algorithm/transport/control/tracer_collection_transport_alg_mod.x90 +++ b/science/gungho/source/algorithm/transport/control/tracer_collection_transport_alg_mod.x90 @@ -180,7 +180,6 @@ contains use function_space_mod, only: function_space_type use intermesh_mappings_alg_mod, only: map_scalar_intermesh use mesh_collection_mod, only: mesh_collection - use mesh_mod, only: mesh_type use multires_coupling_config_mod, only: aerosol_mesh_name implicit none diff --git a/science/gungho/source/algorithm/transport/ffsl/ffsl_hori_alg_mod.x90 b/science/gungho/source/algorithm/transport/ffsl/ffsl_hori_alg_mod.x90 index 705a55a5ab..ae29f0bb7d 100644 --- a/science/gungho/source/algorithm/transport/ffsl/ffsl_hori_alg_mod.x90 +++ b/science/gungho/source/algorithm/transport/ffsl/ffsl_hori_alg_mod.x90 @@ -21,7 +21,10 @@ module ffsl_hori_alg_mod use integer_field_mod, only: integer_field_type use lfric_mpi_mod, only: global_mpi use log_mod, only: log_event, LOG_LEVEL_ERROR - use mesh_mod, only: mesh_type + use mesh_mod, only: mesh_type, & + topology_non_periodic, & + topology_periodic, & + geometry_spherical use r_tran_field_mod, only: r_tran_field_type use timing_mod, only: start_timing, stop_timing, & tik, LPROF @@ -67,9 +70,7 @@ module ffsl_hori_alg_mod use fv_divergence_y_kernel_mod, only: fv_divergence_y_kernel_type ! Configuration options - use base_mesh_config_mod, only: topology, topology_non_periodic, & - topology_fully_periodic, & - geometry, geometry_spherical + use base_mesh_config_mod, only: topology, geometry use boundaries_config_mod, only: limited_area, & transport_boundary_depth, & transport_overwrite_freq, & @@ -365,7 +366,7 @@ contains ! Whether computation is on the cubed sphere is_cubed_sphere = ( & geometry == geometry_spherical & - .and. topology == topology_fully_periodic & + .and. topology == topology_periodic & ) if (is_cubed_sphere) then @@ -619,7 +620,7 @@ contains is_cubed_sphere = ( & geometry == geometry_spherical & - .and. topology == topology_fully_periodic & + .and. topology == topology_periodic & ) if (is_cubed_sphere) then @@ -974,7 +975,7 @@ contains ! Whether computation is on the cubed sphere is_cubed_sphere = ( & geometry == geometry_spherical & - .and. topology == topology_fully_periodic & + .and. topology == topology_periodic & ) if (is_cubed_sphere) then diff --git a/science/gungho/source/algorithm/transport/mol/mol_advective_alg_mod.x90 b/science/gungho/source/algorithm/transport/mol/mol_advective_alg_mod.x90 index b38109d401..53f70cfa34 100644 --- a/science/gungho/source/algorithm/transport/mol/mol_advective_alg_mod.x90 +++ b/science/gungho/source/algorithm/transport/mol/mol_advective_alg_mod.x90 @@ -10,7 +10,7 @@ module mol_advective_alg_mod ! Infrastructure use config_mod, only: config_type use constants_mod, only: r_def, i_def, l_def, r_tran - use mesh_mod, only: mesh_type + use mesh_mod, only: mesh_type, topology_non_periodic use r_tran_field_mod, only: r_tran_field_type use timing_mod, only: start_timing, stop_timing, & tik, LPROF @@ -27,7 +27,7 @@ module mol_advective_alg_mod use wind_precomputations_alg_mod, only: wind_precomputations_type ! Configuration - use base_mesh_config_mod, only: topology, topology_non_periodic + use base_mesh_config_mod, only: topology use boundaries_config_mod, only: limited_area, transport_boundary_depth use transport_config_mod, only: runge_kutta_method diff --git a/science/gungho/source/algorithm/transport/mol/mol_conservative_alg_mod.x90 b/science/gungho/source/algorithm/transport/mol/mol_conservative_alg_mod.x90 index 07892bddd3..4481db5d33 100644 --- a/science/gungho/source/algorithm/transport/mol/mol_conservative_alg_mod.x90 +++ b/science/gungho/source/algorithm/transport/mol/mol_conservative_alg_mod.x90 @@ -12,7 +12,7 @@ module mol_conservative_alg_mod use constants_mod, only: r_def, i_def, l_def, str_def, r_tran use log_mod, only: log_scratch_space, log_event, & LOG_LEVEL_INFO - use mesh_mod, only: mesh_type + use mesh_mod, only: mesh_type, topology_non_periodic use operator_mod, only: operator_type use r_tran_field_mod, only: r_tran_field_type use r_tran_operator_mod, only: r_tran_operator_type @@ -39,7 +39,7 @@ module mol_conservative_alg_mod use dg_matrix_vector_kernel_mod, only: dg_matrix_vector_kernel_type ! Configuration modules - use base_mesh_config_mod, only: topology, topology_non_periodic + use base_mesh_config_mod, only: topology use boundaries_config_mod, only: limited_area, transport_boundary_depth use transport_config_mod, only: runge_kutta_method, & dry_field_name, & diff --git a/science/gungho/source/algorithm/transport/mol/mol_consistent_alg_mod.x90 b/science/gungho/source/algorithm/transport/mol/mol_consistent_alg_mod.x90 index 7876b118e8..8e88f9a62e 100644 --- a/science/gungho/source/algorithm/transport/mol/mol_consistent_alg_mod.x90 +++ b/science/gungho/source/algorithm/transport/mol/mol_consistent_alg_mod.x90 @@ -16,7 +16,7 @@ module mol_consistent_alg_mod use function_space_collection_mod, only: function_space_collection use log_mod, only: log_event, LOG_LEVEL_ERROR, & LOG_LEVEL_INFO - use mesh_mod, only: mesh_type + use mesh_mod, only: mesh_type, topology_non_periodic use mesh_collection_mod, only: mesh_collection use r_tran_field_mod, only: r_tran_field_type use timing_mod, only: start_timing, stop_timing, & @@ -40,7 +40,7 @@ module mol_consistent_alg_mod only: inject_wt_to_sh_w3_kernel_type ! Configuration - use base_mesh_config_mod, only: topology, topology_non_periodic + use base_mesh_config_mod, only: topology use boundaries_config_mod, only: limited_area, & transport_boundary_depth use transport_config_mod, only: runge_kutta_method diff --git a/science/gungho/source/algorithm/transport/mol/wt_advective_update_alg_mod.x90 b/science/gungho/source/algorithm/transport/mol/wt_advective_update_alg_mod.x90 index 7413708cd0..c7ebcf5704 100644 --- a/science/gungho/source/algorithm/transport/mol/wt_advective_update_alg_mod.x90 +++ b/science/gungho/source/algorithm/transport/mol/wt_advective_update_alg_mod.x90 @@ -299,7 +299,6 @@ contains use rtheta_kernel_mod, only: rtheta_kernel_type use rtheta_bd_kernel_mod, only: rtheta_bd_kernel_type use reference_element_mod, only: reference_element_type - use mesh_mod, only: mesh_type use split_w2_field_kernel_mod, only: split_w2_field_kernel_type use integer_field_mod, only: integer_field_type use sci_geometric_constants_mod, only: get_face_selector_ew, & diff --git a/science/gungho/source/algorithm/transport/sl/horizontal_sl_advective_alg_mod.x90 b/science/gungho/source/algorithm/transport/sl/horizontal_sl_advective_alg_mod.x90 index 66d76a6adf..31c42d7460 100644 --- a/science/gungho/source/algorithm/transport/sl/horizontal_sl_advective_alg_mod.x90 +++ b/science/gungho/source/algorithm/transport/sl/horizontal_sl_advective_alg_mod.x90 @@ -17,7 +17,10 @@ module horizontal_sl_advective_alg_mod use constants_mod, only: r_tran, i_def, l_def use field_mod, only: field_type use integer_field_mod, only: integer_field_type - use mesh_mod, only: mesh_type + use mesh_mod, only: mesh_type, & + geometry_spherical, & + topology_non_periodic, & + topology_periodic use r_tran_field_mod, only: r_tran_field_type use timing_mod, only: start_timing, stop_timing, & tik, LPROF @@ -46,10 +49,7 @@ module horizontal_sl_advective_alg_mod use transport_constants_mod, only: get_panel_edge_dist ! Configs - use base_mesh_config_mod, only: topology, geometry, & - topology_fully_periodic, & - topology_non_periodic, & - geometry_spherical + use base_mesh_config_mod, only: topology, geometry use boundaries_config_mod, only: limited_area, & transport_boundary_depth, & transport_overwrite_freq, & @@ -140,8 +140,8 @@ module horizontal_sl_advective_alg_mod mesh_id = mesh%get_id() - is_cubed_sphere = ( & - geometry == geometry_spherical .and. topology == topology_fully_periodic & + is_cubed_sphere = ( & + geometry == geometry_spherical .and. topology == topology_periodic & ) if (is_cubed_sphere) then diff --git a/science/gungho/source/configuration/check_configuration_mod.F90 b/science/gungho/source/configuration/check_configuration_mod.F90 index 201537a5a7..3d6bb1c420 100644 --- a/science/gungho/source/configuration/check_configuration_mod.F90 +++ b/science/gungho/source/configuration/check_configuration_mod.F90 @@ -146,12 +146,13 @@ subroutine check_configuration(modeldb) alpha, & outer_iterations, & inner_iterations - use base_mesh_config_mod, only: geometry, & - geometry_spherical, & + + use mesh_mod, only: geometry_spherical, & geometry_planar, & - topology, & - topology_fully_periodic, & - topology_non_periodic, & + topology_periodic, & + topology_non_periodic + + use base_mesh_config_mod, only: geometry, topology, & prime_mesh_name use departure_points_config_mod, only: horizontal_limit, & horizontal_limit_none, & @@ -318,7 +319,7 @@ subroutine check_configuration(modeldb) write( log_scratch_space, '(A)' ) 'panel_edge_treatment only valid for spherical geometry' call log_event( log_scratch_space, LOG_LEVEL_ERROR ) end if - if ( topology /= topology_fully_periodic) then + if ( topology /= topology_periodic) then write( log_scratch_space, '(A)' ) 'panel_edge_treatment only valid for fully periodic topology' call log_event( log_scratch_space, LOG_LEVEL_ERROR ) end if diff --git a/science/gungho/source/configuration/orography_control_mod.F90 b/science/gungho/source/configuration/orography_control_mod.F90 index 4c19841e2c..875c7ba536 100644 --- a/science/gungho/source/configuration/orography_control_mod.F90 +++ b/science/gungho/source/configuration/orography_control_mod.F90 @@ -15,9 +15,9 @@ module orography_control_mod use constants_mod, only : i_def, str_short - use base_mesh_config_mod, only : geometry, & - geometry_spherical, & + use mesh_mod, only : geometry_spherical, & geometry_planar + use base_mesh_config_mod, only : geometry use orography_config_mod, only : profile, & profile_schar, & profile_agnesi, & diff --git a/science/gungho/source/driver/gungho_init_fields_mod.X90 b/science/gungho/source/driver/gungho_init_fields_mod.X90 index b00b7c2258..e6605059d7 100644 --- a/science/gungho/source/driver/gungho_init_fields_mod.X90 +++ b/science/gungho/source/driver/gungho_init_fields_mod.X90 @@ -35,9 +35,7 @@ module gungho_init_fields_mod LOG_LEVEL_ERROR, & LOG_LEVEL_DEBUG, & log_scratch_space - use base_mesh_config_mod, only : geometry, & - geometry_spherical - use mesh_mod, only : mesh_type + use mesh_mod, only : mesh_type, geometry_spherical use files_config_mod, only : checkpoint_stem_name use formulation_config_mod, only : use_physics use section_choice_config_mod, only : iau, & @@ -919,7 +917,7 @@ subroutine create_model_data( modeldb, & call prognostic_fields%get_field('rho',rho) if ( encorr_usage /= encorr_usage_none ) then - if ( geometry /= geometry_spherical ) then + if ( mesh%geometry() /= geometry_spherical ) then write(log_scratch_space, '(a)') & 'Energy correction valid for spherical geometry only.' call log_event(log_scratch_space, log_level_error) diff --git a/science/gungho/source/driver/gungho_model_mod.F90 b/science/gungho/source/driver/gungho_model_mod.F90 index 1aef30df73..fed1d4f0f5 100644 --- a/science/gungho/source/driver/gungho_model_mod.F90 +++ b/science/gungho/source/driver/gungho_model_mod.F90 @@ -70,7 +70,9 @@ module gungho_model_mod use minmax_tseries_mod, only : minmax_tseries, & minmax_tseries_init, & minmax_tseries_final - use mesh_mod, only : mesh_type + use mesh_mod, only : mesh_type, & + geometry_planar, & + geometry_spherical use mesh_collection_mod, only : mesh_collection use clock_mod, only : clock_type use model_clock_mod, only : model_clock_type @@ -509,9 +511,6 @@ end subroutine basic_initialisations !> subroutine initialise_infrastructure( io_context_name, modeldb ) - use base_mesh_config_mod, only: geometry_planar, & - geometry_spherical - #ifdef UM_PHYSICS use formulation_config_mod, only: use_physics use section_choice_config_mod, only: radiation, & diff --git a/science/gungho/source/driver/iau_multifile_io/iau_multifile_io_mod.F90 b/science/gungho/source/driver/iau_multifile_io/iau_multifile_io_mod.F90 index fd61a518fc..edbb9fb20d 100644 --- a/science/gungho/source/driver/iau_multifile_io/iau_multifile_io_mod.F90 +++ b/science/gungho/source/driver/iau_multifile_io/iau_multifile_io_mod.F90 @@ -265,15 +265,11 @@ subroutine step_multifile_io( io_context_name, modeldb, name ) character(str_def) :: time_origin character(str_def) :: time_start - integer(i_def) :: geometry - integer(i_def) :: topology integer(i_def) :: coord_system real(r_def) :: scaled_radius procedure(event_action), pointer :: context_advance - 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() @@ -304,7 +300,8 @@ subroutine step_multifile_io( io_context_name, modeldb, name ) call io_context%initialise_xios_context( modeldb%mpi%get_comm(), & chi, panel_id, & modeldb%clock, tmp_calendar, & - geometry, topology, & + mesh%geometry(), & + mesh%topology(), & coord_system, scaled_radius, & start_at_zero=.true. ) call io_context%close_context_definition() diff --git a/science/gungho/source/initialisation/analytic_density_profiles_mod.F90 b/science/gungho/source/initialisation/analytic_density_profiles_mod.F90 index 1d4c7c7f53..b660d0fa05 100644 --- a/science/gungho/source/initialisation/analytic_density_profiles_mod.F90 +++ b/science/gungho/source/initialisation/analytic_density_profiles_mod.F90 @@ -46,8 +46,9 @@ module analytic_density_profiles_mod test_vertical_cylinder use initial_density_config_mod, only : r1, x1, y1, z1, r2, x2, y2, z2, & density_max, density_background -use base_mesh_config_mod, only : geometry, & - geometry_spherical +use mesh_mod, only : geometry_spherical + +use base_mesh_config_mod, only : geometry use planet_config_mod, only : p_zero, Rd, kappa, scaled_radius use reference_profile_mod, only : reference_profile use analytic_temperature_profiles_mod, & diff --git a/science/gungho/source/initialisation/analytic_moisture_profiles_mod.F90 b/science/gungho/source/initialisation/analytic_moisture_profiles_mod.F90 index b3329459ba..9f7b92b08d 100644 --- a/science/gungho/source/initialisation/analytic_moisture_profiles_mod.F90 +++ b/science/gungho/source/initialisation/analytic_moisture_profiles_mod.F90 @@ -13,14 +13,14 @@ module analytic_moisture_profiles_mod use log_mod, only : log_event, & log_scratch_space, & LOG_LEVEL_ERROR +use mesh_mod, only : geometry_spherical use idealised_config_mod, only : test_grabowski_clark, & test_deep_baroclinic_wave, & test_isot_dry_atm use physics_common_mod, only : qsaturation use planet_config_mod, only : recip_epsilon, scaled_radius use coord_transform_mod, only : xyz2llr, central_angle -use base_mesh_config_mod, only : geometry, & - geometry_spherical +use base_mesh_config_mod, only : geometry use initial_density_config_mod, only : r1, x1, y1, z1, r2, x2, y2, z2 use deep_baroclinic_wave_mod, only : deep_baroclinic_wave diff --git a/science/gungho/source/initialisation/analytic_pressure_profiles_mod.F90 b/science/gungho/source/initialisation/analytic_pressure_profiles_mod.F90 index b88c07755b..dcbf736bc0 100644 --- a/science/gungho/source/initialisation/analytic_pressure_profiles_mod.F90 +++ b/science/gungho/source/initialisation/analytic_pressure_profiles_mod.F90 @@ -37,8 +37,8 @@ module analytic_pressure_profiles_mod test_grabowski_clark use initial_density_config_mod, only : r1, x1, y1, z1, r2, x2, y2, z2, & density_max, density_background -use base_mesh_config_mod, only : geometry, & - geometry_spherical +use mesh_mod, only : geometry_spherical +use base_mesh_config_mod, only : geometry use planet_config_mod, only : p_zero, Rd, kappa, scaled_radius use reference_profile_mod, only : reference_profile use analytic_temperature_profiles_mod, only: analytic_temperature diff --git a/science/gungho/source/initialisation/analytic_temperature_profiles_mod.F90 b/science/gungho/source/initialisation/analytic_temperature_profiles_mod.F90 index 84cf5b808d..d3602e1efb 100644 --- a/science/gungho/source/initialisation/analytic_temperature_profiles_mod.F90 +++ b/science/gungho/source/initialisation/analytic_temperature_profiles_mod.F90 @@ -29,8 +29,8 @@ module analytic_temperature_profiles_mod use initial_density_config_mod, only : r1, x1, y1, r2, x2, y2, & density_max, density_background use initial_pressure_config_mod, only : surface_pressure -use base_mesh_config_mod, only : geometry, & - geometry_spherical +use mesh_mod, only : geometry_spherical +use base_mesh_config_mod, only : geometry use planet_config_mod, only : p_zero, Rd, kappa, scaled_radius, & scaled_omega, gravity, cp use reference_profile_mod, only : reference_profile diff --git a/science/gungho/source/kernel/core_dynamics/compute_coriolis_matrix_kernel_mod.F90 b/science/gungho/source/kernel/core_dynamics/compute_coriolis_matrix_kernel_mod.F90 index 408a5ac632..00f32e4956 100644 --- a/science/gungho/source/kernel/core_dynamics/compute_coriolis_matrix_kernel_mod.F90 +++ b/science/gungho/source/kernel/core_dynamics/compute_coriolis_matrix_kernel_mod.F90 @@ -31,9 +31,9 @@ module compute_coriolis_matrix_kernel_mod use rotation_vector_mod, only: rotation_vector_fplane, & rotation_vector_sphere use cross_product_mod, only: cross_product +use mesh_mod, only: geometry_spherical -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 diff --git a/science/gungho/source/kernel/core_dynamics/compute_dl_matrix_kernel_mod.F90 b/science/gungho/source/kernel/core_dynamics/compute_dl_matrix_kernel_mod.F90 index 74a80b7518..75ddcdfba7 100644 --- a/science/gungho/source/kernel/core_dynamics/compute_dl_matrix_kernel_mod.F90 +++ b/science/gungho/source/kernel/core_dynamics/compute_dl_matrix_kernel_mod.F90 @@ -26,10 +26,10 @@ module compute_dl_matrix_kernel_mod use fs_continuity_mod, only: W2 use kernel_mod, only: kernel_type use sci_coordinate_jacobian_mod, only: coordinate_jacobian + 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 damping_layer_config_mod, only: dl_type, dl_type_latitude use finite_element_config_mod, only: coord_system use planet_config_mod, only: scaled_radius diff --git a/science/gungho/source/kernel/core_dynamics/compute_geopotential_kernel_mod.F90 b/science/gungho/source/kernel/core_dynamics/compute_geopotential_kernel_mod.F90 index 82f161658f..bbc1d6e3be 100644 --- a/science/gungho/source/kernel/core_dynamics/compute_geopotential_kernel_mod.F90 +++ b/science/gungho/source/kernel/core_dynamics/compute_geopotential_kernel_mod.F90 @@ -25,9 +25,10 @@ module compute_geopotential_kernel_mod use fs_continuity_mod, only: W3 use kernel_mod, only: kernel_type + use mesh_mod, only: geometry_spherical + ! Configuration modules use finite_element_config_mod, only: COORD_SYSTEM_XYZ - use base_mesh_config_mod, only: GEOMETRY_SPHERICAL implicit none diff --git a/science/gungho/source/kernel/core_dynamics/compute_vert_coriolis_matrix_kernel_mod.F90 b/science/gungho/source/kernel/core_dynamics/compute_vert_coriolis_matrix_kernel_mod.F90 index 71785a9b04..c0c9b2f01b 100644 --- a/science/gungho/source/kernel/core_dynamics/compute_vert_coriolis_matrix_kernel_mod.F90 +++ b/science/gungho/source/kernel/core_dynamics/compute_vert_coriolis_matrix_kernel_mod.F90 @@ -29,13 +29,13 @@ module compute_vert_coriolis_matrix_kernel_mod CELL_COLUMN, GH_QUADRATURE_XYoZ use fs_continuity_mod, only: W2, Wtheta use sci_coordinate_jacobian_mod, only: coordinate_jacobian +use mesh_mod, only: geometry_spherical use rotation_vector_mod, only: rotation_vector_fplane, & rotation_vector_sphere, & vert_vector_sphere use cross_product_mod, only: cross_product -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 diff --git a/science/gungho/source/kernel/diagnostics/compute_total_pv_kernel_mod.F90 b/science/gungho/source/kernel/diagnostics/compute_total_pv_kernel_mod.F90 index 56b5c9cc87..5325c1d36a 100644 --- a/science/gungho/source/kernel/diagnostics/compute_total_pv_kernel_mod.F90 +++ b/science/gungho/source/kernel/diagnostics/compute_total_pv_kernel_mod.F90 @@ -22,9 +22,9 @@ module compute_total_pv_kernel_mod use rotation_vector_mod, & only: rotation_vector_fplane, & rotation_vector_sphere + use mesh_mod, only: geometry_spherical - 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 diff --git a/science/gungho/source/kernel/diagnostics/reference_profile_mod.F90 b/science/gungho/source/kernel/diagnostics/reference_profile_mod.F90 index 94b5a9b223..e07bc8300e 100644 --- a/science/gungho/source/kernel/diagnostics/reference_profile_mod.F90 +++ b/science/gungho/source/kernel/diagnostics/reference_profile_mod.F90 @@ -8,10 +8,8 @@ !> @brief Module for computing a linear hydrostatially balanced reference state module reference_profile_mod -use base_mesh_config_mod, only : geometry, & - geometry_spherical, & - topology, & - topology_fully_periodic + +use base_mesh_config_mod, only : geometry use constants_mod, only : r_def, i_def use coord_transform_mod, only : xyz2llr use generate_global_gw_fields_mod, only : generate_global_gw_fields @@ -29,6 +27,8 @@ module reference_profile_mod test_yz_cosine_hill use initial_pressure_config_mod, only : surface_pressure use initial_temperature_config_mod, only : bvf_square, theta_surf +use mesh_mod, only : geometry_spherical + use planet_config_mod, only : scaled_radius, gravity, Cp, Rd, & kappa, p_zero use formulation_config_mod, only : shallow diff --git a/science/gungho/source/kernel/initialisation/initial_streamfunc_kernel_mod.F90 b/science/gungho/source/kernel/initialisation/initial_streamfunc_kernel_mod.F90 index eda2e60e78..4abee618f9 100644 --- a/science/gungho/source/kernel/initialisation/initial_streamfunc_kernel_mod.F90 +++ b/science/gungho/source/kernel/initialisation/initial_streamfunc_kernel_mod.F90 @@ -18,11 +18,10 @@ module initial_streamfunc_kernel_mod use constants_mod, only : r_def, i_def, PI use fs_continuity_mod, only : W1 use kernel_mod, only : kernel_type +use mesh_mod, only : geometry_spherical, geometry_planar ! Configuration modules -use base_mesh_config_mod, only: geometry, topology, & - geometry_planar, & - geometry_spherical +use base_mesh_config_mod, only: geometry, topology use finite_element_config_mod, only: coord_system use initial_wind_config_mod, only: profile use planet_config_mod, only: scaled_radius diff --git a/science/gungho/source/kernel/initialisation/initial_u_kernel_mod.F90 b/science/gungho/source/kernel/initialisation/initial_u_kernel_mod.F90 index 990a777310..27b355dce8 100644 --- a/science/gungho/source/kernel/initialisation/initial_u_kernel_mod.F90 +++ b/science/gungho/source/kernel/initialisation/initial_u_kernel_mod.F90 @@ -21,10 +21,10 @@ module initial_u_kernel_mod use constants_mod, only : r_def, i_def, PI 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 initial_wind_config_mod, only: profile_sin_uv, profile, & sbr_angle_lat, sbr_angle_lon, & diff --git a/science/gungho/source/kernel/limited_area/create_w2bmask_kernel_mod.F90 b/science/gungho/source/kernel/limited_area/create_w2bmask_kernel_mod.F90 index 23116ff861..ca0cb9e0dd 100644 --- a/science/gungho/source/kernel/limited_area/create_w2bmask_kernel_mod.F90 +++ b/science/gungho/source/kernel/limited_area/create_w2bmask_kernel_mod.F90 @@ -25,8 +25,10 @@ module create_w2bmask_kernel_mod use constants_mod, only : r_def, i_def use fs_continuity_mod, only : W2, Wchi use kernel_mod, only : kernel_type - use base_mesh_config_mod, only : geometry, & - geometry_spherical + + use mesh_mod, only : geometry_spherical + + use base_mesh_config_mod, only : geometry use finite_element_config_mod, only : coord_system, & coord_system_xyz diff --git a/science/gungho/source/kernel/limited_area/create_w2mask_blend_kernel_mod.F90 b/science/gungho/source/kernel/limited_area/create_w2mask_blend_kernel_mod.F90 index 8d697bb4b3..d50f1ce8d7 100644 --- a/science/gungho/source/kernel/limited_area/create_w2mask_blend_kernel_mod.F90 +++ b/science/gungho/source/kernel/limited_area/create_w2mask_blend_kernel_mod.F90 @@ -23,8 +23,10 @@ module create_w2mask_blend_kernel_mod use constants_mod, only : r_def, i_def, l_def use fs_continuity_mod, only : W2, Wchi use kernel_mod, only : kernel_type - use base_mesh_config_mod, only : geometry, & - geometry_spherical + + use mesh_mod, only : geometry_spherical + + use base_mesh_config_mod, only : geometry use finite_element_config_mod, only : coord_system, & coord_system_xyz diff --git a/science/gungho/source/kernel/limited_area/create_w2mask_kernel_mod.F90 b/science/gungho/source/kernel/limited_area/create_w2mask_kernel_mod.F90 index 5dc2ed82ff..5d86ed8c77 100644 --- a/science/gungho/source/kernel/limited_area/create_w2mask_kernel_mod.F90 +++ b/science/gungho/source/kernel/limited_area/create_w2mask_kernel_mod.F90 @@ -24,8 +24,10 @@ module create_w2mask_kernel_mod use constants_mod, only : r_def, i_def, l_def use fs_continuity_mod, only : W2, Wchi use kernel_mod, only : kernel_type - use base_mesh_config_mod, only : geometry, & - geometry_spherical + + use mesh_mod, only: geometry_spherical + + use base_mesh_config_mod, only : geometry use finite_element_config_mod, only : coord_system, & coord_system_xyz implicit none diff --git a/science/gungho/source/kernel/limited_area/create_w2mask_lbc_kernel_mod.F90 b/science/gungho/source/kernel/limited_area/create_w2mask_lbc_kernel_mod.F90 index 5c5bdfa654..05cf4b4fbd 100644 --- a/science/gungho/source/kernel/limited_area/create_w2mask_lbc_kernel_mod.F90 +++ b/science/gungho/source/kernel/limited_area/create_w2mask_lbc_kernel_mod.F90 @@ -27,8 +27,10 @@ module create_w2mask_lbc_kernel_mod use constants_mod, only : r_def, i_def, l_def use fs_continuity_mod, only : W2, Wchi use kernel_mod, only : kernel_type - use base_mesh_config_mod, only : geometry, & - geometry_spherical + + use mesh_mod, only : geometry_spherical + + use base_mesh_config_mod, only : geometry use finite_element_config_mod, only : coord_system, & coord_system_xyz diff --git a/science/gungho/source/kernel/limited_area/create_w2mask_tang_kernel_mod.F90 b/science/gungho/source/kernel/limited_area/create_w2mask_tang_kernel_mod.F90 index c4da24414f..f2d484d1fb 100644 --- a/science/gungho/source/kernel/limited_area/create_w2mask_tang_kernel_mod.F90 +++ b/science/gungho/source/kernel/limited_area/create_w2mask_tang_kernel_mod.F90 @@ -24,8 +24,10 @@ module create_w2mask_tang_kernel_mod use constants_mod, only : r_def, i_def, l_def use fs_continuity_mod, only : W2, Wchi use kernel_mod, only : kernel_type - use base_mesh_config_mod, only : geometry, & - geometry_spherical + + use mesh_mod, only : geometry_spherical + + use base_mesh_config_mod, only : geometry use finite_element_config_mod, only : coord_system, & coord_system_xyz diff --git a/science/gungho/source/kernel/limited_area/create_w3mask_blend_kernel_mod.F90 b/science/gungho/source/kernel/limited_area/create_w3mask_blend_kernel_mod.F90 index 80b2fd6b13..01ad944028 100644 --- a/science/gungho/source/kernel/limited_area/create_w3mask_blend_kernel_mod.F90 +++ b/science/gungho/source/kernel/limited_area/create_w3mask_blend_kernel_mod.F90 @@ -22,8 +22,10 @@ module create_w3mask_blend_kernel_mod use constants_mod, only : r_def, i_def, l_def use fs_continuity_mod, only : W3, Wchi use kernel_mod, only : kernel_type - use base_mesh_config_mod, only : geometry, & - geometry_spherical + + use mesh_mod, only : geometry_spherical + + use base_mesh_config_mod, only : geometry use finite_element_config_mod, only : coord_system, & coord_system_xyz diff --git a/science/gungho/source/kernel/limited_area/create_w3mask_kernel_mod.F90 b/science/gungho/source/kernel/limited_area/create_w3mask_kernel_mod.F90 index 94334afe06..27fbdaf372 100644 --- a/science/gungho/source/kernel/limited_area/create_w3mask_kernel_mod.F90 +++ b/science/gungho/source/kernel/limited_area/create_w3mask_kernel_mod.F90 @@ -18,8 +18,10 @@ module create_w3mask_kernel_mod use constants_mod, only : r_def, i_def, l_def use fs_continuity_mod, only : W3, Wchi use kernel_mod, only : kernel_type - use base_mesh_config_mod, only : geometry, & - geometry_spherical + + use mesh_mod, only : geometry_spherical + + use base_mesh_config_mod, only : geometry use finite_element_config_mod, only : coord_system, & coord_system_xyz diff --git a/science/gungho/source/kernel/limited_area/create_w3mask_lbc_kernel_mod.F90 b/science/gungho/source/kernel/limited_area/create_w3mask_lbc_kernel_mod.F90 index 4c6be55599..0f25291dba 100644 --- a/science/gungho/source/kernel/limited_area/create_w3mask_lbc_kernel_mod.F90 +++ b/science/gungho/source/kernel/limited_area/create_w3mask_lbc_kernel_mod.F90 @@ -20,8 +20,9 @@ module create_w3mask_lbc_kernel_mod use constants_mod, only : r_def, i_def, l_def use fs_continuity_mod, only : W3, Wchi use kernel_mod, only : kernel_type - use base_mesh_config_mod, only : geometry, & - geometry_spherical + use mesh_mod, only : geometry_spherical + + use base_mesh_config_mod, only : geometry use finite_element_config_mod, only : coord_system, & coord_system_xyz diff --git a/science/gungho/source/kernel/limited_area/create_wthetamask_blend_kernel_mod.F90 b/science/gungho/source/kernel/limited_area/create_wthetamask_blend_kernel_mod.F90 index ef7318a986..05e18e34f1 100644 --- a/science/gungho/source/kernel/limited_area/create_wthetamask_blend_kernel_mod.F90 +++ b/science/gungho/source/kernel/limited_area/create_wthetamask_blend_kernel_mod.F90 @@ -23,8 +23,10 @@ module create_wthetamask_blend_kernel_mod use constants_mod, only : r_def, i_def, l_def use fs_continuity_mod, only : Wtheta, Wchi use kernel_mod, only : kernel_type - use base_mesh_config_mod, only : geometry, & - geometry_spherical + + use mesh_mod, only : geometry_spherical + + use base_mesh_config_mod, only : geometry use finite_element_config_mod, only : coord_system, & coord_system_xyz diff --git a/science/gungho/source/kernel/limited_area/create_wthetamask_kernel_mod.F90 b/science/gungho/source/kernel/limited_area/create_wthetamask_kernel_mod.F90 index 227dedc524..e0808b87f0 100644 --- a/science/gungho/source/kernel/limited_area/create_wthetamask_kernel_mod.F90 +++ b/science/gungho/source/kernel/limited_area/create_wthetamask_kernel_mod.F90 @@ -18,8 +18,9 @@ module create_wthetamask_kernel_mod use constants_mod, only : r_def, i_def, l_def use fs_continuity_mod, only : Wtheta, Wchi use kernel_mod, only : kernel_type - use base_mesh_config_mod, only : geometry, & - geometry_spherical + use mesh_mod, only : geometry_spherical + + use base_mesh_config_mod, only : geometry use finite_element_config_mod, only : coord_system, & coord_system_xyz diff --git a/science/gungho/source/kernel/limited_area/create_wthetamask_lbc_kernel_mod.F90 b/science/gungho/source/kernel/limited_area/create_wthetamask_lbc_kernel_mod.F90 index 86e783a720..3d9ed85dcd 100644 --- a/science/gungho/source/kernel/limited_area/create_wthetamask_lbc_kernel_mod.F90 +++ b/science/gungho/source/kernel/limited_area/create_wthetamask_lbc_kernel_mod.F90 @@ -20,8 +20,9 @@ module create_wthetamask_lbc_kernel_mod use constants_mod, only : r_def, i_def, l_def use fs_continuity_mod, only : Wtheta, Wchi use kernel_mod, only : kernel_type - use base_mesh_config_mod, only : geometry, & - geometry_spherical + use mesh_mod, only : geometry_spherical + + use base_mesh_config_mod, only : geometry use finite_element_config_mod, only : coord_system, & coord_system_xyz diff --git a/science/gungho/source/kernel/transport/mol/poly1d_advective_coeffs_kernel_mod.F90 b/science/gungho/source/kernel/transport/mol/poly1d_advective_coeffs_kernel_mod.F90 index 84fb981037..c480f9a8e2 100644 --- a/science/gungho/source/kernel/transport/mol/poly1d_advective_coeffs_kernel_mod.F90 +++ b/science/gungho/source/kernel/transport/mol/poly1d_advective_coeffs_kernel_mod.F90 @@ -35,6 +35,8 @@ module poly1d_advective_coeffs_kernel_mod use fs_continuity_mod, only : Wtheta use kernel_mod, only : kernel_type +use mesh_mod, only: geometry_spherical + ! Configuration modules use base_mesh_config_mod, only: geometry, topology use finite_element_config_mod, only: coord_system @@ -168,8 +170,6 @@ subroutine poly1d_advective_coeffs_code(one_layer, & use matrix_invert_mod, only: matrix_invert_lu use cross_product_mod, only: cross_product - use base_mesh_config_mod, only: geometry, & - geometry_spherical use poly_helper_functions_mod, only: local_distance_1d use sci_chi_transform_mod, only: chir2xyz diff --git a/science/gungho/source/kernel/transport/mol/poly1d_flux_coeffs_kernel_mod.F90 b/science/gungho/source/kernel/transport/mol/poly1d_flux_coeffs_kernel_mod.F90 index 9828531ff0..8b1a2050f5 100644 --- a/science/gungho/source/kernel/transport/mol/poly1d_flux_coeffs_kernel_mod.F90 +++ b/science/gungho/source/kernel/transport/mol/poly1d_flux_coeffs_kernel_mod.F90 @@ -35,6 +35,8 @@ module poly1d_flux_coeffs_kernel_mod use fs_continuity_mod, only : W3 use kernel_mod, only : kernel_type +use mesh_mod, only: geometry_spherical + ! Configuration modules use base_mesh_config_mod, only: geometry, topology use finite_element_config_mod, only: coord_system @@ -164,8 +166,6 @@ subroutine poly1d_flux_coeffs_code(one_layer, & use matrix_invert_mod, only: matrix_invert_lu use cross_product_mod, only: cross_product - use base_mesh_config_mod, only: geometry, & - geometry_spherical use poly_helper_functions_mod, only: local_distance_1d use sci_chi_transform_mod, only: chir2xyz diff --git a/science/gungho/source/kernel/transport/mol/poly2d_advective_coeffs_kernel_mod.F90 b/science/gungho/source/kernel/transport/mol/poly2d_advective_coeffs_kernel_mod.F90 index b344af1fbd..2bdc734684 100644 --- a/science/gungho/source/kernel/transport/mol/poly2d_advective_coeffs_kernel_mod.F90 +++ b/science/gungho/source/kernel/transport/mol/poly2d_advective_coeffs_kernel_mod.F90 @@ -33,6 +33,8 @@ module poly2d_advective_coeffs_kernel_mod use fs_continuity_mod, only : Wtheta use kernel_mod, only : kernel_type +use mesh_mod, only: geometry_spherical + ! Configuration modules use base_mesh_config_mod, only: geometry, topology use finite_element_config_mod, only: coord_system @@ -170,8 +172,6 @@ subroutine poly2d_advective_coeffs_code(one_layer, & nedges_qr, nqp_e, wqp_e ) use cross_product_mod, only: cross_product - use base_mesh_config_mod, only: geometry, & - geometry_spherical use poly_helper_functions_mod, only: buildadvcoeff, & local_distance_2d use sci_chi_transform_mod, only: chir2xyz diff --git a/science/gungho/source/kernel/transport/mol/poly2d_flux_coeffs_kernel_mod.F90 b/science/gungho/source/kernel/transport/mol/poly2d_flux_coeffs_kernel_mod.F90 index 87f3505e45..dd49c12027 100644 --- a/science/gungho/source/kernel/transport/mol/poly2d_flux_coeffs_kernel_mod.F90 +++ b/science/gungho/source/kernel/transport/mol/poly2d_flux_coeffs_kernel_mod.F90 @@ -33,6 +33,8 @@ module poly2d_flux_coeffs_kernel_mod use fs_continuity_mod, only : W3 use kernel_mod, only : kernel_type +use mesh_mod, only: geometry_spherical + ! Configuration modules use base_mesh_config_mod, only: geometry, topology use finite_element_config_mod, only: coord_system @@ -165,8 +167,6 @@ subroutine poly2d_flux_coeffs_code(one_layer, & use cross_product_mod, only: cross_product - use base_mesh_config_mod, only: geometry, & - geometry_spherical use poly_helper_functions_mod, only: buildadvcoeff, & local_distance_2d use sci_chi_transform_mod, only: chir2xyz diff --git a/science/gungho/source/orography/assign_orography_field_mod.F90 b/science/gungho/source/orography/assign_orography_field_mod.F90 index 9b9e4299e5..9c7c96007a 100644 --- a/science/gungho/source/orography/assign_orography_field_mod.F90 +++ b/science/gungho/source/orography/assign_orography_field_mod.F90 @@ -23,6 +23,7 @@ module assign_orography_field_mod orog_init_option_none, & orog_init_option_start_dump use mesh_collection_mod, only : mesh_collection + use mesh_mod, only : mesh_type, geometry_spherical use coord_transform_mod, only : xyz2llr, llr2xyz use sci_chi_transform_mod, only : chi2llr use orography_helper_functions_mod, only : z2eta_linear, & @@ -39,10 +40,7 @@ module assign_orography_field_mod use function_space_mod, only : BASIS ! Configuration modules - use base_mesh_config_mod, only: geometry, & - geometry_spherical, & - topology, & - topology_fully_periodic + use base_mesh_config_mod, only: geometry, topology use finite_element_config_mod, only: coord_system, & coord_order, & coord_system_xyz @@ -150,7 +148,6 @@ subroutine assign_orography_field(chi_inventory, panel_id_inventory, & use inventory_by_mesh_mod, only : inventory_by_mesh_type use field_mod, only : field_type, field_proxy_type - use mesh_mod, only : mesh_type use domain_mod, only : domain_type use orography_helper_functions_mod, only : set_horizontal_domain_size use orography_config_mod, only : orog_init_option, & @@ -223,7 +220,7 @@ subroutine assign_orography_field(chi_inventory, panel_id_inventory, & "Assigning analytic orography.", LOG_LEVEL_INFO ) ! Point to appropriate procedure to assign orography - if (geometry == geometry_spherical) then + if (mesh%geometry() == geometry_spherical) then if (coord_system == coord_system_xyz) then analytic_orography => analytic_orography_spherical_xyz else @@ -274,7 +271,7 @@ subroutine assign_orography_field(chi_inventory, panel_id_inventory, & "Assigning orography from surface_altitude field.", LOG_LEVEL_INFO ) ! Point to appropriate procedure to assign orography - if (geometry == geometry_spherical) then + if (mesh%geometry() == geometry_spherical) then if (coord_system == coord_system_xyz) then ancil_orography => ancil_orography_spherical_xyz else diff --git a/science/gungho/unit-test/initialisation/analytic_temperature_profiles_mod_test.pf b/science/gungho/unit-test/initialisation/analytic_temperature_profiles_mod_test.pf index edc900ee41..43e54a05c5 100644 --- a/science/gungho/unit-test/initialisation/analytic_temperature_profiles_mod_test.pf +++ b/science/gungho/unit-test/initialisation/analytic_temperature_profiles_mod_test.pf @@ -51,8 +51,8 @@ contains feign_initial_density_config, & feign_initial_pressure_config - 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 idealised_config_mod, only: test_cold_bubble_x @@ -98,7 +98,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_initial_wind_config( profile=profile_none, & diff --git a/science/gungho/unit-test/initialisation/deep_baroclinic_wave_mod_test.pf b/science/gungho/unit-test/initialisation/deep_baroclinic_wave_mod_test.pf index 9cd708e9cc..54749ca5ad 100644 --- a/science/gungho/unit-test/initialisation/deep_baroclinic_wave_mod_test.pf +++ b/science/gungho/unit-test/initialisation/deep_baroclinic_wave_mod_test.pf @@ -29,8 +29,8 @@ contains feign_initial_wind_config, & feign_formulation_config - 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 formulation_config_mod, only : eos_method_projected, & @@ -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( planet_radius=6000000.0_r_def, & diff --git a/science/gungho/unit-test/kernel/core_dynamics/compute_coriolis_matrix_kernel_mod_test.pf b/science/gungho/unit-test/kernel/core_dynamics/compute_coriolis_matrix_kernel_mod_test.pf index ab249a1d14..8776516a3a 100644 --- a/science/gungho/unit-test/kernel/core_dynamics/compute_coriolis_matrix_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/core_dynamics/compute_coriolis_matrix_kernel_mod_test.pf @@ -40,8 +40,8 @@ contains !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! subroutine setUp( this ) - use base_mesh_config_mod, only : geometry_planar, & - topology_fully_periodic + use mesh_mod, only : geometry_planar, & + topology_periodic use finite_element_config_mod, only : cellshape_quadrilateral, & coord_system_xyz, coord_space_wchi use formulation_config_mod, only : eos_method_sampled, & @@ -60,7 +60,7 @@ contains prime_mesh_name='unit_test', & geometry=geometry_planar, & prepartitioned=.false., & - topology=topology_fully_periodic, & + topology=topology_periodic, & fplane=.true., & f_lat_deg=45.0_r_def ) @@ -98,7 +98,7 @@ contains solver_moisture_conservation=.true., & vector_invariant=.true.) - call init_chi_transforms(geometry_planar, topology_fully_periodic) + call init_chi_transforms(geometry_planar, topology_periodic) end subroutine setUp diff --git a/science/gungho/unit-test/kernel/core_dynamics/compute_geopotential_kernel_mod_test.pf b/science/gungho/unit-test/kernel/core_dynamics/compute_geopotential_kernel_mod_test.pf index 70c4ce5717..648ae7fa4a 100644 --- a/science/gungho/unit-test/kernel/core_dynamics/compute_geopotential_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/core_dynamics/compute_geopotential_kernel_mod_test.pf @@ -10,8 +10,9 @@ module compute_geopotential_kernel_mod_test use constants_mod, only : i_def, r_def, l_def use funit + use mesh_mod, only: geometry_spherical + ! Configuration modules - use base_mesh_config_mod, only: GEOMETRY_SPHERICAL use finite_element_config_mod, only: COORD_SYSTEM_XYZ implicit none @@ -38,7 +39,7 @@ module compute_geopotential_kernel_mod_test real(r_def), parameter :: radius = 6000000.0_r_def integer(i_def), parameter :: coord_system = COORD_SYSTEM_XYZ - integer(i_def), parameter :: geometry = GEOMETRY_SPHERICAL + integer(i_def), parameter :: geometry = geometry_spherical contains diff --git a/science/gungho/unit-test/kernel/core_dynamics/compute_vert_coriolis_matrix_kernel_mod_test.pf b/science/gungho/unit-test/kernel/core_dynamics/compute_vert_coriolis_matrix_kernel_mod_test.pf index 05caed1142..66d05e47ee 100644 --- a/science/gungho/unit-test/kernel/core_dynamics/compute_vert_coriolis_matrix_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/core_dynamics/compute_vert_coriolis_matrix_kernel_mod_test.pf @@ -43,7 +43,7 @@ contains !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! subroutine setUp( this ) - use base_mesh_config_mod, only : geometry_spherical, & + use mesh_mod, only : geometry_spherical, & topology_non_periodic use extrusion_config_mod, only : method_uniform, & stretching_method_linear diff --git a/science/gungho/unit-test/kernel/core_dynamics/project_eos_pressure_kernel_mod_test.pf b/science/gungho/unit-test/kernel/core_dynamics/project_eos_pressure_kernel_mod_test.pf index 2f85aa0667..516d2824d1 100644 --- a/science/gungho/unit-test/kernel/core_dynamics/project_eos_pressure_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/core_dynamics/project_eos_pressure_kernel_mod_test.pf @@ -37,8 +37,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, & @@ -58,7 +58,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( planet_radius=6000000.0_r_def, & domain_height=10.0_r_def, & @@ -94,7 +94,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 diff --git a/science/gungho/unit-test/kernel/core_dynamics/project_eos_rho_kernel_mod_test.pf b/science/gungho/unit-test/kernel/core_dynamics/project_eos_rho_kernel_mod_test.pf index 0708c7bde2..c386505eb8 100644 --- a/science/gungho/unit-test/kernel/core_dynamics/project_eos_rho_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/core_dynamics/project_eos_rho_kernel_mod_test.pf @@ -55,8 +55,8 @@ contains !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! subroutine setUp( this ) - use base_mesh_config_mod, only : geometry_planar, & - topology_fully_periodic + use mesh_mod, only : geometry_planar, & + topology_periodic use finite_element_config_mod, only : cellshape_quadrilateral, & coord_system_xyz, coord_space_wchi use feign_config_mod, only : feign_base_mesh_config, & @@ -74,7 +74,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( cellshape=cellshape_quadrilateral, & coord_order=0_i_def, & @@ -97,7 +97,7 @@ contains theta_pert_size=0.5_r_def, & theta_pert_start=5000.0_r_def ) - call init_chi_transforms(geometry_planar, topology_fully_periodic) + call init_chi_transforms(geometry_planar, topology_periodic) end subroutine setUp diff --git a/science/gungho/unit-test/kernel/core_dynamics/rhs_project_eos_kernel_mod_test.pf b/science/gungho/unit-test/kernel/core_dynamics/rhs_project_eos_kernel_mod_test.pf index 362bdeffe2..b71e0e5b99 100644 --- a/science/gungho/unit-test/kernel/core_dynamics/rhs_project_eos_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/core_dynamics/rhs_project_eos_kernel_mod_test.pf @@ -54,8 +54,8 @@ contains !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! subroutine setUp( this ) - use base_mesh_config_mod, only : geometry_planar, & - topology_fully_periodic + use mesh_mod, only : geometry_planar, & + topology_periodic use finite_element_config_mod, only : cellshape_quadrilateral, & coord_system_xyz, coord_space_wchi use feign_config_mod, only : feign_base_mesh_config, & @@ -74,7 +74,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( cellshape=cellshape_quadrilateral, & coord_order=0_i_def, & @@ -97,7 +97,7 @@ contains theta_pert_size=0.5_r_def, & theta_pert_start=5000.0_r_def ) - call init_chi_transforms(geometry_planar, topology_fully_periodic) + call init_chi_transforms(geometry_planar, topology_periodic) end subroutine setUp diff --git a/science/gungho/unit-test/kernel/core_dynamics/rhs_sample_eos_kernel_mod_test.pf b/science/gungho/unit-test/kernel/core_dynamics/rhs_sample_eos_kernel_mod_test.pf index 3d8247d677..2007acd489 100644 --- a/science/gungho/unit-test/kernel/core_dynamics/rhs_sample_eos_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/core_dynamics/rhs_sample_eos_kernel_mod_test.pf @@ -55,8 +55,8 @@ contains !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! subroutine setUp( this ) - use base_mesh_config_mod, only : geometry_planar, & - topology_fully_periodic + use mesh_mod, only : geometry_planar, & + topology_periodic use finite_element_config_mod, only : cellshape_quadrilateral use feign_config_mod, only : feign_base_mesh_config, & feign_initial_temperature_config @@ -73,7 +73,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_initial_temperature_config( bvf_square=bvf_square, & diff --git a/science/gungho/unit-test/kernel/core_dynamics/sample_eos_pressure_kernel_mod_test.pf b/science/gungho/unit-test/kernel/core_dynamics/sample_eos_pressure_kernel_mod_test.pf index f34d915543..b4c907ca55 100644 --- a/science/gungho/unit-test/kernel/core_dynamics/sample_eos_pressure_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/core_dynamics/sample_eos_pressure_kernel_mod_test.pf @@ -37,8 +37,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 finite_element_config_mod, only : cellshape_quadrilateral use feign_config_mod, only : feign_base_mesh_config, & feign_initial_temperature_config, & @@ -53,7 +53,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_initial_temperature_config( bvf_square=bvf_square, & diff --git a/science/gungho/unit-test/kernel/core_dynamics/sample_eos_rho_kernel_mod_test.pf b/science/gungho/unit-test/kernel/core_dynamics/sample_eos_rho_kernel_mod_test.pf index 7cc18e8a02..71b606cda4 100644 --- a/science/gungho/unit-test/kernel/core_dynamics/sample_eos_rho_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/core_dynamics/sample_eos_rho_kernel_mod_test.pf @@ -55,8 +55,8 @@ contains !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! subroutine setUp( this ) - use base_mesh_config_mod, only : geometry_planar, & - topology_fully_periodic + use mesh_mod, only : geometry_planar, & + topology_periodic use finite_element_config_mod, only : cellshape_quadrilateral use feign_config_mod, only : feign_base_mesh_config, & feign_initial_temperature_config @@ -72,7 +72,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_initial_temperature_config( bvf_square=bvf_square, & diff --git a/science/gungho/unit-test/kernel/diagnostics/compute_total_aam_kernel_mod_test.pf b/science/gungho/unit-test/kernel/diagnostics/compute_total_aam_kernel_mod_test.pf index 1f32694d75..d7e7024a45 100644 --- a/science/gungho/unit-test/kernel/diagnostics/compute_total_aam_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/diagnostics/compute_total_aam_kernel_mod_test.pf @@ -40,8 +40,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 sci_chi_transform_mod, only : init_chi_transforms @@ -57,7 +57,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( planet_radius=planet_radius, & @@ -84,7 +84,7 @@ contains p_zero=100000.0_r_def, & scaling_factor=1.0_r_def ) - call init_chi_transforms(geometry_spherical, topology_fully_periodic) + call init_chi_transforms(geometry_spherical, topology_periodic) end subroutine set_up diff --git a/science/gungho/unit-test/kernel/diagnostics/compute_total_pv_kernel_mod_test.pf b/science/gungho/unit-test/kernel/diagnostics/compute_total_pv_kernel_mod_test.pf index 8e28d53e49..77de69144c 100644 --- a/science/gungho/unit-test/kernel/diagnostics/compute_total_pv_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/diagnostics/compute_total_pv_kernel_mod_test.pf @@ -44,8 +44,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 finite_element_config_mod, only : cellshape_quadrilateral, & @@ -62,7 +62,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( planet_radius=planet_radius, & @@ -89,7 +89,7 @@ contains p_zero=100000.0_r_def, & scaling_factor=1.0_r_def ) - call init_chi_transforms(geometry_spherical, topology_fully_periodic) + call init_chi_transforms(geometry_spherical, topology_periodic) end subroutine set_up diff --git a/science/gungho/unit-test/kernel/diagnostics/reference_profile_mod_test.pf b/science/gungho/unit-test/kernel/diagnostics/reference_profile_mod_test.pf index f6179629b9..a50527dc58 100644 --- a/science/gungho/unit-test/kernel/diagnostics/reference_profile_mod_test.pf +++ b/science/gungho/unit-test/kernel/diagnostics/reference_profile_mod_test.pf @@ -43,8 +43,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, & @@ -67,7 +67,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( planet_radius=6000000.0_r_def, & diff --git a/science/gungho/unit-test/kernel/initialisation/hydro_shallow_to_deep_kernel_mod_test.pf b/science/gungho/unit-test/kernel/initialisation/hydro_shallow_to_deep_kernel_mod_test.pf index 84f5d9bba4..d9354fd07f 100644 --- a/science/gungho/unit-test/kernel/initialisation/hydro_shallow_to_deep_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/initialisation/hydro_shallow_to_deep_kernel_mod_test.pf @@ -54,8 +54,8 @@ contains !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! subroutine setUp( this ) - use base_mesh_config_mod, only : geometry_planar, & - topology_fully_periodic + use mesh_mod, only : geometry_planar, & + topology_periodic use finite_element_config_mod, only : cellshape_quadrilateral use feign_config_mod, only : feign_base_mesh_config, & feign_planet_config @@ -78,7 +78,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 ) diff --git a/science/gungho/unit-test/kernel/initialisation/hydrostatic_coriolis_kernel_mod_test.pf b/science/gungho/unit-test/kernel/initialisation/hydrostatic_coriolis_kernel_mod_test.pf index 8ddc0338bf..2450731f59 100644 --- a/science/gungho/unit-test/kernel/initialisation/hydrostatic_coriolis_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/initialisation/hydrostatic_coriolis_kernel_mod_test.pf @@ -58,8 +58,8 @@ contains !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! subroutine setUp( this ) - use base_mesh_config_mod, only : geometry_planar, & - topology_fully_periodic + use mesh_mod, only : geometry_planar, & + topology_periodic use finite_element_config_mod, only : cellshape_quadrilateral use feign_config_mod, only : feign_base_mesh_config, & feign_planet_config @@ -82,7 +82,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 ) diff --git a/science/gungho/unit-test/kernel/initialisation/hydrostatic_exner_kernel_mod_test.pf b/science/gungho/unit-test/kernel/initialisation/hydrostatic_exner_kernel_mod_test.pf index 21d74a1a5b..0dcd6a496d 100644 --- a/science/gungho/unit-test/kernel/initialisation/hydrostatic_exner_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/initialisation/hydrostatic_exner_kernel_mod_test.pf @@ -68,8 +68,8 @@ contains !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! subroutine setUp( this ) - 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, & @@ -104,7 +104,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( planet_radius=planet_radius, & @@ -153,7 +153,7 @@ contains perturb_init=.false., perturb_magnitude=0, & perturb_seed=0 ) - call init_chi_transforms(geometry_planar, topology_fully_periodic) + call init_chi_transforms(geometry_planar, topology_periodic) nlayers=3 call get_w0_m3x3_q3x3x3_size( this%ndf_w0, this%undf_w0, ncells, & diff --git a/science/gungho/unit-test/kernel/initialisation/initial_rho_sample_kernel_mod_test.pf b/science/gungho/unit-test/kernel/initialisation/initial_rho_sample_kernel_mod_test.pf index f73ba089e9..0dec522429 100644 --- a/science/gungho/unit-test/kernel/initialisation/initial_rho_sample_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/initialisation/initial_rho_sample_kernel_mod_test.pf @@ -35,8 +35,8 @@ contains !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! subroutine setUp( this ) - use base_mesh_config_mod, only : geometry_planar, & - topology_fully_periodic + use mesh_mod, only : geometry_planar, & + topology_periodic use sci_chi_transform_mod, only : init_chi_transforms use feign_config_mod, only : feign_base_mesh_config, & feign_finite_element_config, & @@ -60,7 +60,7 @@ contains prime_mesh_name='unit_test', & geometry=geometry_planar, & prepartitioned=.false., & - topology=topology_fully_periodic, & + topology=topology_periodic, & fplane=.false., f_lat_deg=45.0_r_def ) call feign_finite_element_config( & @@ -84,7 +84,7 @@ contains perturb_init=.false., perturb_magnitude=0, & perturb_seed=0 ) - call init_chi_transforms(geometry_planar, topology_fully_periodic) + call init_chi_transforms(geometry_planar, topology_periodic) end subroutine setUp diff --git a/science/gungho/unit-test/kernel/initialisation/initial_u_kernel_mod_test.pf b/science/gungho/unit-test/kernel/initialisation/initial_u_kernel_mod_test.pf index caf7e5fe1e..8ad9183047 100644 --- a/science/gungho/unit-test/kernel/initialisation/initial_u_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/initialisation/initial_u_kernel_mod_test.pf @@ -66,8 +66,8 @@ contains !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! subroutine setUp( this ) - use base_mesh_config_mod, only : geometry_planar, & - topology_fully_periodic + use mesh_mod, only : geometry_planar, & + topology_periodic use sci_chi_transform_mod, only : init_chi_transforms use finite_element_config_mod, only : cellshape_quadrilateral, & coord_system_xyz, coord_space_wchi @@ -84,7 +84,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( & @@ -116,7 +116,7 @@ contains wavelength=wavelength, & wind_time_period=wind_time_period ) - call init_chi_transforms(geometry_planar, topology_fully_periodic) + call init_chi_transforms(geometry_planar, topology_periodic) end subroutine setUp diff --git a/science/gungho/unit-test/kernel/initialisation/set_rho_kernel_mod_test.pf b/science/gungho/unit-test/kernel/initialisation/set_rho_kernel_mod_test.pf index b7a61d4592..6847838afb 100644 --- a/science/gungho/unit-test/kernel/initialisation/set_rho_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/initialisation/set_rho_kernel_mod_test.pf @@ -58,8 +58,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, & @@ -85,7 +85,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( planet_radius=6371229.0_r_def, & @@ -137,7 +137,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 diff --git a/science/gungho/unit-test/kernel/limited_area/create_w2bmask_kernel_mod_test.pf b/science/gungho/unit-test/kernel/limited_area/create_w2bmask_kernel_mod_test.pf index 1111268ca1..0ac4ba747a 100644 --- a/science/gungho/unit-test/kernel/limited_area/create_w2bmask_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/limited_area/create_w2bmask_kernel_mod_test.pf @@ -35,8 +35,8 @@ contains !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! subroutine setUp( this ) - use base_mesh_config_mod, only: geometry_planar, & - topology_non_periodic + use mesh_mod, only: geometry_planar, & + topology_non_periodic use feign_config_mod, only : feign_base_mesh_config, & feign_finite_element_config use finite_element_config_mod, only : cellshape_quadrilateral, & diff --git a/science/gungho/unit-test/kernel/limited_area/create_w2mask_blend_kernel_mod_test.pf b/science/gungho/unit-test/kernel/limited_area/create_w2mask_blend_kernel_mod_test.pf index cd8a43a5c6..e011b38627 100644 --- a/science/gungho/unit-test/kernel/limited_area/create_w2mask_blend_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/limited_area/create_w2mask_blend_kernel_mod_test.pf @@ -35,7 +35,7 @@ contains !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! subroutine setUp( this ) - use base_mesh_config_mod, only : geometry_planar, & + use mesh_mod, only : geometry_planar, & topology_non_periodic use feign_config_mod, only : feign_base_mesh_config, & feign_finite_element_config diff --git a/science/gungho/unit-test/kernel/limited_area/create_w2mask_kernel_mod_test.pf b/science/gungho/unit-test/kernel/limited_area/create_w2mask_kernel_mod_test.pf index fb2ec23f51..3813367815 100644 --- a/science/gungho/unit-test/kernel/limited_area/create_w2mask_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/limited_area/create_w2mask_kernel_mod_test.pf @@ -35,8 +35,8 @@ contains !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! subroutine setUp( this ) - use base_mesh_config_mod, only: geometry_planar, & - topology_non_periodic + use mesh_mod, only : geometry_planar, & + topology_non_periodic use feign_config_mod, only : feign_base_mesh_config, & feign_finite_element_config use finite_element_config_mod, only : cellshape_quadrilateral, & diff --git a/science/gungho/unit-test/kernel/limited_area/create_w2mask_lbc_kernel_mod_test.pf b/science/gungho/unit-test/kernel/limited_area/create_w2mask_lbc_kernel_mod_test.pf index f7533b85d4..e843a63cec 100644 --- a/science/gungho/unit-test/kernel/limited_area/create_w2mask_lbc_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/limited_area/create_w2mask_lbc_kernel_mod_test.pf @@ -35,7 +35,7 @@ contains !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! subroutine setUp( this ) - use base_mesh_config_mod, only : geometry_planar, & + use mesh_mod, only : geometry_planar, & topology_non_periodic use feign_config_mod, only : feign_base_mesh_config, & feign_finite_element_config diff --git a/science/gungho/unit-test/kernel/limited_area/create_w2mask_tang_kernel_mod_test.pf b/science/gungho/unit-test/kernel/limited_area/create_w2mask_tang_kernel_mod_test.pf index 33282483b9..72c308ff69 100644 --- a/science/gungho/unit-test/kernel/limited_area/create_w2mask_tang_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/limited_area/create_w2mask_tang_kernel_mod_test.pf @@ -35,7 +35,7 @@ contains !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! subroutine setUp( this ) - use base_mesh_config_mod, only : geometry_planar, & + use mesh_mod, only : geometry_planar, & topology_non_periodic use feign_config_mod, only : feign_base_mesh_config, & feign_finite_element_config diff --git a/science/gungho/unit-test/kernel/limited_area/create_w3mask_blend_kernel_mod_test.pf b/science/gungho/unit-test/kernel/limited_area/create_w3mask_blend_kernel_mod_test.pf index 6ae05b2de2..fc9f93c5a7 100644 --- a/science/gungho/unit-test/kernel/limited_area/create_w3mask_blend_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/limited_area/create_w3mask_blend_kernel_mod_test.pf @@ -35,7 +35,7 @@ contains !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! subroutine setUp( this ) - use base_mesh_config_mod, only : geometry_planar, & + use mesh_mod, only : geometry_planar, & topology_non_periodic use feign_config_mod, only : feign_base_mesh_config, & feign_finite_element_config diff --git a/science/gungho/unit-test/kernel/limited_area/create_w3mask_kernel_mod_test.pf b/science/gungho/unit-test/kernel/limited_area/create_w3mask_kernel_mod_test.pf index 18dc66ef16..b2f7ba7d75 100644 --- a/science/gungho/unit-test/kernel/limited_area/create_w3mask_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/limited_area/create_w3mask_kernel_mod_test.pf @@ -35,7 +35,7 @@ contains !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! subroutine setUp( this ) - use base_mesh_config_mod, only : geometry_planar, & + use mesh_mod, only : geometry_planar, & topology_non_periodic use feign_config_mod, only : feign_base_mesh_config, & feign_finite_element_config diff --git a/science/gungho/unit-test/kernel/limited_area/create_w3mask_lbc_kernel_mod_test.pf b/science/gungho/unit-test/kernel/limited_area/create_w3mask_lbc_kernel_mod_test.pf index 6988c74e47..b143ae050c 100644 --- a/science/gungho/unit-test/kernel/limited_area/create_w3mask_lbc_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/limited_area/create_w3mask_lbc_kernel_mod_test.pf @@ -35,7 +35,7 @@ contains !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! subroutine setUp( this ) - use base_mesh_config_mod, only : geometry_planar, & + use mesh_mod, only : geometry_planar, & topology_non_periodic use feign_config_mod, only : feign_base_mesh_config, & feign_finite_element_config diff --git a/science/gungho/unit-test/kernel/limited_area/create_wthetamask_blend_kernel_mod_test.pf b/science/gungho/unit-test/kernel/limited_area/create_wthetamask_blend_kernel_mod_test.pf index 3474630d27..bb2de106d1 100644 --- a/science/gungho/unit-test/kernel/limited_area/create_wthetamask_blend_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/limited_area/create_wthetamask_blend_kernel_mod_test.pf @@ -36,8 +36,8 @@ contains !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! subroutine setUp( this ) - use base_mesh_config_mod, only: geometry_planar, & - topology_non_periodic + use mesh_mod, only : geometry_planar, & + topology_non_periodic use feign_config_mod, only : feign_base_mesh_config, & feign_finite_element_config use finite_element_config_mod, only : cellshape_quadrilateral, & diff --git a/science/gungho/unit-test/kernel/limited_area/create_wthetamask_kernel_mod_test.pf b/science/gungho/unit-test/kernel/limited_area/create_wthetamask_kernel_mod_test.pf index a67e8d7d41..d05af3a2b8 100644 --- a/science/gungho/unit-test/kernel/limited_area/create_wthetamask_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/limited_area/create_wthetamask_kernel_mod_test.pf @@ -35,8 +35,8 @@ contains !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! subroutine setUp( this ) - use base_mesh_config_mod, only: geometry_planar, & - topology_non_periodic + use mesh_mod, only : geometry_planar, & + topology_non_periodic use feign_config_mod, only : feign_base_mesh_config, & feign_finite_element_config use finite_element_config_mod, only : cellshape_quadrilateral, & diff --git a/science/gungho/unit-test/kernel/limited_area/create_wthetamask_lbc_kernel_mod_test.pf b/science/gungho/unit-test/kernel/limited_area/create_wthetamask_lbc_kernel_mod_test.pf index 4dbeafebdf..6b1422f8ad 100644 --- a/science/gungho/unit-test/kernel/limited_area/create_wthetamask_lbc_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/limited_area/create_wthetamask_lbc_kernel_mod_test.pf @@ -35,8 +35,8 @@ contains !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! subroutine setUp( this ) - use base_mesh_config_mod, only: geometry_planar, & - topology_non_periodic + use mesh_mod, only : geometry_planar, & + topology_non_periodic use feign_config_mod, only : feign_base_mesh_config, & feign_finite_element_config use finite_element_config_mod, only : cellshape_quadrilateral, & diff --git a/science/gungho/unit-test/kernel/solver/project_eos_operators_kernel_mod_test.pf b/science/gungho/unit-test/kernel/solver/project_eos_operators_kernel_mod_test.pf index 8a1c3a8096..a3d366dd6c 100644 --- a/science/gungho/unit-test/kernel/solver/project_eos_operators_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/solver/project_eos_operators_kernel_mod_test.pf @@ -43,8 +43,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, & @@ -64,7 +64,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( planet_radius=6000000.0_r_def, & @@ -100,7 +100,7 @@ contains rd=rd, cp=cp, p_zero=p_zero, & 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 diff --git a/science/gungho/unit-test/kernel/solver/sample_eos_operators_kernel_mod_test.pf b/science/gungho/unit-test/kernel/solver/sample_eos_operators_kernel_mod_test.pf index 0f0e6bcfe4..1af5ba59be 100644 --- a/science/gungho/unit-test/kernel/solver/sample_eos_operators_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/solver/sample_eos_operators_kernel_mod_test.pf @@ -43,8 +43,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 @@ -62,7 +62,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( planet_radius=6000000.0_r_def, & diff --git a/science/gungho/unit-test/kernel/transport/common/panel_edge_coords_kernel_mod_test.pf b/science/gungho/unit-test/kernel/transport/common/panel_edge_coords_kernel_mod_test.pf index bfcaab044b..d4a7b96fa5 100644 --- a/science/gungho/unit-test/kernel/transport/common/panel_edge_coords_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/transport/common/panel_edge_coords_kernel_mod_test.pf @@ -29,8 +29,8 @@ contains !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! subroutine setUp( this ) - use base_mesh_config_mod, only : geometry_spherical, & - topology_fully_periodic + use mesh_mod, only : geometry_spherical, & + topology_periodic use sci_chi_transform_mod, only : init_chi_transforms use extrusion_config_mod, only : method_uniform, & stretching_method_linear @@ -50,7 +50,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( & @@ -82,7 +82,7 @@ contains vorticity_in_w1=.false. & ) - call init_chi_transforms(geometry_spherical, topology_fully_periodic) + call init_chi_transforms(geometry_spherical, topology_periodic) end subroutine setUp diff --git a/science/gungho/unit-test/kernel/transport/common/panel_edge_weights_kernel_mod_test.pf b/science/gungho/unit-test/kernel/transport/common/panel_edge_weights_kernel_mod_test.pf index 9bf6b1fb42..97db233a84 100644 --- a/science/gungho/unit-test/kernel/transport/common/panel_edge_weights_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/transport/common/panel_edge_weights_kernel_mod_test.pf @@ -29,8 +29,8 @@ contains !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! subroutine setUp( this ) - use base_mesh_config_mod, only : geometry_spherical, & - topology_fully_periodic + use mesh_mod, only : geometry_spherical, & + topology_periodic use sci_chi_transform_mod, only : init_chi_transforms use extrusion_config_mod, only : method_uniform, & stretching_method_linear @@ -50,7 +50,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( & @@ -82,7 +82,7 @@ contains vorticity_in_w1=.false. & ) - call init_chi_transforms(geometry_spherical, topology_fully_periodic) + call init_chi_transforms(geometry_spherical, topology_periodic) end subroutine setUp diff --git a/science/gungho/unit-test/kernel/transport/mol/poly1d_advective_coeffs_kernel_mod_test.pf b/science/gungho/unit-test/kernel/transport/mol/poly1d_advective_coeffs_kernel_mod_test.pf index 925664315a..67bbc35fee 100644 --- a/science/gungho/unit-test/kernel/transport/mol/poly1d_advective_coeffs_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/transport/mol/poly1d_advective_coeffs_kernel_mod_test.pf @@ -28,8 +28,8 @@ contains subroutine setUp( this ) use feign_config_mod, only: feign_base_mesh_config, & feign_finite_element_config - use base_mesh_config_mod, only: geometry_planar, & - topology_fully_periodic + use mesh_mod, only: geometry_planar, & + topology_periodic use finite_element_config_mod, only: coord_system_xyz, & cellshape_quadrilateral, & coord_space_wchi @@ -42,7 +42,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( cellshape = cellshape_quadrilateral, & @@ -55,7 +55,7 @@ contains rehabilitate = .true., & vorticity_in_w1 = .true. ) - call init_chi_transforms(geometry_planar, topology_fully_periodic) + call init_chi_transforms(geometry_planar, topology_periodic) end subroutine setUp diff --git a/science/gungho/unit-test/kernel/transport/mol/poly1d_flux_coeffs_kernel_mod_test.pf b/science/gungho/unit-test/kernel/transport/mol/poly1d_flux_coeffs_kernel_mod_test.pf index 1b2a6c5297..49e53b3c56 100644 --- a/science/gungho/unit-test/kernel/transport/mol/poly1d_flux_coeffs_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/transport/mol/poly1d_flux_coeffs_kernel_mod_test.pf @@ -28,8 +28,8 @@ contains subroutine setUp( this ) use feign_config_mod, only: feign_base_mesh_config, & feign_finite_element_config - use base_mesh_config_mod, only: geometry_planar, & - topology_fully_periodic + use mesh_mod, only: geometry_planar, & + topology_periodic use finite_element_config_mod, only: coord_system_xyz, & cellshape_quadrilateral, & coord_space_wchi @@ -42,7 +42,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( cellshape = cellshape_quadrilateral, & @@ -55,7 +55,7 @@ contains rehabilitate = .true., & vorticity_in_w1 = .true. ) - call init_chi_transforms(geometry_planar, topology_fully_periodic) + call init_chi_transforms(geometry_planar, topology_periodic) end subroutine setUp diff --git a/science/gungho/unit-test/kernel/transport/mol/poly1d_vert_adv_coeffs_kernel_mod_test.pf b/science/gungho/unit-test/kernel/transport/mol/poly1d_vert_adv_coeffs_kernel_mod_test.pf index 572926d542..b28bf71a9b 100644 --- a/science/gungho/unit-test/kernel/transport/mol/poly1d_vert_adv_coeffs_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/transport/mol/poly1d_vert_adv_coeffs_kernel_mod_test.pf @@ -31,8 +31,8 @@ contains use feign_config_mod, only : feign_base_mesh_config, & feign_planet_config, & feign_transport_config - use base_mesh_config_mod, only : geometry_planar, & - topology_fully_periodic + use mesh_mod, only : geometry_planar, & + topology_periodic use transport_config_mod, only : runge_kutta_method_ssp2, & operators_fv, & slice_order_cubic, & @@ -109,7 +109,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 ) end subroutine setUp diff --git a/science/gungho/unit-test/kernel/transport/mol/poly2d_advective_coeffs_kernel_mod_test.pf b/science/gungho/unit-test/kernel/transport/mol/poly2d_advective_coeffs_kernel_mod_test.pf index 8da84dd721..e2642d2ef4 100644 --- a/science/gungho/unit-test/kernel/transport/mol/poly2d_advective_coeffs_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/transport/mol/poly2d_advective_coeffs_kernel_mod_test.pf @@ -28,8 +28,8 @@ contains subroutine setUp( this ) use feign_config_mod, only: feign_base_mesh_config, & feign_finite_element_config - use base_mesh_config_mod, only: geometry_planar, & - topology_fully_periodic + use mesh_mod, only: geometry_planar, & + topology_periodic use finite_element_config_mod, only: coord_system_xyz, & cellshape_quadrilateral, & coord_space_wchi @@ -42,7 +42,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( cellshape = cellshape_quadrilateral, & @@ -55,7 +55,7 @@ contains rehabilitate = .true., & vorticity_in_w1 = .true. ) - call init_chi_transforms(geometry_planar, topology_fully_periodic) + call init_chi_transforms(geometry_planar, topology_periodic) end subroutine setUp diff --git a/science/gungho/unit-test/kernel/transport/mol/poly2d_flux_coeffs_kernel_mod_test.pf b/science/gungho/unit-test/kernel/transport/mol/poly2d_flux_coeffs_kernel_mod_test.pf index b14dd42cb3..d1640a7a33 100644 --- a/science/gungho/unit-test/kernel/transport/mol/poly2d_flux_coeffs_kernel_mod_test.pf +++ b/science/gungho/unit-test/kernel/transport/mol/poly2d_flux_coeffs_kernel_mod_test.pf @@ -26,10 +26,11 @@ module poly2d_flux_coeffs_kernel_mod_test contains subroutine setUp( this ) + use feign_config_mod, only: feign_base_mesh_config, & feign_finite_element_config - use base_mesh_config_mod, only: geometry_planar, & - topology_fully_periodic + use mesh_mod, only: geometry_planar, & + topology_periodic use finite_element_config_mod, only: coord_system_xyz, & cellshape_quadrilateral, & coord_space_wchi @@ -42,7 +43,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( cellshape = cellshape_quadrilateral, & coord_order = 1, & @@ -54,7 +55,7 @@ contains rehabilitate = .true., & vorticity_in_w1 = .true. ) - call init_chi_transforms(geometry_planar, topology_fully_periodic) + call init_chi_transforms(geometry_planar, topology_periodic) end subroutine setUp diff --git a/science/gungho/unit-test/mesh/gungho_extrusion_mod_test.pf b/science/gungho/unit-test/mesh/gungho_extrusion_mod_test.pf index 660b6c5fda..482d2f0862 100644 --- a/science/gungho/unit-test/mesh/gungho_extrusion_mod_test.pf +++ b/science/gungho/unit-test/mesh/gungho_extrusion_mod_test.pf @@ -9,9 +9,10 @@ module gungho_extrusion_mod_test use constants_mod, only : i_def, r_def use extrusion_mod, only : extrusion_type, prime_extrusion use gungho_extrusion_mod, only : create_extrusion - use funit + use mesh_mod, only: geometry_planar, geometry_spherical + implicit none private @@ -23,7 +24,6 @@ contains @test subroutine test_planar() - use base_mesh_config_mod, only : geometry_planar use extrusion_config_mod, only : method_uniform implicit none @@ -54,7 +54,6 @@ contains @test subroutine test_spherical() - use base_mesh_config_mod, only : geometry_spherical use extrusion_config_mod, only : method_geometric implicit none diff --git a/science/gungho/unit-test/orography/agnesi_orography_cartesian_mod_test.pf b/science/gungho/unit-test/orography/agnesi_orography_cartesian_mod_test.pf index be370ad849..e4546bc72a 100644 --- a/science/gungho/unit-test/orography/agnesi_orography_cartesian_mod_test.pf +++ b/science/gungho/unit-test/orography/agnesi_orography_cartesian_mod_test.pf @@ -13,6 +13,8 @@ module agnesi_orography_cartesian_mod_test use analytic_orography_mod, only : orography_profile use ugrid_mesh_data_mod, only : ugrid_mesh_data_type + use mesh_mod, only: mesh_type, geometry_planar, topology_periodic + use funit implicit none @@ -60,8 +62,6 @@ contains use agnesi_orography_cartesian_mod, only : agnesi_cartesian_type use finite_element_config_mod, only : cellshape_quadrilateral - use base_mesh_config_mod, only : geometry_planar, & - topology_fully_periodic use feign_config_mod, only : & feign_base_mesh_config, & feign_initial_pressure_config, & @@ -82,7 +82,7 @@ contains prime_mesh_name = mesh_name, & geometry = geometry_planar, & prepartitioned = .false., & - topology = topology_fully_periodic, & + topology = topology_periodic, & fplane = .false., & f_lat_deg = 0.0_r_def ) @@ -134,7 +134,6 @@ contains subroutine test_agnesi_orography_cartesian(this) use local_mesh_mod, only : local_mesh_type - use mesh_mod, only : mesh_type use panel_decomposition_mod, only : custom_decomposition_type use partition_mod, only : partition_type, & partitioner_interface, & diff --git a/science/gungho/unit-test/orography/agnesi_orography_spherical_mod_test.pf b/science/gungho/unit-test/orography/agnesi_orography_spherical_mod_test.pf index 10701c536f..0133daaa5f 100644 --- a/science/gungho/unit-test/orography/agnesi_orography_spherical_mod_test.pf +++ b/science/gungho/unit-test/orography/agnesi_orography_spherical_mod_test.pf @@ -59,8 +59,8 @@ contains use extrusion_config_mod, only : method_uniform, & stretching_method_linear use finite_element_config_mod, only : cellshape_quadrilateral - use base_mesh_config_mod, only : geometry_spherical, & - topology_fully_periodic + use mesh_mod, only : geometry_spherical, & + topology_periodic use feign_config_mod, only : & feign_base_mesh_config, & feign_extrusion_config, & @@ -83,7 +83,7 @@ contains prime_mesh_name = mesh_name, & geometry = geometry_spherical, & prepartitioned = .false., & - topology = topology_fully_periodic, & + topology = topology_periodic, & fplane = .false., & f_lat_deg = 0.0_r_def ) diff --git a/science/gungho/unit-test/orography/analytic_orography_field_cartesian_mod_test.pf b/science/gungho/unit-test/orography/analytic_orography_field_cartesian_mod_test.pf index c38cf9bd3e..096dd23b31 100644 --- a/science/gungho/unit-test/orography/analytic_orography_field_cartesian_mod_test.pf +++ b/science/gungho/unit-test/orography/analytic_orography_field_cartesian_mod_test.pf @@ -13,6 +13,8 @@ module analytic_orography_field_cartesian_mod_test use analytic_orography_mod, only : orography_profile use ugrid_mesh_data_mod, only : ugrid_mesh_data_type + use mesh_mod, only: mesh_type, geometry_planar, topology_periodic + use funit implicit none @@ -60,8 +62,6 @@ contains subroutine setUp(this) use schar_orography_cartesian_mod, only : schar_cartesian_type - use base_mesh_config_mod, only : geometry_planar, & - topology_fully_periodic use finite_element_config_mod, only : cellshape_quadrilateral, & coord_system_xyz, coord_space_wchi use feign_config_mod, only : feign_finite_element_config, & @@ -85,7 +85,7 @@ contains prime_mesh_name = mesh_name, & geometry = geometry_planar, & prepartitioned = .false., & - topology = topology_fully_periodic, & + topology = topology_periodic, & fplane = .false., & f_lat_deg = 0.0_r_def ) @@ -159,7 +159,6 @@ contains use domain_mod, only : domain_type use local_mesh_mod, only : local_mesh_type - use mesh_mod, only : mesh_type use panel_decomposition_mod, only : custom_decomposition_type use partition_mod, only : partition_type, & partitioner_interface, & diff --git a/science/gungho/unit-test/orography/analytic_orography_field_spherical_mod_test.pf b/science/gungho/unit-test/orography/analytic_orography_field_spherical_mod_test.pf index 9d1571fc7e..a1906f6db0 100644 --- a/science/gungho/unit-test/orography/analytic_orography_field_spherical_mod_test.pf +++ b/science/gungho/unit-test/orography/analytic_orography_field_spherical_mod_test.pf @@ -14,6 +14,8 @@ module analytic_orography_field_spherical_mod_test use analytic_orography_mod, only : orography_profile use ugrid_mesh_data_mod, only : ugrid_mesh_data_type + use mesh_mod, only: mesh_type, geometry_spherical, topology_periodic + use funit implicit none @@ -58,8 +60,6 @@ contains subroutine setUp(this) use agnesi_orography_spherical_mod, only : agnesi_spherical_type - use base_mesh_config_mod, only : geometry_spherical, & - topology_fully_periodic use extrusion_config_mod, only : method_uniform, & stretching_method_linear use finite_element_config_mod, only : cellshape_quadrilateral, & @@ -87,7 +87,7 @@ contains prime_mesh_name = mesh_name, & geometry = geometry_spherical, & prepartitioned = .false., & - topology = topology_fully_periodic, & + topology = topology_periodic, & fplane = .false., & f_lat_deg = 0.0_r_def ) @@ -141,7 +141,7 @@ contains lambda_focus, & phi_focus ) ) - call init_chi_transforms(geometry_spherical, topology_fully_periodic) + call init_chi_transforms(geometry_spherical, topology_periodic) end subroutine setUp @@ -167,7 +167,6 @@ contains use, intrinsic :: iso_fortran_env, only : real64 use local_mesh_mod, only : local_mesh_type - use mesh_mod, only : mesh_type use panel_decomposition_mod, only : custom_decomposition_type use partition_mod, only : partition_type, & partitioner_interface, & diff --git a/science/gungho/unit-test/orography/ancil_orography_cartesian_mod_test.pf b/science/gungho/unit-test/orography/ancil_orography_cartesian_mod_test.pf index 0d8031b075..075acbc620 100644 --- a/science/gungho/unit-test/orography/ancil_orography_cartesian_mod_test.pf +++ b/science/gungho/unit-test/orography/ancil_orography_cartesian_mod_test.pf @@ -28,8 +28,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, & @@ -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 ) diff --git a/science/gungho/unit-test/orography/ancil_orography_spherical_mod_test.pf b/science/gungho/unit-test/orography/ancil_orography_spherical_mod_test.pf index ad8625391e..912874e54b 100644 --- a/science/gungho/unit-test/orography/ancil_orography_spherical_mod_test.pf +++ b/science/gungho/unit-test/orography/ancil_orography_spherical_mod_test.pf @@ -29,8 +29,8 @@ contains !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! 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 finite_element_config_mod, only : cellshape_quadrilateral, & @@ -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 ) diff --git a/science/gungho/unit-test/orography/dcmip200_orography_spherical_mod_test.pf b/science/gungho/unit-test/orography/dcmip200_orography_spherical_mod_test.pf index 8f4c6a86dd..3892144c6f 100644 --- a/science/gungho/unit-test/orography/dcmip200_orography_spherical_mod_test.pf +++ b/science/gungho/unit-test/orography/dcmip200_orography_spherical_mod_test.pf @@ -61,8 +61,8 @@ contains use extrusion_config_mod, only : method_uniform, & stretching_method_linear use finite_element_config_mod, only : cellshape_quadrilateral - use base_mesh_config_mod, only : geometry_spherical, & - topology_fully_periodic + use mesh_mod, only : geometry_spherical, & + topology_periodic use feign_config_mod, only : & feign_base_mesh_config, & feign_extrusion_config, & @@ -85,7 +85,7 @@ contains prime_mesh_name = mesh_name, & geometry = geometry_spherical, & prepartitioned = .false., & - topology = topology_fully_periodic, & + topology = topology_periodic, & fplane = .false., & f_lat_deg = 0.0_r_def ) diff --git a/science/gungho/unit-test/orography/schar_orography_cartesian_mod_test.pf b/science/gungho/unit-test/orography/schar_orography_cartesian_mod_test.pf index 13f998467f..1a4fac8429 100644 --- a/science/gungho/unit-test/orography/schar_orography_cartesian_mod_test.pf +++ b/science/gungho/unit-test/orography/schar_orography_cartesian_mod_test.pf @@ -13,6 +13,8 @@ module schar_orography_cartesian_mod_test use analytic_orography_mod, only : orography_profile use ugrid_mesh_data_mod, only : ugrid_mesh_data_type + use mesh_mod, only: mesh_type, geometry_planar, topology_periodic + use funit implicit none @@ -59,8 +61,6 @@ contains use schar_orography_cartesian_mod, only : schar_cartesian_type use finite_element_config_mod, only : cellshape_quadrilateral - use base_mesh_config_mod, only : geometry_planar, & - topology_fully_periodic use feign_config_mod, only : & feign_base_mesh_config, & feign_initial_pressure_config, & @@ -80,7 +80,7 @@ contains prime_mesh_name = mesh_name, & geometry = geometry_planar, & prepartitioned = .false., & - topology = topology_fully_periodic, & + topology = topology_periodic, & fplane = .false., & f_lat_deg = 0.0_r_def ) @@ -136,7 +136,6 @@ contains use domain_mod, only : domain_type use local_mesh_mod, only : local_mesh_type - use mesh_mod, only : mesh_type use panel_decomposition_mod, only : custom_decomposition_type use partition_mod, only : partition_type, & partitioner_interface, & diff --git a/science/gungho/unit-test/orography/schar_orography_spherical_mod_test.pf b/science/gungho/unit-test/orography/schar_orography_spherical_mod_test.pf index 0efb54283c..147a850d19 100644 --- a/science/gungho/unit-test/orography/schar_orography_spherical_mod_test.pf +++ b/science/gungho/unit-test/orography/schar_orography_spherical_mod_test.pf @@ -52,8 +52,8 @@ contains !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! subroutine setUp(this) - 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 : & @@ -77,7 +77,7 @@ contains prime_mesh_name = mesh_name, & geometry = geometry_spherical, & prepartitioned = .false., & - topology = topology_fully_periodic, & + topology = topology_periodic, & fplane = .false., & f_lat_deg = 0.0_r_def ) diff --git a/science/linear/source/algorithm/transport/common/tl_end_of_transport_step_alg_mod.x90 b/science/linear/source/algorithm/transport/common/tl_end_of_transport_step_alg_mod.x90 index 7907633867..2594e5d46c 100644 --- a/science/linear/source/algorithm/transport/common/tl_end_of_transport_step_alg_mod.x90 +++ b/science/linear/source/algorithm/transport/common/tl_end_of_transport_step_alg_mod.x90 @@ -8,7 +8,7 @@ module tl_end_of_transport_step_alg_mod - use base_mesh_config_mod, only: topology, topology_non_periodic + use base_mesh_config_mod, only: topology use boundaries_config_mod, only: limited_area use constants_mod, only: i_def, r_tran, l_def use end_of_transport_step_alg_mod, only: build_up_flux @@ -19,7 +19,7 @@ module tl_end_of_transport_step_alg_mod use function_space_collection_mod, only: function_space_collection use log_mod, only: log_event, LOG_LEVEL_ERROR, & LOG_LEVEL_DEBUG - use mesh_mod, only: mesh_type + use mesh_mod, only: mesh_type, topology_non_periodic use mesh_collection_mod, only: mesh_collection use operator_mod, only: operator_type use dg_matrix_vector_kernel_mod, only: dg_matrix_vector_kernel_type diff --git a/science/linear/source/algorithm/transport/ffsl/tl_ffsl_hori_alg_mod.x90 b/science/linear/source/algorithm/transport/ffsl/tl_ffsl_hori_alg_mod.x90 index 63dfcdeac9..0473acf3af 100644 --- a/science/linear/source/algorithm/transport/ffsl/tl_ffsl_hori_alg_mod.x90 +++ b/science/linear/source/algorithm/transport/ffsl/tl_ffsl_hori_alg_mod.x90 @@ -20,7 +20,8 @@ module tl_ffsl_hori_alg_mod get_face_selector_ns use integer_field_mod, only: integer_field_type use log_mod, only: log_event, LOG_LEVEL_ERROR - use mesh_mod, only: mesh_type + use mesh_mod, only: mesh_type, topology_periodic, & + geometry_spherical use r_tran_field_mod, only: r_tran_field_type use timing_mod, only: start_timing, stop_timing, & tik, LPROF @@ -48,9 +49,7 @@ module tl_ffsl_hori_alg_mod use fv_divergence_2d_kernel_mod, only: fv_divergence_2d_kernel_type ! Configuration options - use base_mesh_config_mod, only: topology, & - topology_fully_periodic, & - geometry, geometry_spherical + use base_mesh_config_mod, only: topology, geometry use linear_config_mod, only: transport_efficiency use transport_config_mod, only: & panel_edge_treatment, & @@ -433,7 +432,7 @@ contains ! Whether computation is on the cubed sphere is_cubed_sphere = ( & geometry == geometry_spherical & - .and. topology == topology_fully_periodic & + .and. topology == topology_periodic & ) if (is_cubed_sphere) then @@ -704,7 +703,7 @@ contains ! Whether computation is on the cubed sphere is_cubed_sphere = ( & geometry == geometry_spherical & - .and. topology == topology_fully_periodic & + .and. topology == topology_periodic & ) if (is_cubed_sphere) then diff --git a/science/linear/source/algorithm/transport/mol/tl_mol_conservative_alg_mod.x90 b/science/linear/source/algorithm/transport/mol/tl_mol_conservative_alg_mod.x90 index 92e33a144b..f273c7f77e 100644 --- a/science/linear/source/algorithm/transport/mol/tl_mol_conservative_alg_mod.x90 +++ b/science/linear/source/algorithm/transport/mol/tl_mol_conservative_alg_mod.x90 @@ -14,7 +14,7 @@ module tl_mol_conservative_alg_mod use log_mod, only: log_event, & LOG_LEVEL_ERROR, & LOG_LEVEL_INFO - use mesh_mod, only: mesh_type + use mesh_mod, only: mesh_type, topology_non_periodic use operator_mod, only: operator_type use timing_mod, only: start_timing, stop_timing, & tik, LPROF @@ -43,7 +43,7 @@ module tl_mol_conservative_alg_mod ! Configuration modules use boundaries_config_mod, only: limited_area - use base_mesh_config_mod, only: topology, topology_non_periodic + use base_mesh_config_mod, only: topology use linear_config_mod, only: transport_efficiency use transport_config_mod, only: runge_kutta_method, & dry_field_name, & diff --git a/science/linear/source/algorithm/transport/mol/tl_wt_advective_update_alg_mod.x90 b/science/linear/source/algorithm/transport/mol/tl_wt_advective_update_alg_mod.x90 index 9e0ca9ba7f..5da37492dc 100644 --- a/science/linear/source/algorithm/transport/mol/tl_wt_advective_update_alg_mod.x90 +++ b/science/linear/source/algorithm/transport/mol/tl_wt_advective_update_alg_mod.x90 @@ -76,7 +76,6 @@ contains use reference_element_mod, only: reference_element_type - use mesh_mod, only: mesh_type use split_w2_field_kernel_mod, only: split_w2_field_kernel_type use integer_field_mod, only: integer_field_type use sci_geometric_constants_mod, only: get_face_selector_ew, & diff --git a/science/linear/unit-test/kernel/core_dynamics/initial_theta_ref_kernel_mod_test.pf b/science/linear/unit-test/kernel/core_dynamics/initial_theta_ref_kernel_mod_test.pf index e0a6e14f1b..d50b50a68b 100644 --- a/science/linear/unit-test/kernel/core_dynamics/initial_theta_ref_kernel_mod_test.pf +++ b/science/linear/unit-test/kernel/core_dynamics/initial_theta_ref_kernel_mod_test.pf @@ -47,8 +47,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, & @@ -72,7 +72,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, & @@ -117,7 +117,7 @@ contains theta_pert_size=0.5_r_def, & theta_pert_start=5000.0_r_def ) - call init_chi_transforms(geometry_planar, topology_fully_periodic) + call init_chi_transforms(geometry_planar, topology_periodic) end subroutine set_up diff --git a/science/linear/unit-test/kernel/core_dynamics/tl_project_eos_pressure_kernel_mod_test.pf b/science/linear/unit-test/kernel/core_dynamics/tl_project_eos_pressure_kernel_mod_test.pf index 19fee89a0e..4a82fb0a4a 100644 --- a/science/linear/unit-test/kernel/core_dynamics/tl_project_eos_pressure_kernel_mod_test.pf +++ b/science/linear/unit-test/kernel/core_dynamics/tl_project_eos_pressure_kernel_mod_test.pf @@ -37,8 +37,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, & @@ -58,7 +58,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, & @@ -90,7 +90,7 @@ contains theta_pert_size=0.5_r_def, & theta_pert_start=5000.0_r_def ) - call init_chi_transforms(geometry_planar, topology_fully_periodic) + call init_chi_transforms(geometry_planar, topology_periodic) call feign_planet_config( gravity=10.0_r_def, & omega=8.0E-5_r_def, & diff --git a/science/linear/unit-test/kernel/core_dynamics/tl_rhs_project_eos_kernel_mod_test.pf b/science/linear/unit-test/kernel/core_dynamics/tl_rhs_project_eos_kernel_mod_test.pf index fd06b4989a..eb00469005 100644 --- a/science/linear/unit-test/kernel/core_dynamics/tl_rhs_project_eos_kernel_mod_test.pf +++ b/science/linear/unit-test/kernel/core_dynamics/tl_rhs_project_eos_kernel_mod_test.pf @@ -54,8 +54,8 @@ contains !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! subroutine setUp( this ) - use base_mesh_config_mod, only : geometry_planar, & - topology_fully_periodic + use mesh_mod, only : geometry_planar, & + topology_periodic use finite_element_config_mod, only : cellshape_quadrilateral, & coord_system_xyz, coord_space_wchi use feign_config_mod, only : feign_base_mesh_config, & @@ -73,7 +73,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( cellshape=cellshape_quadrilateral, & coord_order=0_i_def, & @@ -96,7 +96,7 @@ contains theta_pert_size=0.5_r_def, & theta_pert_start=5000.0_r_def ) - call init_chi_transforms(geometry_planar, topology_fully_periodic) + call init_chi_transforms(geometry_planar, topology_periodic) end subroutine setUp diff --git a/science/linear/unit-test/kernel/core_dynamics/tl_rhs_sample_eos_kernel_mod_test.pf b/science/linear/unit-test/kernel/core_dynamics/tl_rhs_sample_eos_kernel_mod_test.pf index ceccb2e969..44417254cf 100644 --- a/science/linear/unit-test/kernel/core_dynamics/tl_rhs_sample_eos_kernel_mod_test.pf +++ b/science/linear/unit-test/kernel/core_dynamics/tl_rhs_sample_eos_kernel_mod_test.pf @@ -54,8 +54,8 @@ contains !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! subroutine setUp( this ) - use base_mesh_config_mod, only : geometry_planar, & - topology_fully_periodic + use mesh_mod, only : geometry_planar, & + topology_periodic use finite_element_config_mod, only : cellshape_quadrilateral, & coord_system_xyz, coord_space_wchi use feign_config_mod, only : feign_base_mesh_config, & @@ -72,7 +72,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( cellshape=cellshape_quadrilateral, & coord_order=0_i_def, & diff --git a/science/linear/unit-test/kernel/core_dynamics/tl_sample_eos_pressure_kernel_mod_test.pf b/science/linear/unit-test/kernel/core_dynamics/tl_sample_eos_pressure_kernel_mod_test.pf index ee9b58d3f3..5fddb68e2a 100644 --- a/science/linear/unit-test/kernel/core_dynamics/tl_sample_eos_pressure_kernel_mod_test.pf +++ b/science/linear/unit-test/kernel/core_dynamics/tl_sample_eos_pressure_kernel_mod_test.pf @@ -37,8 +37,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, & @@ -58,7 +58,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, & @@ -96,7 +96,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 diff --git a/science/shared/unit-test/utilities/space_from_metadata_mod_test.pf b/science/shared/unit-test/utilities/space_from_metadata_mod_test.pf index c53e718a88..2231ba7d09 100644 --- a/science/shared/unit-test/utilities/space_from_metadata_mod_test.pf +++ b/science/shared/unit-test/utilities/space_from_metadata_mod_test.pf @@ -11,15 +11,15 @@ module space_from_metadata_mod_test use feign_config_mod, only : feign_base_mesh_config - use base_mesh_config_mod, only : geometry_planar, & - topology_fully_periodic + use mesh_mod, only : geometry_planar, & + topology_periodic use space_from_metadata_mod, only : trim_string_start_arrow, & try_split, split_composite_grid_ref, & get_field_fsenum, get_field_flavour, & space_from_metadata use constants_mod, only : r_def, str_def, l_def, i_def use funit - use function_space_mod, only: function_space_type + use function_space_mod, only : function_space_type implicit none @@ -40,7 +40,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 ) end subroutine set_up