Merge pull request #824 from GEOS-ESM/feature/zhaobin74/enable-cgrid-evp

enable C-EVP in CICE6
GEOS-ESM · Sep 28, 2023 · 8eb267a · 8eb267a
2 parents 8c01594 + 37bc32c
commit 8eb267a
Show file tree

Hide file tree

Showing 7 changed files with 1,213 additions and 8 deletions.
diff --git a/GEOSogcm_GridComp/GEOS_OgcmGridComp.F90 b/GEOSogcm_GridComp/GEOS_OgcmGridComp.F90
@@ -814,6 +814,11 @@ subroutine SetServices ( GC, RC )
             SRC_ID = SEAICE,            &
             RC=STATUS  )
        VERIFY_(STATUS)
+       call MAPL_AddConnectivity ( GC,   &
+          SHORT_NAME  = (/'UWC','VWC'/), &
+          SRC_ID = OCEAN,                &
+          DST_ID = SEAICE,               &
+          _RC)
      endif
   end if
 

diff --git a/GEOSogcm_GridComp/GEOSseaice_GridComp/CICE_GEOSPlug/CICE_GEOSPlug.F90 b/GEOSogcm_GridComp/GEOSseaice_GridComp/CICE_GEOSPlug/CICE_GEOSPlug.F90
@@ -161,6 +161,26 @@ subroutine SetServices ( GC, RC )
          RC=STATUS  )
   VERIFY_(STATUS)
 
+  call MAPL_AddImportSpec(GC,                               &
+         SHORT_NAME         = 'UWC',                                &
+         LONG_NAME          = 'water_skin_eastward_cgrid_velocity', &
+         UNITS              = 'm s-1 ',                            &
+         DIMS               = MAPL_DimsHorzOnly,                   &
+         VLOCATION          = MAPL_VLocationNone,                  &
+         DEFAULT            = 0.0,                                 &
+         RC=STATUS  )
+  VERIFY_(STATUS)
+
+  call MAPL_AddImportSpec(GC,                               &
+         SHORT_NAME         = 'VWC',                                &
+         LONG_NAME          = 'water_skin_northward_cgrid_velocity',&
+         UNITS              = 'm s-1 ',                            &
+         DIMS               = MAPL_DimsHorzOnly,                   &
+         VLOCATION          = MAPL_VLocationNone,                  &
+         DEFAULT            = 0.0,                                 &
+         RC=STATUS  )
+  VERIFY_(STATUS)
+
   call MAPL_AddImportSpec(GC,                               &
          SHORT_NAME         = 'SLV',                           &
          LONG_NAME          = 'sea_level_with_ice_loading',     &
@@ -758,6 +778,8 @@ subroutine Run  ( GC, IMPORT, EXPORT, CLOCK, RC )
     REAL_, pointer                     :: TAUY(:,:)          => null()
     REAL_, pointer                     :: UWB(:,:)           => null()
     REAL_, pointer                     :: VWB(:,:)           => null()
+    REAL_, pointer                     :: UWC(:,:)           => null()
+    REAL_, pointer                     :: VWC(:,:)           => null()
     REAL_, pointer                     :: SLV(:,:)           => null()
 
 ! Temporaries
@@ -813,6 +835,8 @@ subroutine Run  ( GC, IMPORT, EXPORT, CLOCK, RC )
     call MAPL_GetPointer(IMPORT,  SLV,     'SLV'         ,                 _RC)
     call MAPL_GetPointer(IMPORT,  UWB,     'UWB'         ,                 _RC)
     call MAPL_GetPointer(IMPORT,  VWB,     'VWB'         ,                 _RC)
+    call MAPL_GetPointer(IMPORT,  UWC,     'UWC'         ,                 _RC)
+    call MAPL_GetPointer(IMPORT,  VWC,     'VWC'         ,                 _RC)
 
     call MAPL_GetPointer(EXPORT,   TI,     'TI'          ,  alloc=.true.,  _RC)
     call MAPL_GetPointer(EXPORT,   FI,     'FRSEAICE'    ,  alloc=.true.,  _RC)
@@ -830,7 +854,7 @@ subroutine Run  ( GC, IMPORT, EXPORT, CLOCK, RC )
 
     !call ice_import_thermo2()
 
-    call ice_import_dyna(TAUX, TAUY, SLV, UWB, VWB, _RC)
+    call ice_import_dyna(TAUX, TAUY, SLV, UWB, VWB, UWC, VWC, _RC)
 
 
     call CICE_Run