Restructuring under GEOSocean_GridComp

GEOSogcm_GridComp/CMakeLists.txt

@@ -5,14 +5,15 @@ set (alldirs
   GEOS_OceanBioGeoChemGridComp
   GEOS_OradGridComp
   GEOS_OradBioGridComp
+  GEOS_OceanGridComp
   )
 
-set (dependencies GuestOcean_GridComp GEOS_Seaice_GridComp MAPL CICE4)
+set (dependencies GEOS_Seaice_GridComp MAPL CICE4)
 
 esma_add_library (${this}
   SRCS GEOS_OgcmGridComp.F90
   SUBCOMPONENTS ${alldirs}
-  SUBDIRS GEOSseaice_GridComp GEOSocean_GridComp 
+  SUBDIRS GEOSseaice_GridComp 
   DEPENDENCIES ${dependencies}
   INCLUDES ${INC_ESMF})
 

GEOSogcm_GridComp/GEOSocean_GridComp/GuestOcean_GridComp/CMakeLists.txt → GEOSogcm_GridComp/GEOS_OceanGridComp/CMakeLists.txt

@@ -2,8 +2,9 @@ esma_set_this ()
 
 add_subdirectory(MOM6_GEOSPlug)
 add_subdirectory(MOM_GEOS5PlugMod)
+add_subdirectory(GEOSdatasea_GridComp)
 
 esma_add_library (${this}
-  SRCS GuestOcean_GridComp.F90
+  SRCS GEOS_OceanGridComp.F90
   DEPENDENCIES GEOSdatasea_GridComp MAPL
   INCLUDES ${INC_ESMF})

GEOSogcm_GridComp/GEOSocean_GridComp/GuestOcean_GridComp/GuestOcean_GridComp.F90 → GEOSogcm_GridComp/GEOS_OceanGridComp/GEOS_OceanGridComp.F90

@@ -2,10 +2,10 @@
 
 #include "MAPL_Generic.h"
 
-module GuestOcean_GridCompMod
+module GEOS_OceanGridCompMod
 
 !BOP
-! !MODULE: GuestOcean_GridCompMod -- Implements ESMF wrapper to invoke the DATASEA/MIT/MOM ocean models.
+! !MODULE: GEOS_OceanGridCompMod -- Implements ESMF wrapper to invoke the DATASEA/MIT/MOM ocean models.
 
 ! !USES:
 
@@ -1374,4 +1374,4 @@ subroutine Run ( gc, import, export, clock, rc )
 
   end subroutine Run
 
-end module GuestOcean_GridCompMod
+end module GEOS_OceanGridCompMod

GEOSogcm_GridComp/GEOS_OgcmGridComp.F90

@@ -19,7 +19,7 @@ module GEOS_OgcmGridCompMod
   use GEOS_OradBioGridCompMod,           only : OradBioSetServices => SetServices
   use GEOS_OradGridCompMod,              only : OradSetServices    => SetServices
 
-  use GuestOcean_GridCompMod,            only : GuestOceanSetServices => SetServices
+  use GEOS_OceanGridCompMod,             only : OceanSetServices => SetServices
   use GEOS_SeaIceGridCompMod,            only : SeaIceSetServices => SetServices
 
   implicit none
@@ -33,7 +33,7 @@ module GEOS_OgcmGridCompMod
 ! 
 !   {\tt GEOS\_Ogcm} is a light-weight gridded component that implements the
 !      interface to the ogcm components. The ogcm computational components
-!      (MOMx/GuestOcean, CICEx/GEOS_Seaice, OceanRadiation, OceanBioGeochemistry, etc)
+!      (MOMx/Ocean, CICEx/GEOS_Seaice, OceanRadiation, OceanBioGeochemistry, etc)
 !      are its children.
 !      This component currently serves as an interface between the exchange
 !      grid and the ocean's grid. Its ``natural'' grid is the ocean part of the 
@@ -181,7 +181,7 @@ subroutine SetServices ( GC, RC )
        NUM_ICE_LAYERS     = 1
     endif
 
-! this get resource is repeated in Guest - change both together!
+! this get resource is repeated in Ocean - change both together!
     call MAPL_GetResource ( MAPL, DO_DATASEAONLY, Label="USE_DATASEA:" ,        DEFAULT=1, RC=STATUS)
     VERIFY_(STATUS)
     call MAPL_GetResource ( MAPL, DO_DATAICE,     Label="USE_DATASEAICE:" ,     DEFAULT=1, RC=STATUS)
@@ -232,7 +232,7 @@ subroutine SetServices ( GC, RC )
     SEAICE = MAPL_AddChild(GC, NAME='SEAICE', SS=SeaIceSetServices, RC=STATUS)
     VERIFY_(STATUS)
 
-    OCEAN = MAPL_AddChild(GC, NAME='OCEAN', SS=GuestOceanSetServices, RC=STATUS) 
+    OCEAN = MAPL_AddChild(GC, NAME='OCEAN', SS=OceanSetServices, RC=STATUS) 
     VERIFY_(STATUS)
 
 ! Set the state variable specs.
@@ -2087,7 +2087,7 @@ subroutine RUN ( GC, IMPORT, EXPORT, CLOCK, RC )
           deallocate(CHLD)
 
        else
-       ! run explicitly the children excluding "real" seaice (ocean has the data part inside guest)
+       ! run explicitly the children excluding "real" seaice (ocean has the data part inside ocean)
           allocate(CHLD(4), stat=status)
           VERIFY_(STATUS)
           CHLD = (/OBIO,ORAD,SEAICE,OCEAN/)