Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions model/src/w3fldsmd.F90
Original file line number Diff line number Diff line change
Expand Up @@ -2324,6 +2324,15 @@ SUBROUTINE W3FLDH (J, NDST, NDSE, MX, MY, NX, NY, T0, TN, &
END DO
#ifdef W3_T
WRITE (NDST,9020)
#endif
ELSE IF ( J .EQ. 6 ) THEN
DO IX=1, NX
DO IY=1, NY
FS0(IX,IY) = FSN(IX,IY)
END DO
END DO
#ifdef W3_T
WRITE (NDST,9020)
#endif
END IF
#ifdef W3_T
Expand Down
1 change: 1 addition & 0 deletions regtests/bin/matrix.base
Original file line number Diff line number Diff line change
Expand Up @@ -720,6 +720,7 @@
echo "$rtst -s PR3_UQ -w work_PR3_UQ $ww3 ww3_tp2.13" >> matrix.body
echo "$rtst -w work_PR3_UQ $ww3 ww3_tp2.15" >> matrix.body
echo "$rtst -w work_5km -g 5km $ww3 ww3_tp2.15" >> matrix.body
echo "$rtst -i input_const -w work_PR3_UQ_CONST $ww3 ww3_tp2.15" >> matrix.body
echo "$rtst -i input_rho -w work_PR3_UQ_RHO $ww3 ww3_tp2.15" >> matrix.body
echo "$rtst -s ST4 -i input_rho -w work_ST4FLX5 $ww3 ww3_tp2.15" >> matrix.body
echo "$rtst -s ST6 -i input_rho -w work_ST6FLX5 $ww3 ww3_tp2.15" >> matrix.body
Expand Down
7 changes: 5 additions & 2 deletions regtests/ww3_tp2.15/info
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,11 @@
# -o netcdf -N ../model ww3_tp2.15 #
# #
# Run using FLX5 #
# ./bin/run_test -i input_rho -s ST6 -w work_ST6FLX5 ../model ww3_tp2.15 #
# ./bin/run_test -i input_rho -s ST4 -w work_ST4FLX5 ../model ww3_tp2.15 #
# ./bin/run_test -i input_rho -s ST6 -w work_ST6FLX5 ../model ww3_tp2.15 #
# ./bin/run_test -i input_rho -s ST4 -w work_ST4FLX5 ../model ww3_tp2.15 #
# #
# Run using homogeneous RHO and TAU input fields #
# ./bin/run_test -i input_const -w work_CONST ../model ww3_tp2.15 #
# #
# A matlab script is provided in the input directory: extract_AA_STE.m #
# which computes STE parameters at the location of the Acqua Alta #
Expand Down
5 changes: 5 additions & 0 deletions regtests/ww3_tp2.15/input_const/namelists_ADRIATIC.nml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
&SIN4 BETAMAX = 1.33, Z0MAX = 0.002 /
&SDS4 SDSBCHOICE = 1, FXFM3=2.5, SDSBR = 0.00085, SDSCUM = 0.0 /
&SNL1 NLPROP = 2.7E7 /
&MISC STDX = 11.2, STDY = 11.2, STDT = 1800., FLAGTR = 4 /
END OF NAMELISTS
1 change: 1 addition & 0 deletions regtests/ww3_tp2.15/input_const/points.list
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
12.5088 45.3138 'AA '
1 change: 1 addition & 0 deletions regtests/ww3_tp2.15/input_const/switch
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
NOGRB SHRD PR3 UQ FLX0 LN1 ST4 NL1 BT1 DB1 TR0 BS0 IC0 IS0 REF0 WNT1 WNX1 CRT1 CRX1 O0 O1 O2 O3 O4 O5 O6 O7 O10 O11
1 change: 1 addition & 0 deletions regtests/ww3_tp2.15/input_const/switch_MPI
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
NOGRB DIST MPI PR3 UQ FLX0 LN1 ST4 NL1 BT1 DB1 TR0 BS0 IC0 IS0 REF0 WNT1 WNX1 CRT1 CRX1 O0 O1 O2 O3 O4 O5 O6 O7 O10 O11
1 change: 1 addition & 0 deletions regtests/ww3_tp2.15/input_const/switch_ST4
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
NOGRB SHRD PR3 UQ FLX5 LN1 ST4 NL1 BT1 DB1 TR0 BS0 IC0 IS0 REF0 WNT1 WNX1 CRT1 CRX1 O0 O1 O2 O3 O4 O5 O6 O7 O10 O11
1 change: 1 addition & 0 deletions regtests/ww3_tp2.15/input_const/switch_ST6
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
NOGRB SHRD PR3 UQ FLX5 LN1 ST6 NL1 BT1 DB1 TR0 BS0 IC0 IS0 REF0 WNT1 WNX1 CRT1 CRX1 O0 O1 O2 O3 O4 O5 O6 O7 O10 O11
33 changes: 33 additions & 0 deletions regtests/ww3_tp2.15/input_const/ww3_grid.inp
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
$ WAVEWATCH III Grid preprocessor input file
$ ------------------------------------------
'ADRIATIC SEA 15km LAMBERT CONFORMAL '
$
1.1 0.05 40 36 .5
$
F T T T F T
$
900. 450. 450. 5.
$
&SIN4 BETAMAX = 1.33, Z0MAX = 0.002 /
&SDS4 SDSBCHOICE = 1, FXFM3=2.5, SDSBR = 0.00085, SDSCUM = 0.0 /
&SNL1 NLPROP = 2.7E7 /
&MISC STDX = 11.2, STDY = 11.2, STDT = 1800., FLAGTR = 4 /
END OF NAMELISTS
$
'CURV' T 'NONE'
43 42
$ Longitudes for GLW CURV grid
41 1. 0. 1 1 '(...)' 'NAME' '../input/lon_ste_adri_15km.dat'
$ Latitudes for GLW CURV grid
42 1. 0. 1 1 '(...)' 'NAME' '../input/lat_ste_adri_15km.dat'
$ Bottom Bathymetry
-0.10 2.50 43 0.001000 1 1 '(....)' 'NAME' '../input/ste_adri_15km_etopo1.depth'
$ Sub-grid information
44 0.010000 1 1 '(...)' 'NAME' '../input/ste_adri_15km_etopo1.obstr'
$
45 1 1 '(...)' 'NAME' '../input/ste_adri_15km_etopo1.mask'
$
0. 0. 0. 0. 0
$
$ End of input file

88 changes: 88 additions & 0 deletions regtests/ww3_tp2.15/input_const/ww3_grid.nml
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
! -------------------------------------------------------------------- !
! WAVEWATCH III - ww3_grid.nml - Grid pre-processing !
! -------------------------------------------------------------------- !

! -------------------------------------------------------------------- !
! Define the spectrum parameterization via SPECTRUM_NML namelist
! -------------------------------------------------------------------- !
&SPECTRUM_NML
SPECTRUM%XFR = 1.1
SPECTRUM%FREQ1 = 0.05
SPECTRUM%NK = 40
SPECTRUM%NTH = 36
SPECTRUM%THOFF = .5
/

! -------------------------------------------------------------------- !
! Define the run parameterization via RUN_NML namelist
! -------------------------------------------------------------------- !
&RUN_NML
RUN%FLCX = T
RUN%FLCY = T
RUN%FLCTH = T
RUN%FLSOU = T
/

! -------------------------------------------------------------------- !
! Define the timesteps parameterization via TIMESTEPS_NML namelist
! -------------------------------------------------------------------- !
&TIMESTEPS_NML
TIMESTEPS%DTMAX = 900.
TIMESTEPS%DTXY = 450.
TIMESTEPS%DTKTH = 450.
TIMESTEPS%DTMIN = 5.
/

! -------------------------------------------------------------------- !
! Define the grid to preprocess via GRID_NML namelist
! -------------------------------------------------------------------- !
&GRID_NML
GRID%NAME = 'ADRIATIC SEA 15km LAMBERT CONFORMAL'
GRID%NML = '../input_rho/namelists_ADRIATIC.nml'
GRID%TYPE = 'CURV'
GRID%COORD = 'SPHE'
GRID%CLOS = 'NONE'
GRID%ZLIM = -0.10
GRID%DMIN = 2.50
/

! -------------------------------------------------------------------- !
! Define the curvilinear grid type via CURV_NML namelist
! -------------------------------------------------------------------- !
&CURV_NML
CURV%NX = 43
CURV%NY = 42
CURV%XCOORD%FILENAME = '../input/lon_ste_adri_15km.dat'
CURV%XCOORD%FORMAT = '(...)'
CURV%YCOORD%FILENAME = '../input/lat_ste_adri_15km.dat'
CURV%YCOORD%FORMAT = '(...)'
/

! -------------------------------------------------------------------- !
! Define the depth to preprocess via DEPTH_NML namelist
! -------------------------------------------------------------------- !
&DEPTH_NML
DEPTH%SF = 0.001000
DEPTH%FILENAME = '../input/ste_adri_15km_etopo1.depth'
/

! -------------------------------------------------------------------- !
! Define the point status map via MASK_NML namelist
! -------------------------------------------------------------------- !
&MASK_NML
MASK%FILENAME = '../input/ste_adri_15km_etopo1.mask'
MASK%FORMAT = '(...)'
/

! -------------------------------------------------------------------- !
! Define the obstruction map via OBST_NML namelist
! -------------------------------------------------------------------- !
&OBST_NML
OBST%SF = 0.010000
OBST%FILENAME = '../input/ste_adri_15km_etopo1.obstr'
OBST%FORMAT = '(...)'
/

! -------------------------------------------------------------------- !
! WAVEWATCH III - end of namelist !
! -------------------------------------------------------------------- !
21 changes: 21 additions & 0 deletions regtests/ww3_tp2.15/input_const/ww3_ounf.inp
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
$ WAVEWATCH III Grid output post-processing
$ -----------------------------------------
20140309 000000 900. 9999
$
N
HS WND RHO TAU T02 DP DIR FP MXE MXES MXH MXHC SDMH SDMHC QP QKK
$
$
3 4
0 1 2
T
$
$ -------------------------------------------------------------------- $
$ File prefix
$ number of characters in date [0(nodate),4(yearly),6(monthly),8(daily),10(hourly)]
$ IX and IY ranges [regular:IX NX IY NY, unstructured:IP NP 1 1]
$
ww3.
6
1 1000000 1 1000000
$
25 changes: 25 additions & 0 deletions regtests/ww3_tp2.15/input_const/ww3_ounf.nml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
! -------------------------------------------------------------------- !
! WAVEWATCH III ww3_ounf.nml - Grid output post-processing !
! -------------------------------------------------------------------- !

! -------------------------------------------------------------------- !
! Define the output fields to postprocess via FIELD_NML namelist
! -------------------------------------------------------------------- !
&FIELD_NML
FIELD%TIMESTART = '20140309 000000'
FIELD%TIMESTRIDE = '900.'
FIELD%TIMECOUNT = '9999'
FIELD%LIST = 'HS WND RHO TAU T02 DP DIR FP MXE MXES MXH MXHC SDMH SDMHC QP QKK'
FIELD%PARTITION = '0 1 2'
FIELD%TYPE = 4
/

! -------------------------------------------------------------------- !
! Define the content of the output file via FILE_NML namelist
! -------------------------------------------------------------------- !
&FILE_NML
/

! -------------------------------------------------------------------- !
! WAVEWATCH III - end of namelist !
! -------------------------------------------------------------------- !
118 changes: 118 additions & 0 deletions regtests/ww3_tp2.15/input_const/ww3_ounp_par.inp
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
$ -------------------------------------------------------------------- $
$ WAVEWATCH III NETCDF Point output post-processing $
$--------------------------------------------------------------------- $
$ First output time (yyyymmdd hhmmss), increment of output (s),
$ and number of output times.
$
20140309 000000 3600. 37
$
$ Points requested --------------------------------------------------- $
$
$ Define points index for which output is to be generated.
$ If no one defined, all points are selected
$ One index number per line, negative number identifies end of list.
$ 1
$ 2
$ mandatory end of list
-1
$
$--------------------------------------------------------------------- $
$ file prefix
$ number of characters in date [4(yearly),6(monthly),8(daily),10(hourly)]
$ netCDF version [3,4]
$ points in same file [T] or not [F]
$ and max number of points to be processed in one pass
$ output type ITYPE [0,1,2,3]
$ flag for global attributes WW3 [0] or variable version [1-2-3-4]
$ flag for dimensions order time,station [T] or station,time [F]
$
ww3.
6
3
T 150
2
0
T
$
$ -------------------------------------------------------------------- $
$ ITYPE = 0, inventory of file.
$ No additional input, the above time range is ignored.
$
$ -------------------------------------------------------------------- $
$ ITYPE = 1, netCDF Spectra.
$ - Sub-type OTYPE : 1 : Print plots.
$ 2 : Table of 1-D spectra
$ 3 : Transfer file.
$ 4 : Spectral partitioning.
$ - Scaling factors for 1-D and 2-D spectra Negative factor
$ disables, output, factor = 0. gives normalized spectrum.
$ - Netcdf variable type [2=SHORT, 3=it depends, 4=REAL]
$
$ 3 1 0 4
$
$ The transfer file contains records with the following contents.
$
$ - File ID in quotes, number of frequencies, directions and points.
$ grid name in quotes (for unformatted file C*21,3I,C*30).
$ - Bin frequencies in Hz for all bins.
$ - Bin directions in radians for all bins (Oceanographic conv.).
$ -+
$ - Time in yyyymmdd hhmmss format | loop
$ -+ |
$ - Point name (C*40), lat, lon, d, U10 and | loop | over
$ direction, current speed and direction | over |
$ - E(f,theta) | points | times
$ -+ -+
$
$ -------------------------------------------------------------------- $
$ ITYPE = 2, netCDF Tables of (mean) parameter
$ - Sub-type OTYPE : 1 : Depth, current, wind
$ 2 : Mean wave pars.
$ 3 : Nondimensional pars. (U*)
$ 4 : Nondimensional pars. (U10)
$ 5 : 'Validation table'
$ 6 : WMO standard output
2
$
$ -------------------------------------------------------------------- $
$ ITYPE = 3, netCDF Source terms
$ - Sub-type OTYPE : 1 : Print plots.
$ 2 : Table of 1-D S(f).
$ 3 : Table of 1-D inverse time scales
$ (1/T = S/F).
$ 4 : Transfer file
$ - Scaling factors for 1-D and 2-D source terms. Negative
$ factor disables print plots, factor = 0. gives normalized
$ print plots.
$ - Flags for spectrum, input, interactions, dissipation,
$ bottom and total source term.
$ - scale ISCALE for OTYPE=2,3
$ 0 : Dimensional.
$ 1 : Nondimensional in terms of U10
$ 2 : Nondimensional in terms of U*
$ 3-5: like 0-2 with f normalized with fp.
$
$ 4 0 0 T T T T T T 0
$
$ The transfer file contains records with the following contents.
$
$ - File ID in quotes, nubmer of frequencies, directions and points,
$ flags for spectrum and source terms (C*21, 3I, 6L)
$ - Bin frequencies in Hz for all bins.
$ - Bin directions in radians for all bins (Oceanographic conv.).
$ -+
$ - Time in yyyymmdd hhmmss format | loop
$ -+ |
$ - Point name (C*40), depth, wind speed and | loop | over
$ direction, current speed and direction | over |
$ - E(f,theta) if requested | points | times
$ - Sin(f,theta) if requested | |
$ - Snl(f,theta) if requested | |
$ - Sds(f,theta) if requested | |
$ - Sbt(f,theta) if requested | |
$ - Stot(f,theta) if requested | |
$ -+ -+
$
$ -------------------------------------------------------------------- $
$ End of input file $
$ -------------------------------------------------------------------- $
47 changes: 47 additions & 0 deletions regtests/ww3_tp2.15/input_const/ww3_ounp_par.nml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
! -------------------------------------------------------------------- !
! WAVEWATCH III ww3_ounp.nml - Point output post-processing !
! -------------------------------------------------------------------- !

! -------------------------------------------------------------------- !
! Define the output fields to postprocess via POINT_NML namelist
! -------------------------------------------------------------------- !
&POINT_NML
POINT%TIMESTART = '20140309 000000'
POINT%TIMESTRIDE = '3600.'
POINT%TIMECOUNT = '37'
POINT%TYPE = 2
/

! -------------------------------------------------------------------- !
! Define the content of the output file via FILE_NML namelist
! -------------------------------------------------------------------- !
&FILE_NML
/

! -------------------------------------------------------------------- !
! Define the type 0, inventory of file
! -------------------------------------------------------------------- !


! -------------------------------------------------------------------- !
! Define the type 1, spectra via SPECTRA_NML namelist
! -------------------------------------------------------------------- !
&SPECTRA_NML
/

! -------------------------------------------------------------------- !
! Define the type 2, mean parameter via PARAM_NML namelist
! -------------------------------------------------------------------- !
&PARAM_NML
PARAM%OUTPUT = 2
/

! -------------------------------------------------------------------- !
! Define the type 3, source terms via SOURCE_NML namelist
! -------------------------------------------------------------------- !
&SOURCE_NML
/

! -------------------------------------------------------------------- !
! WAVEWATCH III - end of namelist !
! -------------------------------------------------------------------- !
Loading
Loading