- Timestamp:
- 2009-05-11T15:33:19+02:00 (15 years ago)
- Location:
- branches/dev_004_VVL/NEMO/OPA_SRC
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/dev_004_VVL/NEMO/OPA_SRC/restart.F90
r1410 r1433 143 143 CALL iom_rstput( kt, nitrst, numrow, 'rotn' , rotn ) 144 144 CALL iom_rstput( kt, nitrst, numrow, 'hdivn' , hdivn ) 145 CALL iom_rstput( kt, nitrst, numrow, 'rn2' , rn2 ) 145 146 146 147 #if defined key_zdftke2 … … 150 151 CALL iom_rstput( kt, nitrst, numrow, 'rhd' , rhd ) 151 152 #if defined key_zdftke2 152 CALL iom_rstput( kt, nitrst, numrow, 'rn2' , rn2 )153 153 CALL iom_rstput( kt, nitrst, numrow, 'avt' , avt ) 154 154 ENDIF … … 239 239 hdivb(:,:,:) = hdivn(:,:,:) 240 240 ENDIF 241 CALL eos_init ! usefull to get the equation state type neos parameter 242 IF( iom_varid( numror, 'rn2', ldstop = .FALSE. ) > 0 ) THEN 243 CALL iom_get( numror, jpdom_autoglo, 'rn2' , rn2 ) 244 ELSE 245 CALL bn2( tb, sb, rn2 ) ! before Brunt-Vaisala frequency 246 ENDIF 241 247 242 248 #if defined key_zdftke2 … … 257 263 #endif 258 264 #if defined key_zdftke2 259 CALL eos_init ! usefull to get the equation state type neos parameter260 IF( iom_varid( numror, 'rn2', ldstop = .FALSE. ) > 0 ) THEN261 CALL iom_get( numror, jpdom_autoglo, 'rn2' , rn2 )262 ELSE263 IF ( ln_dynhpg_imp ) THEN264 CALL bn2( tb, sb, rn2 ) ! before Brunt-Vaisala frequency265 ENDIF266 ENDIF267 265 IF( iom_varid( numror, 'avt', ldstop = .FALSE. ) > 0 ) THEN 268 266 CALL iom_get( numror, jpdom_autoglo, 'avt' , avt ) -
branches/dev_004_VVL/NEMO/OPA_SRC/step.F90
r1430 r1433 208 208 ! N.B. ua, va, ta, sa arrays are used as workspace in this section 209 209 !----------------------------------------------------------------------- 210 #if defined key_zdftke2211 IF ( ln_dynhpg_imp ) THEN212 !-----------------------------------------------------------------------213 ! LATERAL PHYSICS214 !-----------------------------------------------------------------------215 CALL zdf_mxl( kstp ) ! mixed layer depth216 IF( lk_ldfslp ) CALL ldf_slp( kstp, rhd, rn2 ) ! before slope of the lateral mixing217 # if defined key_traldf_c2d218 IF( lk_traldf_eiv ) CALL ldf_eiv( kstp ) ! eddy induced velocity coefficient219 # endif220 ENDIF221 #endif222 !-----------------------------------------------------------------------223 ! VERTICAL PHYSICS224 !-----------------------------------------------------------------------225 210 IF( neuler == 0 .AND. kstp == nit000 ) THEN 226 211 CALL bn2( tn, sn, rn2 ) ! now Brunt-Vaisala frequency … … 231 216 ENDIF 232 217 218 #if defined key_zdftke2 219 IF ( ln_dynhpg_imp ) THEN 220 !----------------------------------------------------------------------- 221 ! LATERAL PHYSICS 222 !----------------------------------------------------------------------- 223 CALL zdf_mxl( kstp ) ! mixed layer depth 224 IF( lk_ldfslp ) CALL ldf_slp( kstp, rhd, rn2b ) ! before slope of the lateral mixing 225 # if defined key_traldf_c2d 226 IF( lk_traldf_eiv ) CALL ldf_eiv( kstp ) ! eddy induced velocity coefficient 227 # endif 228 ENDIF 229 #endif 230 !----------------------------------------------------------------------- 231 ! VERTICAL PHYSICS 232 !----------------------------------------------------------------------- 233 233 ! ! Vertical eddy viscosity and diffusivity coefficients 234 234 IF( lk_zdfric ) CALL zdf_ric( kstp ) ! Richardson number dependent Kz
Note: See TracChangeset
for help on using the changeset viewer.