Skip to content

Fix incorrect field index for ICEF #561

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

Merged
JessicaMeixner-NOAA merged 2 commits into from
Dec 20, 2021
Merged

Fix incorrect field index for ICEF #561

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba26e98
Fixed incorrect field index for ICEF.
ukmo-ccbunney Dec 16, 2021
fe94637
Fixed incorrect field orderreing for ICEF in ww3_outf. Also added
ukmo-ccbunney Dec 17, 2021
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
8 changes: 4 additions & 4 deletions model/src/w3initmd.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2613,7 +2613,7 @@ SUBROUTINE W3MPIO ( IMOD )
#endif
!
#ifdef W3_MPI
IF ( FLGRDALL( 1, 9) ) THEN
IF ( FLGRDALL( 1, 12) ) THEN
IH = IH + 1
IT = IT + 1
CALL MPI_SEND_INIT (ICEF (IAPROC), 1, WW3_FIELD_VEC, &
Expand Down Expand Up @@ -4021,7 +4021,7 @@ SUBROUTINE W3MPIO ( IMOD )
#endif
!
#ifdef W3_MPI
IF ( FLGRDALL( 1, 9) ) THEN
IF ( FLGRDALL( 1, 12) ) THEN
IH = IH + 1
IT = IT + 1
CALL MPI_RECV_INIT (ICEF (I0),1,WW3_FIELD_VEC, IFROM, IT, &
Expand Down Expand Up @@ -5533,7 +5533,7 @@ SUBROUTINE W3MPIO ( IMOD )
#endif
!
#ifdef W3_MPI
IF ( FLOGRR( 1, 9) ) THEN
IF ( FLOGRR( 1, 12) ) THEN
IH = IH + 1
IT = IT0 + 6
CALL MPI_SEND_INIT (ICEF(IAPROC), 1, WW3_FIELD_VEC, &
Expand Down Expand Up @@ -5930,7 +5930,7 @@ SUBROUTINE W3MPIO ( IMOD )
#endif
!
#ifdef W3_MPI
IF ( FLOGRR( 1, 9) ) THEN
IF ( FLOGRR( 1, 12) ) THEN
IH = IH + 1
IT = IT0 + 6
CALL MPI_RECV_INIT (ICEF (I0),1,WW3_FIELD_VEC, &
Expand Down
4 changes: 2 additions & 2 deletions model/src/w3iorsmd.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -984,7 +984,7 @@ SUBROUTINE W3IORS ( INXOUT, NDSR, DUMFPI, IMOD, FLRSTRT )
WRITE(NDSR,ERR=803,IOSTAT=IERR) CX(1:NSEA)
WRITE(NDSR,ERR=803,IOSTAT=IERR) CY(1:NSEA)
ENDIF
IF ( FLOGRR(1,9) ) &
IF ( FLOGRR(1,12) ) &
WRITE(NDSR,ERR=803,IOSTAT=IERR) ICEF(1:NSEA)
IF ( FLOGRR(2,1) ) &
WRITE(NDSR,ERR=803,IOSTAT=IERR) HS(1:NSEA)
Expand Down Expand Up @@ -1181,7 +1181,7 @@ SUBROUTINE W3IORS ( INXOUT, NDSR, DUMFPI, IMOD, FLRSTRT )
#ifdef W3_DEBUGINIT
WRITE(740+IAPROC,*) 'Before reading ICEF'
#endif
IF ( FLOGOA(1,9) ) THEN
IF ( FLOGOA(1,12) ) THEN
READ (NDSR,ERR=802,IOSTAT=IERR) ICEF(1:NSEA)
ENDIF
#ifdef W3_DEBUGINIT
Expand Down
64 changes: 59 additions & 5 deletions model/src/ww3_outf.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,8 @@ PROGRAM W3OUTF
USE W3IOGOMD, ONLY: W3IOGO, W3READFLGRD
!/
USE W3GDATMD
USE W3WDATMD, ONLY: TIME, WLV, ICE, ICEH, ICEF, BERG, UST, USTDIR
USE W3WDATMD, ONLY: TIME, WLV, ICE, ICEH, ICEF, BERG, UST, &
USTDIR, RHOAIR
USE W3ADATMD, ONLY: DW, UA, UD, AS, CX, CY, HS, WLM, T0M1, THM, &
THS, FP0, THP0, FP1, THP1, DTDYN, FCUT, &
ABA, ABD, UBA, UBD, SXX, SYY, SXY, USERO, &
Expand All @@ -134,7 +135,7 @@ PROGRAM W3OUTF
CFLTHMAX, CFLKMAX, BEDFORMS, WHITECAP, T02, &
CGE, T01, HSIG, STMAXE, STMAXD, HMAXE, &
HCMAXE, HMAXD, HCMAXD, MSSD, MSCD, WBT, &
WNMEAN
WNMEAN, TAUA, TAUADIR
USE W3ODATMD, ONLY: NDSO, NDSE, NDST, NOGRP, NGRPP, IDOUT, &
UNDEF, FLOGRD, FNMPRE, NOSWLL, NOGE
!
Expand Down Expand Up @@ -879,8 +880,61 @@ SUBROUTINE W3EXGO ( NX, NY, NSEA )
CALL W3S2XY ( NSEA, NSEA, NX+1, NY, BERG , MAPSF, X1 )
ENDIF
!
ELSE IF ( IFI .EQ. 1 .AND. IFJ .EQ. 8 ) THEN
!! Note - TAUA and TAUADIR read in from .ww3 file are TAUAX,TAUAY
IF ( VECTOR ) THEN
FLTWO = .TRUE.
ELSE
FLDIR = .TRUE.
END IF
FSC = 0.01
UNITS = 'Pa'
ENAME = '.taua'
#ifdef W3_RTD
! Rotate x,y vector back to standard pole
IF ( FLAGUNR ) THEN
CALL W3XYRTN(NSEA, TAUA(1:NSEA), TAUADIR(1:NSEA), AnglD)
ENDIF
#endif
IF ( ITYPE .EQ. 4 ) THEN
XS1 = TAUA(1:NSEA)
XS2 = TAUADIR(1:NSEA)
ELSE
CALL W3S2XY ( NSEA, NSEA, NX+1, NY, TAUA(1:NSEA), MAPSF, XX )
CALL W3S2XY ( NSEA, NSEA, NX+1, NY, TAUADIR(1:NSEA), MAPSF, XY )
ENDIF

DO ISEA=1, NSEA
UABS = SQRT(TAUA(ISEA)**2+TAUADIR(ISEA)**2)
IF ( UABS .GT. 0.01 ) THEN
TAUADIR(ISEA) = MOD ( 630. - &
RADE*ATAN2(TAUA(ISEA),TAUADIR(ISEA)), 360.)
ELSE
TAUADIR(ISEA) = UNDEF
END IF
UA(ISEA) = UABS
END DO
IF ( ITYPE .EQ. 4 ) THEN
XS3 = TAUA(1:NSEA)
XS4 = TAUADIR(1:NSEA)
ELSE
CALL W3S2XY ( NSEA, NSEA, NX+1, NY, TAUA(1:NSEA), MAPSF, X1 )
CALL W3S2XY ( NSEA, NSEA, NX+1, NY, TAUADIR(1:NSEA), MAPSF, X2)
ENDIF
!
ELSE IF ( IFI .EQ. 1 .AND. IFJ .EQ. 9 ) THEN
FLONE = .TRUE.
FSC = 0.0001
UNITS = 'kg m-3'
ENAME = '.rhoa'
IF ( ITYPE .EQ. 4 ) THEN
XS1 = RHOAIR
ELSE
CALL W3S2XY ( NSEA, NSEA, NX+1, NY, RHOAIR, MAPSF, X1 )
ENDIF
!
#ifdef W3_BT4
ELSE IF ( IFI .EQ. 1 .AND. IFJ .EQ. 8 ) THEN
ELSE IF ( IFI .EQ. 1 .AND. IFJ .EQ. 10 ) THEN
FLONE = .TRUE.
FSC = 0.01
UNITS = 'Krumbein phi scale'
Expand All @@ -894,7 +948,7 @@ SUBROUTINE W3EXGO ( NX, NY, NSEA )
#endif
!
#ifdef W3_IS2
ELSE IF ( IFI .EQ. 1 .AND. IFJ .EQ. 9 ) THEN
ELSE IF ( IFI .EQ. 1 .AND. IFJ .EQ. 11 ) THEN
FLONE = .TRUE.
FSC = 0.001
UNITS = 'm'
Expand All @@ -907,7 +961,7 @@ SUBROUTINE W3EXGO ( NX, NY, NSEA )
#endif
!
#ifdef W3_IS2
ELSE IF ( IFI .EQ. 1 .AND. IFJ .EQ. 10) THEN
ELSE IF ( IFI .EQ. 1 .AND. IFJ .EQ. 12) THEN
FLONE = .TRUE.
FSC = 0.001
UNITS = 'm'
Expand Down