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

Sync develop -> dev/ufs-weather-model #982

Merged
merged 4 commits into from
Apr 17, 2023
Merged

Sync develop -> dev/ufs-weather-model #982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c6e7b40
Update ww3_gint to interpolate restart files (#962)
JessicaMeixner-NOAA Apr 4, 2023
7d5238b
Extend loop to include ghost points for VA (#975)
DeniseWorthen Apr 11, 2023
11d4f67
Reorders some loops in PDLIB_EXPLICIT_BLOCK for efficiency (#979)
DeniseWorthen Apr 12, 2023
5fe3ee0
Merge remote-tracking branch 'EMC/develop' into updateWW30413
JessicaMeixner-NOAA Apr 13, 2023
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
7 changes: 5 additions & 2 deletions model/inp/ww3_gint.inp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
$ -------------------------------------------------------------------- $
$ WAVEWATCH III Grid integration input file $
$ -------------------------------------------------------------------- $
$ Time, time increment and number of outputs
$ Time, time increment and number of outputs, and optional T/F
$ option (default is T) to indicate out_grd (T) or restart (F)
$ This option for example allows you to create a regional grid from global
$ Note, there is no interpolation in spectral space only geographic
$
19680606 060000 10800. 1
19680606 060000 10800. 1 T
$
$ Total number of grids (NGR). The code assumes that the first NGR-1
$ grids are the input grids and the last grid is the target grid in
Expand Down
1 change: 0 additions & 1 deletion model/src/w3iorsmd.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -827,7 +827,6 @@ SUBROUTINE W3IORS ( INXOUT, NDSR, DUMFPI, IMOD, FLRSTRT )
! Include remainder values (switch to record format) ---- *
JSEA = NSEAL_MIN + 1
IF ( JSEA.EQ.NSEAL ) THEN
!ISEA = IAPROC + (JSEA - 1) * NAPROC
CALL INIT_GET_ISEA(ISEA, JSEA)
NREC = ISEA + 2
RPOS = 1_8 + LRECL*(NREC-1_8)
Expand Down
351 changes: 176 additions & 175 deletions model/src/w3profsmd_pdlib.F90
View file
Open in desktop

Large diffs are not rendered by default.

104 changes: 52 additions & 52 deletions model/src/w3wavemd.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1166,19 +1166,19 @@ SUBROUTINE W3WAVE ( IMOD, ODAT, TEND, STAMP, NO_OUT &
END IF

#ifdef W3_DEBUGRUN
DO JSEA = 1, NSEAL
DO IS = 1, NSPEC
IF (VA(IS, JSEA) .LT. 0.) THEN
WRITE(740+IAPROC,*) 'TEST W3WAVE 5', VA(IS,JSEA)
CALL FLUSH(740+IAPROC)
ENDIF
DO JSEA = 1, NSEAL
DO IS = 1, NSPEC
IF (VA(IS, JSEA) .LT. 0.) THEN
WRITE(740+IAPROC,*) 'TEST W3WAVE 5', VA(IS,JSEA)
CALL FLUSH(740+IAPROC)
ENDIF
ENDDO
ENDDO
ENDDO
IF (SUM(VA) .NE. SUM(VA)) THEN
WRITE(740+IAPROC,*) 'NAN in ACTION 5', IX, IY, SUM(VA)
CALL FLUSH(740+IAPROC)
STOP
ENDIF
IF (SUM(VA) .NE. SUM(VA)) THEN
WRITE(740+IAPROC,*) 'NAN in ACTION 5', IX, IY, SUM(VA)
CALL FLUSH(740+IAPROC)
STOP
ENDIF
#endif
call print_memcheck(memunit, 'memcheck_____:'//' WW3_WAVE TIME LOOP 6')

Expand Down Expand Up @@ -1523,48 +1523,48 @@ SUBROUTINE W3WAVE ( IMOD, ODAT, TEND, STAMP, NO_OUT &
#endif
!
#ifdef W3_DEBUGSRC
IF (IX .eq. DEBUG_NODE) THEN
WRITE(740+IAPROC,*) 'NODE_SRCE_IMP_PRE : IX=', IX, ' JSEA=', JSEA
END IF
WRITE(740+IAPROC,*) 'IT/IX/IY/IMOD=', IT, IX, IY, IMOD
WRITE(740+IAPROC,*) 'ISEA/JSEA=', ISEA, JSEA
WRITE(740+IAPROC,*) 'Before sum(VA)=', sum(VA(:,JSEA))
FLUSH(740+IAPROC)
#endif
CALL W3SRCE(srce_imp_pre, IT, ISEA, JSEA, IX, IY, IMOD, &
VAold(:,JSEA), VA(:,JSEA), &
VSioDummy, VDioDummy, SHAVETOT(JSEA), &
ALPHA(1:NK,JSEA), WN(1:NK,ISEA), &
CG(1:NK,ISEA), CLATS(ISEA), DW(ISEA), U10(ISEA), &
U10D(ISEA), &
IF (IX .eq. DEBUG_NODE) THEN
WRITE(740+IAPROC,*) 'NODE_SRCE_IMP_PRE : IX=', IX, ' JSEA=', JSEA
END IF
WRITE(740+IAPROC,*) 'IT/IX/IY/IMOD=', IT, IX, IY, IMOD
WRITE(740+IAPROC,*) 'ISEA/JSEA=', ISEA, JSEA
WRITE(740+IAPROC,*) 'Before sum(VA)=', sum(VA(:,JSEA))
FLUSH(740+IAPROC)
#endif
CALL W3SRCE(srce_imp_pre, IT, ISEA, JSEA, IX, IY, IMOD, &
VAold(:,JSEA), VA(:,JSEA), &
VSioDummy, VDioDummy, SHAVETOT(JSEA), &
ALPHA(1:NK,JSEA), WN(1:NK,ISEA), &
CG(1:NK,ISEA), CLATS(ISEA), DW(ISEA), U10(ISEA), &
U10D(ISEA), &
#ifdef W3_FLX5
TAUA(ISEA), TAUADIR(ISEA), &
#endif
AS(ISEA), UST(ISEA), &
USTDIR(ISEA), CX(ISEA), CY(ISEA), &
ICE(ISEA), ICEH(ISEA), ICEF(ISEA), &
ICEDMAX(ISEA), &
REFLEC, REFLED, DELX, DELY, DELA, &
TRNX(IY,IX), TRNY(IY,IX), BERG(ISEA), &
FPIS(ISEA), DTDYN(JSEA), &
FCUT(JSEA), DTGpre, TAUWX(JSEA), TAUWY(JSEA), &
TAUOX(JSEA), TAUOY(JSEA), TAUWIX(JSEA), &
TAUWIY(JSEA), TAUWNX(JSEA), &
TAUWNY(JSEA), PHIAW(JSEA), CHARN(JSEA), &
TWS(JSEA), PHIOC(JSEA), TMP1, D50, PSIC, TMP2, &
PHIBBL(JSEA), TMP3, TMP4, PHICE(JSEA), &
TAUOCX(JSEA), TAUOCY(JSEA), WNMEAN(JSEA), &
RHOAIR(ISEA), ASF(ISEA))
IF (.not. LSLOC) THEN
VSTOT(:,JSEA) = VSioDummy
VDTOT(:,JSEA) = VDioDummy
ENDIF
TAUA(ISEA), TAUADIR(ISEA), &
#endif
AS(ISEA), UST(ISEA), &
USTDIR(ISEA), CX(ISEA), CY(ISEA), &
ICE(ISEA), ICEH(ISEA), ICEF(ISEA), &
ICEDMAX(ISEA), &
REFLEC, REFLED, DELX, DELY, DELA, &
TRNX(IY,IX), TRNY(IY,IX), BERG(ISEA), &
FPIS(ISEA), DTDYN(JSEA), &
FCUT(JSEA), DTGpre, TAUWX(JSEA), TAUWY(JSEA), &
TAUOX(JSEA), TAUOY(JSEA), TAUWIX(JSEA), &
TAUWIY(JSEA), TAUWNX(JSEA), &
TAUWNY(JSEA), PHIAW(JSEA), CHARN(JSEA), &
TWS(JSEA), PHIOC(JSEA), TMP1, D50, PSIC, TMP2, &
PHIBBL(JSEA), TMP3, TMP4, PHICE(JSEA), &
TAUOCX(JSEA), TAUOCY(JSEA), WNMEAN(JSEA), &
RHOAIR(ISEA), ASF(ISEA))
IF (.not. LSLOC) THEN
VSTOT(:,JSEA) = VSioDummy
VDTOT(:,JSEA) = VDioDummy
ENDIF
#ifdef W3_DEBUGSRC
WRITE(740+IAPROC,*) 'After sum(VA)=', sum(VA(:,JSEA))
WRITE(740+IAPROC,*) ' sum(VSTOT)=', sum(VSTOT(:,JSEA))
WRITE(740+IAPROC,*) ' sum(VDTOT)=', sum(VDTOT(:,JSEA))
WRITE(740+IAPROC,*) ' SHAVETOT=', SHAVETOT(JSEA)
FLUSH(740+IAPROC)
WRITE(740+IAPROC,*) 'After sum(VA)=', sum(VA(:,JSEA))
WRITE(740+IAPROC,*) ' sum(VSTOT)=', sum(VSTOT(:,JSEA))
WRITE(740+IAPROC,*) ' sum(VDTOT)=', sum(VDTOT(:,JSEA))
WRITE(740+IAPROC,*) ' SHAVETOT=', SHAVETOT(JSEA)
FLUSH(740+IAPROC)
#endif
END DO ! JSEA
END IF ! PDLIB
Expand Down
Loading