diff --git a/sorc/hycom_nuopc.F90 b/sorc/hycom_nuopc.F90 index aa1e013..6f0e210 100644 --- a/sorc/hycom_nuopc.F90 +++ b/sorc/hycom_nuopc.F90 @@ -860,18 +860,19 @@ SUBROUTINE HYCOM_ModelAdvance(gcomp, rc) line=__LINE__, & file=__FILE__)) & return ! bail out - call ESMF_TimePrint(currTime, & - "--------------> HYCOM_Run() advancing from: ", rc=rc) - if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, & - line=__LINE__, & - file=__FILE__)) & - return ! bail out - call ESMF_TimePrint(currTime + timeStep_O, & - "--------------> HYCOM_Run() advancing to: ", rc=rc) - if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, & - line=__LINE__, & - file=__FILE__)) & - return ! bail out +!!Alex incompatibility with ESMF 7.0.0 +! call ESMF_TimePrint(currTime, & +! "--------------> HYCOM_Run() advancing from: ", rc=rc) +! if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, & +! line=__LINE__, & +! file=__FILE__)) & +! return ! bail out +! call ESMF_TimePrint(currTime + timeStep_O, & +! "--------------> HYCOM_Run() advancing to: ", rc=rc) +! if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, & +! line=__LINE__, & +! file=__FILE__)) & +! return ! bail out #endif ! get endtime @@ -1373,8 +1374,10 @@ subroutine HYCOM_WriteFieldBundle(grid, fieldbundle, fieldNameList, filePrefix, ! line=__LINE__, & ! file=__FILE__)) & !return ! bail out - - call ESMF_FieldWrite(field, file=trim(fileName), variableName=trim(fieldNameList_loc(i)), & +!!Alex incompatibility ESMF 7.0.0 +! call ESMF_FieldWrite(field, file=trim(fileName), variableName=trim(fieldNameList_loc(i)), & +! overwrite=overwrite, status=status, timeslice=timeslice, rc=rc) + call ESMF_FieldWrite(field, fileName=trim(fileName), variableName=trim(fieldNameList_loc(i)), & overwrite=overwrite, status=status, timeslice=timeslice, rc=rc) if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, & line=__LINE__, & @@ -1490,7 +1493,10 @@ subroutine RedistAndWriteField(grid, state, fieldNameList, filePrefix, overwrite ! file=__FILE__)) & !return ! bail out - call ESMF_FieldWrite(dst2DField, file=trim(fileName), variableName=trim(fieldNameList_loc(i)), & +!!Alex incompatibility ESMF 7.0.0 +! call ESMF_FieldWrite(dst2DField, file=trim(fileName), variableName=trim(fieldNameList_loc(i)), & +! overwrite=overwrite, status=status, timeslice=timeslice, rc=rc) + call ESMF_FieldWrite(dst2DField, fileName=trim(fileName), variableName=trim(fieldNameList_loc(i)), & overwrite=overwrite, status=status, timeslice=timeslice, rc=rc) if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, & line=__LINE__, &