Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit b992aa6d6ab7a82efe83c8961904d309cb4a56af
Author: Ali <ali.abdolali@noaa.gov>
Date:   Wed Nov 21 18:03:00 2018 +0000

    revert GNU link and comp and ww3_grid.nml and ww3_shel.nml for tp2.6

commit b9140598c24374ed27bd91dd88a888e15cdb46a8
Author: Ali <ali.abdolali@noaa.gov>
Date:   Wed Nov 21 17:20:24 2018 +0000

    debug tp2.16

commit 05e351572e1f3f6b2b481b71f7f7fe508b34aed7
Author: Aron Roland - wave <aaronroland@gmx.de>
Date:   Wed Nov 21 17:48:32 2018 +0100

    bf_PRv6_Intel_Debug: fix bug found by ali ...

commit 4e3acb9fe690647f5ba960cc60bf685a7739d88e
Merge: 1a6da57 df62b47
Author: Ali <ali.abdolali@noaa.gov>
Date:   Wed Nov 21 04:29:38 2018 +0000

    Merge remote-tracking branch 'origin/PRv6' into bf_PRv6_Intel_Debug

commit 1ab8a097581e320d31603a0f520137c1d63ece06 [formerly df62b47fe65d14f4590e784157d294e604d1a24d]
Author: Ali <ali.abdolali@noaa.gov>
Date:   Wed Nov 21 04:01:57 2018 +0000

    PRv6: reintegrating bf_reflection_ugdev branch:
    > fixes for speed slow down
    > fixes the error reported for ww3_tp2.17 with intel_debug

commit 1a6da57b4b8413a3f4a62cdf5d1cfdc00026b7ad
Author: Ali <ali.abdolali@noaa.gov>
Date:   Sat Nov 17 02:40:04 2018 +0000

    edit ww3_tp2.6/input/ww3_grid.inp

commit c7b0d158d40a0f510523fc95fa442fa9a69d9cc8
Author: Ali <ali.abdolali@noaa.gov>
Date:   Fri Nov 16 18:18:30 2018 +0000

    debug the ww3_gint and negative energy in tp2.5 test

commit e854f8dc09643c2f8fd3cd6c394aacf67974c689 [formerly d5593305e4dd37ae071cf7ce8e22d0374f541231]
Author: Jessica.Meixner <Jessica.Meixner@noaa.gov>
Date:   Tue Nov 13 21:19:01 2018 +0000

    PRv6: bug fix for if you are building wmesmf without PDLIB

commit 04ad03ecb62f1eba0791a173b061656f5a103d94 [formerly 295fa01c126ecad9cbe861f785eb52a362f5a1b8]
Author: Ali <ali.abdolali@noaa.gov>
Date:   Tue Nov 13 17:46:32 2018 +0000

    modify comp.Intel_debug and link.Intel_debug

commit 12be8c20e01d853a1c333e328eb89224c65fd217 [formerly 3358d56f1cfe4ac132804dfdc0782d63f31e1d1c]
Author: Ali <ali.abdolali@noaa.gov>
Date:   Wed Nov 7 20:41:30 2018 +0000

    PRv6: reintegrating bf_reflection_ugdev:
    * reflection debug

commit 425bd20f0c3253cbcc18985a86c1b1b1669c2882 [formerly 01708723ce20b521079be7460b189d5e272c9a51]
Author: Ali <ali.abdolali@noaa.gov>
Date:   Wed Nov 7 19:38:25 2018 +0000

    PRv6: integrating bf_PRv6_mo to PRv6
    * Updated manual for ww3_tp2.16 regtest.
    * Update inputs for ww3_tpt1.1
    * Updated manual to docuement new partitioning regression test

commit 823af3dd0eea9189c3518181044c5ce790143728 [formerly 4d3b86020c9994afd64bc417d57e5b4f40fdef18]
Author: Jessica.Meixner <Jessica.Meixner@noaa.gov>
Date:   Mon Nov 5 22:55:52 2018 +0000

    PRv6: reintegrating bugfix_points VLab issue #56247
    which fixes an issue in the unified point output for multi
    not being bit reproducible because ICEO,ICEHO,ICEFO were not
    communicated to points.  There is likely still an issue with this
    if mpi partitioning of processors for different grids is used
    look in wmiopo for JDM to see comments in code. Plus some other
    minor updates in w3_new and matrix.base and the comp.* files.

commit 59fb8a7402366bbcb582f80527fc329f55e29d72 [formerly 64c8c2e4c027fd60bf203fd2167e56678241c96e]
Author: Ali <ali.abdolali@noaa.gov>
Date:   Mon Nov 5 17:06:55 2018 +0000

    adding tp2.16 regression test to matrix.base

commit 149a5d024fa8d474b187d3017897ce04f69a5ec9 [formerly 4fd49553c3f6bb2287260f63be62096864db4cc3]
Author: Ali <ali.abdolali@noaa.gov>
Date:   Mon Nov 5 15:35:54 2018 +0000

    PRv6: reintegrating bf_PRv6_mo to PRv6 VLab Issue #56311


Former-commit-id: c279a48048bc3e20257547df7e753aca71fdbb64
  • Loading branch information
Ali committed Nov 23, 2018
1 parent f29bef2 commit 8ef2dd2
Show file tree
Hide file tree
Showing 3 changed files with 471 additions and 43 deletions.
55 changes: 12 additions & 43 deletions regtests/ww3_tp2.6/input/ww3_grid.inp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,23 @@ $ In versions 1.18 and 2.22 of the model this value was by definiton 0,
$ it is added to mitigate the GSE for a first order scheme. Note that
$ this factor is IGNORED in the print plots in ww3_outp.
$
1.1 0.05 36 36 0.
1.1 0.05 25 24 0.
$
$ Set model flags ---------------------------------------------------- $
$ - FLDRY Dry run (input/output only, no calculation).
$ - FLCX, FLCY Activate X and Y component of propagation.
$ - FLCTH, FLCK Activate direction and wavenumber shifts.
$ - FLSOU Activate source terms.
$
F T T T T T
F T T T T T
$
$ Set time steps ----------------------------------------------------- $
$ - Time step information (this information is always read)
$ 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
120. 30. 30. 10.
$
$ Start of namelist input section ------------------------------------ $
$ Starting with WAVEWATCH III version 2.00, the tunable parameters
Expand Down Expand Up @@ -91,45 +91,14 @@ $ PHImin.
$
$ BAJ (adjusted)
$
&SIN4 BETAMAX = 1.52, Z0MAX = 1.002 /
$&SDS4 SDSC1 = 1.0, SDSC2 = 0.0 , SDSBCK = 0.100, SDSHCK = 1.0, SDSDTH = 0 /
$&SDB1 BJGAM = 1.0, BJALFA = 0.001 /
&SNL1 NLPROP = 3.1E7 /
$
$ TEST451
$
$ &SNL1 NLPROP=2.5E7 /
$
$
&UNST
UGOBCAUTO = F
UGOBCDEPTH= -10.
EXPFSN = T,
EXPFSPSI = F,
EXPFSFCT = F,
IMPFSN = F,
IMPTOTAL = F,
EXPTOTAL = 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_NLEVEL = 0
JGS_SOURCE_NONLINEAR = F,
JGS_BLOCK_GAUSS_SEIDEL = T,
JGS_TERMINATE_MAXITER = T,
JGS_MAXITER = 100000,
JGS_TERMINATE_NORM = F,
JGS_TERMINATE_DIFFERENCE = T,
JGS_DIFF_THR = 1.E-4,
JGS_PMIN = 3.0
JGS_LIMITER = F,
JGS_BLOCK_GAUSS_SEIDEL = T
JGS_NORM_THR = 1.E-6
/
$ &SIN3 BETAMAX = 1.25 /
$
$ TEST441
$
$
&SNL1 NLPROP=2.5E7 /
$
&UNST UGOBCAUTO = F , EXPFSN = T /
$
$ Bottom friction - - - - - - - - - - - - - - - - - - - - - - - - - -
$ JONSWAP : Namelist SBT1
Expand Down Expand Up @@ -194,7 +163,7 @@ $ Define grid -------------------------------------------------------- $
$
'UNST' T 'NONE'
$
1.0 0.10 20 -1. 4 1 '(20f10.2)' 'NAME' './../input/limon_ll.msh'
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
$ this file and follows below (no intermediate comment lines allowed).
Expand Down
256 changes: 256 additions & 0 deletions regtests/ww3_tp2.6/input/ww3_grid.nml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,256 @@
! -------------------------------------------------------------------- !
! WAVEWATCH III - ww3_grid.nml - Grid pre-processing !
! -------------------------------------------------------------------- !

! -------------------------------------------------------------------- !
! Define the spectrum parameterization via SPECTRUM_NML namelist
!
! * namelist must be terminated with /
! * definitions & defaults:
! SPECTRUM%XFR = 0. ! frequency increment
! SPECTRUM%FREQ1 = 0. ! first frequency (Hz)
! SPECTRUM%NK = 0 ! number of frequencies (wavenumbers)
! SPECTRUM%NTH = 0 ! number of direction bins
! SPECTRUM%THOFF = 0. ! relative offset of first direction [-0.5,0.5]
! -------------------------------------------------------------------- !
&SPECTRUM_NML
SPECTRUM%XFR = 1.1
SPECTRUM%FREQ1 = 0.05
SPECTRUM%NK = 25
SPECTRUM%NTH = 24
/

! -------------------------------------------------------------------- !
! Define the run parameterization via RUN_NML namelist
!
! * namelist must be terminated with /
! * definitions & defaults:
! RUN%FLDRY = F ! dry run (I/O only, no calculation)
! RUN%FLCX = F ! x-component of propagation
! RUN%FLCY = F ! y-component of propagation
! RUN%FLCTH = F ! direction shift
! RUN%FLCK = F ! wavenumber shift
! RUN%FLSOU = F ! source terms
! -------------------------------------------------------------------- !
&RUN_NML
RUN%FLCX = T
RUN%FLCY = T
RUN%FLCTH = T
RUN%FLCK = T
RUN%FLSOU = T
/

! -------------------------------------------------------------------- !
! Define the timesteps parameterization via TIMESTEPS_NML namelist
!
! * It is highly recommended to set up time steps which are multiple
! between them.
!
! * The first time step to calculate is the maximum CFL time step
! which depend on the lowest frequency FREQ1 previously set up and the
! lowest spatial grid resolution in meters DXY.
! reminder : 1 degree=60minutes // 1minute=1mile // 1mile=1.852km
! The formula for the CFL time is :
! Tcfl = DXY / (G / (FREQ1*4*Pi) ) with the constants Pi=3,14 and G=9.8m/s²;
! DTXY ~= 90% Tcfl
! DTMAX ~= 3 * DTXY (maximum global time step limit)
!
! * The refraction time step depends on how strong can be the current velocities
! on your grid :
! DTKTH ~= DTMAX / 2 ! in case of no or light current velocities
! DTKTH ~= DTMAX / 10 ! in case of strong current velocities
!
! * The source terms time step is usually defined between 5s and 60s.
! A common value is 10s.
! DTMIN ~= 10
!
! * namelist must be terminated with /
! * definitions & defaults:
! TIMESTEPS%DTMAX = 0. ! maximum global time step (s)
! TIMESTEPS%DTXY = 0. ! maximum CFL time step for x-y (s)
! TIMESTEPS%DTKTH = 0. ! maximum CFL time step for k-th (s)
! TIMESTEPS%DTMIN = 0. ! minimum source term time step (s)
! -------------------------------------------------------------------- !
&TIMESTEPS_NML
TIMESTEPS%DTMAX = 120.
TIMESTEPS%DTXY = 30.
TIMESTEPS%DTKTH = 30.
TIMESTEPS%DTMIN = 10.
/

! -------------------------------------------------------------------- !
! Define the grid to preprocess via GRID_NML namelist
!
! * the tunable parameters for source terms, propagation schemes, and
! numerics are read using namelists.
! * Any namelist found in the folowing sections is temporarily written
! to param.scratch, and read from there if necessary.
! * The order of the namelists is immaterial.
! * Namelists not needed for the given switch settings will be skipped
! automatically
!
! * grid type can be :
! 'RECT' : rectilinear
! 'CURV' : curvilinear
! 'UNST' : unstructured (triangle-based)
!
! * coordinate system can be :
! 'SPHE' : Spherical (degrees)
! 'CART' : Cartesian (meters)
!
! * grid closure can only be applied in spherical coordinates
!
! * grid closure can be :
! 'NONE' : No closure is applied
! 'SMPL' : Simple grid closure. Grid is periodic in the
! : i-index and wraps at i=NX+1. In other words,
! : (NX+1,J) => (1,J). A grid with simple closure
! : may be rectilinear or curvilinear.
! 'TRPL' : Tripole grid closure : Grid is periodic in the
! : i-index and wraps at i=NX+1 and has closure at
! : j=NY+1. In other words, (NX+1,J<=NY) => (1,J)
! : and (I,NY+1) => (NX-I+1,NY). Tripole
! : grid closure requires that NX be even. A grid
! : with tripole closure must be curvilinear.
!
! * The coastline limit depth is the value which distinguish the sea
! points to the land points. All the points with depth values (ZBIN)
! greater than this limit (ZLIM) will be considered as excluded points
! and will never be wet points, even if the water level grows over.
! It can only overwrite the status of a sea point to a land point.
! The value must have a negative value under the mean sea level
!
! * The minimum water depth allowed to compute the model is the absolute
! depth value (DMIN) used in the model if the input depth is lower to
! avoid the model to blow up.
!
! * namelist must be terminated with /
! * definitions & defaults:
! GRID%NAME = 'unset' ! grid name (30 char)
! GRID%NML = 'namelists.nml' ! namelists filename
! GRID%TYPE = 'unset' ! grid type
! GRID%COORD = 'unset' ! coordinate system
! GRID%CLOS = 'unset' ! grid closure
!
! GRID%ZLIM = 0. ! coastline limit depth (m)
! GRID%DMIN = 0. ! abs. minimum water depth (m)
! -------------------------------------------------------------------- !
&GRID_NML
GRID%NAME = 'LIMON'
GRID%NML = '../input/namelists_LIMON.nml'
GRID%TYPE = 'UNST'
GRID%COORD = 'SPHE'
GRID%CLOS = 'NONE'
GRID%ZLIM = 5.0
GRID%DMIN = 0.30
/

! -------------------------------------------------------------------- !
! Define the unstructured grid type via UNST_NML namelist
! - only for UNST grids -
!
! * The minimum grid size is 3x3.
!
! * &MISC namelist must be removed
!
! * The depth value must have negative values under the mean sea level
!
! * The map value must be set as :
! -2 : Excluded boundary point (covered by ice)
! -1 : Excluded sea point (covered by ice)
! 0 : Excluded land point
! 1 : Sea point
! 2 : Active boundary point
! 3 : Excluded grid point
! 7 : Ice point
!
! * the file must be a GMESH grid file containing node and element lists.
!
! * Extra open boundary list file with UGOBCFILE in namelist &UNST
! An example is given in regtest ww3_tp2.7
!
! * value <= scale_fac * value_read
!
! * IDLA : Layout indicator :
! 1 : Read line-by-line bottom to top. (default)
! 2 : Like 1, single read statement.
! 3 : Read line-by-line top to bottom.
! 4 : Like 3, single read statement.
! * IDFM : format indicator :
! 1 : Free format. (default)
! 2 : Fixed format.
! 3 : Unformatted.
! * FORMAT : element format to read :
! '(....)' : auto detected (default)
! '(f10.6)' : float type
!
! * Example :
! IDF SF IDLA IDFM FORMAT FILENAME
! 20 -1. 4 2 '(20f10.2)' 'ngug.msh'
!
! * namelist must be terminated with /
! * definitions & defaults:
! UNST%SF = 1. ! unst scale factor
! UNST%FILENAME = 'unset' ! unst filename
! UNST%IDF = 20 ! unst file unit number
! UNST%IDLA = 1 ! unst layout indicator
! UNST%IDFM = 1 ! unst format indicator
! UNST%FORMAT = '(....)' ! unst formatted read format
!
! UNST%UGOBCFILE = 'unset' ! additional boundary list file
! -------------------------------------------------------------------- !
&UNST_NML
UNST%SF = -1.
UNST%FILENAME = './../input/limon_ll.msh'
UNST%IDLA = 4
UNST%FORMAT = '(20f10.2)'
/

! -------------------------------------------------------------------- !
! Define the input boundary points via INBND_COUNT_NML and
! INBND_POINT_NML namelist
! - for RECT, CURV and UNST grids -
!
! * If no mask defined, INBOUND can be used
!
! * If the actual input data is not defined in the actual wave model run
! the initial conditions will be applied as constant boundary conditions.
!
! * The number of points is defined by INBND_COUNT
!
! * The points must start from index 1 to N
!
! * Each line contains:
! Discrete grid counters (IX,IY) of the active point and a
! connect flag. If this flag is true, and the present and previous
! point are on a grid line or diagonal, all intermediate points
! are also defined as boundary points.
!
! * Included point :
! grid points from segment data
! Defines as lines identifying points at which
! input boundary conditions are to be defined.
!
! * namelist must be terminated with /
! * definitions & defaults:
! INBND_COUNT%N_POINT = 0 ! number of segments
!
! INBND_POINT(I)%X_INDEX = 0 ! x index included point
! INBND_POINT(I)%Y_INDEX = 0 ! y index included point
! INBND_POINT(I)%CONNECT = F ! connect flag
!
! OR
! INBND_POINT(I) = 0 0 F ! included point
! -------------------------------------------------------------------- !
&INBND_COUNT_NML
INBND_COUNT%N_POINT = 2
/

&INBND_POINT_NML
INBND_POINT(1) = 66 1 F
INBND_POINT(2) = 99 1 T
/

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

0 comments on commit 8ef2dd2

Please sign in to comment.