Merge pull request #490 from jedwards4b/fix_nan_in_pslv

nan was picked up in pslv field on first pass
ESCOMP · Aug 1, 2024 · a41d9c2 · a41d9c2
2 parents 739b964 + 5adf83a
commit a41d9c2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/mediator/med_methods_mod.F90 b/mediator/med_methods_mod.F90
@@ -2609,6 +2609,7 @@ subroutine med_methods_FB_check_for_nans(FB, maintask, logunit, rc)
     do index=1,fieldCount
        call med_methods_FB_getNameN(FB, index, fieldname, rc)
        if (chkerr(rc,__LINE__,u_FILE_u)) return
+
        call ESMF_FieldBundleGet(FB, fieldName=fieldname, field=field, rc=rc)
        if (chkerr(rc,__LINE__,u_FILE_u)) return
        call ESMF_FieldGet(field, rank=fieldrank, name=fieldname, rc=rc)
@@ -2632,9 +2633,8 @@ subroutine med_methods_FB_check_for_nans(FB, maintask, logunit, rc)
     if (nanfound) then
        call ESMF_LogWrite('ABORTING JOB', ESMF_LOGMSG_ERROR, line=__LINE__, file=u_FILE_u)
        rc = ESMF_FAILURE
-       return
     end if
-
+    
   end subroutine med_methods_FB_check_for_nans
 
   !-----------------------------------------------------------------------------

diff --git a/mediator/med_phases_prep_ocn_mod.F90 b/mediator/med_phases_prep_ocn_mod.F90
@@ -284,6 +284,7 @@ subroutine med_phases_prep_ocn_avg(gcomp, rc)
     ! local variables
     type(InternalState)        :: is_local
     integer                    :: ncnt
+    logical, save              :: first_call = .true.
     character(len=*),parameter :: subname='(med_phases_prep_ocn_avg)'
     !---------------------------------------
 
@@ -324,9 +325,10 @@ subroutine med_phases_prep_ocn_avg(gcomp, rc)
        if (ChkErr(rc,__LINE__,u_FILE_u)) return
 
        ! Check for nans in fields export to ocn
-       call FB_check_for_nans(is_local%wrap%FBExp(compocn), maintask, logunit, rc=rc)
-       if (ChkErr(rc,__LINE__,u_FILE_u)) return
-
+       if(.not. first_call) then
+          call FB_check_for_nans(is_local%wrap%FBExp(compocn), maintask, logunit, rc=rc)
+          if (ChkErr(rc,__LINE__,u_FILE_u)) return
+       endif
        ! zero accumulator
        is_local%wrap%ExpAccumOcnCnt = 0
        call FB_reset(is_local%wrap%FBExpAccumOcn, value=czero, rc=rc)
@@ -338,6 +340,7 @@ subroutine med_phases_prep_ocn_avg(gcomp, rc)
        call ESMF_LogWrite(trim(subname)//": done", ESMF_LOGMSG_INFO)
     end if
     call t_stopf('MED:'//subname)
+    first_call = .false.
 
   end subroutine med_phases_prep_ocn_avg