Merge pull request #1030 from GEOS-ESM/bugfix/zhaobin1974/do-not-terminate-surfst

do not terminate SURFSTAT when running with CICE6

Author: sdrabenh

GEOSdataatm_GridComp/GEOS_DataAtmGridComp.F90

@@ -270,7 +270,12 @@ subroutine SetServices ( GC, RC )
 
     ! This call is needed only when we use ReadForcing.
     ! If we switch to use ExtData, next line has be commented out
-    call MAPL_TerminateImport    ( GC, ALL=.true., __RC__ )
+    if (DO_CICE_THERMO == 2) then
+       call MAPL_TerminateImport    ( GC, SHORT_NAMES=['SURFSTATE'],    &
+                                      CHILD_IDS=[SURF],  __RC__  )
+    else
+       call MAPL_TerminateImport    ( GC, ALL=.true., __RC__ )
+    endif
 
     call MAPL_GenericSetServices    ( GC, __RC__)
 
@@ -1070,7 +1075,7 @@ subroutine Finalize ( gc, import, export, clock, rc )
     call MAPL_TimerOn(MAPL,"TOTAL"   )
     call MAPL_TimerOn(MAPL,"FINALIZE")
 
-    if (DO_CICE_THERMO /= 0) call dealloc_column_physics( MAPL_AM_I_Root(), Iam )
+    if (DO_CICE_THERMO == 1) call dealloc_column_physics( MAPL_AM_I_Root(), Iam )
 
     call MAPL_TimerOff(MAPL,"FINALIZE")
     call MAPL_TimerOff(MAPL,"TOTAL"   )