Changeset 12311 for NEMO/branches/UKMO/NEMO_4.0_FKOSM
- Timestamp:
- 2020-01-14T11:18:59+01:00 (4 years ago)
- Location:
- NEMO/branches/UKMO/NEMO_4.0_FKOSM/src/OCE
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/UKMO/NEMO_4.0_FKOSM/src/OCE/TRA/tramle.F90
r12245 r12311 21 21 USE lbclnk ! lateral boundary condition / mpp link 22 22 23 ! where OSMOSIS_OBL is used with integrated FK 24 USE zdf_oce, ONLY : ln_zdfosm 23 25 USE zdfosm, ONLY : ln_osm_mle, hmle, dbdx_mle, dbdy_mle, mld_prof 24 26 … … 97 99 ! 98 100 ! 99 IF(ln_osm_mle ) THEN101 IF(ln_osm_mle.and.ln_zdfosm) THEN 100 102 ikmax = MIN( MAXVAL( mld_prof(:,:) ), jpkm1 ) ! max level of the computation 101 103 ! … … 151 153 ELSE !do not use osn_mle 152 154 ! !== MLD used for MLE ==! 153 ! ! co nvert density into buoyancy155 ! ! compute from the 10m density to deal with the diurnal cycle 154 156 inml_mle(:,:) = mbkt(:,:) + 1 ! init. to number of ocean w-level (T-level + 1) 155 157 IF ( nla10 > 0 ) THEN ! avoid case where first level is thicker than 10m … … 162 164 END DO 163 165 ENDIF 166 ikmax = MIN( MAXVAL( inml_mle(:,:) ), jpkm1 ) ! max level of the computation 164 167 165 168 ! … … 203 206 END SELECT 204 207 ! ! convert density into buoyancy 205 ikmax = MIN( MAXVAL( inml_mle(:,:) ), jpkm1 ) ! max level of the computation206 208 zbm(:,:) = + grav * zbm(:,:) / MAX( e3t_n(:,:,1), zmld(:,:) ) 207 209 ! … … 294 296 IF( cdtype == 'TRA') THEN !== outputs ==! 295 297 ! 296 IF (ln_osm_mle ) THEN298 IF (ln_osm_mle.and.ln_zdfosm) THEN 297 299 zLf_NH(:,:) = SQRT( rb_c * hmle(:,:) ) * r1_ft(:,:) ! Lf = N H / f 298 300 ELSE … … 352 354 WRITE(numout,*) ' Density difference used to define ML for FK rn_rho_c_mle = ', rn_rho_c_mle 353 355 ENDIF 354 355 356 IF( ln_osm_mle .AND. ln_mle ) THEN 357 WRITE(numout,*) 'WARNING: You are running with both OSM-FK and default FK' 358 ! CALL ctl_stop('STOP in zdf_osm_init: Cannot run with both OSM-FK and default FK') 359 END IF 360 361 IF(lwp) THEN 356 ! 357 IF(lwp) THEN 362 358 WRITE(numout,*) 363 359 IF( ln_mle ) THEN -
NEMO/branches/UKMO/NEMO_4.0_FKOSM/src/OCE/ZDF/zdfosm.F90
r12266 r12311 2243 2243 IF( TRIM(cdrw) == 'WRITE') THEN !* Write hbli into the restart file, then return 2244 2244 IF(lwp) WRITE(numout,*) '---- osm-rst ----' 2245 CALL iom_rstput( kt, nitrst, numrow, 'wn' , wn , ldxios = lwxios ) 2246 CALL iom_rstput( kt, nitrst, numrow, 'hbl' , hbl , ldxios = lwxios ) 2247 CALL iom_rstput( kt, nitrst, numrow, 'dh' , dh, ldxios = lwxios ) 2245 IF( lwxios ) CALL iom_swap( cwxios_context ) 2246 CALL iom_rstput( kt, nitrst, numrow, 'wn' , wn , ldxios = lwxios ) 2247 CALL iom_rstput( kt, nitrst, numrow, 'hbl' , hbl , ldxios = lwxios ) 2248 CALL iom_rstput( kt, nitrst, numrow, 'dh' , dh, ldxios = lwxios ) 2249 IF( lwxios ) CALL iom_swap( cxios_context ) 2248 2250 RETURN 2249 2251 END IF
Note: See TracChangeset
for help on using the changeset viewer.