From daf9284c6b1eec7f65d0391f4e58cfb693d06bfe Mon Sep 17 00:00:00 2001 From: Jules Kouatchou Date: Wed, 14 Aug 2024 14:22:02 -0400 Subject: [PATCH] - Move procedures from individual submodules files back into main modules. - Make sure that the procedures are no longer within interface statements. --- generic3g/CMakeLists.txt | 12 +- generic3g/GriddedComponentDriver.F90 | 73 +++++--- .../GriddedComponentDriver/get_clock.F90 | 19 -- .../GriddedComponentDriver/get_gridcomp.F90 | 15 -- generic3g/GriddedComponentDriver/get_name.F90 | 22 --- .../GriddedComponentDriver/get_states.F90 | 20 -- .../GriddedComponentDriver/set_clock.F90 | 19 -- generic3g/OuterMetaComponent.F90 | 177 +++++++++++------- .../OuterMetaComponent/get_component_spec.F90 | 14 -- generic3g/OuterMetaComponent/get_geom.F90 | 16 -- generic3g/OuterMetaComponent/get_gridcomp.F90 | 16 -- generic3g/OuterMetaComponent/get_hconfig.F90 | 16 -- .../OuterMetaComponent/get_internal_state.F90 | 20 -- generic3g/OuterMetaComponent/get_lgr.F90 | 16 -- generic3g/OuterMetaComponent/get_name.F90 | 22 --- generic3g/OuterMetaComponent/get_phases.F90 | 17 -- generic3g/OuterMetaComponent/get_registry.F90 | 16 -- .../OuterMetaComponent/get_user_gc_driver.F90 | 14 -- generic3g/OuterMetaComponent/set_geom.F90 | 16 -- generic3g/OuterMetaComponent/set_hconfig.F90 | 16 -- .../OuterMetaComponent/set_vertical_grid.F90 | 16 -- geom_mgr/CoordinateAxis.F90 | 46 +++-- geom_mgr/CoordinateAxis/CMakeLists.txt | 3 - geom_mgr/CoordinateAxis/equal_to.F90 | 1 + geom_mgr/CoordinateAxis/get_centers.F90 | 19 -- geom_mgr/CoordinateAxis/get_corners.F90 | 19 -- geom_mgr/CoordinateAxis/get_extent.F90 | 20 -- geom_mgr/CoordinateAxis/is_periodic.F90 | 1 + geom_mgr/GeomManager.F90 | 90 ++++++--- geom_mgr/GeomManager/CMakeLists.txt | 4 - geom_mgr/GeomManager/get_geom_from_id.F90 | 24 --- .../get_mapl_geom_from_hconfig.F90 | 24 --- .../GeomManager/get_mapl_geom_from_id.F90 | 22 --- .../get_mapl_geom_from_metadata.F90 | 24 --- geom_mgr/MaplGeom.F90 | 57 +++--- geom_mgr/MaplGeom/CMakeLists.txt | 5 - geom_mgr/MaplGeom/get_factory.F90 | 21 --- geom_mgr/MaplGeom/get_file_metadata.F90 | 21 --- geom_mgr/MaplGeom/get_geom.F90 | 21 --- geom_mgr/MaplGeom/get_gridded_dims.F90 | 21 --- geom_mgr/MaplGeom/get_spec.F90 | 21 --- 41 files changed, 279 insertions(+), 757 deletions(-) delete mode 100644 generic3g/GriddedComponentDriver/get_clock.F90 delete mode 100644 generic3g/GriddedComponentDriver/get_gridcomp.F90 delete mode 100644 generic3g/GriddedComponentDriver/get_name.F90 delete mode 100644 generic3g/GriddedComponentDriver/get_states.F90 delete mode 100644 generic3g/GriddedComponentDriver/set_clock.F90 delete mode 100644 generic3g/OuterMetaComponent/get_component_spec.F90 delete mode 100644 generic3g/OuterMetaComponent/get_geom.F90 delete mode 100644 generic3g/OuterMetaComponent/get_gridcomp.F90 delete mode 100644 generic3g/OuterMetaComponent/get_hconfig.F90 delete mode 100644 generic3g/OuterMetaComponent/get_internal_state.F90 delete mode 100644 generic3g/OuterMetaComponent/get_lgr.F90 delete mode 100644 generic3g/OuterMetaComponent/get_name.F90 delete mode 100644 generic3g/OuterMetaComponent/get_phases.F90 delete mode 100644 generic3g/OuterMetaComponent/get_registry.F90 delete mode 100644 generic3g/OuterMetaComponent/get_user_gc_driver.F90 delete mode 100644 generic3g/OuterMetaComponent/set_geom.F90 delete mode 100644 generic3g/OuterMetaComponent/set_hconfig.F90 delete mode 100644 generic3g/OuterMetaComponent/set_vertical_grid.F90 delete mode 100644 geom_mgr/CoordinateAxis/get_centers.F90 delete mode 100644 geom_mgr/CoordinateAxis/get_corners.F90 delete mode 100644 geom_mgr/CoordinateAxis/get_extent.F90 delete mode 100644 geom_mgr/GeomManager/get_geom_from_id.F90 delete mode 100644 geom_mgr/GeomManager/get_mapl_geom_from_hconfig.F90 delete mode 100644 geom_mgr/GeomManager/get_mapl_geom_from_id.F90 delete mode 100644 geom_mgr/GeomManager/get_mapl_geom_from_metadata.F90 delete mode 100644 geom_mgr/MaplGeom/get_factory.F90 delete mode 100644 geom_mgr/MaplGeom/get_file_metadata.F90 delete mode 100644 geom_mgr/MaplGeom/get_geom.F90 delete mode 100644 geom_mgr/MaplGeom/get_gridded_dims.F90 delete mode 100644 geom_mgr/MaplGeom/get_spec.F90 diff --git a/generic3g/CMakeLists.txt b/generic3g/CMakeLists.txt index 898518db6931..4101e55f1839 100644 --- a/generic3g/CMakeLists.txt +++ b/generic3g/CMakeLists.txt @@ -71,15 +71,12 @@ esma_add_fortran_submodules( SOURCES SetServices.F90 add_child_by_name.F90 new_outer_meta.F90 init_meta.F90 get_child_by_name.F90 run_child_by_name.F90 run_children.F90 get_outer_meta_from_outer_gc.F90 attach_outer_meta.F90 free_outer_meta.F90 - get_phases.F90 set_hconfig.F90 get_hconfig.F90 get_geom.F90 initialize_advertise_geom.F90 initialize_realize_geom.F90 initialize_advertise.F90 initialize_post_advertise.F90 initialize_realize.F90 recurse.F90 apply_to_children_custom.F90 initialize_user.F90 run_custom.F90 run_user.F90 run_clock_advance.F90 - read_restart.F90 write_restart.F90 get_name.F90 get_gridcomp.F90 - set_geom.F90 set_vertical_grid.F90 get_registry.F90 - get_component_spec.F90 get_internal_state.F90 get_lgr.F90 - get_user_gc_driver.F90 connect_all.F90 set_entry_point.F90 + read_restart.F90 write_restart.F90 + connect_all.F90 set_entry_point.F90 finalize.F90) esma_add_fortran_submodules( @@ -98,10 +95,9 @@ esma_add_fortran_submodules( esma_add_fortran_submodules( TARGET MAPL.generic3g SUBDIRECTORY GriddedComponentDriver - SOURCES initialize.F90 run.F90 finalize.F90 get_states.F90 - get_clock.F90 set_clock.F90 run_export_couplers.F90 + SOURCES initialize.F90 run.F90 finalize.F90 run_export_couplers.F90 run_import_couplers.F90 clock_advance.F90 new_GriddedComponentDriver.F90 - get_gridcomp.F90 get_name.F90 add_export_coupler.F90 + add_export_coupler.F90 add_import_coupler.F90 read_restart.F90 write_restart.F90) target_include_directories (${this} PUBLIC diff --git a/generic3g/GriddedComponentDriver.F90 b/generic3g/GriddedComponentDriver.F90 index abd1e411447e..b503a02cc6a4 100644 --- a/generic3g/GriddedComponentDriver.F90 +++ b/generic3g/GriddedComponentDriver.F90 @@ -84,23 +84,6 @@ module recursive subroutine write_restart(this, unusable, phase_idx, rc) integer, optional, intent(out) :: rc end subroutine write_restart - module function get_states(this) result(states) - type(MultiState) :: states - class(GriddedComponentDriver), intent(in) :: this - end function get_states - - module function get_clock(this) result(clock) - use esmf, only: ESMF_Clock - type(ESMF_Clock) :: clock - class(GriddedComponentDriver), intent(in) :: this - end function get_clock - - module subroutine set_clock(this, clock) - use esmf, only: ESMF_Clock - class(GriddedComponentDriver), intent(inout) :: this - type(ESMF_Clock), intent(in) :: clock - end subroutine set_clock - recursive module subroutine run_export_couplers(this, unusable, phase_idx, rc) class(GriddedComponentDriver), intent(inout) :: this class(KE), optional, intent(in) :: unusable @@ -125,18 +108,6 @@ module function new_GriddedComponentDriver(gridcomp, clock, states) result(child type(MultiState), intent(in) :: states end function new_GriddedComponentDriver - module function get_gridcomp(this) result(gridcomp) - use esmf, only: ESMF_GridComp - type(ESMF_GridComp) :: gridcomp - class(GriddedComponentDriver), intent(in) :: this - end function get_gridcomp - - module function get_name(this, rc) result(name) - character(:), allocatable :: name - class(GriddedComponentDriver), intent(in) :: this - integer, optional, intent(out) :: rc - end function get_name - module subroutine add_export_coupler(this, driver) class(GriddedComponentDriver), intent(inout) :: this type(GriddedComponentDriver), intent(in) :: driver @@ -149,4 +120,48 @@ end subroutine add_import_coupler end interface + CONTAINS + + function get_clock(this) result(clock) + type(ESMF_Clock) :: clock + class(GriddedComponentDriver), intent(in) :: this + + clock = this%clock + end function get_clock + + function get_gridcomp(this) result(gridcomp) + use esmf, only: ESMF_GridComp + type(ESMF_GridComp) :: gridcomp + class(GriddedComponentDriver), intent(in) :: this + gridcomp = this%gridcomp + end function get_gridcomp + + function get_name(this, rc) result(name) + character(:), allocatable :: name + class(GriddedComponentDriver), intent(in) :: this + integer, optional, intent(out) :: rc + + integer :: status + character(len=ESMF_MAXSTR) :: buffer + + call ESMF_GridCompGet(this%gridcomp, name=buffer, _RC) + name = trim(buffer) + + _RETURN(ESMF_SUCCESS) + end function get_name + + function get_states(this) result(states) + type(MultiState) :: states + class(GriddedComponentDriver), intent(in) :: this + + states = this%states + end function get_states + + subroutine set_clock(this, clock) + class(GriddedComponentDriver), intent(inout) :: this + type(ESMF_Clock), intent(in) :: clock + + this%clock = clock + end subroutine set_clock + end module mapl3g_GriddedComponentDriver diff --git a/generic3g/GriddedComponentDriver/get_clock.F90 b/generic3g/GriddedComponentDriver/get_clock.F90 deleted file mode 100644 index 36c7735981e9..000000000000 --- a/generic3g/GriddedComponentDriver/get_clock.F90 +++ /dev/null @@ -1,19 +0,0 @@ -#include "MAPL_ErrLog.h" - -submodule(mapl3g_GriddedComponentDriver) get_clock_smod - use :: mapl_ErrorHandling - use :: mapl3g_OuterMetaComponent - use :: mapl3g_MethodPhasesMapUtils - use mapl3g_CouplerMetaComponent, only: GENERIC_COUPLER_INVALIDATE, GENERIC_COUPLER_UPDATE - implicit none - -contains - - module function get_clock(this) result(clock) - type(ESMF_Clock) :: clock - class(GriddedComponentDriver), intent(in) :: this - - clock = this%clock - end function get_clock - -end submodule get_clock_smod diff --git a/generic3g/GriddedComponentDriver/get_gridcomp.F90 b/generic3g/GriddedComponentDriver/get_gridcomp.F90 deleted file mode 100644 index 4777a3f8bd06..000000000000 --- a/generic3g/GriddedComponentDriver/get_gridcomp.F90 +++ /dev/null @@ -1,15 +0,0 @@ -#include "MAPL_Generic.h" - -submodule (mapl3g_GriddedComponentDriver) get_gridcomp_smod - implicit none - -contains - - module function get_gridcomp(this) result(gridcomp) - use esmf, only: ESMF_GridComp - type(ESMF_GridComp) :: gridcomp - class(GriddedComponentDriver), intent(in) :: this - gridcomp = this%gridcomp - end function get_gridcomp - -end submodule get_gridcomp_smod diff --git a/generic3g/GriddedComponentDriver/get_name.F90 b/generic3g/GriddedComponentDriver/get_name.F90 deleted file mode 100644 index c7765abf1241..000000000000 --- a/generic3g/GriddedComponentDriver/get_name.F90 +++ /dev/null @@ -1,22 +0,0 @@ -#include "MAPL_Generic.h" - -submodule (mapl3g_GriddedComponentDriver) get_name_smod - implicit none - -contains - - module function get_name(this, rc) result(name) - character(:), allocatable :: name - class(GriddedComponentDriver), intent(in) :: this - integer, optional, intent(out) :: rc - - integer :: status - character(len=ESMF_MAXSTR) :: buffer - - call ESMF_GridCompGet(this%gridcomp, name=buffer, _RC) - name = trim(buffer) - - _RETURN(ESMF_SUCCESS) - end function get_name - -end submodule get_name_smod diff --git a/generic3g/GriddedComponentDriver/get_states.F90 b/generic3g/GriddedComponentDriver/get_states.F90 deleted file mode 100644 index 4e067a5951c5..000000000000 --- a/generic3g/GriddedComponentDriver/get_states.F90 +++ /dev/null @@ -1,20 +0,0 @@ -#include "MAPL_ErrLog.h" - -submodule(mapl3g_GriddedComponentDriver) get_states_smod - use :: mapl_ErrorHandling - use :: mapl3g_OuterMetaComponent - use :: mapl3g_MethodPhasesMapUtils - use mapl3g_CouplerMetaComponent, only: GENERIC_COUPLER_INVALIDATE, GENERIC_COUPLER_UPDATE - implicit none - -contains - - module function get_states(this) result(states) - type(MultiState) :: states - class(GriddedComponentDriver), intent(in) :: this - - states = this%states - end function get_states - - -end submodule get_states_smod diff --git a/generic3g/GriddedComponentDriver/set_clock.F90 b/generic3g/GriddedComponentDriver/set_clock.F90 deleted file mode 100644 index 6ca0cff7462c..000000000000 --- a/generic3g/GriddedComponentDriver/set_clock.F90 +++ /dev/null @@ -1,19 +0,0 @@ -#include "MAPL_ErrLog.h" - -submodule(mapl3g_GriddedComponentDriver) set_clock_smod - use :: mapl_ErrorHandling - use :: mapl3g_OuterMetaComponent - use :: mapl3g_MethodPhasesMapUtils - use mapl3g_CouplerMetaComponent, only: GENERIC_COUPLER_INVALIDATE, GENERIC_COUPLER_UPDATE - implicit none - -contains - - module subroutine set_clock(this, clock) - class(GriddedComponentDriver), intent(inout) :: this - type(ESMF_Clock), intent(in) :: clock - - this%clock = clock - end subroutine set_clock - -end submodule set_clock_smod diff --git a/generic3g/OuterMetaComponent.F90 b/generic3g/OuterMetaComponent.F90 index 7bbd70bee830..23d090528cb9 100644 --- a/generic3g/OuterMetaComponent.F90 +++ b/generic3g/OuterMetaComponent.F90 @@ -214,27 +214,6 @@ module subroutine free_outer_meta(gridcomp, rc) integer, optional, intent(out) :: rc end subroutine free_outer_meta - module function get_phases(this, method_flag) result(phases) - type(StringVector), pointer :: phases - class(OuterMetaComponent), target, intent(inout):: this - type(ESMF_Method_Flag), intent(in) :: method_flag - end function get_phases - - module subroutine set_hconfig(this, hconfig) - class(OuterMetaComponent), intent(inout) :: this - type(ESMF_HConfig), intent(in) :: hconfig - end subroutine set_hconfig - - module function get_hconfig(this) result(hconfig) - type(ESMF_Hconfig) :: hconfig - class(OuterMetaComponent), intent(inout) :: this - end function get_hconfig - - module function get_geom(this) result(geom) - type(ESMF_Geom) :: geom - class(OuterMetaComponent), intent(inout) :: this - end function get_geom - module recursive subroutine initialize_advertise_geom(this, unusable, rc) class(OuterMetaComponent), target, intent(inout) :: this ! optional arguments @@ -354,52 +333,6 @@ module recursive subroutine write_restart(this, importState, exportState, clock, integer, optional, intent(out) :: rc end subroutine write_restart - module function get_name(this, rc) result(name) - character(:), allocatable :: name - class(OuterMetaComponent), intent(in) :: this - integer, optional, intent(out) :: rc - end function get_name - - module function get_gridcomp(this) result(gridcomp) - type(ESMF_GridComp) :: gridcomp - class(OuterMetaComponent), intent(in) :: this - end function get_gridcomp - - module subroutine set_geom(this, geom) - class(OuterMetaComponent), intent(inout) :: this - type(ESMF_Geom), intent(in) :: geom - end subroutine set_geom - - module subroutine set_vertical_grid(this, vertical_grid) - class(OuterMetaComponent), intent(inout) :: this - class(VerticalGrid), intent(in) :: verticaL_grid - end subroutine set_vertical_grid - - module function get_registry(this) result(registry) - type(StateRegistry), pointer :: registry - class(OuterMetaComponent), target, intent(in) :: this - end function get_registry - - module function get_component_spec(this) result(component_spec) - type(ComponentSpec), pointer :: component_spec - class(OuterMetaComponent), target, intent(in) :: this - end function get_component_spec - - module function get_internal_state(this) result(internal_state) - type(ESMF_State) :: internal_state - class(OuterMetaComponent), intent(in) :: this - end function get_internal_state - - module function get_lgr(this) result(lgr) - class(Logger), pointer :: lgr - class(OuterMetaComponent), target, intent(in) :: this - end function get_lgr - - module function get_user_gc_driver(this) result(user_gc_driver) - type(GriddedComponentDriver), pointer :: user_gc_driver - class(OuterMetaComponent), target, intent(in) :: this - end function get_user_gc_driver - module subroutine connect_all(this, src_comp, dst_comp, rc) class(OuterMetaComponent), intent(inout) :: this character(*), intent(in) :: src_comp @@ -441,4 +374,114 @@ end subroutine set_entry_point integer, save :: counter = 0 + CONTAINS + + function get_component_spec(this) result(component_spec) + type(ComponentSpec), pointer :: component_spec + class(OuterMetaComponent), target, intent(in) :: this + component_spec => this%component_spec + end function get_component_spec + + function get_geom(this) result(geom) + type(ESMF_Geom) :: geom + class(OuterMetaComponent), intent(inout) :: this + + geom = this%geom + + end function get_geom + + function get_gridcomp(this) result(gridcomp) + type(ESMF_GridComp) :: gridcomp + class(OuterMetaComponent), intent(in) :: this + gridcomp = this%self_gridcomp + end function get_gridcomp + + function get_hconfig(this) result(hconfig) + type(ESMF_Hconfig) :: hconfig + class(OuterMetaComponent), intent(inout) :: this + + hconfig = this%hconfig + + end function get_hconfig + + !TODO: put "user" in procedure name + function get_internal_state(this) result(internal_state) + type(ESMF_State) :: internal_state + class(OuterMetaComponent), intent(in) :: this + + type(MultiState) :: user_states + + user_states = this%user_gc_driver%get_states() + internal_state = user_states%internalState + + end function get_internal_state + + function get_lgr(this) result(lgr) + class(Logger), pointer :: lgr + class(OuterMetaComponent), target, intent(in) :: this + + lgr => this%lgr + + end function get_lgr + + function get_name(this, rc) result(name) + character(:), allocatable :: name + class(OuterMetaComponent), intent(in) :: this + integer, optional, intent(out) :: rc + + integer :: status + character(len=ESMF_MAXSTR) :: buffer + + call ESMF_GridCompGet(this%self_gridcomp, name=buffer, _RC) + name=trim(buffer) + + _RETURN(ESMF_SUCCESS) + end function get_name + + function get_phases(this, method_flag) result(phases) + type(StringVector), pointer :: phases + class(OuterMetaComponent), target, intent(inout):: this + type(ESMF_Method_Flag), intent(in) :: method_flag + + phases => this%user_phases_map%of(method_flag) + + end function get_phases + + function get_registry(this) result(registry) + type(StateRegistry), pointer :: registry + class(OuterMetaComponent), target, intent(in) :: this + + registry => this%registry + end function get_registry + + function get_user_gc_driver(this) result(user_gc_driver) + type(GriddedComponentDriver), pointer :: user_gc_driver + class(OuterMetaComponent), target, intent(in) :: this + user_gc_driver => this%user_gc_driver + end function get_user_gc_driver + + subroutine set_geom(this, geom) + class(OuterMetaComponent), intent(inout) :: this + type(ESMF_Geom), intent(in) :: geom + + this%geom = geom + + end subroutine set_geom + + subroutine set_hconfig(this, hconfig) + class(OuterMetaComponent), intent(inout) :: this + type(ESMF_HConfig), intent(in) :: hconfig + + this%hconfig = hconfig + + end subroutine set_hconfig + + subroutine set_vertical_grid(this, vertical_grid) + class(OuterMetaComponent), intent(inout) :: this + class(VerticalGrid), intent(in) :: verticaL_grid + + this%vertical_grid = vertical_grid + + end subroutine set_vertical_grid + end module mapl3g_OuterMetaComponent diff --git a/generic3g/OuterMetaComponent/get_component_spec.F90 b/generic3g/OuterMetaComponent/get_component_spec.F90 deleted file mode 100644 index f319e6416ebb..000000000000 --- a/generic3g/OuterMetaComponent/get_component_spec.F90 +++ /dev/null @@ -1,14 +0,0 @@ -#include "MAPL_Generic.h" - -submodule (mapl3g_OuterMetaComponent) get_component_spec_smod - implicit none - -contains - - module function get_component_spec(this) result(component_spec) - type(ComponentSpec), pointer :: component_spec - class(OuterMetaComponent), target, intent(in) :: this - component_spec => this%component_spec - end function get_component_spec - -end submodule get_component_spec_smod diff --git a/generic3g/OuterMetaComponent/get_geom.F90 b/generic3g/OuterMetaComponent/get_geom.F90 deleted file mode 100644 index d410a9307f38..000000000000 --- a/generic3g/OuterMetaComponent/get_geom.F90 +++ /dev/null @@ -1,16 +0,0 @@ -#include "MAPL_Generic.h" - -submodule (mapl3g_OuterMetaComponent) get_geom_smod - implicit none - -contains - - module function get_geom(this) result(geom) - type(ESMF_Geom) :: geom - class(OuterMetaComponent), intent(inout) :: this - - geom = this%geom - - end function get_geom - -end submodule get_geom_smod diff --git a/generic3g/OuterMetaComponent/get_gridcomp.F90 b/generic3g/OuterMetaComponent/get_gridcomp.F90 deleted file mode 100644 index cc8fd34ef7e2..000000000000 --- a/generic3g/OuterMetaComponent/get_gridcomp.F90 +++ /dev/null @@ -1,16 +0,0 @@ -#include "MAPL_Generic.h" - -submodule (mapl3g_OuterMetaComponent) get_gridcomp_smod - implicit none - -contains - - ! Needed for unit testing purposes. - - module function get_gridcomp(this) result(gridcomp) - type(ESMF_GridComp) :: gridcomp - class(OuterMetaComponent), intent(in) :: this - gridcomp = this%self_gridcomp - end function get_gridcomp - -end submodule get_gridcomp_smod diff --git a/generic3g/OuterMetaComponent/get_hconfig.F90 b/generic3g/OuterMetaComponent/get_hconfig.F90 deleted file mode 100644 index 8817f8239447..000000000000 --- a/generic3g/OuterMetaComponent/get_hconfig.F90 +++ /dev/null @@ -1,16 +0,0 @@ -#include "MAPL_Generic.h" - -submodule (mapl3g_OuterMetaComponent) get_hconfig_smod - implicit none - -contains - - module function get_hconfig(this) result(hconfig) - type(ESMF_Hconfig) :: hconfig - class(OuterMetaComponent), intent(inout) :: this - - hconfig = this%hconfig - - end function get_hconfig - -end submodule get_hconfig_smod diff --git a/generic3g/OuterMetaComponent/get_internal_state.F90 b/generic3g/OuterMetaComponent/get_internal_state.F90 deleted file mode 100644 index ca6b4e52c9be..000000000000 --- a/generic3g/OuterMetaComponent/get_internal_state.F90 +++ /dev/null @@ -1,20 +0,0 @@ -#include "MAPL_Generic.h" - -submodule (mapl3g_OuterMetaComponent) get_internal_state_smod - implicit none - -contains - - !TODO: put "user" in procedure name - module function get_internal_state(this) result(internal_state) - type(ESMF_State) :: internal_state - class(OuterMetaComponent), intent(in) :: this - - type(MultiState) :: user_states - - user_states = this%user_gc_driver%get_states() - internal_state = user_states%internalState - - end function get_internal_state - -end submodule get_internal_state_smod diff --git a/generic3g/OuterMetaComponent/get_lgr.F90 b/generic3g/OuterMetaComponent/get_lgr.F90 deleted file mode 100644 index f9d46adc8cec..000000000000 --- a/generic3g/OuterMetaComponent/get_lgr.F90 +++ /dev/null @@ -1,16 +0,0 @@ -#include "MAPL_Generic.h" - -submodule (mapl3g_OuterMetaComponent) get_lgr_smod - implicit none - -contains - - module function get_lgr(this) result(lgr) - class(Logger), pointer :: lgr - class(OuterMetaComponent), target, intent(in) :: this - - lgr => this%lgr - - end function get_lgr - -end submodule get_lgr_smod diff --git a/generic3g/OuterMetaComponent/get_name.F90 b/generic3g/OuterMetaComponent/get_name.F90 deleted file mode 100644 index 3d92729a7f69..000000000000 --- a/generic3g/OuterMetaComponent/get_name.F90 +++ /dev/null @@ -1,22 +0,0 @@ -#include "MAPL_Generic.h" - -submodule (mapl3g_OuterMetaComponent) get_name_smod - implicit none - -contains - - module function get_name(this, rc) result(name) - character(:), allocatable :: name - class(OuterMetaComponent), intent(in) :: this - integer, optional, intent(out) :: rc - - integer :: status - character(len=ESMF_MAXSTR) :: buffer - - call ESMF_GridCompGet(this%self_gridcomp, name=buffer, _RC) - name=trim(buffer) - - _RETURN(ESMF_SUCCESS) - end function get_name - -end submodule get_name_smod diff --git a/generic3g/OuterMetaComponent/get_phases.F90 b/generic3g/OuterMetaComponent/get_phases.F90 deleted file mode 100644 index 11aa8d482332..000000000000 --- a/generic3g/OuterMetaComponent/get_phases.F90 +++ /dev/null @@ -1,17 +0,0 @@ -#include "MAPL_Generic.h" - -submodule (mapl3g_OuterMetaComponent) get_phases_smod - implicit none - -contains - - module function get_phases(this, method_flag) result(phases) - type(StringVector), pointer :: phases - class(OuterMetaComponent), target, intent(inout):: this - type(ESMF_Method_Flag), intent(in) :: method_flag - - phases => this%user_phases_map%of(method_flag) - - end function get_phases - -end submodule get_phases_smod diff --git a/generic3g/OuterMetaComponent/get_registry.F90 b/generic3g/OuterMetaComponent/get_registry.F90 deleted file mode 100644 index 6bdfa2a1e9be..000000000000 --- a/generic3g/OuterMetaComponent/get_registry.F90 +++ /dev/null @@ -1,16 +0,0 @@ -#include "MAPL_Generic.h" - -submodule (mapl3g_OuterMetaComponent) get_registry_smod - implicit none - -contains - - module function get_registry(this) result(registry) - type(StateRegistry), pointer :: registry - class(OuterMetaComponent), target, intent(in) :: this - - registry => this%registry - end function get_registry - - -end submodule get_registry_smod diff --git a/generic3g/OuterMetaComponent/get_user_gc_driver.F90 b/generic3g/OuterMetaComponent/get_user_gc_driver.F90 deleted file mode 100644 index aec7ddb89aae..000000000000 --- a/generic3g/OuterMetaComponent/get_user_gc_driver.F90 +++ /dev/null @@ -1,14 +0,0 @@ -#include "MAPL_Generic.h" - -submodule (mapl3g_OuterMetaComponent) get_user_gc_driver_smod - implicit none - -contains - - module function get_user_gc_driver(this) result(user_gc_driver) - type(GriddedComponentDriver), pointer :: user_gc_driver - class(OuterMetaComponent), target, intent(in) :: this - user_gc_driver => this%user_gc_driver - end function get_user_gc_driver - -end submodule get_user_gc_driver_smod diff --git a/generic3g/OuterMetaComponent/set_geom.F90 b/generic3g/OuterMetaComponent/set_geom.F90 deleted file mode 100644 index 5ea30497e844..000000000000 --- a/generic3g/OuterMetaComponent/set_geom.F90 +++ /dev/null @@ -1,16 +0,0 @@ -#include "MAPL_Generic.h" - -submodule (mapl3g_OuterMetaComponent) set_geom_smod - implicit none - -contains - - module subroutine set_geom(this, geom) - class(OuterMetaComponent), intent(inout) :: this - type(ESMF_Geom), intent(in) :: geom - - this%geom = geom - - end subroutine set_geom - -end submodule set_geom_smod diff --git a/generic3g/OuterMetaComponent/set_hconfig.F90 b/generic3g/OuterMetaComponent/set_hconfig.F90 deleted file mode 100644 index 14a9cff28621..000000000000 --- a/generic3g/OuterMetaComponent/set_hconfig.F90 +++ /dev/null @@ -1,16 +0,0 @@ -#include "MAPL_Generic.h" - -submodule (mapl3g_OuterMetaComponent) set_hconfig_smod - implicit none - -contains - - module subroutine set_hconfig(this, hconfig) - class(OuterMetaComponent), intent(inout) :: this - type(ESMF_HConfig), intent(in) :: hconfig - - this%hconfig = hconfig - - end subroutine set_hconfig - -end submodule set_hconfig_smod diff --git a/generic3g/OuterMetaComponent/set_vertical_grid.F90 b/generic3g/OuterMetaComponent/set_vertical_grid.F90 deleted file mode 100644 index 193559386491..000000000000 --- a/generic3g/OuterMetaComponent/set_vertical_grid.F90 +++ /dev/null @@ -1,16 +0,0 @@ -#include "MAPL_Generic.h" - -submodule (mapl3g_OuterMetaComponent) set_vertical_grid_smod - implicit none - -contains - - module subroutine set_vertical_grid(this, vertical_grid) - class(OuterMetaComponent), intent(inout) :: this - class(VerticalGrid), intent(in) :: verticaL_grid - - this%vertical_grid = vertical_grid - - end subroutine set_vertical_grid - -end submodule set_vertical_grid_smod diff --git a/geom_mgr/CoordinateAxis.F90 b/geom_mgr/CoordinateAxis.F90 index 097fac660e33..81be42888181 100644 --- a/geom_mgr/CoordinateAxis.F90 +++ b/geom_mgr/CoordinateAxis.F90 @@ -66,24 +66,6 @@ elemental logical module function not_equal_to(a, b) type(CoordinateAxis), intent(in) :: a, b end function not_equal_to - ! Accessors - !---------- - ! Note that size(this%corners) might be one larger for non-periodic - pure module function get_extent(this) result(extent) - class(CoordinateAxis), intent(in) :: this - integer :: extent - end function get_extent - - pure module function get_centers(this) result(centers) - real(kind=R8), allocatable :: centers(:) - class(CoordinateAxis), intent(in) :: this - end function get_centers - - pure module function get_corners(this) result(corners) - real(kind=R8), allocatable :: corners(:) - class(CoordinateAxis), intent(in) :: this - end function get_corners - pure logical module function is_periodic(this) class(CoordinateAxis), intent(in) :: this end function is_periodic @@ -103,8 +85,34 @@ module function get_coordinates_dim(file_metadata, dim_name, rc) result(coordina integer, optional, intent(out) :: rc end function get_coordinates_dim - end interface + CONTAINS + + pure function get_centers(this) result(centers) + real(kind=R8), allocatable :: centers(:) + class(CoordinateAxis), intent(in) :: this + + centers = this%centers + + end function get_centers + + pure function get_corners(this) result(corners) + real(kind=R8), allocatable :: corners(:) + class(CoordinateAxis), intent(in) :: this + + corners = this%corners + + end function get_corners + + ! Accessors + !---------- + ! Note that size(this%corners) might be one larger for non-periodic + pure function get_extent(this) result(extent) + class(CoordinateAxis), intent(in) :: this + integer :: extent + extent = size(this%centers) + end function get_extent + end module mapl3g_CoordinateAxis diff --git a/geom_mgr/CoordinateAxis/CMakeLists.txt b/geom_mgr/CoordinateAxis/CMakeLists.txt index ed7897e73f2a..f625f28ce928 100644 --- a/geom_mgr/CoordinateAxis/CMakeLists.txt +++ b/geom_mgr/CoordinateAxis/CMakeLists.txt @@ -3,9 +3,6 @@ target_sources(MAPL.geom_mgr PRIVATE new_CoordinateAxis.F90 equal_to.F90 not_equal_to.F90 - get_extent.F90 - get_centers.F90 - get_corners.F90 is_periodic.F90 get_dim_name.F90 get_coordinates_dim.F90 diff --git a/geom_mgr/CoordinateAxis/equal_to.F90 b/geom_mgr/CoordinateAxis/equal_to.F90 index b64a6b5c6cc6..70a5934f0ef4 100644 --- a/geom_mgr/CoordinateAxis/equal_to.F90 +++ b/geom_mgr/CoordinateAxis/equal_to.F90 @@ -10,6 +10,7 @@ elemental logical module function equal_to(a, b) type(CoordinateAxis), intent(in) :: a, b + INTRINSIC size ! Do the fast checks first equal_to = size(a%centers) == size(b%centers) diff --git a/geom_mgr/CoordinateAxis/get_centers.F90 b/geom_mgr/CoordinateAxis/get_centers.F90 deleted file mode 100644 index 3a7837869f44..000000000000 --- a/geom_mgr/CoordinateAxis/get_centers.F90 +++ /dev/null @@ -1,19 +0,0 @@ -#include "MAPL_ErrLog.h" - -submodule (mapl3g_CoordinateAxis) get_centers_smod - use esmf, only: ESMF_UtilStringLowerCase - use mapl_ErrorHandling - use gftl2_StringVector - use, intrinsic :: iso_fortran_env, only: REAL32, REAL64 - -contains - - pure module function get_centers(this) result(centers) - real(kind=R8), allocatable :: centers(:) - class(CoordinateAxis), intent(in) :: this - - centers = this%centers - - end function get_centers - -end submodule get_centers_smod diff --git a/geom_mgr/CoordinateAxis/get_corners.F90 b/geom_mgr/CoordinateAxis/get_corners.F90 deleted file mode 100644 index de195cdeff56..000000000000 --- a/geom_mgr/CoordinateAxis/get_corners.F90 +++ /dev/null @@ -1,19 +0,0 @@ -#include "MAPL_ErrLog.h" - -submodule (mapl3g_CoordinateAxis) get_corners_smod - use esmf, only: ESMF_UtilStringLowerCase - use mapl_ErrorHandling - use gftl2_StringVector - use, intrinsic :: iso_fortran_env, only: REAL32, REAL64 - -contains - - pure module function get_corners(this) result(corners) - real(kind=R8), allocatable :: corners(:) - class(CoordinateAxis), intent(in) :: this - - corners = this%corners - - end function get_corners - -end submodule get_corners_smod diff --git a/geom_mgr/CoordinateAxis/get_extent.F90 b/geom_mgr/CoordinateAxis/get_extent.F90 deleted file mode 100644 index cf01e289ef4c..000000000000 --- a/geom_mgr/CoordinateAxis/get_extent.F90 +++ /dev/null @@ -1,20 +0,0 @@ -#include "MAPL_ErrLog.h" - -submodule (mapl3g_CoordinateAxis) get_extent_smod - use esmf, only: ESMF_UtilStringLowerCase - use mapl_ErrorHandling - use gftl2_StringVector - use, intrinsic :: iso_fortran_env, only: REAL32, REAL64 - -contains - - ! Accessors - !---------- - ! Note that size(this%corners) might be one larger for non-periodic - pure module function get_extent(this) result(extent) - class(CoordinateAxis), intent(in) :: this - integer :: extent - extent = size(this%centers) - end function get_extent - -end submodule get_extent_smod diff --git a/geom_mgr/CoordinateAxis/is_periodic.F90 b/geom_mgr/CoordinateAxis/is_periodic.F90 index d2140b267639..0011b720af1c 100644 --- a/geom_mgr/CoordinateAxis/is_periodic.F90 +++ b/geom_mgr/CoordinateAxis/is_periodic.F90 @@ -13,6 +13,7 @@ pure logical module function is_periodic(this) real(kind=R8) :: span, spacing real(kind=R8), parameter :: tolerance = 0.01 + INTRINSIC size associate (corners => this%corners) associate (n => size(corners)) diff --git a/geom_mgr/GeomManager.F90 b/geom_mgr/GeomManager.F90 index 730672d1b70a..fd8157ce595b 100644 --- a/geom_mgr/GeomManager.F90 +++ b/geom_mgr/GeomManager.F90 @@ -105,29 +105,6 @@ module subroutine delete_mapl_geom(this, geom_spec, rc) integer, optional, intent(out) :: rc end subroutine delete_mapl_geom - - module function get_mapl_geom_from_hconfig(this, hconfig, rc) result(mapl_geom) - type(MaplGeom), pointer :: mapl_geom - class(GeomManager), target, intent(inout) :: this - type(ESMF_HConfig), intent(inout) :: hconfig - integer, optional, intent(out) :: rc - end function get_mapl_geom_from_hconfig - - module function get_mapl_geom_from_metadata(this, metadata, rc) result(mapl_geom) - type(MaplGeom), pointer :: mapl_geom - class(GeomManager), target, intent(inout) :: this - type(FileMetadata), intent(in) :: metadata - integer, optional, intent(out) :: rc - end function get_mapl_geom_from_metadata - - module function get_mapl_geom_from_id(this, id, rc) result(mapl_geom) - type(MaplGeom), pointer :: mapl_geom - class(GeomManager), target, intent(inout) :: this - integer, intent(in) :: id - integer, optional, intent(out) :: rc - end function get_mapl_geom_from_id - - module function get_mapl_geom_from_spec(this, geom_spec, rc) result(mapl_geom) type(MaplGeom), pointer :: mapl_geom class(GeomManager), target, intent(inout) :: this @@ -169,13 +146,6 @@ module function make_mapl_geom_from_spec(this, spec, rc) result(mapl_geom) integer, optional, intent(out) :: rc end function make_mapl_geom_from_spec - module function get_geom_from_id(this, id, rc) result(geom) - type(ESMF_Geom) :: geom - class(GeomManager), target, intent(inout) :: this - integer, intent(in) :: id - integer, optional, intent(out) :: rc - end function get_geom_from_id - module function get_geom_manager() result(geom_mgr) type(GeomManager), pointer :: geom_mgr end function get_geom_manager @@ -188,4 +158,64 @@ module function find_factory(factories, predicate, rc) result(factory) end function find_factory end interface + CONTAINS + + function get_geom_from_id(this, id, rc) result(geom) + type(ESMF_Geom) :: geom + class(GeomManager), target, intent(inout) :: this + integer, intent(in) :: id + integer, optional, intent(out) :: rc + + integer :: status + type(MaplGeom), pointer :: mapl_geom + + mapl_geom => this%mapl_geoms%at(id, _RC) + geom = mapl_geom%get_geom() + + _RETURN(_SUCCESS) + end function get_geom_from_id + + function get_mapl_geom_from_hconfig(this, hconfig, rc) result(mapl_geom) + type(MaplGeom), pointer :: mapl_geom + class(GeomManager), target, intent(inout) :: this + type(ESMF_HConfig), intent(inout) :: hconfig + integer, optional, intent(out) :: rc + + class(GeomSpec), allocatable :: geom_spec + integer :: status + + geom_spec = this%make_geom_spec(hconfig, _RC) + mapl_geom => this%get_mapl_geom(geom_spec, _RC) + + _RETURN(_SUCCESS) + end function get_mapl_geom_from_hconfig + + function get_mapl_geom_from_id(this, id, rc) result(mapl_geom) + type(MaplGeom), pointer :: mapl_geom + class(GeomManager), target, intent(inout) :: this + integer, intent(in) :: id + integer, optional, intent(out) :: rc + + integer :: status + + mapl_geom => this%mapl_geoms%at(id, _RC) + + _RETURN(_SUCCESS) + end function get_mapl_geom_from_id + + function get_mapl_geom_from_metadata(this, metadata, rc) result(mapl_geom) + type(MaplGeom), pointer :: mapl_geom + class(GeomManager), target, intent(inout) :: this + type(FileMetadata), intent(in) :: metadata + integer, optional, intent(out) :: rc + + class(GeomSpec), allocatable :: geom_spec + integer :: status + + geom_spec = this%make_geom_spec(metadata, _RC) + mapl_geom => this%get_mapl_geom(geom_spec, _RC) + + _RETURN(_SUCCESS) + end function get_mapl_geom_from_metadata + end module mapl3g_GeomManager diff --git a/geom_mgr/GeomManager/CMakeLists.txt b/geom_mgr/GeomManager/CMakeLists.txt index fd18be105d16..12fd79a46a00 100644 --- a/geom_mgr/GeomManager/CMakeLists.txt +++ b/geom_mgr/GeomManager/CMakeLists.txt @@ -5,14 +5,10 @@ target_sources(MAPL.geom_mgr PRIVATE initialize.F90 add_factory.F90 delete_mapl_geom.F90 - get_mapl_geom_from_hconfig.F90 - get_mapl_geom_from_metadata.F90 - get_mapl_geom_from_id.F90 get_mapl_geom_from_spec.F90 add_mapl_geom.F90 find_factory.F90 make_geom_spec_from_metadata.F90 make_geom_spec_from_hconfig.F90 make_mapl_geom_from_spec.F90 - get_geom_from_id.F90 ) diff --git a/geom_mgr/GeomManager/get_geom_from_id.F90 b/geom_mgr/GeomManager/get_geom_from_id.F90 deleted file mode 100644 index 199725427c1e..000000000000 --- a/geom_mgr/GeomManager/get_geom_from_id.F90 +++ /dev/null @@ -1,24 +0,0 @@ -#include "MAPL_Generic.h" - -submodule (mapl3g_GeomManager) get_geom_from_id_smod - - implicit none - -contains - - module function get_geom_from_id(this, id, rc) result(geom) - type(ESMF_Geom) :: geom - class(GeomManager), target, intent(inout) :: this - integer, intent(in) :: id - integer, optional, intent(out) :: rc - - integer :: status - type(MaplGeom), pointer :: mapl_geom - - mapl_geom => this%mapl_geoms%at(id, _RC) - geom = mapl_geom%get_geom() - - _RETURN(_SUCCESS) - end function get_geom_from_id - -end submodule get_geom_from_id_smod diff --git a/geom_mgr/GeomManager/get_mapl_geom_from_hconfig.F90 b/geom_mgr/GeomManager/get_mapl_geom_from_hconfig.F90 deleted file mode 100644 index 100944582e0e..000000000000 --- a/geom_mgr/GeomManager/get_mapl_geom_from_hconfig.F90 +++ /dev/null @@ -1,24 +0,0 @@ -#include "MAPL_Generic.h" - -submodule (mapl3g_GeomManager) get_mapl_geom_from_hconfig_smod - - implicit none - -contains - - module function get_mapl_geom_from_hconfig(this, hconfig, rc) result(mapl_geom) - type(MaplGeom), pointer :: mapl_geom - class(GeomManager), target, intent(inout) :: this - type(ESMF_HConfig), intent(inout) :: hconfig - integer, optional, intent(out) :: rc - - class(GeomSpec), allocatable :: geom_spec - integer :: status - - geom_spec = this%make_geom_spec(hconfig, _RC) - mapl_geom => this%get_mapl_geom(geom_spec, _RC) - - _RETURN(_SUCCESS) - end function get_mapl_geom_from_hconfig - -end submodule get_mapl_geom_from_hconfig_smod diff --git a/geom_mgr/GeomManager/get_mapl_geom_from_id.F90 b/geom_mgr/GeomManager/get_mapl_geom_from_id.F90 deleted file mode 100644 index 68457df9c324..000000000000 --- a/geom_mgr/GeomManager/get_mapl_geom_from_id.F90 +++ /dev/null @@ -1,22 +0,0 @@ -#include "MAPL_Generic.h" - -submodule (mapl3g_GeomManager) get_mapl_geom_from_id_smod - - implicit none - -contains - - module function get_mapl_geom_from_id(this, id, rc) result(mapl_geom) - type(MaplGeom), pointer :: mapl_geom - class(GeomManager), target, intent(inout) :: this - integer, intent(in) :: id - integer, optional, intent(out) :: rc - - integer :: status - - mapl_geom => this%mapl_geoms%at(id, _RC) - - _RETURN(_SUCCESS) - end function get_mapl_geom_from_id - -end submodule get_mapl_geom_from_id_smod diff --git a/geom_mgr/GeomManager/get_mapl_geom_from_metadata.F90 b/geom_mgr/GeomManager/get_mapl_geom_from_metadata.F90 deleted file mode 100644 index 5c5c0bee23a9..000000000000 --- a/geom_mgr/GeomManager/get_mapl_geom_from_metadata.F90 +++ /dev/null @@ -1,24 +0,0 @@ -#include "MAPL_Generic.h" - -submodule (mapl3g_GeomManager) get_mapl_geom_from_metadata_smod - - implicit none - -contains - - module function get_mapl_geom_from_metadata(this, metadata, rc) result(mapl_geom) - type(MaplGeom), pointer :: mapl_geom - class(GeomManager), target, intent(inout) :: this - type(FileMetadata), intent(in) :: metadata - integer, optional, intent(out) :: rc - - class(GeomSpec), allocatable :: geom_spec - integer :: status - - geom_spec = this%make_geom_spec(metadata, _RC) - mapl_geom => this%get_mapl_geom(geom_spec, _RC) - - _RETURN(_SUCCESS) - end function get_mapl_geom_from_metadata - -end submodule get_mapl_geom_from_metadata_smod diff --git a/geom_mgr/MaplGeom.F90 b/geom_mgr/MaplGeom.F90 index af81835c0fe8..d914e4ee7f12 100644 --- a/geom_mgr/MaplGeom.F90 +++ b/geom_mgr/MaplGeom.F90 @@ -66,31 +66,6 @@ module subroutine set_id(this, id, rc) integer, optional, intent(out) :: rc end subroutine set_id - module function get_spec(this) result(spec) - class(GeomSpec), allocatable :: spec - class(MaplGeom), intent(in) :: this - end function get_spec - - module function get_geom(this) result(geom) - type(ESMF_Geom) :: geom - class(MaplGeom), intent(in) :: this - end function get_geom - - module function get_factory(this) result(factory) - class(GeomFactory), allocatable :: factory - class(MaplGeom), intent(in) :: this - end function get_factory - - module function get_file_metadata(this) result(file_metadata) - type(FileMetadata) :: file_metadata - class(MaplGeom), intent(in) :: this - end function get_file_metadata - - module function get_gridded_dims(this) result(gridded_dims) - type(StringVector) :: gridded_dims - class(MaplGeom), intent(in) :: this - end function get_gridded_dims - recursive module function get_basis(this, mode, rc) result(basis) type(VectorBasis), pointer :: basis class(MaplGeom), target, intent(inout) :: this @@ -100,6 +75,38 @@ end function get_basis end interface + CONTAINS + + function get_factory(this) result(factory) + class(GeomFactory), allocatable :: factory + class(MaplGEOM), intent(in) :: this + factory = this%factory + end function get_factory + + function get_file_metadata(this) result(file_metadata) + type(FileMetadata) :: file_metadata + class(MaplGeom), intent(in) :: this + file_metadata = this%file_metadata + end function get_file_metadata + + function get_geom(this) result(geom) + type(ESMF_Geom) :: geom + class(MaplGeom), intent(in) :: this + geom = this%geom + end function get_geom + + function get_gridded_dims(this) result(gridded_dims) + type(StringVector) :: gridded_dims + class(MaplGeom), intent(in) :: this + gridded_dims = this%gridded_dims + end function get_gridded_dims + + function get_spec(this) result(spec) + class(GeomSpec), allocatable :: spec + class(MaplGeom), intent(in) :: this + spec = this%spec + end function get_spec + end module mapl3g_MaplGeom diff --git a/geom_mgr/MaplGeom/CMakeLists.txt b/geom_mgr/MaplGeom/CMakeLists.txt index 405f05e18f35..9adfbb6eb7f8 100644 --- a/geom_mgr/MaplGeom/CMakeLists.txt +++ b/geom_mgr/MaplGeom/CMakeLists.txt @@ -2,10 +2,5 @@ target_sources(MAPL.geom_mgr PRIVATE new_MaplGeom.F90 set_id.F90 - get_spec.F90 - get_geom.F90 - get_factory.F90 - get_file_metadata.F90 - get_gridded_dims.F90 get_basis.F90 ) diff --git a/geom_mgr/MaplGeom/get_factory.F90 b/geom_mgr/MaplGeom/get_factory.F90 deleted file mode 100644 index 475ae0975a2e..000000000000 --- a/geom_mgr/MaplGeom/get_factory.F90 +++ /dev/null @@ -1,21 +0,0 @@ -#include "MAPL_ErrLog.h" - -submodule (mapl3g_MaplGeom) get_factory_smod - use mapl3g_GeomSpec - use mapl3g_VectorBasis - use mapl3g_GeomUtilities - use mapl_ErrorHandlingMod - use pfio_FileMetadataMod, only: FileMetadata - use ESMF, only: ESMF_Info - use ESMF, only: ESMF_InfoGetFromHost - use ESMF, only: ESMF_InfoSet - -contains - - module function get_factory(this) result(factory) - class(GeomFactory), allocatable :: factory - class(MaplGEOM), intent(in) :: this - factory = this%factory - end function get_factory - -end submodule get_factory_smod diff --git a/geom_mgr/MaplGeom/get_file_metadata.F90 b/geom_mgr/MaplGeom/get_file_metadata.F90 deleted file mode 100644 index 4c552a8a16b9..000000000000 --- a/geom_mgr/MaplGeom/get_file_metadata.F90 +++ /dev/null @@ -1,21 +0,0 @@ -#include "MAPL_ErrLog.h" - -submodule (mapl3g_MaplGeom) get_file_metadata_smod - use mapl3g_GeomSpec - use mapl3g_VectorBasis - use mapl3g_GeomUtilities - use mapl_ErrorHandlingMod - use pfio_FileMetadataMod, only: FileMetadata - use ESMF, only: ESMF_Info - use ESMF, only: ESMF_InfoGetFromHost - use ESMF, only: ESMF_InfoSet - -contains - - module function get_file_metadata(this) result(file_metadata) - type(FileMetadata) :: file_metadata - class(MaplGeom), intent(in) :: this - file_metadata = this%file_metadata - end function get_file_metadata - -end submodule get_file_metadata_smod diff --git a/geom_mgr/MaplGeom/get_geom.F90 b/geom_mgr/MaplGeom/get_geom.F90 deleted file mode 100644 index 7a5646372dc1..000000000000 --- a/geom_mgr/MaplGeom/get_geom.F90 +++ /dev/null @@ -1,21 +0,0 @@ -#include "MAPL_ErrLog.h" - -submodule (mapl3g_MaplGeom) get_geom_smod - use mapl3g_GeomSpec - use mapl3g_VectorBasis - use mapl3g_GeomUtilities - use mapl_ErrorHandlingMod - use pfio_FileMetadataMod, only: FileMetadata - use ESMF, only: ESMF_Info - use ESMF, only: ESMF_InfoGetFromHost - use ESMF, only: ESMF_InfoSet - -contains - - module function get_geom(this) result(geom) - type(ESMF_Geom) :: geom - class(MaplGeom), intent(in) :: this - geom = this%geom - end function get_geom - -end submodule get_geom_smod diff --git a/geom_mgr/MaplGeom/get_gridded_dims.F90 b/geom_mgr/MaplGeom/get_gridded_dims.F90 deleted file mode 100644 index 8dce511b3736..000000000000 --- a/geom_mgr/MaplGeom/get_gridded_dims.F90 +++ /dev/null @@ -1,21 +0,0 @@ -#include "MAPL_ErrLog.h" - -submodule (mapl3g_MaplGeom) get_gridded_dims_smod - use mapl3g_GeomSpec - use mapl3g_VectorBasis - use mapl3g_GeomUtilities - use mapl_ErrorHandlingMod - use pfio_FileMetadataMod, only: FileMetadata - use ESMF, only: ESMF_Info - use ESMF, only: ESMF_InfoGetFromHost - use ESMF, only: ESMF_InfoSet - -contains - - module function get_gridded_dims(this) result(gridded_dims) - type(StringVector) :: gridded_dims - class(MaplGeom), intent(in) :: this - gridded_dims = this%gridded_dims - end function get_gridded_dims - -end submodule get_gridded_dims_smod diff --git a/geom_mgr/MaplGeom/get_spec.F90 b/geom_mgr/MaplGeom/get_spec.F90 deleted file mode 100644 index 82a61574a7dc..000000000000 --- a/geom_mgr/MaplGeom/get_spec.F90 +++ /dev/null @@ -1,21 +0,0 @@ -#include "MAPL_ErrLog.h" - -submodule (mapl3g_MaplGeom) get_spec_smod - use mapl3g_GeomSpec - use mapl3g_VectorBasis - use mapl3g_GeomUtilities - use mapl_ErrorHandlingMod - use pfio_FileMetadataMod, only: FileMetadata - use ESMF, only: ESMF_Info - use ESMF, only: ESMF_InfoGetFromHost - use ESMF, only: ESMF_InfoSet - -contains - - module function get_spec(this) result(spec) - class(GeomSpec), allocatable :: spec - class(MaplGeom), intent(in) :: this - spec = this%spec - end function get_spec - -end submodule get_spec_smod