Skip to content

Backport Charnock Cap and SinTable to PS45-1 branch #49

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

Open
ukmo-ccbunney wants to merge 4 commits into
base: ukmo_ps45-1.hotfixes
Choose a base branch
from
Open

Backport Charnock Cap and SinTable to PS45-1 branch #49

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
2a59e24
Backported that Charnock Cap PR (#NOAA-EMC/WW3/1225)
ukmo-ccbunney May 15, 2024
1972231
Fixed typo
ukmo-ccbunney May 16, 2024
74c5da8
Fixed missing continuation & character
ukmo-ccbunney May 16, 2024
c3d31fd
Fixed typo
ukmo-ccbunney May 16, 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
18 changes: 14 additions & 4 deletions model/ftn/w3gdatmd.ftn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -801,11 +801,12 @@
!/ST4 REAL, POINTER :: DCKI(:,:), SATWEIGHTS(:,:),CUMULW(:,:),QBI(:,:)
!/ST4 REAL :: AALPHA, BBETA, ZZ0MAX, ZZ0RAT, ZZALP,&
!/ST4 SSINTHP, TTAUWSHELTER, SSWELLF(1:7), &
!/ST4 SSDSC(1:21), SSDSBR, &
!/ST4 SSDSC(1:21), SSDSBR, SINTAILPAR(1:5),&
!/ST4 SSDSP, WWNMEANP, SSTXFTF, SSTXFTWN, &
!/ST4 FFXPM, FFXFM, FFXFA, &
!/ST4 SSDSBRF1, SSDSBRF2, SSDSBINT,SSDSBCK,&
!/ST4 SSDSHCK, SSDSABK, SSDSPBK, SSINBR
!/ST4 SSDSHCK, SSDSABK, SSDSPBK, SSINBR, &
!/ST4 CAPCHNK(1:10)
!/ST4 REAL :: ZZWND
!/ST4 REAL :: SSDSCOS, SSDSDTH, SSDSBT, SSDSBM(0:4)
!
Expand Down Expand Up @@ -1101,9 +1102,10 @@
!/ST4 FFXFM, FFXPM, SSDSBRF1, SSDSBRF2, &
!/ST4 SSDSBINT, SSDSBCK, SSDSHCK, SSDSABK, &
!/ST4 SSDSPBK, SSINBR,SSINTHP,TTAUWSHELTER,&
!/ST4 SSWELLF(:), SSDSC(:), SSDSBR, &
!/ST4 SINTAILPAR(:), SSWELLF(:), SSDSC(:), SSDSBR, &
!/ST4 SSDSP, WWNMEANP, SSTXFTF, SSTXFTWN, &
!/ST4 SSDSBT, SSDSCOS, SSDSDTH, SSDSBM(:)
!/ST4 SSDSBT, SSDSCOS, SSDSDTH, SSDSBM(:), &
!/ST4 CAPCHNK(:)
!/ST6 REAL, POINTER :: SIN6A0, SDS6A1, SDS6A2, SWL6B1, &
!/ST6 SIN6WS, SIN6FC
!/ST6 INTEGER, POINTER :: SDS6P1, SDS6P2
Expand Down Expand Up @@ -1770,12 +1772,18 @@
!/ST4 MPARS(IMOD)%SRCPS%QBI(NKHS,NKD), &
!/ST4 STAT=ISTAT )
!/ST4 CHECK_ALLOC_STATUS ( ISTAT )
!/ST4 MPARS(IMOD)%SRCPS%IKTAB(:,:)=0.
!/ST4 MPARS(IMOD)%SRCPS%DCKI(:,:)=0.
!/ST4 MPARS(IMOD)%SRCPS%QBI(:,:)=0.
!/ST4 SDSNTH = MTH/2-1 !MIN(NINT(SSDSDTH/(DTH*RADE)),MTH/2-1)
!/ST4 ALLOCATE( MPARS(IMOD)%SRCPS%SATINDICES(2*SDSNTH+1,MTH), &
!/ST4 MPARS(IMOD)%SRCPS%SATWEIGHTS(2*SDSNTH+1,MTH), &
!/ST4 MPARS(IMOD)%SRCPS%CUMULW(MSPEC,MSPEC), &
!/ST4 STAT=ISTAT )
!/ST4 CHECK_ALLOC_STATUS ( ISTAT )
!/ST4 MPARS(IMOD)%SRCPS%SATINDICES(:,:)=0.
!/ST4 MPARS(IMOD)%SRCPS%SATWEIGHTS(:,:)=0.
!/ST4 MPARS(IMOD)%SRCPS%CUMULW(:,:)=0.
!
SGRDS(IMOD)%SINIT = .TRUE.
#if defined(TEST_W3GDATMD) || defined(TEST_W3GDATMD_W3DIMS)
Expand Down Expand Up @@ -2287,6 +2295,8 @@
!/ST4 ZZ0RAT => MPARS(IMOD)%SRCPS%ZZ0RAT
!/ST4 ZZALP => MPARS(IMOD)%SRCPS%ZZALP
!/ST4 TTAUWSHELTER => MPARS(IMOD)%SRCPS%TTAUWSHELTER
!/ST4 SINTAILPAR => MPARS(IMOD)%SRCPS%SINTAILPAR
!/ST4 CAPCHNK => MPARS(IMOD)%SRCPS%CAPCHNK
!/ST4 SSWELLFPAR => MPARS(IMOD)%SRCPS%SSWELLFPAR
!/ST4 SSWELLF => MPARS(IMOD)%SRCPS%SSWELLF
!/ST4 SSDSC => MPARS(IMOD)%SRCPS%SSDSC
Expand Down
53 changes: 45 additions & 8 deletions model/ftn/w3gridmd.ftn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -750,7 +750,8 @@
!/ST3 REAL :: STXFTFTAIL, SDSC1, &
!/ST3 SDSDELTA1, SDSDELTA2
!
!/ST4 INTEGER :: SWELLFPAR, SDSISO, SDSBRFDF
!/ST4 INTEGER :: SWELLFPAR, SDSISO, SDSBRFDF, SINTABLE,&
!/ST4 TAUWBUG
!/ST4 REAL :: SDSBCHOICE
!/ST4 REAL :: ZWND, ALPHA0, Z0MAX, BETAMAX, SINTHP,&
!/ST4 ZALP, Z0RAT, TAUWSHELTER, SWELLF, &
Expand All @@ -766,7 +767,11 @@
!/ST4 SDSBRF1, &
!/ST4 SDSBM0, SDSBM1, SDSBM2, SDSBM3, &
!/ST4 SDSBM4, SDSFACMTF, SDSCUMP, SDSNUW, &
!/ST4 SDSL, SDSMWD, SDSMWPOW, SPMSS, SDSNMTF
!/ST4 SDSL, SDSMWD, SDSMWPOW, SPMSS, SDSNMTF, &
!/ST4 SINTAIL1, SINTAIL2, &
!/ST4 CUMSIGP, VISCSTRESS, &
!/ST4 CAPCHA, CHAMIN, CHA0, UCAP, SIGMAUCAP

!
!/ST6 REAL :: SINA0, SINWS, SINFC, &
!/ST6 SDSA1, SDSA2, SWLB1
Expand Down Expand Up @@ -855,7 +860,10 @@
!/ST4 NAMELIST /SIN4/ ZWND, ALPHA0, Z0MAX, BETAMAX, SINTHP, ZALP, &
!/ST4 TAUWSHELTER, SWELLFPAR, SWELLF, &
!/ST4 SWELLF2, SWELLF3, SWELLF4, SWELLF5, SWELLF6, &
!/ST4 SWELLF7, Z0RAT, SINBR
!/ST4 SWELLF7, Z0RAT, SINBR, SINTABLE, SINTAIL1, &
!/ST4 SINTAIL2, TAUWBUG, VISCSTRESS, &
!/ST4 CAPCHA, CHAMIN, CHA0, UCAP, SIGMAUCAP

!/NL1 NAMELIST /SNL1/ LAMBDA, NLPROP, KDCONV, KDMIN, &
!/NL1 SNLCS1, SNLCS2, SNLCS3
!/NL2 NAMELIST /SNL2/ IQTYPE, TAILNL, NDEPTH
Expand All @@ -875,7 +883,7 @@
!/ST4 SDSC5, SDSC6, SDSBR, SDSBT, SDSP, SDSISO, &
!/ST4 SDSBCK, SDSABK, SDSPBK, SDSBINT, SDSHCK, &
!/ST4 SDSDTH, SDSCOS, SDSBRF1, SDSBRFDF, SDSNUW, &
!/ST4 SDSBM0, SDSBM1, SDSBM2, SDSBM3, SDSBM4, &
!/ST4 SDSBM0, SDSBM1, SDSBM2, SDSBM3, SDSBM4, CUMSIGP,&
!/ST4 WHITECAPWIDTH, WHITECAPDUR, SDSMWD, SDSMWPOW, SDKOF

!/ST6 NAMELIST /SIN6/ SINA0, SINWS, SINFC
Expand Down Expand Up @@ -1429,6 +1437,18 @@
!/ST4 TAUWSHELTER = 0.3
!/ST4 ZALP = 0.006
!/ST4 SINBR = 0.
!/ST4 SINTABLE = 1
!/ST4 SINTAIL1 = 0. ! TAUWSHELTER FOR TAIL (no table)
!/ST4 SINTAIL2 = 0. ! additional peak in capillary range
!/ST4 TAUWBUG = 1 ! TAUWBUG is 1 is the bug is kept:
!/ST4 ! initializes TAUWX/Y to zero in W3SRCE
!/ST4 VISCSTRESS =0
!/ST4 CAPCHA = 0. ! =1 indicates capping of drag is active
!/ST4 CHAMIN = 0.0001 !
!/ST4 CHA0 = ALPHA0 ! initial value for charnock
!/ST4 UCAP = 30. ! U10 threshold from which drag capping is applied
!/ST4 SIGMAUCAP = 10. ! Width for reduction of drag beyond UCAP

!
!/ST6 SINA0 = 0.09
!/ST6 SINWS = 32.0
Expand Down Expand Up @@ -1498,6 +1518,16 @@
!/ST4 SSWELLF(6) = SWELLF6
!/ST4 SSWELLF(7) = SWELLF7
!/ST4 SSWELLFPAR = SWELLFPAR
!/ST4 SINTAILPAR(1) = FLOAT(SINTABLE)
!/ST4 SINTAILPAR(2) = SINTAIL1
!/ST4 SINTAILPAR(3) = SINTAIL2
!/ST4 SINTAILPAR(4) = FLOAT(TAUWBUG)
!/ST4 SINTAILPAR(5) = VISCSTRESS
!/ST4 CAPCHNK(1) = CAPCHA
!/ST4 CAPCHNK(2) = CHAMIN
!/ST4 CAPCHNK(3) = CHA0
!/ST4 CAPCHNK(4) = UCAP
!/ST4 CAPCHNK(5) = SIGMAUCAP
!
!/ST6 CALL READNL ( NDSS, 'SIN6', STATUS )
!/ST6 WRITE (NDSO,920) STATUS
Expand Down Expand Up @@ -1745,8 +1775,9 @@
!/ST4 SDSBINT = 0.3
!/ST4 SDSHCK = 1.5
!/ST4 WHITECAPWIDTH = 0.3
!/ST4 SDSSTRAIN = 0.
!/ST4 SDSFACMTF = 400 ! MTF factor for Lambda , Romero (2019)
!/ST4 CUMSIGP = 0.
!/ST4 SDSSTRAIN = 0.
!/ST4 SDSSTRAINA = 15.
!/ST4 SDSSTRAIN2 = 0.
!/ST4 WHITECAPDUR = 0.56 ! breaking duration factor
Expand Down Expand Up @@ -1831,7 +1862,7 @@
!/ST4 SSDSC(9) = SDSL
!/ST4 SSDSC(10) = SDSSTRAINA*NTH/360. ! angle Aor enhanced straining
!/ST4 SSDSC(11) = SDSSTRAIN2 ! straining constant for directional part
!/ST4 SSDSC(12) = SDSBT
!/ST4 SSDSC(12) = CUMSIGP
!/ST4 SSDSC(13) = SDSMWD
!/ST4 SSDSC(14) = SPMSS
!/ST4 SSDSC(15) = SDSMWPOW
Expand Down Expand Up @@ -2694,7 +2725,8 @@
!/ST3 SWELLF
!/ST4 WRITE (NDSO,2920) ZWND, ALPHA0, Z0MAX, BETAMAX, SINTHP, ZALP, &
!/ST4 TAUWSHELTER, SWELLFPAR, SWELLF, SWELLF2, SWELLF3, SWELLF4, &
!/ST4 SWELLF5, SWELLF6, SWELLF7, Z0RAT, SINBR
!/ST4 SWELLF5, SWELLF6, SWELLF7, Z0RAT, SINBR, SINTABLE, TAUWBUG, &
!/ST4 VISCSTRESS, SINTAIL1, SINTAIL2, CAPCHA, CHAMIN, CHA0, UCAP, SIGMAUCAP
!/ST6 WRITE (NDSO,2920) SINA0, SINWS, SINFC
!/NL1 WRITE (NDSO,2922) LAMBDA, NLPROP, KDCONV, KDMIN, &
!/NL1 SNLCS1, SNLCS2, SNLCS3
Expand Down Expand Up @@ -5577,7 +5609,12 @@
!/ST4 ' SWELLF =',F8.5,', SWELLF2 =',F8.5, &
!/ST4 ', SWELLF3 =',F8.5,', SWELLF4 =',F9.1,','/ &
!/ST4 ' SWELLF5 =',F8.5,', SWELLF6 =',F8.5, &
!/ST4 ', SWELLF7 =',F12.2,', Z0RAT =',F8.5,', SINBR =',F8.5,' /')
!/ST4 ', SWELLF7 =',F12.2,', Z0RAT =',F8.5,', SINBR =',F8.5,','/ &
!/ST4 ' SINTABLE =',I2,', TAUWBUG =',I2, &
!/ST4 ', VISCSTRESS =',F8.5,', SINTAIL1 =',F8.5,', SINTAIL2 =',F8.5,',' / &
!/ST4 ', CAPCHA =',F8.5,', CHAMIN =',F8.5,', CHA0 =',F8.5,', UCAP =',F5.1,', SIGMAUCAP =', &
!/ST4 F5.1,' /')

!
!/ST6 920 FORMAT (/' Wind input (Donelan et al, 2006) ',A/ &
!/ST6 ' --------------------------------------------------')
Expand Down
30 changes: 20 additions & 10 deletions model/ftn/w3iogrmd.ftn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1070,29 +1070,39 @@
!/ST4 ZZWND, AALPHA, ZZ0MAX, BBETA, SSINTHP, ZZALP, &
!/ST4 TTAUWSHELTER, SSWELLFPAR, SSWELLF, SSINBR, &
!/ST4 ZZ0RAT, SSDSC, &
!/ST4 SSDSISO, SSDSBR, SSDSBT, SSDSBM, SSDSP, &
!/ST4 SSDSISO, SSDSBR, SSDSBT, SSDSBM, SSDSP, &
!/ST4 SSDSCOS, SSDSDTH, WWNMEANP, WWNMEANPTAIL,SSTXFTF,&
!/ST4 SSTXFTFTAIL, SSTXFTWN, SSTXFTF, SSTXFTWN, &
!/ST4 SSDSBRF1, SSDSBRF2, SSDSBRFDF,SSDSBCK, SSDSABK, &
!/ST4 SSDSPBK, SSDSBINT, FFXPM, FFXFM, FFXFA, &
!/ST4 SSDSHCK, DELUST, DELTAIL, DELTAUW, &
!/ST4 DELU, DELALP, TAUT, TAUHFT, TAUHFT2, &
!/ST4 SSDSPBK, SSDSBINT, FFXPM, FFXFM, FFXFA, &
!/ST4 SSDSHCK, &
!/ST4 IKTAB, DCKI, QBI, SATINDICES, SATWEIGHTS, &
!/ST4 DIKCUMUL, CUMULW
!/ST4 DIKCUMUL, CUMULW, SINTAILPAR, CAPCHNK
!/ST4 IF (SINTAILPAR(1).GT.0.5) THEN
!/ST4 WRITE (NDSM) DELUST, DELTAIL, DELTAUW, DELU, DELALP, &
!/ST4 TAUT, TAUHFT
!/ST4 IF (TTAUWSHELTER.GT.0) WRITE (NDSM) TAUHFT2
!/ST4 END IF
!/ST4 ELSE
!/ST4 READ (NDSM,END=801,ERR=802,IOSTAT=IERR) &
!/ST4 ZZWND, AALPHA, ZZ0MAX, BBETA, SSINTHP, ZZALP, &
!/ST4 TTAUWSHELTER, SSWELLFPAR, SSWELLF, SSINBR, &
!/ST4 ZZ0RAT, SSDSC, &
!/ST4 SSDSISO, SSDSBR, SSDSBT, SSDSBM, SSDSP, &
!/ST4 SSDSISO, SSDSBR, SSDSBT, SSDSBM, SSDSP, &
!/ST4 SSDSCOS, SSDSDTH, WWNMEANP, WWNMEANPTAIL,SSTXFTF,&
!/ST4 SSTXFTFTAIL, SSTXFTWN, SSTXFTF, SSTXFTWN, &
!/ST4 SSDSBRF1, SSDSBRF2, SSDSBRFDF,SSDSBCK, SSDSABK, &
!/ST4 SSDSPBK, SSDSBINT, FFXPM, FFXFM, FFXFA, &
!/ST4 SSDSHCK, DELUST, DELTAIL, DELTAUW, &
!/ST4 DELU, DELALP, TAUT, TAUHFT, TAUHFT2, &
!/ST4 SSDSPBK, SSDSBINT, FFXPM, FFXFM, FFXFA, &
!/ST4 SSDSHCK, &
!/ST4 IKTAB, DCKI, QBI, SATINDICES, SATWEIGHTS, &
!/ST4 DIKCUMUL, CUMULW
!/ST4 DIKCUMUL, CUMULW, SINTAILPAR, CAPCHNK
!/ST4 IF (SINTAILPAR(1).GT.0.5) THEN
!/ST4 CALL INSIN4(.FALSE.)
!/ST4 READ (NDSM,END=801,ERR=802,IOSTAT=IERR) &
!/ST4 DELUST, DELTAIL, DELTAUW, DELU, DELALP, &
!/ST4 TAUT, TAUHFT
!/ST4 IF (TTAUWSHELTER.GT.0) READ(NDSM,END=801,ERR=802,IOSTAT=IERR) TAUHFT2
!/ST4 END IF
!/ST4 END IF
!
!/DEBUGIOGR WRITE(740+IAPROC,*) 'W3IOGR, step 18'
Expand Down
Loading