Changeset 6353
- Timestamp:
- 2016-02-24T20:04:41+01:00 (8 years ago)
- Location:
- branches/2015/nemo_v3_6_STABLE/NEMOGCM/NEMO/OPA_SRC
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2015/nemo_v3_6_STABLE/NEMOGCM/NEMO/OPA_SRC/LDF/ldfslp.F90
r5120 r6353 188 188 DO jj = 2, jpjm1 189 189 DO ji = fs_2, fs_jpim1 ! vector opt. 190 IF (miku(ji,jj) .GT. miku(ji+1,jj)) zhmlpu(ji,jj) = MAX(hmlpt(ji ,jj ), 5._wp) 191 IF (miku(ji,jj) .LT. miku(ji+1,jj)) zhmlpu(ji,jj) = MAX(hmlpt(ji+1,jj ), 5._wp) 192 IF (miku(ji,jj) .EQ. miku(ji+1,jj)) zhmlpu(ji,jj) = MAX(hmlpt(ji ,jj ), hmlpt(ji+1,jj ), 5._wp) 193 IF (mikv(ji,jj) .GT. miku(ji,jj+1)) zhmlpv(ji,jj) = MAX(hmlpt(ji ,jj ), 5._wp) 194 IF (mikv(ji,jj) .LT. miku(ji,jj+1)) zhmlpv(ji,jj) = MAX(hmlpt(ji ,jj+1), 5._wp) 195 IF (mikv(ji,jj) .EQ. miku(ji,jj+1)) zhmlpv(ji,jj) = MAX(hmlpt(ji ,jj ), hmlpt(ji ,jj+1), 5._wp) 190 zhmlpu(ji,jj) = ( MAX(hmlpt(ji,jj) , hmlpt (ji+1,jj ), 5._wp) & 191 & - MAX(risfdep(ji,jj), risfdep(ji+1,jj ) ) ) 192 zhmlpv(ji,jj) = ( MAX(hmlpt (ji,jj), hmlpt (ji ,jj+1), 5._wp) & 193 & - MAX(risfdep(ji,jj), risfdep(ji ,jj+1) ) ) 196 194 ENDDO 197 195 ENDDO -
branches/2015/nemo_v3_6_STABLE/NEMOGCM/NEMO/OPA_SRC/TRA/traldf.F90
r6312 r6353 215 215 IF( ierr == 1 ) CALL ctl_stop( ' iso-level in z-coordinate - partial step, not allowed' ) 216 216 IF( ierr == 2 ) CALL ctl_stop( ' isoneutral bilaplacian operator does not exist' ) 217 IF( ln_traldf_grif .AND. ln_isfcav ) & 218 CALL ctl_stop( ' ice shelf and traldf_grif not tested') 217 219 IF( lk_traldf_eiv .AND. .NOT.ln_traldf_iso ) & 218 220 CALL ctl_stop( ' eddy induced velocity on tracers', & -
branches/2015/nemo_v3_6_STABLE/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfmxl.F90
r6204 r6353 80 80 INTEGER, INTENT(in) :: kt ! ocean time-step index 81 81 ! 82 INTEGER :: ji, jj, jk ! dummy loop indices83 INTEGER :: iikn, iiki, ikt , imkt! local integer84 REAL(wp) :: zN2_c ! local scalar82 INTEGER :: ji, jj, jk ! dummy loop indices 83 INTEGER :: iikn, iiki, ikt ! local integer 84 REAL(wp) :: zN2_c ! local scalar 85 85 INTEGER, POINTER, DIMENSION(:,:) :: imld ! 2D workspace 86 86 !!---------------------------------------------------------------------- … … 117 117 DO jj = 1, jpj 118 118 DO ji = 1, jpi 119 imkt = mikt(ji,jj) 120 IF( avt (ji,jj,jk) < avt_c ) imld(ji,jj) = MAX( imkt, jk ) ! Turbocline 119 IF( avt (ji,jj,jk) < avt_c * wmask(ji,jj,jk) ) imld(ji,jj) = jk ! Turbocline 121 120 END DO 122 121 END DO … … 127 126 iiki = imld(ji,jj) 128 127 iikn = nmln(ji,jj) 129 imkt = mikt(ji,jj) 130 hmld (ji,jj) = ( fsdepw(ji,jj,iiki ) - fsdepw(ji,jj,imkt ) ) * ssmask(ji,jj) ! Turbocline depth 131 hmlp (ji,jj) = ( fsdepw(ji,jj,iikn ) - fsdepw(ji,jj,imkt ) ) * ssmask(ji,jj) ! Mixed layer depth 132 hmlpt(ji,jj) = ( fsdept(ji,jj,iikn-1) - fsdepw(ji,jj,imkt ) ) * ssmask(ji,jj) ! depth of the last T-point inside the mixed layer 128 hmld (ji,jj) = fsdepw(ji,jj,iiki ) * ssmask(ji,jj) ! Turbocline depth 129 hmlp (ji,jj) = fsdepw(ji,jj,iikn ) * ssmask(ji,jj) ! Mixed layer depth 130 hmlpt(ji,jj) = fsdept(ji,jj,iikn-1) * ssmask(ji,jj) ! depth of the last T-point inside the mixed layer 133 131 END DO 134 132 END DO 135 IF( .NOT.lk_offline ) THEN ! no need to output in offline mode 136 CALL iom_put( "mldr10_1", hmlp ) ! mixed layer depth 137 CALL iom_put( "mldkz5" , hmld ) ! turbocline depth 133 ! no need to output in offline mode 134 IF( .NOT.lk_offline ) THEN 135 IF ( iom_use("mldr10_1") ) THEN 136 IF( ln_isfcav ) THEN 137 CALL iom_put( "mldr10_1", hmlp - risfdep) ! mixed layer thickness 138 ELSE 139 CALL iom_put( "mldr10_1", hmlp ) ! mixed layer depth 140 END IF 141 END IF 142 IF ( iom_use("mldkz5") ) THEN 143 IF( ln_isfcav ) THEN 144 CALL iom_put( "mldkz5" , hmld - risfdep ) ! turbocline thickness 145 ELSE 146 CALL iom_put( "mldkz5" , hmld ) ! turbocline depth 147 END IF 148 END IF 138 149 ENDIF 139 150
Note: See TracChangeset
for help on using the changeset viewer.