Skip to content

Commit

Permalink
master: minor updates for gfortran
Browse files Browse the repository at this point in the history
-STOP as the start of a variable does not work in gfortran (ww3_prnc.ftn)
-EQ needs to be EQV when comparing logicals for certain compilers
-added model/bin/wwatch3.env to .gitignore

Former-commit-id: f05ab5bdcb90e5cee020138df449ae6a48562049
  • Loading branch information
JessicaMeixner-NOAA committed May 21, 2018
1 parent e7d747b commit 66602e5
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 43 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -73,4 +73,4 @@ model/bin/w3list
model/bin/w3prnt
model/bin/w3split
model/wwatch3.env

model/bin/wwatch3.env
37 changes: 2 additions & 35 deletions model/ftn/w3nmlprncmd.ftn
Original file line number Diff line number Diff line change
Expand Up @@ -305,11 +305,11 @@

! set/check RETURN values
IF (FORCING%TIDAL.NE.'unset') THEN
IF (FORCING%FIELD%WATER_LEVELS.EQ..FALSE. .AND. FORCING%FIELD%CURRENTS.EQ..FALSE.) THEN
IF (FORCING%FIELD%WATER_LEVELS.EQV..FALSE. .AND. FORCING%FIELD%CURRENTS.EQV..FALSE.) THEN
WRITE (NDSE,'(A,I3)') 'ERROR: TIDAL must only be used on FIELD%WATER_LEVELS or FIELD%CURRENTS'
IERR = 1
RETURN
ELSE IF (FORCING%GRID%ASIS.EQ..FALSE.) THEN
ELSE IF (FORCING%GRID%ASIS.EQV..FALSE.) THEN
WRITE (NDSE,'(A,I3)') 'ERROR: TIDAL must only be used on GRID%ASIS'
IERR = 1
RETURN
Expand Down Expand Up @@ -652,36 +652,3 @@ END MODULE W3NMLPRNCMD




































2 changes: 1 addition & 1 deletion model/ftn/wminitmd.ftn
Original file line number Diff line number Diff line change
Expand Up @@ -3813,7 +3813,7 @@
END IF
! INFLAGS2 is initial value of INFLAGS1. Unlike INFLAGS1,
! it does not change during the simulation
IF(INFLAGS2(J).EQ..FALSE.) INFLAGS2(J)=INFLAGS1(J)
IF(INFLAGS2(J).EQV..FALSE.) INFLAGS2(J)=INFLAGS1(J)
END DO ! DO J=JFIRST, 7
END DO ! DO I=1, NRGRD
!
Expand Down
12 changes: 6 additions & 6 deletions model/ftn/ww3_prnc.ftn
Original file line number Diff line number Diff line change
Expand Up @@ -266,8 +266,8 @@
CHARACTER*50 :: TIMEUNITS, CALENDAR
REAL :: FILLVALUE, TIMEDELAY
INTEGER :: I,ITIME
INTEGER :: REFDATE(8),CURDATE(8),STARTDATE(8),STOPDATE(8)
DOUBLE PRECISION :: REFJULDAY, CURJULDAY, STARTJULDAY, STOPJULDAY
INTEGER :: REFDATE(8),CURDATE(8),STARTDATE(8),STPDATE(8)
DOUBLE PRECISION :: REFJULDAY, CURJULDAY, STARTJULDAY, STPJULDAY
!
! Variables used in tidal analysis
DOUBLE PRECISION, ALLOCATABLE :: ALLTIMES(:)
Expand Down Expand Up @@ -500,8 +500,8 @@
CALL T2D(TIMESTART,STARTDATE,IERR)
CALL D2J(STARTDATE,STARTJULDAY,IERR)
READ(NML_FORCING%TIMESTOP,*) TIMESTOP
CALL T2D(TIMESTOP,STOPDATE,IERR)
CALL D2J(STOPDATE,STOPJULDAY,IERR)
CALL T2D(TIMESTOP,STPDATE,IERR)
CALL D2J(STPDATE,STPJULDAY,IERR)

! Check time shift
FLHDR = .TRUE.
Expand Down Expand Up @@ -621,7 +621,7 @@

! initialize timestart and timestop
STARTJULDAY=0
STOPJULDAY=100000000000
STPJULDAY=100000000000

END IF ! .NOT. FLGNML

Expand Down Expand Up @@ -1626,7 +1626,7 @@
IF (STARTJULDAY.GT.CURJULDAY) CYCLE

! exit when reaching the stop time
IF (STOPJULDAY.LT.CURJULDAY) EXIT
IF (STPJULDAY.LT.CURJULDAY) EXIT

! convert julday to date and time
CALL J2D(CURJULDAY,CURDATE,IERR)
Expand Down

0 comments on commit 66602e5

Please sign in to comment.