Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Auto PR - main → MAPL-v3 - Fix bug #81

Merged
merged 3 commits into from
Jun 10, 2024
Merged

Auto PR - main → MAPL-v3 - Fix bug #81

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1010a7b
Fix bug
mathomp4 Jun 10, 2024
9795dea
Merge branch 'main' into bugfix/mathomp4/remove-paths
mathomp4 Jun 10, 2024
f18506d
Merge pull request #80 from GEOS-ESM/bugfix/mathomp4/remove-paths
mathomp4 Jun 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 44 additions & 44 deletions post/time_ave.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,13 +120,13 @@ program time_ave
real, allocatable :: TEM_VARS(:,:,:,:)

data TEM_NAMES / 'U','V','T','OMEGA','USVS','USWS','VSTS' /
data TEM_FOUND / '.F.' ,
. '.F.' ,
. '.F.' ,
. '.F.' ,
. '.F.' ,
. '.F.' ,
. '.F.' /
data TEM_FOUND / .FALSE. ,
. .FALSE. ,
. .FALSE. ,
. .FALSE. ,
. .FALSE. ,
. .FALSE. ,
. .FALSE. /

logical TEM_WRITE
logical NO_TEM
Expand Down Expand Up @@ -215,22 +215,22 @@ program time_ave
if( trim(arg(n)).eq.'-dv'.or. trim(arg(n)).eq.'-mdv') ldquad = .true.

if( trim(arg(n)).eq.'-d' .or. trim(arg(n)).eq.'-dv' ) then
diurnal = .TRUE.
diurnal = .TRUE.
if( n+1.le.nargs ) then
read(arg(n+1),fmt='(a1)') char
if( char.ne.'-' ) doutput = arg(n+1)
endif
endif

if( trim(arg(n)).eq.'-md' .or. trim(arg(n)).eq.'-mdv' ) then
mdiurnal = .TRUE.
mdiurnal = .TRUE.
if( n+1.le.nargs ) then
read(arg(n+1),fmt='(a1)') char
if( char.ne.'-' ) doutput = arg(n+1)
endif
endif

if( trim(arg(n)).eq.'-eta' .or.
if( trim(arg(n)).eq.'-eta' .or.
. trim(arg(n)).eq.'-hdf' ) then ! Backward compatable for old interface
nfiles = 1
read(arg(n+nfiles),fmt='(a1)') char
Expand Down Expand Up @@ -525,7 +525,7 @@ program time_ave
nstar = index( trim(quadratics(1,nv)),'star',back=.true. )
if( nstar.ne.0 ) then
lzstar(nv) = .TRUE.
vtitle2(mv) = "Product_of_Zonal_Mean_Deviations_of_"
vtitle2(mv) = "Product_of_Zonal_Mean_Deviations_of_"
. // trim(vname(qloc(1,nv))) // "_and_" // trim(vname(qloc(2,nv)))
endif

Expand Down Expand Up @@ -650,12 +650,12 @@ program time_ave
call tick (nymd,nhms,-86400)
endif

if( ( begdate.ne.-999 .and. begtime.ne.-999 ) .and.
. ( begdate.gt.nymd .or.
if( ( begdate.ne.-999 .and. begtime.ne.-999 ) .and.
. ( begdate.gt.nymd .or.
. ( begdate.eq.nymd.and.begtime.gt.nhms ) ) ) cycle

if( ( enddate.ne.-999 .and. endtime.ne.-999 ) .and.
. ( enddate.lt.nymd .or.
if( ( enddate.ne.-999 .and. endtime.ne.-999 ) .and.
. ( enddate.lt.nymd .or.
. ( enddate.eq.nymd.and.endtime.lt.nhms ) ) ) cycle

k = k+1
Expand Down Expand Up @@ -955,10 +955,10 @@ program time_ave

if( root ) then
call gfio_close ( id,rc )
print *
print *
print *, 'Created: ',trim(hdfile)
print *, '-------- '
print *
print *
endif
call timeend(' Write_AVE')

Expand Down Expand Up @@ -1012,7 +1012,7 @@ program time_ave
enddo
endif

call TEM( TEM_VARS,imglobal,jmglobal,lm,TEM_NVARS,
call TEM( TEM_VARS,imglobal,jmglobal,lm,TEM_NVARS,
. EXPID,lon,lat,lev,levunits,nymd0,nhms0,timinc,undef )
endif
endif
Expand Down Expand Up @@ -1102,7 +1102,7 @@ program time_ave
call gfio_close ( id,rc )
print *, 'Created: ',trim(hdfile)
print *, '-------- '
print *
print *
endif
call tick (nymd0,nhms0,ndt)
enddo
Expand All @@ -1111,9 +1111,9 @@ program time_ave
call gfio_close ( id,rc )
print *, 'Created: ',trim(hdfile)
print *, '-------- '
print *
print *
endif
if( root ) print *
if( root ) print *

call timeend(' Write_Diurnal')
endif
Expand Down Expand Up @@ -1336,45 +1336,45 @@ subroutine tick (nymd,nhms,ndt)
NSEC = NSEC - 86400
NYMD = INCYMD (NYMD,1)
ENDDO
ENDIF
ENDIF

IF (NSEC.EQ.86400) THEN
NSEC = 0
NYMD = INCYMD (NYMD,1)
ENDIF
ENDIF

IF (NSEC.LT.00000) THEN
DO WHILE (NSEC.LT.0)
NSEC = 86400 + NSEC
NYMD = INCYMD (NYMD,-1)
ENDDO
ENDIF
ENDIF

NHMS = NHMSF (NSEC)
ENDIF
ENDIF

RETURN
RETURN
end subroutine tick

function incymd (NYMD,M)
C***********************************************************************
C PURPOSE
C INCYMD: NYMD CHANGED BY ONE DAY
C MODYMD: NYMD CONVERTED TO JULIAN DATE
C DESCRIPTION OF PARAMETERS
C NYMD CURRENT DATE IN YYMMDD FORMAT
C M +/- 1 (DAY ADJUSTMENT)
C
C***********************************************************************
C* GODDARD LABORATORY FOR ATMOSPHERES *
C***********************************************************************
C***********************************************************************
C PURPOSE
C INCYMD: NYMD CHANGED BY ONE DAY
C MODYMD: NYMD CONVERTED TO JULIAN DATE
C DESCRIPTION OF PARAMETERS
C NYMD CURRENT DATE IN YYMMDD FORMAT
C M +/- 1 (DAY ADJUSTMENT)
C
C***********************************************************************
C* GODDARD LABORATORY FOR ATMOSPHERES *
C***********************************************************************

INTEGER NDPM(12)
DATA NDPM /31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31/
LOGICAL LEAP
LEAP(NY) = MOD(NY,4).EQ.0 .AND. (MOD(NY,100).NE.0 .OR. MOD(NY,400).EQ.0)

C***********************************************************************
C***********************************************************************
C
NY = NYMD / 10000
NM = MOD(NYMD,10000) / 100
Expand Down Expand Up @@ -1405,9 +1405,9 @@ function incymd (NYMD,M)
INCYMD = NY*10000 + NM*100 + ND
RETURN

C***********************************************************************
C E N T R Y M O D Y M D
C***********************************************************************
C***********************************************************************
C E N T R Y M O D Y M D
C***********************************************************************

ENTRY MODYMD (NYMD)
NY = NYMD / 10000
Expand Down
Loading