Merge pull request #2839 from GEOS-ESM/MAPL-v3/smods/generic3g/v3_2

Complete the creation of submodules for GriddedComponentDriver.F90

generic3g/GriddedComponentDriver.F90

@@ -103,55 +103,35 @@ module subroutine clock_advance(this, rc)
          integer, optional, intent(out) :: rc
       end subroutine clock_advance
 
-   end interface
-
-contains
-
-   function new_GriddedComponentDriver(gridcomp, clock, states) result(child)
-      type(GriddedComponentDriver) :: child
-      type(ESMF_GridComp), intent(in) :: gridcomp
-      type(ESMF_Clock), intent(in) :: clock
-      type(MultiState), intent(in) :: states
-
-      child%gridcomp = gridcomp
-      child%clock = clock
-      child%states = states
-
-   end function new_GriddedComponentDriver
-
-
-   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
+      module function new_GriddedComponentDriver(gridcomp, clock, states) result(child)
+         type(GriddedComponentDriver) :: child
+         type(ESMF_GridComp), intent(in) :: gridcomp
+         type(ESMF_Clock), intent(in) :: clock
+         type(MultiState), intent(in) :: states
+      end function new_GriddedComponentDriver
 
-      call ESMF_GridCompGet(this%gridcomp, name=buffer, _RC)
-      name = trim(buffer)
+      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
 
-      _RETURN(ESMF_SUCCESS)
-   end function get_name
+      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
 
-   subroutine add_export_coupler(this, driver)
-      class(GriddedComponentDriver), intent(inout) :: this
-      type(GriddedComponentDriver), intent(in) :: driver
-      call this%export_couplers%push_back(driver)
-   end subroutine add_export_coupler
+      module subroutine add_export_coupler(this, driver)
+         class(GriddedComponentDriver), intent(inout) :: this
+         type(GriddedComponentDriver), intent(in) :: driver
+      end subroutine add_export_coupler
 
-   subroutine add_import_coupler(this, driver)
-      class(GriddedComponentDriver), intent(inout) :: this
-      type(GriddedComponentDriver), intent(in) :: driver
-      call this%import_couplers%push_back(driver)
-   end subroutine add_import_coupler
+      module subroutine add_import_coupler(this, driver)
+         class(GriddedComponentDriver), intent(inout) :: this
+         type(GriddedComponentDriver), intent(in) :: driver
+      end subroutine add_import_coupler
 
+   end interface
 
 end module mapl3g_GriddedComponentDriver

generic3g/GriddedComponentDriver/CMakeLists.txt

@@ -9,5 +9,10 @@ target_sources(MAPL.generic3g PRIVATE
     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_import_coupler.F90
 
 )

generic3g/GriddedComponentDriver/add_export_coupler.F90

@@ -0,0 +1,14 @@
+#include "MAPL_Generic.h"
+
+submodule (mapl3g_GriddedComponentDriver) add_export_coupler_smod
+   implicit none
+
+contains
+
+   module subroutine add_export_coupler(this, driver)
+      class(GriddedComponentDriver), intent(inout) :: this
+      type(GriddedComponentDriver), intent(in) :: driver
+      call this%export_couplers%push_back(driver)
+   end subroutine add_export_coupler
+
+end submodule add_export_coupler_smod

generic3g/GriddedComponentDriver/add_import_coupler.F90

@@ -0,0 +1,15 @@
+#include "MAPL_Generic.h"
+
+submodule (mapl3g_GriddedComponentDriver) add_import_coupler_smod
+   implicit none
+
+contains
+
+   module subroutine add_import_coupler(this, driver)
+      class(GriddedComponentDriver), intent(inout) :: this
+      type(GriddedComponentDriver), intent(in) :: driver
+      call this%import_couplers%push_back(driver)
+   end subroutine add_import_coupler
+
+
+end submodule add_import_coupler_smod

generic3g/GriddedComponentDriver/get_gridcomp.F90

@@ -0,0 +1,15 @@
+#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

generic3g/GriddedComponentDriver/get_name.F90

@@ -0,0 +1,22 @@
+#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

generic3g/GriddedComponentDriver/new_GriddedComponentDriver.F90

@@ -0,0 +1,20 @@
+#include "MAPL_Generic.h"
+
+submodule (mapl3g_GriddedComponentDriver) new_GriddedComponentDriver_smod
+   implicit none
+
+contains
+
+   module function new_GriddedComponentDriver(gridcomp, clock, states) result(child)
+      type(GriddedComponentDriver) :: child
+      type(ESMF_GridComp), intent(in) :: gridcomp
+      type(ESMF_Clock), intent(in) :: clock
+      type(MultiState), intent(in) :: states
+
+      child%gridcomp = gridcomp
+      child%clock = clock
+      child%states = states
+
+   end function new_GriddedComponentDriver
+
+end submodule new_GriddedComponentDriver_smod