Skip to content

Commit

Permalink
handle NaN air-sea temperatures from nearest land points (#869)
Browse files Browse the repository at this point in the history
  • Loading branch information
SanderHulst authored Jun 8, 2023
1 parent 80572c5 commit 3eb8161
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 3 deletions.
4 changes: 2 additions & 2 deletions model/src/w3ounfmetamd.F90
Original file line number Diff line number Diff line change
Expand Up @@ -2638,8 +2638,8 @@ SUBROUTINE DEFAULT_META()
!META(1)%VARNS='air_sea_temperature_difference'
META(1)%VARNS=''
META(1)%VARNG='air_sea_temperature_difference'
META(1)%VMIN = 0
META(1)%VMAX = 400
META(1)%VMIN = -200.0
META(1)%VMAX = 200.0
! IFI=1, IFJ=5, WLV
META => GROUP(1)%FIELD(5)%META
META(1)%FSC = 0.01
Expand Down
31 changes: 30 additions & 1 deletion model/src/w3src4md.F90
Original file line number Diff line number Diff line change
Expand Up @@ -666,8 +666,16 @@ SUBROUTINE W3SIN4 (A, CG, K, U, USTAR, DRAT, AS, USDIR, Z0, CD, &
! I got it from, maybe just made up from drag law ...
!
#ifdef W3_STAB3
Usigma=MAX(0.,-0.025*AS)
IF ( ISNAN(AS) ) THEN
! AS is typically NaN on land and can propagate into the domain by interpolation
Usigma = 0.
ELSE
Usigma = MAX(0.,-0.025*AS)
END IF
USTARsigma=(1.0+U/(10.+U))*Usigma
#endif
#ifdef W3_T
WRITE (NDST,9003) AS, Usigma, USTARsigma, U
#endif
UST=USTAR
ISTAB=3
Expand All @@ -678,6 +686,9 @@ SUBROUTINE W3SIN4 (A, CG, K, U, USTAR, DRAT, AS, USDIR, Z0, CD, &
#endif
TAUX = UST**2* COS(USDIR)
TAUY = UST**2* SIN(USDIR)
#ifdef W3_T
WRITE (NDST,9001) ISTAB, TAUX, TAUY, UST
#endif
!
! Loop over the resolved part of the spectrum
!
Expand Down Expand Up @@ -788,6 +799,9 @@ SUBROUTINE W3SIN4 (A, CG, K, U, USTAR, DRAT, AS, USDIR, Z0, CD, &
YSTRESS=0.5*(STRESSSTAB(1,2)+STRESSSTAB(2,2))
TAUWNX=0.5*(STRESSSTABN(1,1)+STRESSSTABN(2,1))
TAUWNY=0.5*(STRESSSTABN(1,2)+STRESSSTABN(2,2))
#endif
#ifdef W3_T
WRITE (NDST,9002) SUM(D), SUM(A), XSTRESS, YSTRESS, TAUWNX, TAUWNY
#endif
S = D * A
!
Expand Down Expand Up @@ -868,6 +882,21 @@ SUBROUTINE W3SIN4 (A, CG, K, U, USTAR, DRAT, AS, USDIR, Z0, CD, &
!
#ifdef W3_T
9000 FORMAT (' TEST W3SIN4 : COMMON FACT.: ',3E10.3)
9001 FORMAT (' TEST W3SIN4 : ISTAB :',I2/ &
' TAUX :',E12.3/ &
' TAUY :',E12.3/ &
' UST :',E12.3)
9002 FORMAT (' TEST W3SIN4 : SUM(D) :',E12.3/ &
' SUM(A) :',E12.3/ &
' STRESSX :',E12.3/ &
' STRESSY :',E12.3/ &
' TAUWNX :',E12.3/ &
' TAUWNY :',E12.3)
9003 FORMAT (' TEST W3SIN4 : AS :',F8.4/ &
' Usigma :',E12.3/ &
' USTARsigma :',E12.3/ &
' U :',E12.3)

#endif
!/
!/ End of W3SIN4 ----------------------------------------------------- /
Expand Down

0 comments on commit 3eb8161

Please sign in to comment.