From d13e5d1b2456bc71dc801d94b6567fb504f6fee0 Mon Sep 17 00:00:00 2001 From: bzhao Date: Mon, 4 Dec 2023 17:06:45 -0500 Subject: [PATCH 1/5] moved CICE4ColumnPhys and SeaiceInterface into their own dirs --- .../{ => GEOS_CICE4ColumnPhysGridComp}/BufferPacking.h | 0 .../{ => GEOS_CICE4ColumnPhysGridComp}/BufferPacking_RUN1.h | 0 .../{ => GEOS_CICE4ColumnPhysGridComp}/BufferUnpacking.h | 0 .../{ => GEOS_CICE4ColumnPhysGridComp}/BufferUnpacking_RUN1.h | 0 .../GEOS_CICE4ColumnPhysGridComp.F90 | 0 .../{ => GEOS_CICE4ColumnPhysGridComp}/GetPtr.h | 0 .../{ => GEOS_CICE4ColumnPhysGridComp}/GetPtr_RUN1.h | 0 .../GEOS_SeaiceInterfaceGridComp.F90 | 0 8 files changed, 0 insertions(+), 0 deletions(-) rename GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/{ => GEOS_CICE4ColumnPhysGridComp}/BufferPacking.h (100%) rename GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/{ => GEOS_CICE4ColumnPhysGridComp}/BufferPacking_RUN1.h (100%) rename GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/{ => GEOS_CICE4ColumnPhysGridComp}/BufferUnpacking.h (100%) rename GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/{ => GEOS_CICE4ColumnPhysGridComp}/BufferUnpacking_RUN1.h (100%) rename GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/{ => GEOS_CICE4ColumnPhysGridComp}/GEOS_CICE4ColumnPhysGridComp.F90 (100%) rename GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/{ => GEOS_CICE4ColumnPhysGridComp}/GetPtr.h (100%) rename GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/{ => GEOS_CICE4ColumnPhysGridComp}/GetPtr_RUN1.h (100%) rename GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/{ => GEOS_SeaiceInterfaceGridComp}/GEOS_SeaiceInterfaceGridComp.F90 (100%) diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/BufferPacking.h b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/GEOS_CICE4ColumnPhysGridComp/BufferPacking.h similarity index 100% rename from GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/BufferPacking.h rename to GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/GEOS_CICE4ColumnPhysGridComp/BufferPacking.h diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/BufferPacking_RUN1.h b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/GEOS_CICE4ColumnPhysGridComp/BufferPacking_RUN1.h similarity index 100% rename from GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/BufferPacking_RUN1.h rename to GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/GEOS_CICE4ColumnPhysGridComp/BufferPacking_RUN1.h diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/BufferUnpacking.h b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/GEOS_CICE4ColumnPhysGridComp/BufferUnpacking.h similarity index 100% rename from GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/BufferUnpacking.h rename to GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/GEOS_CICE4ColumnPhysGridComp/BufferUnpacking.h diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/BufferUnpacking_RUN1.h b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/GEOS_CICE4ColumnPhysGridComp/BufferUnpacking_RUN1.h similarity index 100% rename from GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/BufferUnpacking_RUN1.h rename to GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/GEOS_CICE4ColumnPhysGridComp/BufferUnpacking_RUN1.h diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/GEOS_CICE4ColumnPhysGridComp.F90 b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/GEOS_CICE4ColumnPhysGridComp/GEOS_CICE4ColumnPhysGridComp.F90 similarity index 100% rename from GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/GEOS_CICE4ColumnPhysGridComp.F90 rename to GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/GEOS_CICE4ColumnPhysGridComp/GEOS_CICE4ColumnPhysGridComp.F90 diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/GetPtr.h b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/GEOS_CICE4ColumnPhysGridComp/GetPtr.h similarity index 100% rename from GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/GetPtr.h rename to GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/GEOS_CICE4ColumnPhysGridComp/GetPtr.h diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/GetPtr_RUN1.h b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/GEOS_CICE4ColumnPhysGridComp/GetPtr_RUN1.h similarity index 100% rename from GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/GetPtr_RUN1.h rename to GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/GEOS_CICE4ColumnPhysGridComp/GetPtr_RUN1.h diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/GEOS_SeaiceInterfaceGridComp.F90 b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/GEOS_SeaiceInterfaceGridComp/GEOS_SeaiceInterfaceGridComp.F90 similarity index 100% rename from GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/GEOS_SeaiceInterfaceGridComp.F90 rename to GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/GEOS_SeaiceInterfaceGridComp/GEOS_SeaiceInterfaceGridComp.F90 From 34c7d7e399b4066d84152fe921dc7143481f032c Mon Sep 17 00:00:00 2001 From: bzhao Date: Mon, 4 Dec 2023 17:47:15 -0500 Subject: [PATCH 2/5] first attempt at CMakeLists; needs check by SI --- .../GEOSsaltwater_GridComp/CMakeLists.txt | 9 +++++---- .../GEOS_CICE4ColumnPhysGridComp/CMakeLists.txt | 12 ++++++++++++ .../GEOS_SeaiceInterfaceGridComp/CMakeLists.txt | 12 ++++++++++++ 3 files changed, 29 insertions(+), 4 deletions(-) create mode 100644 GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/GEOS_CICE4ColumnPhysGridComp/CMakeLists.txt create mode 100644 GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/GEOS_SeaiceInterfaceGridComp/CMakeLists.txt diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/CMakeLists.txt b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/CMakeLists.txt index ac601e1c3..f91f80643 100644 --- a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/CMakeLists.txt +++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/CMakeLists.txt @@ -1,12 +1,13 @@ esma_set_this() set (srcs - GEOS_CICE4ColumnPhysGridComp.F90 GEOS_OpenWaterGridComp.F90 - GEOS_SaltWaterGridComp.F90 GEOS_SimpleSeaiceGridComp.F90 - GEOS_SeaiceInterfaceGridComp.F90 + GEOS_OpenWaterGridComp.F90 + GEOS_SaltWaterGridComp.F90 + GEOS_SimpleSeaiceGridComp.F90 GEOS_ObioGridComp.F90) esma_add_library (${this} SRCS ${srcs} - DEPENDENCIES GEOS_Shared MAPL CICE4 esmf NetCDF::NetCDF_Fortran) + SUBCOMPONENTS GEOS_CICE4ColumnPhysGridComp GEOS_SeaiceInterfaceGridComp + DEPENDENCIES GEOS_Shared MAPL esmf NetCDF::NetCDF_Fortran) diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/GEOS_CICE4ColumnPhysGridComp/CMakeLists.txt b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/GEOS_CICE4ColumnPhysGridComp/CMakeLists.txt new file mode 100644 index 000000000..8fe7d0acd --- /dev/null +++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/GEOS_CICE4ColumnPhysGridComp/CMakeLists.txt @@ -0,0 +1,12 @@ +esma_set_this () + +set (SRCS + GEOS_CICE4ColumnPhysGridComp.F90 + ) + +esma_add_library (${this} + SRCS ${SRCS} + DEPENDENCIES GEOS_Shared MAPL CICE4 + TYPE SHARED + ) + diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/GEOS_SeaiceInterfaceGridComp/CMakeLists.txt b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/GEOS_SeaiceInterfaceGridComp/CMakeLists.txt new file mode 100644 index 000000000..a8047f438 --- /dev/null +++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/GEOS_SeaiceInterfaceGridComp/CMakeLists.txt @@ -0,0 +1,12 @@ +esma_set_this () + +set (SRCS + GEOS_SeaiceInterfaceGridComp.F90 + ) + +esma_add_library (${this} + SRCS ${SRCS} + DEPENDENCIES GEOS_Shared MAPL + TYPE SHARED + ) + From 8232f63fd31484afe56043de7fc3a1ef7b1ac33a Mon Sep 17 00:00:00 2001 From: bzhao Date: Mon, 4 Dec 2023 19:08:06 -0500 Subject: [PATCH 3/5] add SetServices to be used as a dso --- .../GEOS_CICE4ColumnPhysGridComp.F90 | 8 ++++++++ .../GEOS_SeaiceInterfaceGridComp.F90 | 8 +++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/GEOS_CICE4ColumnPhysGridComp/GEOS_CICE4ColumnPhysGridComp.F90 b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/GEOS_CICE4ColumnPhysGridComp/GEOS_CICE4ColumnPhysGridComp.F90 index 33ef4d134..f49c433c7 100644 --- a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/GEOS_CICE4ColumnPhysGridComp/GEOS_CICE4ColumnPhysGridComp.F90 +++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/GEOS_CICE4ColumnPhysGridComp/GEOS_CICE4ColumnPhysGridComp.F90 @@ -5759,3 +5759,11 @@ subroutine CICEReOrder8(Packed, UnPacked, MSK, Pdim, Udim, LM, DIR) end do end do end subroutine CICEReOrder8 + +subroutine SetServices(gc, rc) + use ESMF + use GEOS_CICE4ColumnPhysGridComp, only : mySetservices=>SetServices + type(ESMF_GridComp) :: gc + integer, intent(out) :: rc + call mySetServices(gc,rc=rc) +end subroutine diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/GEOS_SeaiceInterfaceGridComp/GEOS_SeaiceInterfaceGridComp.F90 b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/GEOS_SeaiceInterfaceGridComp/GEOS_SeaiceInterfaceGridComp.F90 index f72e14e75..65990628e 100644 --- a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/GEOS_SeaiceInterfaceGridComp/GEOS_SeaiceInterfaceGridComp.F90 +++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/GEOS_SeaiceInterfaceGridComp/GEOS_SeaiceInterfaceGridComp.F90 @@ -3120,4 +3120,10 @@ end subroutine RetrieveTransforms end module GEOS_SeaiceInterfaceGridComp - +subroutine SetServices(gc, rc) + use ESMF + use GEOS_SeaiceInterfaceGridComp, only : mySetservices=>SetServices + type(ESMF_GridComp) :: gc + integer, intent(out) :: rc + call mySetServices(gc,rc=rc) +end subroutine From 1e097751a91efb5f9a2e12471c416cc3c4b5fd87 Mon Sep 17 00:00:00 2001 From: bzhao Date: Tue, 5 Dec 2023 12:11:56 -0500 Subject: [PATCH 4/5] load sea ice child gcs as dso --- .../GEOS_SaltWaterGridComp.F90 | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/GEOS_SaltWaterGridComp.F90 b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/GEOS_SaltWaterGridComp.F90 index 7f9822832..7b8058e7f 100644 --- a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/GEOS_SaltWaterGridComp.F90 +++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/GEOS_SaltWaterGridComp.F90 @@ -36,8 +36,6 @@ module GEOS_SaltwaterGridCompMod use GEOS_OpenwaterGridCompMod, only : OpenWaterSetServices => SetServices use GEOS_SimpleSeaiceGridCompMod, only : SimpleSeaiceSetServices => SetServices - use GEOS_CICE4ColumnPhysGridComp, only : CICE4ColumnPhysSetServices => SetServices - use GEOS_SeaiceInterfaceGridComp, only : SeaiceInterfaceSetServices => SetServices use GEOS_ObioGridCompMod, only : ObioSetServices => SetServices implicit none @@ -102,6 +100,7 @@ subroutine SetServices ( GC, RC ) integer :: DO_CICE_THERMO ! default (=0) is to run saltwater, with no LANL CICE Thermodynamics logical :: seaIceT_extData ! default (=.FALSE.) is to NOT use data sea ice thickness from ExtData + character(len=ESMF_MAXSTR) :: sharedObj character(len = 2) :: suffix !============================================================================= @@ -144,14 +143,13 @@ subroutine SetServices ( GC, RC ) ! sea-ice first and openwater second ! changing order requires also changing indices of ICE and WATER (sub-tiles at the top) if(DO_CICE_THERMO == 0) then - I = MAPL_AddChild(GC, NAME='SEAICETHERMO', SS=SimpleSeaiceSetServices, RC=STATUS) - VERIFY_(STATUS) + I = MAPL_AddChild(GC, NAME='SEAICETHERMO', SS=SimpleSeaiceSetServices, _RC) elseif(DO_CICE_THERMO == 1) then - I = MAPL_AddChild(GC, NAME='SEAICETHERMO', SS=CICE4ColumnPhysSetServices, RC=STATUS) - VERIFY_(STATUS) + call MAPL_GetResource ( MAPL, sharedObj, Label="GEOS_CICE4ColumnPhysGridComp:", DEFAULT="libGEOS_CICE4ColumnPhysGridComp.so", _RC) + I = MAPL_AddChild('SEAICETHERMO','setservices_', parentGC=GC, sharedObj=sharedObj, _RC) else - I = MAPL_AddChild(GC, NAME='SEAICETHERMO', SS=SeaiceInterfaceSetServices, RC=STATUS) - VERIFY_(STATUS) + call MAPL_GetResource ( MAPL, sharedObj, Label="GEOS_SeaiceInterfaceGridComp:", DEFAULT="libGEOS_SeaiceInterfaceGridComp.so", _RC) + I = MAPL_AddChild('SEAICETHERMO','setservices_', parentGC=GC, sharedObj=sharedObj, _RC) endif I = MAPL_AddChild(GC, NAME='OPENWATER', SS=OpenWaterSetServices, _RC) From 4ee25dc74a3f12491d3c521c0ba575a2ab4cf7b6 Mon Sep 17 00:00:00 2001 From: bzhao Date: Tue, 5 Dec 2023 16:44:29 -0500 Subject: [PATCH 5/5] build and load GEOSCICEDyna_GridComp as a dso --- .../GEOSCICEDyna_GridComp/CMakeLists.txt | 3 ++- .../GEOSCICEDyna_GridComp/GEOS_CICEDynaGridComp.F90 | 8 ++++++++ .../GEOSseaice_GridComp/GEOS_SeaIceGridComp.F90 | 6 ++---- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/GEOSogcm_GridComp/GEOSseaice_GridComp/GEOSCICEDyna_GridComp/CMakeLists.txt b/GEOSogcm_GridComp/GEOSseaice_GridComp/GEOSCICEDyna_GridComp/CMakeLists.txt index baabff8ad..f04065b40 100644 --- a/GEOSogcm_GridComp/GEOSseaice_GridComp/GEOSCICEDyna_GridComp/CMakeLists.txt +++ b/GEOSogcm_GridComp/GEOSseaice_GridComp/GEOSCICEDyna_GridComp/CMakeLists.txt @@ -2,7 +2,8 @@ esma_set_this () esma_add_library (${this} SRCS GEOS_CICEDynaGridComp.F90 - DEPENDENCIES MAPL CICE4 esmf) + DEPENDENCIES MAPL CICE4 esmf + TYPE SHARED) target_compile_definitions(${this} PRIVATE DIAGOUT MODIFY_TOPOGRAPHY USE_R8) diff --git a/GEOSogcm_GridComp/GEOSseaice_GridComp/GEOSCICEDyna_GridComp/GEOS_CICEDynaGridComp.F90 b/GEOSogcm_GridComp/GEOSseaice_GridComp/GEOSCICEDyna_GridComp/GEOS_CICEDynaGridComp.F90 index 421dcaf19..0e723d495 100755 --- a/GEOSogcm_GridComp/GEOSseaice_GridComp/GEOSCICEDyna_GridComp/GEOS_CICEDynaGridComp.F90 +++ b/GEOSogcm_GridComp/GEOSseaice_GridComp/GEOSCICEDyna_GridComp/GEOS_CICEDynaGridComp.F90 @@ -2893,3 +2893,11 @@ end subroutine Finalize end module GEOS_CICEDynaGridCompMod + +subroutine SetServices(gc, rc) + use ESMF + use GEOS_CICEDynaGridCompMod, only : mySetservices=>SetServices + type(ESMF_GridComp) :: gc + integer, intent(out) :: rc + call mySetServices(gc, rc=rc) +end subroutine diff --git a/GEOSogcm_GridComp/GEOSseaice_GridComp/GEOS_SeaIceGridComp.F90 b/GEOSogcm_GridComp/GEOSseaice_GridComp/GEOS_SeaIceGridComp.F90 index 9fc75f0bb..94d4301f0 100644 --- a/GEOSogcm_GridComp/GEOSseaice_GridComp/GEOS_SeaIceGridComp.F90 +++ b/GEOSogcm_GridComp/GEOSseaice_GridComp/GEOS_SeaIceGridComp.F90 @@ -13,8 +13,6 @@ module GEOS_SeaIceGridCompMod use MAPL #ifdef BUILD_MIT_OCEAN use GEOS_MITDynaGridCompMod, only : GEOSMITSeaIceSetServices => SetServices -#else - use GEOS_CICEDynaGridCompMod, only : CICE4SeaIceSetServices => SetServices #endif use GEOS_DataSeaIceGridCompMod, only : DataSeaIceSetServices => SetServices use ice_prescribed_mod, only : ice_nudging @@ -123,12 +121,12 @@ subroutine SetServices ( GC, RC ) call MAPL_GetResource ( MAPL, SEAICE_NAME, Label="SEAICE_NAME:", DEFAULT="CICE4", __RC__ ) select case (trim(SEAICE_NAME)) case ("CICE4") - ICE = MAPL_AddChild(GC, NAME=SEAICE_NAME, SS=CICE4SeaIceSetServices, __RC__) + call MAPL_GetResource ( MAPL, sharedObj, Label="GEOSCICEDyna_GridComp:", DEFAULT="libGEOSCICEDyna_GridComp.so", __RC__ ) + ICE = MAPL_AddChild(SEAICE_NAME,'setservices_', parentGC=GC, sharedObj=sharedObj, __RC__) case ("CICE6") call MAPL_GetResource ( MAPL, sharedObj, Label="CICE_GEOSPLUG:", DEFAULT="libCICE_GEOSPlug.so", __RC__ ) ICE = MAPL_AddChild(SEAICE_NAME,'setservices_', parentGC=GC, sharedObj=sharedObj, __RC__) - !ICE = MAPL_AddChild(GC, NAME=SEAICE_NAME, SS=CICE6SeaIceSetServices, __RC__) case default charbuf_ = "SEAICE_NAME: " // trim(SEAICE_NAME) // " is not implemented, ABORT!" call WRITE_PARALLEL(charbuf_)