Merge branch 'dev/nuopc' of https://github.com/NCAR/MOM6 into dev/nuopc

NOAA-GFDL · Jun 5, 2018 · 9e25780 · 9e25780
2 parents 50e4a65 + eef4bf2
commit 9e25780
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/config_src/nuopc_driver/mom_cap.F90 b/config_src/nuopc_driver/mom_cap.F90
@@ -392,6 +392,7 @@ module mom_cap_mod
   use mom_cap_methods,          only: ocn_export, ocn_import
   use esmFlds,                  only: flds_scalar_name, flds_scalar_num
   use esmFlds,                  only: fldListFr, fldListTo, compocn, compname
+  use esmFlds,                  only: flds_scalar_index_nx, flds_scalar_index_ny
   use shr_nuopc_fldList_mod,    only: shr_nuopc_fldList_Realize
   use shr_nuopc_fldList_mod,    only: shr_nuopc_fldList_Concat
   use shr_nuopc_fldList_mod,    only: shr_nuopc_fldList_Getnumflds
@@ -875,6 +876,7 @@ subroutine InitializeRealize(gcomp, importState, exportState, clock, rc)
     real(ESMF_KIND_R8), pointer            :: dataPtr_xcor(:,:)
     real(ESMF_KIND_R8), pointer            :: dataPtr_ycor(:,:)
     type(ESMF_Field)                       :: field_t_surf
+    integer                                :: mpicom
     character(len=*),parameter  :: subname='(mom_cap:InitializeRealize)'
 
     rc = ESMF_SUCCESS
@@ -895,7 +897,7 @@ subroutine InitializeRealize(gcomp, importState, exportState, clock, rc)
       file=__FILE__)) &
       return  ! bail out
 
-    call ESMF_VMGet(vm, petCount=npet, rc=rc)
+    call ESMF_VMGet(vm, petCount=npet, mpiCommunicator=mpicom, rc=rc)
     if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, &
       line=__LINE__, &
       file=__FILE__)) &
@@ -1314,6 +1316,14 @@ subroutine InitializeRealize(gcomp, importState, exportState, clock, rc)
     call shr_nuopc_fldList_Realize(exportState, fldListFr(compocn), flds_scalar_name, flds_scalar_num, &
          grid=gridOut, tag=subname//':MOM6Export', rc=rc)
     if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, line=__LINE__, file=__FILE__)) return  
+
+    call shr_nuopc_methods_State_SetScalar(dble(nxg),flds_scalar_index_nx, exportState, mpicom, &
+         flds_scalar_name, flds_scalar_num, rc)
+    if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, line=__LINE__, file=__FILE__)) return  
+
+    call shr_nuopc_methods_State_SetScalar(dble(nyg),flds_scalar_index_ny, exportState, mpicom, &
+         flds_scalar_name, flds_scalar_num, rc)
+    if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, line=__LINE__, file=__FILE__)) return  
 #else
     call MOM_RealizeFields(importState, gridIn , fldsToOcn_num, fldsToOcn, "Ocn import", rc)
     if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, &