Skip to content

Commit d6ef92a

Browse files
Remove double definition of UNST namelists (#984)
1 parent d609a49 commit d6ef92a

File tree

2 files changed

+30
-27
lines changed

2 files changed

+30
-27
lines changed

.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,9 @@ regtests/ww3_tp2.14/input/ww3_shel.inp
9898
regtests/ww3_tp2.14/input/ww3_shel.nml
9999
regtests/ww3_tp2.15/input_rho/ww3_prnc.inp
100100
regtests/ww3_tp2.17/input/inlet.msh
101+
regtests/ww3_tp2.19/input/Boers.msh
102+
regtests/ww3_tp2.19/input/meshbnd.msh
103+
regtests/ww3_ufs1.1/input_unstr/global_1deg_unstr.msh
101104
regtests/ww3_tp2.21/input/mesh.msh
102105
regtests/ww3_tp2.21/input/obstructions_local.glo_unst.in
103106
regtests/ww3_tp2.21/input/obstructions_shadow.glo_unst.in

model/src/w3gridmd.F90

+27-27
Original file line numberDiff line numberDiff line change
@@ -897,36 +897,36 @@ MODULE W3GRIDMD
897897
#ifdef W3_PR3
898898
REAL :: WDTHCG, WDTHTH
899899
#endif
900-
LOGICAL :: JGS_TERMINATE_MAXITER = .TRUE.
901-
LOGICAL :: JGS_TERMINATE_DIFFERENCE = .TRUE.
902-
LOGICAL :: JGS_TERMINATE_NORM = .TRUE.
903-
LOGICAL :: JGS_LIMITER = .FALSE.
904-
INTEGER :: JGS_LIMITER_FUNC = 1
905-
LOGICAL :: JGS_BLOCK_GAUSS_SEIDEL = .TRUE.
906-
LOGICAL :: JGS_USE_JACOBI = .TRUE.
907-
LOGICAL :: JGS_SOURCE_NONLINEAR = .FALSE.
908-
LOGICAL :: UGOBCAUTO = .FALSE.
909-
LOGICAL :: UGBCCFL = .FALSE.
910-
LOGICAL :: EXPFSN = .TRUE.
911-
LOGICAL :: EXPFSPSI = .FALSE.
912-
LOGICAL :: EXPFSFCT = .FALSE.
913-
LOGICAL :: IMPFSN = .FALSE.
914-
LOGICAL :: EXPTOTAL = .FALSE.
915-
LOGICAL :: IMPTOTAL = .FALSE.
916-
LOGICAL :: IMPREFRACTION = .FALSE.
917-
LOGICAL :: IMPFREQSHIFT = .FALSE.
918-
LOGICAL :: IMPSOURCE = .FALSE.
919-
LOGICAL :: SETUP_APPLY_WLV = .FALSE.
920-
INTEGER :: JGS_MAXITER=100
900+
LOGICAL :: JGS_TERMINATE_MAXITER
901+
LOGICAL :: JGS_TERMINATE_DIFFERENCE
902+
LOGICAL :: JGS_TERMINATE_NORM
903+
LOGICAL :: JGS_LIMITER
904+
INTEGER :: JGS_LIMITER_FUNC
905+
LOGICAL :: JGS_BLOCK_GAUSS_SEIDEL
906+
LOGICAL :: JGS_USE_JACOBI
907+
LOGICAL :: JGS_SOURCE_NONLINEAR
908+
LOGICAL :: UGOBCAUTO
909+
LOGICAL :: UGBCCFL
910+
LOGICAL :: EXPFSN
911+
LOGICAL :: EXPFSPSI
912+
LOGICAL :: EXPFSFCT
913+
LOGICAL :: IMPFSN
914+
LOGICAL :: EXPTOTAL
915+
LOGICAL :: IMPTOTAL
916+
LOGICAL :: IMPREFRACTION
917+
LOGICAL :: IMPFREQSHIFT
918+
LOGICAL :: IMPSOURCE
919+
LOGICAL :: SETUP_APPLY_WLV
920+
INTEGER :: JGS_MAXITER
921921
INTEGER :: nbSel
922922
INTEGER :: UNSTSCHEMES(6)
923923
INTEGER :: UNSTSCHEME
924-
INTEGER :: JGS_NLEVEL = 0
925-
REAL*8 :: JGS_PMIN = 0.
926-
REAL*8 :: JGS_DIFF_THR = 1.E-10
927-
REAL*8 :: JGS_NORM_THR = 1.E-20
928-
REAL*8 :: SOLVERTHR_SETUP = 1.E-20
929-
REAL*8 :: CRIT_DEP_SETUP = 0.
924+
INTEGER :: JGS_NLEVEL
925+
REAL*8 :: JGS_PMIN
926+
REAL*8 :: JGS_DIFF_THR
927+
REAL*8 :: JGS_NORM_THR
928+
REAL*8 :: SOLVERTHR_SETUP
929+
REAL*8 :: CRIT_DEP_SETUP
930930
!
931931
CHARACTER :: UGOBCFILE*60
932932
REAL :: UGOBCDEPTH

0 commit comments

Comments
 (0)