Changeset 2303 for branches/nemo_v3_3_beta
- Timestamp:
- 2010-10-22T16:51:08+02:00 (14 years ago)
- Location:
- branches/nemo_v3_3_beta/NEMOGCM/NEMO
- Files:
-
- 1 deleted
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/nemo_v3_3_beta/NEMOGCM/NEMO/C1D_SRC/diawri_c1d.F90
r2287 r2303 20 20 USE sbcmod ! surface Boundary Codition 21 21 USE sbcssr ! surface boundary condition: restauring to SSS and or SST 22 USE zdftke_old ! TKE vertical mixing (old scheme)23 22 USE zdftke ! TKE vertical mixing 24 23 USE zdfkpp ! KPP vertical mixing … … 221 220 CALL histdef( nid_T, "sometauy", "Wind Stress along j-axis" , "N/m2" , & ! vtau 222 221 & jpi, jpj, nh_T, 1 , 1, 1 , - 99, 32, clop, zsto, zout ) 223 #if defined key_zdftke_old224 CALL histdef( nid_T, "votlsdis", " Dissipation Turbulent Lenght Scale", "m" , & ! e_dis225 & jpi, jpj, nh_T, ipk, 1, ipk, nz_T, 32, clop, zsto, zout )226 CALL histdef( nid_T, "votlsmix", " Mixing Turbulent Lenght Scale" , "m" , & ! e_mix227 & jpi, jpj, nh_T, ipk, 1, ipk, nz_T, 32, clop, zsto, zout )228 CALL histdef( nid_T, "votlspdl", " Prandl Number", "-" , & ! e_pdl229 & jpi, jpj, nh_T, ipk, 1, ipk, nz_T, 32, clop, zsto, zout )230 CALL histdef( nid_T, "votlsric", " Local Richardson Number", "-" , & ! e_ric231 & jpi, jpj, nh_T, ipk, 1, ipk, nz_T, 32, clop, zsto, zout )232 CALL histdef( nid_T, "votkeend", "TKE: Turbulent kinetic energy" , "m2/s" , & ! TKE233 & jpi, jpj, nh_T, ipk, 1, ipk, nz_T, 32, clop, zsto, zout )234 CALL histdef( nid_T, "sotkehlc", "TKE: Langmuir Circulation depth" , "m" , & ! hlc235 & jpi, jpj, nh_T, 1 , 1, 1 , -99 , 32, clop, zsto, zout )236 #endif237 222 #if defined key_zdfkpp 238 223 CALL histdef( nid_T, "vokpprig", " Gradient Richardson Number" , "-" , & ! rig … … 317 302 CALL histwrite( nid_T, "vomecrty", it, vn , ndim_T , ndex_T ) ! j-current 318 303 CALL histwrite( nid_T, "sometauy", it, vtau , ndim_hT, ndex_hT ) ! j-wind stress 319 #if defined key_zdftke_old320 CALL histwrite( nid_T, "votlsdis", it, e_dis , ndim_T , ndex_T ) ! Diss. Turb. lenght scale321 CALL histwrite( nid_T, "votlsmix", it, e_mix , ndim_T , ndex_T ) ! Mixing Turb. lenght scale322 CALL histwrite( nid_T, "votlspdl", it, e_pdl , ndim_T , ndex_T ) ! Prandl number323 CALL histwrite( nid_T, "votlsric", it, e_ric , ndim_T , ndex_T ) ! local Richardson number324 CALL histwrite( nid_T, "votkeend", it, en , ndim_T , ndex_T ) ! TKE325 CALL histwrite( nid_T, "sotkehlc", it, hlc , ndim_hT, ndex_hT ) ! TKE Langmuir Circulation depth326 #endif327 304 #if defined key_zdfkpp 328 305 CALL histwrite( nid_T, "vokpprig", it, rig , ndim_T , ndex_T ) ! gradient Richardson number -
branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/DYN/dynzdf.F90
r2287 r2303 102 102 !! explicit (time-splitting) scheme if ln_zdfexp=T 103 103 !!---------------------------------------------------------------------- 104 USE zdftke_old105 104 USE zdftke 106 105 USE zdfgls … … 114 113 ! 115 114 ! Force implicit schemes 116 IF( lk_zdftke _old .OR. lk_zdftke.OR. lk_zdfgls .OR. lk_zdfkpp ) nzdf = 1 ! TKE, GLS or KPP physics117 IF( ln_dynldf_iso 118 IF( ln_dynldf_hor .AND. ln_sco 115 IF( lk_zdftke .OR. lk_zdfgls .OR. lk_zdfkpp ) nzdf = 1 ! TKE, GLS or KPP physics 116 IF( ln_dynldf_iso ) nzdf = 1 ! iso-neutral lateral physics 117 IF( ln_dynldf_hor .AND. ln_sco ) nzdf = 1 ! horizontal lateral physics in s-coordinate 119 118 ! 120 119 IF( lk_esopa ) nzdf = -1 ! Esopa key: All schemes used -
branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/TRA/trazdf.F90
r2287 r2303 119 119 !! the implicit scheme is required. 120 120 !!---------------------------------------------------------------------- 121 USE zdftke_old122 121 USE zdftke 123 122 USE zdfgls … … 131 130 132 131 ! Force implicit schemes 133 IF( lk_zdftke _old .OR. lk_zdftke.OR. lk_zdfgls .OR. lk_zdfkpp ) nzdf = 1 ! TKE, GLS or KPP physics134 IF( ln_traldf_iso 135 IF( ln_traldf_hor .AND. ln_sco 132 IF( lk_zdftke .OR. lk_zdfgls .OR. lk_zdfkpp ) nzdf = 1 ! TKE, GLS or KPP physics 133 IF( ln_traldf_iso ) nzdf = 1 ! iso-neutral lateral physics 134 IF( ln_traldf_hor .AND. ln_sco ) nzdf = 1 ! horizontal lateral physics in s-coordinate 136 135 IF( ln_zdfexp .AND. nzdf == 1 ) CALL ctl_stop( 'tra_zdf : If using the rotation of lateral mixing operator', & 137 136 & ' TKE or KPP scheme, the implicit scheme is required, set ln_zdfexp = .false.' ) -
branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfini.F90
r2287 r2303 18 18 USE zdf_oce ! TKE vertical mixing 19 19 USE lib_mpp ! distribued memory computing 20 USE zdftke_old ! TKE vertical mixing (old scheme)21 20 USE zdftke ! TKE vertical mixing 22 21 USE zdfgls ! GLS vertical mixing … … 99 98 ioptio = ioptio+1 100 99 ENDIF 101 IF( lk_zdftke_old ) THEN102 IF(lwp) WRITE(numout,*) ' TKE dependent eddy coefficients'103 ioptio = ioptio+1104 ENDIF105 100 IF( lk_zdftke ) THEN 106 101 IF(lwp) WRITE(numout,*) ' TKE dependent eddy coefficients' … … 130 125 ioptio = ioptio+1 131 126 ENDIF 132 IF( lk_zdftke _old .OR. lk_zdftke) THEN127 IF( lk_zdftke ) THEN 133 128 IF(lwp) WRITE(numout,*) ' use the 1.5 turbulent closure' 134 129 ENDIF … … 144 139 ENDIF 145 140 IF ( ioptio > 1 .AND. .NOT. lk_esopa ) CALL ctl_stop( ' chose between ln_zdfnpc and ln_zdfevd' ) 146 IF( ioptio == 0 .AND. .NOT.( lk_zdftke _old .OR. lk_zdftke.OR. lk_zdfgls .OR. lk_zdfkpp ) ) &141 IF( ioptio == 0 .AND. .NOT.( lk_zdftke .OR. lk_zdfgls .OR. lk_zdfkpp ) ) & 147 142 CALL ctl_stop( ' except for TKE, GLS or KPP physics, a convection scheme is', & 148 143 & ' required: ln_zdfevd or ln_zdfnpc logicals' ) -
branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/opa.F90
r2287 r2303 276 276 CALL zdf_bfr_init ! bottom friction 277 277 IF( lk_zdfric ) CALL zdf_ric_init ! Richardson number dependent Kz 278 IF( lk_zdftke_old ) CALL zdf_tke_init_o ! TKE closure scheme for Kz (old scheme)279 278 IF( lk_zdftke ) CALL zdf_tke_init ! TKE closure scheme for Kz 280 279 IF( lk_zdfkpp ) CALL zdf_kpp_init ! KPP closure scheme for Kz -
branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/step.F90
r2287 r2303 121 121 ! ! Vertical eddy viscosity and diffusivity coefficients 122 122 IF( lk_zdfric ) CALL zdf_ric ( kstp ) ! Richardson number dependent Kz 123 IF( lk_zdftke_old ) CALL zdf_tke_old( kstp ) ! TKE closure scheme for Kz (old scheme)124 123 IF( lk_zdftke ) CALL zdf_tke ( kstp ) ! TKE closure scheme for Kz 125 124 IF( lk_zdfgls ) CALL zdf_gls ( kstp ) ! GLS closure scheme for Kz -
branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/step_oce.F90
r2287 r2303 67 67 USE zdftmx ! tide-induced vertical mixing (zdf_tmx routine) 68 68 USE zdfbfr ! bottom friction (zdf_bfr routine) 69 USE zdftke_old ! old TKE vertical mixing (zdf_tke_old routine)70 69 USE zdftke ! TKE vertical mixing (zdf_tke routine) 71 70 USE zdfkpp ! KPP vertical mixing (zdf_kpp routine) -
branches/nemo_v3_3_beta/NEMOGCM/NEMO/TOP_SRC/TRP/trczdf.F90
r2287 r2303 136 136 IF( ln_trcldf_iso ) nzdf = 1 ! iso-neutral lateral physics 137 137 IF( ln_trcldf_hor .AND. ln_sco ) nzdf = 1 ! horizontal lateral physics in s-coordinate 138 #if defined key_zdftke || defined key_zdf tke_old || defined key_zdfkpp138 #if defined key_zdftke || defined key_zdfkpp 139 139 nzdf = 1 ! TKE or KPP physics 140 140 #endif
Note: See TracChangeset
for help on using the changeset viewer.