diff --git a/regtests/ww3_repro/input/namelists_pdlib.nml b/regtests/ww3_repro/input/namelists_pdlib.nml deleted file mode 100644 index 851522b5d..000000000 --- a/regtests/ww3_repro/input/namelists_pdlib.nml +++ /dev/null @@ -1,26 +0,0 @@ -&SLN1 CLIN = 80.0, RFPM = 1.00, RFHF = 0.50 / -&UNST UGOBCAUTO = F, -UGOBCDEPTH= -10., -EXPFSN = F, -EXPFSPSI = F, -EXPFSFCT = F, -IMPFSN = F, -EXPTOTAL = F, -IMPTOTAL = T, -IMPREFRACTION = T, -IMPFREQSHIFT = T, -IMPSOURCE = T, -SETUP_APPLY_WLV = F, -SOLVERTHR_SETUP=1E-14, -CRIT_DEP_SETUP=0.1, -JGS_USE_JACOBI = T, -JGS_BLOCK_GAUSS_SEIDEL = T, -JGS_TERMINATE_MAXITER = T, -JGS_MAXITER = 1000, -JGS_TERMINATE_NORM = F, -JGS_TERMINATE_DIFFERENCE = T, -JGS_DIFF_THR = 1.E-8, -JGS_PMIN = 3.0, -JGS_LIMITER = F, -JGS_NORM_THR = 1.E-20 / -END OF NAMELISTS diff --git a/regtests/ww3_repro/input/ww3_grid_pdlib.inp b/regtests/ww3_repro/input/ww3_grid_pdlib.inp index c72f5e229..d1701894a 100644 --- a/regtests/ww3_repro/input/ww3_grid_pdlib.inp +++ b/regtests/ww3_repro/input/ww3_grid_pdlib.inp @@ -24,11 +24,11 @@ $ $ $ Set time steps ----------------------------------------------------- $ $ - Time step information (this information is always read) -$ maximum global time step, maximum CFL time step for x-y and +$ maximum global time step, maximum CFL time step for x-y and $ k-theta, minimum source term time step (all in seconds). $ $ - 10. 10. 10. 10. + 10. 10. 10. 10. $ $ Start of namelist input section ------------------------------------ $ $ Starting with WAVEWATCH III version 2.00, the tunable parameters @@ -43,30 +43,67 @@ $ Tolman and Chalikov input would be $ &SLN1 CLIN = 80.0, RFPM = 1.00, RFHF = 0.50 / $ +$ GRID B: Block-explicit solver ufs1.1/unstr ------------------------- $ +$ &UNST UGOBCAUTO = F, - UGOBCDEPTH= -10., + UGOBCDEPTH= -10., + UGBCCFL= F, EXPFSN = F, EXPFSPSI = F, EXPFSFCT = F, IMPFSN = F, - EXPTOTAL = F, - IMPTOTAL = T, - IMPREFRACTION = T, - IMPFREQSHIFT = T, - IMPSOURCE = T, + EXPTOTAL = T, + IMPTOTAL = F, + IMPREFRACTION = F, + IMPFREQSHIFT = F, + IMPSOURCE = F, SETUP_APPLY_WLV = F, SOLVERTHR_SETUP=1E-14, CRIT_DEP_SETUP=0.1, - JGS_USE_JACOBI = T, - JGS_BLOCK_GAUSS_SEIDEL = T, - JGS_TERMINATE_MAXITER = T, + JGS_NLEVEL = 0, + JGS_USE_JACOBI = F, + JGS_BLOCK_GAUSS_SEIDEL = F, + JGS_TERMINATE_MAXITER = F, JGS_MAXITER = 1000, JGS_TERMINATE_NORM = F, - JGS_TERMINATE_DIFFERENCE = T, + JGS_TERMINATE_DIFFERENCE = F, JGS_DIFF_THR = 1.E-8, JGS_PMIN = 3.0, JGS_LIMITER = F, - JGS_NORM_THR = 1.E-20 / + JGS_NORM_THR = 1.E-6 / +$ +$ +$ End GRID B: Block-explicit solver ufs1.1/unstr --------------------- $ +$ +$ Original unstructured solver options ------------------------------- $ +$ +$ &UNST UGOBCAUTO = F, +$ UGOBCDEPTH= -10., +$ EXPFSN = F, +$ EXPFSPSI = F, +$ EXPFSFCT = F, +$ IMPFSN = F, +$ EXPTOTAL = F, +$ IMPTOTAL = T, +$ IMPREFRACTION = T, +$ IMPFREQSHIFT = T, +$ IMPSOURCE = T, +$ SETUP_APPLY_WLV = F, +$ SOLVERTHR_SETUP=1E-14, +$ CRIT_DEP_SETUP=0.1, +$ JGS_USE_JACOBI = T, +$ JGS_BLOCK_GAUSS_SEIDEL = T, +$ JGS_TERMINATE_MAXITER = T, +$ JGS_MAXITER = 1000, +$ JGS_TERMINATE_NORM = F, +$ JGS_TERMINATE_DIFFERENCE = T, +$ JGS_DIFF_THR = 1.E-8, +$ JGS_PMIN = 3.0, +$ JGS_LIMITER = F, +$ JGS_NORM_THR = 1.E-20 / +$ +$ End original unstructured solver options --------------------------- $ +$ $ $ Bottom friction - - - - - - - - - - - - - - - - - - - - - - - - - - $ JONSWAP : Namelist SBT1 @@ -118,7 +155,7 @@ $ XP, XR, XFILT $ Xp, Xr and Xf for the dynamic $ integration scheme. $ -$ In the 'Out of the box' test setup we run with sub-grid obstacles +$ In the 'Out of the box' test setup we run with sub-grid obstacles $ and with continuous ice treatment. $ $ &MISC CICE0 = 0.25, CICEN = 0.75, FLAGTR = 4 / @@ -130,17 +167,17 @@ $ $ Define grid -------------------------------------------------------- $ $ 'UNST' T 'NONE' -$ +$ 5.0 0.30 20 -1. 4 1 '(20f10.2)' 'NAME' './../input/limon_ll.msh' $ -$ If the above unit number equals 10, the bottom data is read from +$ If the above unit number equals 10, the bottom data is read from $ this file and follows below (no intermediate comment lines allowed). $ -$ 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +$ 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 $ $ If sub-grid information is avalaible as indicated by FLAGTR above, $ additional input to define this is needed below. In such cases a -$ field of fractional obstructions at or between grid points needs to +$ field of fractional obstructions at or between grid points needs to $ be supplied. First the location and format of the data is defined $ by (as above) : $ - Unit number of file (can be 10, and/or identical to bottem depth @@ -153,7 +190,7 @@ $ *** NOTE if this unit number is the same as the previous bottom $ depth unit number, it is assumed that this is the same file $ without further checks. *** $ -$ If the above unit number equals 10, the bottom data is read from +$ If the above unit number equals 10, the bottom data is read from $ this file and follows below (no intermediate comment lines allowed, $ except between the two fields). $ @@ -187,7 +224,7 @@ $ *** NOTE size of fields is always NX * NY *** $ 10 3 1 '(....)' 'PART' 'mapsta.inp' $ Input boundary points ---------------------------------------------- $ -$ An unlimited number of lines identifying points at which input +$ An unlimited number of lines identifying points at which input $ boundary conditions are to be defined. If the actual input data is $ not defined in the actual wave model run, the initial conditions $ will be applied as constant boundary conditions. Each line contains: @@ -217,18 +254,18 @@ $ 0 0 $ $ Output boundary points --------------------------------------------- $ -$ Output boundary points are defined as a number of straight lines, +$ Output boundary points are defined as a number of straight lines, $ defined by its starting point (X0,Y0), increments (DX,DY) and number $ of points. A negative number of points starts a new output file. $ Note that this data is only generated if requested by the actual $ program. Example again for spherical grid in degrees. $ $ -2.5312 48.5 0.00 0.008738 102 -$ -2.5312 49.3850 0.013554 0.00 51 +$ -2.5312 49.3850 0.013554 0.00 51 $ $ Close list by defining line with 0 points (mandatory) $ - 0. 0. 0. 0. 0 + 0. 0. 0. 0. 0 $ $ -------------------------------------------------------------------- $ $ End of input file $ diff --git a/regtests/ww3_repro/input/ww3_ounf.inp b/regtests/ww3_repro/input/ww3_ounf.inp index d2bde30b6..30e86a995 100644 --- a/regtests/ww3_repro/input/ww3_ounf.inp +++ b/regtests/ww3_repro/input/ww3_ounf.inp @@ -1,10 +1,10 @@ $ -------------------------------------------------------------------- $ $ WAVEWATCH III Grid output post-processing $ $--------------------------------------------------------------------- $ -$ First output time (yyyymmdd hhmmss), increment of output (s), +$ First output time (yyyymmdd hhmmss), increment of output (s), $ and number of output times. $ - 20100801 000000 10 3600 + 20100801 030000 10800 1000 $ $ Fields requested --------------------------------------------------- $ $ @@ -19,7 +19,7 @@ $--------------------------------------------------------------------- $ $ netCDF version [3,4] $ and variable type 4 [2 = SHORT, 3 = it depends , 4 = REAL] $ swell partitions [0 1 2 3 4 5] -$ variables in same file [T] or not [F] +$ variables in same file [T] or not [F] $ 3 4 0 1 2 diff --git a/regtests/ww3_repro/input/ww3_ounp.inp b/regtests/ww3_repro/input/ww3_ounp.inp index dd99c642f..36e6e7e33 100644 --- a/regtests/ww3_repro/input/ww3_ounp.inp +++ b/regtests/ww3_repro/input/ww3_ounp.inp @@ -1,14 +1,14 @@ $ -------------------------------------------------------------------- $ $ WAVEWATCH III NETCDF Point output post-processing $ $--------------------------------------------------------------------- $ -$ First output time (yyyymmdd hhmmss), increment of output (s), +$ First output time (yyyymmdd hhmmss), increment of output (s), $ and number of output times. $ - 19850101 000000 3600. 1000 + 20100801 030000 10800. 1000 $ $ Points requested --------------------------------------------------- $ $ -$ Define points index for which output is to be generated. +$ 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 @@ -19,7 +19,7 @@ $--------------------------------------------------------------------- $ $ 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] +$ 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] @@ -28,7 +28,7 @@ $ ww3. 8 3 - F 100 + F 100 1 0 T @@ -70,7 +70,7 @@ $ 2 : Mean wave pars. $ 3 : Nondimensional pars. (U*) $ 4 : Nondimensional pars. (U10) $ 5 : 'Validation table' -$ 6 : WMO standard output +$ 6 : WMO standard output $ 4 $ $ -------------------------------------------------------------------- $ diff --git a/regtests/ww3_repro/input/ww3_outf.inp b/regtests/ww3_repro/input/ww3_outf.inp index 86c1115ff..7fa7aa890 100644 --- a/regtests/ww3_repro/input/ww3_outf.inp +++ b/regtests/ww3_repro/input/ww3_outf.inp @@ -3,10 +3,10 @@ $ WAVEWATCH III Grid output post-processing $ $--------------------------------------------------------------------- $ $ Time, time increment and number of outputs $ - 20020101 120000 3600 10000 + 20100801 030000 10800 1000 $ $ Request flags identifying fields as in ww3_shel input and section 2.4 fo the manual. -N +N HS LM T02 T01 T0M1 UST CHA CGE DTD FC CFX CFD QP QKK $ $ Output type ITYPE [0,1,2,3] @@ -33,7 +33,7 @@ $ $ -------------------------------------------------------------------- $ $ ITYPE = 3, transfer files. $ IX, IY range, IDLA and IDFM as in ww3_grid.inp. -$ The additional option IDLA=5 gives ia longitude, lattitude +$ The additional option IDLA=5 gives ia longitude, lattitude $ and parameter value(s) per record (defined points only). $ $1 1778 1 1 3 2 diff --git a/regtests/ww3_repro/input/ww3_outp.inp b/regtests/ww3_repro/input/ww3_outp.inp index 888ca870c..f6d4df310 100644 --- a/regtests/ww3_repro/input/ww3_outp.inp +++ b/regtests/ww3_repro/input/ww3_outp.inp @@ -1,13 +1,13 @@ $ -------------------------------------------------------------------- $ $ WAVEWATCH III Point output post-processing $ $--------------------------------------------------------------------- $ -$ First output time (yyyymmdd hhmmss), increment of output (s), +$ First output time (yyyymmdd hhmmss), increment of output (s), $ and number of output times. $ - 19680606 000000 3600. 9999 + 20100801 030000 10800. 1000 $ $ Points requested --------------------------------------------------- $ -$ Define points for which output is to be generated. +$ Define points for which output is to be generated. $ 1 $ mandatory end of list diff --git a/regtests/ww3_repro/input/ww3_shel.inp.start b/regtests/ww3_repro/input/ww3_shel.inp.start index 368d56b5a..29bfb71a3 100644 --- a/regtests/ww3_repro/input/ww3_shel.inp.start +++ b/regtests/ww3_repro/input/ww3_shel.inp.start @@ -54,7 +54,7 @@ $ see w3iogo.ftn for additional doc. $ $ $ - 20100801 000000 10800 20100801 090000 + 20100801 030000 10800 20100801 090000 $---------------------------------------------------------------- $ Output request flags identifying fields as in ww3_shel input and $ section 2.4 of the manual. @@ -79,7 +79,7 @@ $ advised, because it will break the GrADS utility to $ plots spectra and source terms, and will make it more $ difficult to use point names in data files. $ - 20100801 000000 10800 20100801 090000 + 20100801 030000 10800 20100801 090000 $output points for cartesian grid $output points for IROISE $ @@ -93,8 +93,8 @@ $ Flag for formatted input file. $ The data files are track_i.ww3 and $ track_o.ww3, see w3iotr.ftn for ad. doc. $ - 20100801 000000 0 20100801 090000 T - 20100801 000000 10800 20100801 090000 + 20100801 030000 0 20100801 090000 T + 20100801 030000 10800 20100801 090000 $ $ Type 4 : Restart files (no additional data required). $ The data file is restartN.ww3, see