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

Staging/UKMO Oct 2021 #499

Merged
merged 8 commits into from
Nov 5, 2021
+6 −6
Merged

Staging/UKMO Oct 2021 #499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
43a45eb
Small bigfix to variable INTENT
ukmo-ccbunney Oct 7, 2021
47bdb36
Fix incorrect order of parameters in W3SRCE subroutine signature.
ukmo-ccbunney Oct 8, 2021
c7a4035
Merge branch 'NOAA-EMC:develop' into bugfix/flx5_tau
ukmo-ccbunney Oct 12, 2021
66efc5c
Merge branch 'develop' into bugfix/flx5_tau
ukmo-ccbunney Oct 20, 2021
f00c4b4
Merge branch 'develop' into bugfix/issue489-intent
ukmo-ccbunney Oct 20, 2021
1a024cf
Missing continuation character
ukmo-ccbunney Oct 20, 2021
064fb5c
Merge branch 'bugfix/flx5_tau' into staging/ukmo_oct2021
ukmo-ccbunney Oct 20, 2021
6cdce6d
Fix potential divide by zero error if USTAR=0
ukmo-ccbunney Nov 4, 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
2 changes: 1 addition & 1 deletion model/src/w3flx5md.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ SUBROUTINE W3FLX5 ( ZWND, U10, U10D, TAUA, TAUADIR, RHOAIR, UST, USTD, Z0, CD )
! 2. Computation ---------------------------------------------------- *
!
!
UST = SQRT(TAUA/RHOAIR)
UST = MAX ( 1E-4, SQRT(TAUA/RHOAIR) )
UNZ = MAX ( 0.01 , U10 )
CD = (UST/UNZ)**2
USTD = TAUADIR
Expand Down
6 changes: 3 additions & 3 deletions model/src/w3ounfmetamd.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -954,9 +954,9 @@ SUBROUTINE READ_META_PAIRS(NDMI, META, ILINE)
!
!/ ------------------------------------------------------------------- /
IMPLICIT NONE
INTEGER, INTENT(IN) :: NDMI
TYPE(META_T), INTENT(IN), POINTER :: META
INTEGER, INTENT(INOUT) :: ILINE
INTEGER, INTENT(IN) :: NDMI
TYPE(META_T), INTENT(INOUT), POINTER :: META
INTEGER, INTENT(INOUT) :: ILINE
!/ ------------------------------------------------------------------- /
!/ Local parameters
!
Expand Down
4 changes: 2 additions & 2 deletions model/src/w3srcemd.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,11 @@ MODULE W3SRCEMD
!/ ------------------------------------------------------------------- /
SUBROUTINE W3SRCE ( srce_call, IT, JSEA, IX, IY, IMOD, &
SPECOLD, SPEC, VSIO, VDIO, SHAVEIO, &
ALPHA, WN1, CG1, &
D_INP, U10ABS, U10DIR, AS, USTAR, USTDIR, &
ALPHA, WN1, CG1, D_INP, U10ABS, U10DIR, &
#ifdef W3_FLX5
TAUA, TAUADIR, &
#endif
AS, USTAR, USTDIR, &
CX, CY, ICE, ICEH, ICEF, ICEDMAX, &
REFLEC, REFLED, DELX, DELY, DELA, TRNX, &
TRNY, BERG, FPI, DTDYN, FCUT, DTG, TAUWX, &
Expand Down