Skip to content

Commit

Permalink
Merge pull request #558 from GEOS-ESM/bugfix/tclune/#557-gfortran-pfl…
Browse files Browse the repository at this point in the history 
…ogger-workarounds

Fixes #557 - gfortran workaround for pFlogger
  • Loading branch information
@mathomp4
mathomp4 authored Sep 30, 2020
2 parents 24e0903 + bcde1b8 commit db77b90
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 12 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed
### Removed


## [2.3.0] - 2020-09-29

### Added
Expand Down
24 changes: 12 additions & 12 deletions base/MAPL_ExtDataGridCompMod.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2007,7 +2007,7 @@ subroutine CreateTimeInterval(item,clock,rc)
end if

if (lgr%isEnabledFor(DEBUG)) then
call lgr%debug(' >> REFFTIME for %a~: %a',trim(item%file), trim(item%FileReffTime))
call lgr%debug(' >> REFFTIME for %a~: %a',trim(item%file), '<'//trim(item%FileReffTime)//'>')
call ESMF_TimeGet(item%reff_time,yy=iyy,mm=imm,dd=idd,h=ihh,m=imn,s=isc,rc=status)
call lgr%debug(' >> Reference time: %i0.4~-%i0.2~-%i0.2 %i0.2~:%i0.2~:%i0.2', iYy, iMm, iDd, iHh, iMn, iSc)
call ESMF_TimeIntervalGet(item%frequency,yy=iyy,mm=imm,d=idd,h=ihh,m=imn,s=isc,rc=status)
Expand Down Expand Up @@ -2257,7 +2257,7 @@ subroutine UpdateBracketTime(item,cTime,bSide,interpTime,fileTime,file_processed
type(ESMF_Time), allocatable :: xTSeries(:)
type(FileMetaDataUtils), pointer :: fdata

call lgr%info('Updating %a bracket for %a',bside, trim(item%name))
call lgr%info('Updating %a1 bracket for %a',bside, trim(item%name))
call ESMF_TimeIntervalSet(zero,__RC__)

! Default
Expand Down Expand Up @@ -2514,7 +2514,7 @@ subroutine UpdateBracketTime(item,cTime,bSide,interpTime,fileTime,file_processed
! whether it is the right or left time
if (.not.found) then

call lgr%debug(' UpdateBracketTime: Scanning for bracket %a of %a~. RSide: %l1', bSide, trim(file_processed), (bSide=="R"))
call lgr%debug(' UpdateBracketTime: Scanning for bracket %a1 of %a~. RSide: %l1', bSide, trim(file_processed), (bSide=="R"))

bracketScan = .True.
newTime = fTime
Expand Down Expand Up @@ -2561,7 +2561,7 @@ subroutine UpdateBracketTime(item,cTime,bSide,interpTime,fileTime,file_processed
End If
End Do
if (status /= ESMF_SUCCESS) then
call lgr%error('ExtData could not find appropriate file from file template %a for side %a', trim(item%file), bSide)
call lgr%error('ExtData could not find appropriate file from file template %a for side %a1', trim(item%file), bSide)
_RETURN(ESMF_FAILURE)
end if
else if (bSide == "L") then
Expand Down Expand Up @@ -2599,7 +2599,7 @@ subroutine UpdateBracketTime(item,cTime,bSide,interpTime,fileTime,file_processed
End If
End Do
if (status /= ESMF_SUCCESS) then
call lgr%error('ExtData could not find appropriate file from file template %a for side %a', trim(item%file), bSide)
call lgr%error('ExtData could not find appropriate file from file template %a for side %a1', trim(item%file), bSide)
_RETURN(ESMF_FAILURE)
end if
end if
Expand Down Expand Up @@ -2639,7 +2639,7 @@ subroutine UpdateBracketTime(item,cTime,bSide,interpTime,fileTime,file_processed
call GetBracketTimeOnFile(fdata,xTSeries,readTime,bSide,UniFileClim,interpTime,fileTime,tindex,yrOffsetInt=yrOffset+yrOffsetStamp,rc=status)
found = (status == ESMF_SUCCESS)
if (.not.found) then
call lgr%error('ExtData could not find bracketing data from file template %a for side %a', trim(item%file), bSide)
call lgr%error('ExtData could not find bracketing data from file template %a for side %a1', trim(item%file), bSide)
_RETURN(ESMF_FAILURE)

end if
Expand All @@ -2650,13 +2650,13 @@ subroutine UpdateBracketTime(item,cTime,bSide,interpTime,fileTime,file_processed


if (lgr%isEnabledFor(DEBUG)) then
call lgr%debug(' UpdateBracketTime: Updated bracket %a for %a', bside, trim(file_processed))
call lgr%debug(' UpdateBracketTime: Updated bracket %a1 for %a', bside, trim(file_processed))
call ESMF_TimeGet(cTime,yy=iyr,mm=imm,dd=idd,h=ihr,m=imn,s=isc,__RC__)
call lgr%debug(' ==> (%a) Time Requested: %i0.4~-%i0.2~-%i0.2 %i0.2~:%i0.2~:%i0.2', bside, iYr, iMm, iDd, iHr, iMn, iSc)
call lgr%debug(' ==> (%a1) Time Requested: %i0.4~-%i0.2~-%i0.2 %i0.2~:%i0.2~:%i0.2', bside, iYr, iMm, iDd, iHr, iMn, iSc)
call ESMF_TimeGet(fileTime,yy=iyr,mm=imm,dd=idd,h=ihr,m=imn,s=isc,__RC__)
call lgr%debug(' ==> (%a) Record time : %i0.4~-%i0.2~-%i0.2 %i0.2~:%i0.2~:%i0.2', bside, iYr, iMm, iDd, iHr, iMn, iSc)
call lgr%debug(' ==> (%a1) Record time : %i0.4~-%i0.2~-%i0.2 %i0.2~:%i0.2~:%i0.2', bside, iYr, iMm, iDd, iHr, iMn, iSc)
call ESMF_TimeGet(interpTime,yy=iyr,mm=imm,dd=idd,h=ihr,m=imn,s=isc,__RC__)
call lgr%debug(' ==> (%a) Effective time: %i0.4~-%i0.2~-%i0.2 %i0.2~:%i0.2~:%i0.2', bside, iYr, iMm, iDd, iHr, iMn, iSc)
call lgr%debug(' ==> (%a1) Effective time: %i0.4~-%i0.2~-%i0.2 %i0.2~:%i0.2~:%i0.2', bside, iYr, iMm, iDd, iHr, iMn, iSc)
End If

! If we made it this far, then I guess we are OK?
Expand Down Expand Up @@ -3125,7 +3125,7 @@ subroutine GetBracketTimeOnFile(fdata,tSeries,cTime,bSide,UniFileClim,interpTime
_RETURN(ESMF_FAILURE)
end if

call lgr%debug(' GetBracketTimeOnFile: (%a) called for %a', bside, trim(fdata%get_file_name()))
call lgr%debug(' GetBracketTimeOnFile: (%a1) called for %a', bside, trim(fdata%get_file_name()))

if (yrOffset.ne.0) then
! If the source year is a leap year but this isn't, modify to day 28
Expand Down Expand Up @@ -3195,7 +3195,7 @@ subroutine GetBracketTimeOnFile(fdata,tSeries,cTime,bSide,UniFileClim,interpTime

if (lgr%isEnabledFor(DEBUG)) then
call ESMF_TimeGet(fileTime,yy=iyr,mm=imm,dd=idd,h=ihr,m=imn,s=isc,__RC__)
call lgr%debug(' GetBracketTimeOnFile: Data from time %i0.4~-%i0.2~-%i0.2 %i0.2~:%i0.2~:%i0.2 set for bracket %a of file %a', &
call lgr%debug(' GetBracketTimeOnFile: Data from time %i0.4~-%i0.2~-%i0.2 %i0.2~:%i0.2~:%i0.2 set for bracket %a1 of file %a', &
& iyr, imm, idd, ihr, imn, isc, bside, trim(fdata%get_file_name()))
if (yrOffset /= 0) then
call ESMF_TimeGet(interpTime,yy=iyr,mm=imm,dd=idd,h=ihr,m=imn,s=isc,__RC__)
Expand Down

0 comments on commit db77b90

Please sign in to comment.