fixes for having mom6 work with nuopc-cmeps-v0.4

NOAA-GFDL · May 24, 2018 · 9fae628 · 9fae628
1 parent 0a49485
commit 9fae628
Show file tree

Hide file tree

Showing 2 changed files with 554 additions and 543 deletions.
diff --git a/config_src/nuopc_driver/mom_cap.F90 b/config_src/nuopc_driver/mom_cap.F90
@@ -1410,11 +1410,15 @@ subroutine DataInitialize(gcomp, rc)
     ocean_state        => ocean_internalstate%ptr%ocean_state_type_ptr
     call get_ocean_grid(ocean_state, ocean_grid)
 
-!tcx ----------
-   return
-!tcx ----------
+    !tcx ----------
+    RETURN
+    !tcx ----------
 
-    call ocn_export(ocean_public, ocean_grid, exportState)
+    call ocn_export(ocean_public, ocean_grid, exportState, rc=rc)
+    if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, &
+      line=__LINE__, &
+      file=__FILE__)) &
+      return  ! bail out
 
     call ESMF_StateGet(exportState, itemCount=fieldCount, rc=rc)
     if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, &
@@ -1501,7 +1505,6 @@ subroutine ModelAdvance(gcomp, rc)
     integer :: nc
 #ifdef CESMCOUPLED
     ! in ocn_import, ocn_export
-
 #else
     real(ESMF_KIND_R8), allocatable        :: ofld(:,:), ocz(:,:), ocm(:,:)
     real(ESMF_KIND_R8), allocatable        :: mmmf(:,:), mzmf(:,:)
@@ -1629,7 +1632,11 @@ subroutine ModelAdvance(gcomp, rc)
       line=__LINE__, &
       file=__FILE__)) &
       return  ! bail out
-    call ocn_import(ocean_public, ocean_grid, importState, ice_ocean_boundary)
+    call ocn_import(ocean_public, ocean_grid, importState, ice_ocean_boundary, rc=rc)
+    if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, &
+      line=__LINE__, &
+      file=__FILE__)) &
+      return  ! bail out
 #else
     call State_getFldPtr(exportState,'ocean_mask',dataPtr_mask,rc=rc)
     if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, &
@@ -1721,7 +1728,11 @@ subroutine ModelAdvance(gcomp, rc)
       line=__LINE__, &
       file=__FILE__)) &
       return  ! bail out
-    call ocn_export(ocean_public, ocean_grid, exportState)
+    call ocn_export(ocean_public, ocean_grid, exportState, rc=rc)
+    if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, &
+      line=__LINE__, &
+      file=__FILE__)) &
+      return  ! bail out
 #else
     allocate(ofld(isc:iec,jsc:jec))