Changeset 9526 for branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC
- Timestamp:
- 2018-04-30T12:22:35+02:00 (6 years ago)
- Location:
- branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC
- Files:
-
- 5 edited
-
DYN/dynadv.F90 (modified) (4 diffs)
-
LDF/ldfdyn.F90 (modified) (5 diffs)
-
LDF/ldftra.F90 (modified) (5 diffs)
-
TRA/traadv.F90 (modified) (4 diffs)
-
ZDF/zdfdrg.F90 (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynadv.F90
r9490 r9526 30 30 PUBLIC dyn_adv_init ! routine called by opa module 31 31 32 ! 33 LOGICAL, PUBLIC :: ln_dynadv_ NONE!: linear dynamics (no momentum advection)32 ! !!* namdyn_adv namelist * 33 LOGICAL, PUBLIC :: ln_dynadv_OFF !: linear dynamics (no momentum advection) 34 34 LOGICAL, PUBLIC :: ln_dynadv_vec !: vector form 35 35 INTEGER, PUBLIC :: nn_dynkeg !: scheme of grad(KE): =0 C2 ; =1 Hollingsworth … … 95 95 INTEGER :: ioptio, ios ! Local integer 96 96 ! 97 NAMELIST/namdyn_adv/ ln_dynadv_ NONE, ln_dynadv_vec, nn_dynkeg, ln_dynadv_cen2, ln_dynadv_ubs97 NAMELIST/namdyn_adv/ ln_dynadv_OFF, ln_dynadv_vec, nn_dynkeg, ln_dynadv_cen2, ln_dynadv_ubs 98 98 !!---------------------------------------------------------------------- 99 99 ! … … 114 114 IF(lwp) THEN ! Namelist print 115 115 WRITE(numout,*) ' Namelist namdyn_adv : chose a advection formulation & scheme for momentum' 116 WRITE(numout,*) ' linear dynamics : no momentum advection ln_dynadv_ NONE = ', ln_dynadv_NONE116 WRITE(numout,*) ' linear dynamics : no momentum advection ln_dynadv_OFF = ', ln_dynadv_OFF 117 117 WRITE(numout,*) ' Vector form: 2nd order centered scheme ln_dynadv_vec = ', ln_dynadv_vec 118 118 WRITE(numout,*) ' with Hollingsworth scheme (=1) or not (=0) nn_dynkeg = ', nn_dynkeg … … 122 122 123 123 ioptio = 0 ! parameter control and set n_dynadv 124 IF( ln_dynadv_ NONE) THEN ; ioptio = ioptio + 1 ; n_dynadv = np_LIN_dyn ; ENDIF124 IF( ln_dynadv_OFF ) THEN ; ioptio = ioptio + 1 ; n_dynadv = np_LIN_dyn ; ENDIF 125 125 IF( ln_dynadv_vec ) THEN ; ioptio = ioptio + 1 ; n_dynadv = np_VEC_c2 ; ENDIF 126 126 IF( ln_dynadv_cen2 ) THEN ; ioptio = ioptio + 1 ; n_dynadv = np_FLX_c2 ; ENDIF -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/LDF/ldfdyn.F90
r9490 r9526 33 33 34 34 ! !!* Namelist namdyn_ldf : lateral mixing on momentum * 35 LOGICAL , PUBLIC :: ln_dynldf_ NONE!: No operator (i.e. no explicit diffusion)35 LOGICAL , PUBLIC :: ln_dynldf_OFF !: No operator (i.e. no explicit diffusion) 36 36 LOGICAL , PUBLIC :: ln_dynldf_lap !: laplacian operator 37 37 LOGICAL , PUBLIC :: ln_dynldf_blp !: bilaplacian operator … … 109 109 CHARACTER(len=5) :: cl_Units ! units (m2/s or m4/s) 110 110 !! 111 NAMELIST/namdyn_ldf/ ln_dynldf_ NONE, ln_dynldf_lap, ln_dynldf_blp, & ! type of operator112 & ln_dynldf_lev 113 & nn_ahm_ijk_t 114 & rn_csmc 111 NAMELIST/namdyn_ldf/ ln_dynldf_OFF, ln_dynldf_lap, ln_dynldf_blp, & ! type of operator 112 & ln_dynldf_lev, ln_dynldf_hor, ln_dynldf_iso, & ! acting direction of the operator 113 & nn_ahm_ijk_t , rn_Uv , rn_Lv, rn_ahm_b, & ! lateral eddy coefficient 114 & rn_csmc , rn_minfac , rn_maxfac ! Smagorinsky settings 115 115 !!---------------------------------------------------------------------- 116 116 ! … … 131 131 ! 132 132 WRITE(numout,*) ' type :' 133 WRITE(numout,*) ' no explicit diffusion ln_dynldf_ NONE= ', ln_dynldf_NONE133 WRITE(numout,*) ' no explicit diffusion ln_dynldf_OFF = ', ln_dynldf_OFF 134 134 WRITE(numout,*) ' laplacian operator ln_dynldf_lap = ', ln_dynldf_lap 135 135 WRITE(numout,*) ' bilaplacian operator ln_dynldf_blp = ', ln_dynldf_blp … … 159 159 nldf_dyn = np_ERROR 160 160 ioptio = 0 161 IF( ln_dynldf_ NONE) THEN ; nldf_dyn = np_no_ldf ; ioptio = ioptio + 1 ; ENDIF162 IF( ln_dynldf_lap 163 IF( ln_dynldf_blp 164 IF( ioptio /= 1 165 ! 166 IF(.NOT.ln_dynldf_ NONE ) THEN!== direction ==>> type of operator ==!161 IF( ln_dynldf_OFF ) THEN ; nldf_dyn = np_no_ldf ; ioptio = ioptio + 1 ; ENDIF 162 IF( ln_dynldf_lap ) THEN ; ioptio = ioptio + 1 ; ENDIF 163 IF( ln_dynldf_blp ) THEN ; ioptio = ioptio + 1 ; ENDIF 164 IF( ioptio /= 1 ) CALL ctl_stop( 'dyn_ldf_init: use ONE of the 3 operator options (NONE/lap/blp)' ) 165 ! 166 IF(.NOT.ln_dynldf_OFF ) THEN !== direction ==>> type of operator ==! 167 167 ioptio = 0 168 168 IF( ln_dynldf_lev ) ioptio = ioptio + 1 … … 232 232 l_ldfdyn_time = .FALSE. ! no time variation except in case defined below 233 233 ! 234 IF( ln_dynldf_ NONE) THEN234 IF( ln_dynldf_OFF ) THEN 235 235 IF(lwp) WRITE(numout,*) ' ==>>> No viscous operator selected. ahmt and ahmf are not allocated' 236 236 RETURN -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/LDF/ldftra.F90
r9490 r9526 43 43 ! !!* Namelist namtra_ldf : lateral mixing on tracers * 44 44 ! != Operator type =! 45 LOGICAL , PUBLIC :: ln_traldf_ NONE!: no operator: No explicit diffusion45 LOGICAL , PUBLIC :: ln_traldf_OFF !: no operator: No explicit diffusion 46 46 LOGICAL , PUBLIC :: ln_traldf_lap !: laplacian operator 47 47 LOGICAL , PUBLIC :: ln_traldf_blp !: bilaplacian operator … … 135 135 CHARACTER(len=5) :: cl_Units ! units (m2/s or m4/s) 136 136 !! 137 NAMELIST/namtra_ldf/ ln_traldf_ NONE, ln_traldf_lap , ln_traldf_blp ,& ! type of operator138 & ln_traldf_lev , ln_traldf_hor , ln_traldf_triad,& ! acting direction of the operator139 & ln_traldf_iso , ln_traldf_msc , rn_slpmax ,& ! option for iso-neutral operator140 & ln_triad_iso , ln_botmix_triad, rn_sw_triad ,& ! option for triad operator141 & nn_aht_ijk_t , rn_Ud , rn_Ld! lateral eddy coefficient137 NAMELIST/namtra_ldf/ ln_traldf_OFF, ln_traldf_lap , ln_traldf_blp , & ! type of operator 138 & ln_traldf_lev, ln_traldf_hor , ln_traldf_triad, & ! acting direction of the operator 139 & ln_traldf_iso, ln_traldf_msc , rn_slpmax , & ! option for iso-neutral operator 140 & ln_triad_iso , ln_botmix_triad, rn_sw_triad , & ! option for triad operator 141 & nn_aht_ijk_t , rn_Ud , rn_Ld ! lateral eddy coefficient 142 142 !!---------------------------------------------------------------------- 143 143 ! … … 163 163 WRITE(numout,*) ' Namelist : namtra_ldf --- lateral mixing parameters (type, direction, coefficients)' 164 164 WRITE(numout,*) ' type :' 165 WRITE(numout,*) ' no explicit diffusion ln_traldf_ NONE = ', ln_traldf_NONE165 WRITE(numout,*) ' no explicit diffusion ln_traldf_OFF = ', ln_traldf_OFF 166 166 WRITE(numout,*) ' laplacian operator ln_traldf_lap = ', ln_traldf_lap 167 167 WRITE(numout,*) ' bilaplacian operator ln_traldf_blp = ', ln_traldf_blp … … 188 188 nldf_tra = np_ERROR 189 189 ioptio = 0 190 IF( ln_traldf_ NONE) THEN ; nldf_tra = np_no_ldf ; ioptio = ioptio + 1 ; ENDIF191 IF( ln_traldf_lap 192 IF( ln_traldf_blp 193 IF( ioptio /= 1 194 ! 195 IF( .NOT.ln_traldf_ NONE ) THEN!== direction ==>> type of operator ==!190 IF( ln_traldf_OFF ) THEN ; nldf_tra = np_no_ldf ; ioptio = ioptio + 1 ; ENDIF 191 IF( ln_traldf_lap ) THEN ; ioptio = ioptio + 1 ; ENDIF 192 IF( ln_traldf_blp ) THEN ; ioptio = ioptio + 1 ; ENDIF 193 IF( ioptio /= 1 ) CALL ctl_stop( 'tra_ldf_init: use ONE of the 3 operator options (NONE/lap/blp)' ) 194 ! 195 IF( .NOT.ln_traldf_OFF ) THEN !== direction ==>> type of operator ==! 196 196 ioptio = 0 197 197 IF( ln_traldf_lev ) ioptio = ioptio + 1 … … 278 278 l_ldftra_time = .FALSE. ! no time variation except in case defined below 279 279 ! 280 IF( ln_traldf_ NONE ) THEN!== no explicit diffusive operator ==!280 IF( ln_traldf_OFF ) THEN !== no explicit diffusive operator ==! 281 281 ! 282 282 IF(lwp) WRITE(numout,*) ' ==>>> No diffusive operator selected. ahtu and ahtv are not allocated' -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/traadv.F90
r9190 r9526 46 46 47 47 ! !!* Namelist namtra_adv * 48 LOGICAL :: ln_traadv_ NONE! no advection on T and S48 LOGICAL :: ln_traadv_OFF ! no advection on T and S 49 49 LOGICAL :: ln_traadv_cen ! centered scheme flag 50 50 INTEGER :: nn_cen_h, nn_cen_v ! =2/4 : horizontal and vertical choices of the order of CEN scheme … … 185 185 INTEGER :: ioptio, ios ! Local integers 186 186 ! 187 NAMELIST/namtra_adv/ ln_traadv_ NONE,& ! No advection187 NAMELIST/namtra_adv/ ln_traadv_OFF, & ! No advection 188 188 & ln_traadv_cen , nn_cen_h, nn_cen_v, & ! CEN 189 189 & ln_traadv_fct , nn_fct_h, nn_fct_v, & ! FCT … … 208 208 WRITE(numout,*) '~~~~~~~~~~~~' 209 209 WRITE(numout,*) ' Namelist namtra_adv : chose a advection scheme for tracers' 210 WRITE(numout,*) ' No advection on T & S ln_traadv_ NONE= ', ln_traadv_NONE210 WRITE(numout,*) ' No advection on T & S ln_traadv_OFF = ', ln_traadv_OFF 211 211 WRITE(numout,*) ' centered scheme ln_traadv_cen = ', ln_traadv_cen 212 212 WRITE(numout,*) ' horizontal 2nd/4th order nn_cen_h = ', nn_fct_h … … 224 224 ! !== Parameter control & set nadv ==! 225 225 ioptio = 0 226 IF( ln_traadv_ NONE) THEN ; ioptio = ioptio + 1 ; nadv = np_NO_adv ; ENDIF227 IF( ln_traadv_cen 228 IF( ln_traadv_fct 229 IF( ln_traadv_mus 230 IF( ln_traadv_ubs 231 IF( ln_traadv_qck 226 IF( ln_traadv_OFF ) THEN ; ioptio = ioptio + 1 ; nadv = np_NO_adv ; ENDIF 227 IF( ln_traadv_cen ) THEN ; ioptio = ioptio + 1 ; nadv = np_CEN ; ENDIF 228 IF( ln_traadv_fct ) THEN ; ioptio = ioptio + 1 ; nadv = np_FCT ; ENDIF 229 IF( ln_traadv_mus ) THEN ; ioptio = ioptio + 1 ; nadv = np_MUS ; ENDIF 230 IF( ln_traadv_ubs ) THEN ; ioptio = ioptio + 1 ; nadv = np_UBS ; ENDIF 231 IF( ln_traadv_qck ) THEN ; ioptio = ioptio + 1 ; nadv = np_QCK ; ENDIF 232 232 ! 233 233 IF( ioptio /= 1 ) CALL ctl_stop( 'tra_adv_init: Choose ONE advection option in namelist namtra_adv' ) -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfdrg.F90
r9256 r9526 41 41 42 42 ! !!* Namelist namdrg: nature of drag coefficient namelist * 43 LOGICAL :: ln_ NONE! free-slip : Cd = 043 LOGICAL :: ln_OFF ! free-slip : Cd = 0 44 44 LOGICAL :: ln_lin ! linear drag: Cd = Cd0_lin 45 45 LOGICAL :: ln_non_lin ! non-linear drag: Cd = Cd0_nl |U| … … 61 61 INTEGER :: ndrg ! choice of the type of drag coefficient 62 62 ! ! associated indices: 63 INTEGER, PARAMETER :: np_ NONE= 0 ! free-slip: drag set to zero63 INTEGER, PARAMETER :: np_OFF = 0 ! free-slip: drag set to zero 64 64 INTEGER, PARAMETER :: np_lin = 1 ! linear drag: Cd = Cd0_lin 65 65 INTEGER, PARAMETER :: np_non_lin = 2 ! non-linear drag: Cd = Cd0_nl |U| … … 231 231 INTEGER :: ios, ioptio ! local integers 232 232 !! 233 NAMELIST/namdrg/ ln_ NONE, ln_lin, ln_non_lin, ln_loglayer, ln_drgimp233 NAMELIST/namdrg/ ln_OFF, ln_lin, ln_non_lin, ln_loglayer, ln_drgimp 234 234 !!---------------------------------------------------------------------- 235 235 ! … … 249 249 WRITE(numout,*) '~~~~~~~~~~~~' 250 250 WRITE(numout,*) ' Namelist namdrg : top/bottom friction choices' 251 WRITE(numout,*) ' free-slip : Cd = 0 ln_ NONE = ', ln_NONE251 WRITE(numout,*) ' free-slip : Cd = 0 ln_OFF = ', ln_OFF 252 252 WRITE(numout,*) ' linear drag : Cd = Cd0 ln_lin = ', ln_lin 253 253 WRITE(numout,*) ' non-linear drag: Cd = Cd0_nl |U| ln_non_lin = ', ln_non_lin … … 257 257 ! 258 258 ioptio = 0 ! set ndrg and control check 259 IF( ln_ NONE ) THEN ; ndrg = np_NONE; ioptio = ioptio + 1 ; ENDIF259 IF( ln_OFF ) THEN ; ndrg = np_OFF ; ioptio = ioptio + 1 ; ENDIF 260 260 IF( ln_lin ) THEN ; ndrg = np_lin ; ioptio = ioptio + 1 ; ENDIF 261 261 IF( ln_non_lin ) THEN ; ndrg = np_non_lin ; ioptio = ioptio + 1 ; ENDIF … … 386 386 SELECT CASE( ndrg ) 387 387 ! 388 CASE( np_ NONE) !== No top/bottom friction ==! (pCdU = 0)388 CASE( np_OFF ) !== No top/bottom friction ==! (pCdU = 0) 389 389 IF(lwp) WRITE(numout,*) 390 390 IF(lwp) WRITE(numout,*) ' ==>>> ',TRIM(cd_topbot),' free-slip, friction set to zero'
Note: See TracChangeset
for help on using the changeset viewer.
