Skip to content

Commit

Permalink
Bugfix/st4wcf (NOAA-EMC#261)
Browse files Browse the repository at this point in the history
* add feature for fixed filename with ndates=0 for ww3_ounf

* bugfix for netcdf file id allocation

* remove extra line due to copy/paste error

* change vers from 7.00 to 7.01
add comment

* add WCOR to switch list

* add check on array index

* revert comment on wcc and wcf in manual

* Update of IS2 default parameters and associated change to regtest.

* correct SSDSC array to re-enable T500

* First cleanup before introducing Romero's dissipation

* Merged STX from Romero into ST4 ... running but not same result yet

* Fixed bug in Romero option: now working OK.

* Minor update

* Updated the method for computing modulation

* Bug correction: MSSSUM was not computed in some cases

* Final but correction for MSSSUM .

* Corrected one more bug in the MSSSUM calculation ...

* Added namelist parameters that were missing in SDS4

* Corrected for bug in additional turbulence dissipation

* Since I was at it, I added also the effect of water viscosity on the
dissipation

* This reverts commits which are in feature/ST4tail:
82837c7
337fe6d
9816fdb
983f5f6
ac5c363
21c7316
9b9e2e8
6c42cef
0e0ba5e
8583692
8c56170

* Revert "Update of IS2 default parameters and associated change to regtest."

This reverts commit f2a653b.

* correct conflict in previous merge

* manually merge noaa/develop into develop
to integrate minor changes lost by past mistakes
with git commands

* correct bug related to b4b problem on WCF
it was due to missing variables in out_grd
and missing initialization of some variables

* set initialize under ST4 switch

Co-authored-by: ardhuin <ardhuin@kanagawa.univ-brest.fr>
Co-authored-by: Fabrice Ardhuin <fabrice.ardhuin@ifremer.fr>
  • Loading branch information
3 people authored Oct 23, 2020
1 parent 03e13f7 commit 9735c7d
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 5 deletions.
11 changes: 7 additions & 4 deletions model/ftn/w3iogrmd.ftn
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
!/
!/ Private parameter statements (ID strings)
!/
CHARACTER(LEN=10), PARAMETER, PRIVATE :: VERGRD = '2020-06-18'
CHARACTER(LEN=10), PARAMETER, PRIVATE :: VERGRD = '2020-10-19'
CHARACTER(LEN=35), PARAMETER, PRIVATE :: &
IDSTR = 'WAVEWATCH III MODEL DEFINITION FILE'
!/
Expand All @@ -83,7 +83,7 @@
!/ | H. L. Tolman |
!/ ! F. Ardhuin !
!/ | FORTRAN 90 |
!/ | Last update : 15-Apr-2020 |
!/ | Last update : 19-Oct-2020 |
!/ +-----------------------------------+
!/
!/ 14-Jan-1999 : Distributed FORTRAN 77 version. ( version 1.18 )
Expand Down Expand Up @@ -147,6 +147,7 @@
!/ 26-Aug-2018 : UOST (Mentaschi et al. 2015, 2018) ( version 6.06 )
!/ 15-Apr-2020 : Adds optional opt-out for CFL on BC ( version 7.08 )
!/ 18-Jun-2020 : Adds 360-day calendar option ( version 7.08 )
!/ 19-Oct-2020 : Add AIRCMIN, AIRGB parameters ( version 7.08 )
!/
!/ Copyright 2009-2013 National Weather Service (NWS),
!/ National Oceanic and Atmospheric Administration. All rights
Expand Down Expand Up @@ -642,7 +643,8 @@
FLCK, FLSOU, FLBPI, FLBPO, CLATS, CLATIS, CTHG0S, &
STEXU, STEYU, STEDU, IICEHMIN, IICEHINIT, IICEDISP, &
ICESCALES(1:4), CALTYPE, CMPRTRCK, IICEHFAC, IICEHDISP,&
IICEDDISP, IICEFDISP, BTBETA
IICEDDISP, IICEFDISP, BTBETA, &
AAIRCMIN, AAIRGB

WRITE(NDSM)GRIDSHIFT
!/SEC1 WRITE (NDSM) NITERSEC1
Expand Down Expand Up @@ -782,7 +784,8 @@
FLCTH, FLCK, FLSOU, FLBPI, FLBPO, CLATS, CLATIS, &
CTHG0S, STEXU, STEYU, STEDU, IICEHMIN, IICEHINIT, &
IICEDISP, ICESCALES(1:4), CALTYPE, CMPRTRCK, IICEHFAC, &
IICEDDISP, IICEHDISP, IICEFDISP, BTBETA
IICEDDISP, IICEHDISP, IICEFDISP, BTBETA, &
AAIRCMIN, AAIRGB
!/DEBUGIOGR WRITE(740+IAPROC,*) 'W3IOGR, step 7.14'
!/DEBUGIOGR FLUSH(740+IAPROC)

Expand Down
7 changes: 6 additions & 1 deletion model/ftn/w3src4md.ftn
Original file line number Diff line number Diff line change
Expand Up @@ -2189,7 +2189,6 @@
! times wavelength times a (a=5 in Reul&Chapron JGR 2003) times dk
!
DO IK=1,MIN(FLOOR(AAIRCMIN),NK)
! Need to extrapolate above NK if necessary ... to be added later.
C=SIG(IK)/K(IK)
IS0=(IK-1)*NTH
COEF4(IK) = C*C*SUM(BRLAMBDA(IS0+1:IS0+NTH)) &
Expand All @@ -2201,6 +2200,12 @@
! SSDSC(7) * DDEN(IK)/(DTH*SIG(IK)*CG(IK))
! NB: SSDSC(7) is WHITECAPWIDTH
END DO
! Need to extrapolate above NK if necessary ... to be added later.
DO IK=MIN(FLOOR(AAIRCMIN),NK),NK
COEF4(IK)=0.
COEF5(IK)=0.
END DO

!/
IF ( FLOGRD(5,7) ) THEN
!
Expand Down
2 changes: 2 additions & 0 deletions model/ftn/w3srcemd.ftn
Original file line number Diff line number Diff line change
Expand Up @@ -643,7 +643,9 @@
!/DEBUGSRC WRITE(740+IAPROC,*) 'W3SRCE start USTAR=', USTAR
!/DEBUGSRC END IF

!/ST4 DLWMEAN= 0.
!/ST4 BRLAMBDA(:)=0.
!/ST4 WHITECAP(:)=0.
!
! 1.c Set mean parameters
!
Expand Down

0 comments on commit 9735c7d

Please sign in to comment.