Skip to content

Commit

Permalink
Remove double definition of UNST namelists (NOAA-EMC#984)
Browse files Browse the repository at this point in the history
  • Loading branch information
JessicaMeixner-NOAA authored Apr 18, 2023
1 parent d609a49 commit d6ef92a
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 27 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,9 @@ regtests/ww3_tp2.14/input/ww3_shel.inp
regtests/ww3_tp2.14/input/ww3_shel.nml
regtests/ww3_tp2.15/input_rho/ww3_prnc.inp
regtests/ww3_tp2.17/input/inlet.msh
regtests/ww3_tp2.19/input/Boers.msh
regtests/ww3_tp2.19/input/meshbnd.msh
regtests/ww3_ufs1.1/input_unstr/global_1deg_unstr.msh
regtests/ww3_tp2.21/input/mesh.msh
regtests/ww3_tp2.21/input/obstructions_local.glo_unst.in
regtests/ww3_tp2.21/input/obstructions_shadow.glo_unst.in
Expand Down
54 changes: 27 additions & 27 deletions model/src/w3gridmd.F90
Original file line number Diff line number Diff line change
Expand Up @@ -897,36 +897,36 @@ MODULE W3GRIDMD
#ifdef W3_PR3
REAL :: WDTHCG, WDTHTH
#endif
LOGICAL :: JGS_TERMINATE_MAXITER = .TRUE.
LOGICAL :: JGS_TERMINATE_DIFFERENCE = .TRUE.
LOGICAL :: JGS_TERMINATE_NORM = .TRUE.
LOGICAL :: JGS_LIMITER = .FALSE.
INTEGER :: JGS_LIMITER_FUNC = 1
LOGICAL :: JGS_BLOCK_GAUSS_SEIDEL = .TRUE.
LOGICAL :: JGS_USE_JACOBI = .TRUE.
LOGICAL :: JGS_SOURCE_NONLINEAR = .FALSE.
LOGICAL :: UGOBCAUTO = .FALSE.
LOGICAL :: UGBCCFL = .FALSE.
LOGICAL :: EXPFSN = .TRUE.
LOGICAL :: EXPFSPSI = .FALSE.
LOGICAL :: EXPFSFCT = .FALSE.
LOGICAL :: IMPFSN = .FALSE.
LOGICAL :: EXPTOTAL = .FALSE.
LOGICAL :: IMPTOTAL = .FALSE.
LOGICAL :: IMPREFRACTION = .FALSE.
LOGICAL :: IMPFREQSHIFT = .FALSE.
LOGICAL :: IMPSOURCE = .FALSE.
LOGICAL :: SETUP_APPLY_WLV = .FALSE.
INTEGER :: JGS_MAXITER=100
LOGICAL :: JGS_TERMINATE_MAXITER
LOGICAL :: JGS_TERMINATE_DIFFERENCE
LOGICAL :: JGS_TERMINATE_NORM
LOGICAL :: JGS_LIMITER
INTEGER :: JGS_LIMITER_FUNC
LOGICAL :: JGS_BLOCK_GAUSS_SEIDEL
LOGICAL :: JGS_USE_JACOBI
LOGICAL :: JGS_SOURCE_NONLINEAR
LOGICAL :: UGOBCAUTO
LOGICAL :: UGBCCFL
LOGICAL :: EXPFSN
LOGICAL :: EXPFSPSI
LOGICAL :: EXPFSFCT
LOGICAL :: IMPFSN
LOGICAL :: EXPTOTAL
LOGICAL :: IMPTOTAL
LOGICAL :: IMPREFRACTION
LOGICAL :: IMPFREQSHIFT
LOGICAL :: IMPSOURCE
LOGICAL :: SETUP_APPLY_WLV
INTEGER :: JGS_MAXITER
INTEGER :: nbSel
INTEGER :: UNSTSCHEMES(6)
INTEGER :: UNSTSCHEME
INTEGER :: JGS_NLEVEL = 0
REAL*8 :: JGS_PMIN = 0.
REAL*8 :: JGS_DIFF_THR = 1.E-10
REAL*8 :: JGS_NORM_THR = 1.E-20
REAL*8 :: SOLVERTHR_SETUP = 1.E-20
REAL*8 :: CRIT_DEP_SETUP = 0.
INTEGER :: JGS_NLEVEL
REAL*8 :: JGS_PMIN
REAL*8 :: JGS_DIFF_THR
REAL*8 :: JGS_NORM_THR
REAL*8 :: SOLVERTHR_SETUP
REAL*8 :: CRIT_DEP_SETUP
!
CHARACTER :: UGOBCFILE*60
REAL :: UGOBCDEPTH
Expand Down

0 comments on commit d6ef92a

Please sign in to comment.