update to esmf bs47; add export field openwater_frac_in_atm

atmos_model.F90

@@ -2620,6 +2620,20 @@ subroutine setup_exportdata (rc)
         enddo
       enddo
     endif
+
+   ! oceanfrac used by atm to calculate fluxes
+    idx = queryfieldlist(exportFieldsList,'openwater_frac_in_atm')
+    if (idx > 0 ) then
+!$omp parallel do default(shared) private(i,j,nb,ix)
+      do j=jsc,jec
+        do i=isc,iec
+          nb = Atm_block%blkno(i,j)
+          ix = Atm_block%ixp(i,j)
+          exportData(i,j,idx) = (one - GFS_Data(nb)%Sfcprop%fice(ix))*GFS_Data(nb)%Sfcprop%oceanfrac(ix)
+        enddo
+      enddo
+    endif
+
     endif !cplflx
 
 !---

cpl/module_cap_cpl.F90

@@ -139,50 +139,45 @@ subroutine realizeConnectedCplFields(state, grid,
         isConnected = NUOPC_IsConnected(state, fieldName=trim(fieldNames(item)), rc=rc)
         if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, line=__LINE__, file=__FILE__)) return
         if (isConnected) then
+          call ESMF_StateGet(state, field=field, itemName=trim(fieldNames(item)), rc=rc)
+          if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, line=__LINE__, file=__FILE__)) return
+          call ESMF_FieldEmptySet(field, grid=grid, rc=rc)
+          if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, line=__LINE__, file=__FILE__)) return
           select case (fieldTypes(item))
             case ('l','layer')
-              field = ESMF_FieldCreate(grid, typekind=ESMF_TYPEKIND_R8, &
-                                       name=trim(fieldNames(item)),     &
+              call ESMF_FieldEmptyComplete(field, typekind=ESMF_TYPEKIND_R8, &
                                        ungriddedLBound=(/1/), ungriddedUBound=(/numLevels/), rc=rc)
               if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, line=__LINE__, file=__FILE__)) return
             case ('i','interface')
-              field = ESMF_FieldCreate(grid, typekind=ESMF_TYPEKIND_R8, &
-                                       name=trim(fieldNames(item)),     &
+              call ESMF_FieldEmptyComplete(field, typekind=ESMF_TYPEKIND_R8, &
                                        ungriddedLBound=(/1/), ungriddedUBound=(/numLevels+1/), rc=rc)
               if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, line=__LINE__, file=__FILE__)) return
             case ('t','tracer')
-              field = ESMF_FieldCreate(grid, typekind=ESMF_TYPEKIND_R8, &
-                                       name=trim(fieldNames(item)),     &
+              call ESMF_FieldEmptyComplete(field, typekind=ESMF_TYPEKIND_R8, &
                                        ungriddedLBound=(/1, 1/), ungriddedUBound=(/numLevels, numTracers/), rc=rc)
               if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, line=__LINE__, file=__FILE__)) return
             case ('u','tracer_up_flux')
-              field = ESMF_FieldCreate(grid, typekind=ESMF_TYPEKIND_R8, &
-                                       name=trim(fieldNames(item)),     &
+              call ESMF_FieldEmptyComplete(field, typekind=ESMF_TYPEKIND_R8, &
                                        ungriddedLBound=(/1/), ungriddedUBound=(/num_diag_sfc_emis_flux/), rc=rc)
               if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, line=__LINE__, file=__FILE__)) return
             case ('d','tracer_down_flx')
-              field = ESMF_FieldCreate(grid, typekind=ESMF_TYPEKIND_R8, &
-                                       name=trim(fieldNames(item)),     &
+              call ESMF_FieldEmptyComplete(field, typekind=ESMF_TYPEKIND_R8, &
                                        ungriddedLBound=(/1, 1/),        &
                                        ungriddedUBound=(/num_diag_down_flux, num_diag_type_down_flux/), rc=rc)
               if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, line=__LINE__, file=__FILE__)) return
             case ('b','tracer_anth_biom_emission')
-              field = ESMF_FieldCreate(grid, typekind=ESMF_TYPEKIND_R8, &
-                                       name=trim(fieldNames(item)),     &
+              call ESMF_FieldEmptyComplete(field, typekind=ESMF_TYPEKIND_R8, &
                                        ungriddedLBound=(/1/), ungriddedUBound=(/num_diag_burn_emis_flux/), rc=rc)
               if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, line=__LINE__, file=__FILE__)) return
             case ('c','tracer_column_mass_density')
-              field = ESMF_FieldCreate(grid, typekind=ESMF_TYPEKIND_R8, &
-                                       name=trim(fieldNames(item)),     &
+              call ESMF_FieldEmptyComplete(field, typekind=ESMF_TYPEKIND_R8, &
                                        ungriddedLBound=(/1/), ungriddedUBound=(/num_diag_cmass/), rc=rc)
               if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, line=__LINE__, file=__FILE__)) return
             case ('s','surface')
-              field = ESMF_FieldCreate(grid, typekind=ESMF_TYPEKIND_R8, &
-                                       name=trim(fieldNames(item)), rc=rc)
+              call ESMF_FieldEmptyComplete(field, typekind=ESMF_TYPEKIND_R8, rc=rc)
               if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, line=__LINE__, file=__FILE__)) return
             case ('g','soil')
-              field = ESMF_FieldCreate(grid, typekind=ESMF_TYPEKIND_R8, &
-                                       name=trim(fieldNames(item)),     &
+              call ESMF_FieldEmptyComplete(field, typekind=ESMF_TYPEKIND_R8, &
                                        ungriddedLBound=(/1/), ungriddedUBound=(/numSoilLayers/), rc=rc)
               if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, line=__LINE__, file=__FILE__)) return
             case default
@@ -194,7 +189,7 @@ subroutine realizeConnectedCplFields(state, grid,
           call NUOPC_Realize(state, field=field, rc=rc)
           if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, line=__LINE__, file=__FILE__)) return
 
-          ! -- zero out field 
+          ! -- zero out field
           call ESMF_FieldFill(field, dataFillScheme="const", const1=0._ESMF_KIND_R8, rc=rc)
           if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, line=__LINE__, file=__FILE__)) return
 
@@ -216,16 +211,17 @@ end subroutine realizeConnectedCplFields
   !-----------------------------------------------------------------------------
 
     subroutine diagnose_cplFields(gcomp, importState, exportstate, clock_fv3,    &
-         statewrite_flag, stdiagnose_flag, state_tag, timestr)
+                     fcstpe, statewrite_flag, stdiagnose_flag, state_tag, timestr)
 
       type(ESMF_GridComp), intent(in)       :: gcomp
       type(ESMF_State)                      :: importState, exportstate
       type(ESMF_Clock),intent(in)           :: clock_fv3
+      logical, intent(in)                   :: fcstpe
       logical, intent(in)                   :: statewrite_flag
       integer, intent(in)                   :: stdiagnose_flag
       character(len=*),         intent(in)  :: state_tag                        !< Import or export.
       character(len=*),         intent(in)  :: timestr                          !< Import or export.
-      integer                               :: timeslice = 1 
+      integer                               :: timeslice = 1
 !
       character(len=160) :: nuopcMsg
       character(len=160) :: filename
@@ -244,11 +240,11 @@ subroutine diagnose_cplFields(gcomp, importState, exportstate, clock_fv3,    &
                            unit=nuopcMsg)
 !      call ESMF_LogWrite(nuopcMsg, ESMF_LOGMSG_INFO)
 
-      if(trim(state_tag) .eq. 'import')then 
+      if(trim(state_tag) .eq. 'import')then
         call ESMF_GridCompGet(gcomp, importState=importState, rc=rc)
         if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, line=__LINE__, file=__FILE__)) return
 
-        if(stdiagnose_flag > 0)then
+        if(stdiagnose_flag > 0 .and. fcstpe)then
          call state_diagnose(importState, ':IS', rc=rc)
         end if
 
@@ -264,7 +260,7 @@ subroutine diagnose_cplFields(gcomp, importState, exportstate, clock_fv3,    &
         call ESMF_GridCompGet(gcomp, exportState=exportState, rc=rc)
         if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, line=__LINE__, file=__FILE__)) return
 
-        if(stdiagnose_flag > 0)then
+        if(stdiagnose_flag > 0 .and. fcstpe)then
          call state_diagnose(exportState, ':ES', rc=rc)
         end if
 

cpl/module_cplfields.F90

@@ -13,7 +13,7 @@ module module_cplfields
   private
 
 ! Export Fields ----------------------------------------
-  integer,          public, parameter :: NexportFields = 71
+  integer,          public, parameter :: NexportFields = 72
   type(ESMF_Field), target, public    :: exportFields(NexportFields)
   character(len=*), public, parameter :: exportFieldsList(NexportFields) = (/ &
        "inst_pres_interface                      ", &
@@ -86,7 +86,8 @@ module module_cplfields
        "inst_merid_wind_height_lowest            ", &
        "inst_pres_height_lowest                  ", &
        "inst_height_lowest                       ", &
-       "mean_fprec_rate                          "  &
+       "mean_fprec_rate                          ", &
+       "openwater_frac_in_atm                    "  &
 !      "northward_wind_neutral                   ", &
 !      "eastward_wind_neutral                    ", &
 !      "upward_wind_neutral                      ", &
@@ -112,7 +113,7 @@ module module_cplfields
        "s","s","s","s","s","s","s","s",     &
        "s","s","s","s","s","s","s","s",     &
        "s","s","s","s","s","s","s","s",     &
-       "s","s","s","s","s"                  &
+       "s","s","s","s","s","s"              &
 !      "l","l","l","l","l","l","l","s",     &
   /)
   ! Set exportFieldShare to .true. if field is provided as memory reference
@@ -132,7 +133,7 @@ module module_cplfields
        .false.,.false.,.false.,.false.,.false., &
        .false.,.false.,.false.,.true. ,.false., &
        .false.,.false.,.false.,.false.,.false., &
-       .false.                                  &
+       .false.,.false.                          &
 !      .false.,.false.,.false.,.false.,.false., &
 !      .false.,.false.,.false.                  &
   /)
@@ -212,7 +213,7 @@ subroutine fillExportFields(data_a2oi, rc)
       isCreated = ESMF_FieldIsCreated(exportFields(n), rc=localrc)
       if (ESMF_LogFoundError(rcToCheck=localrc, msg=ESMF_LOGERR_PASSTHRU, line=__LINE__, file=__FILE__, rcToReturn=rc)) return
       if (isCreated) then
-! set data 
+! set data
         call ESMF_FieldGet(exportFields(n), name=fieldname, dimCount=dimCount, typekind=datatype, rc=localrc)
         if (ESMF_LogFoundError(rcToCheck=localrc, msg=ESMF_LOGERR_PASSTHRU, line=__LINE__, file=__FILE__, rcToReturn=rc)) return
         !print *,'in fillExportFields, field created n=',n,size(exportFields),'name=', trim(fieldname)