- Timestamp:
- 2015-10-31T08:40:45+01:00 (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2015/dev_r5836_NOC3_vvl_by_default/NEMOGCM/NEMO/OPA_SRC/ZDF/zdftmx.F90
r5836 r5845 51 51 52 52 !! * Substitutions 53 # include "domzgr_substitute.h90"54 53 # include "vectopt_loop_substitute.h90" 55 54 !!---------------------------------------------------------------------- … … 126 125 zkz(:,:) = 0.e0 !* Associated potential energy consummed over the whole water column 127 126 DO jk = 2, jpkm1 128 zkz(:,:) = zkz(:,:) + fse3w(:,:,jk) * MAX( 0.e0, rn2(:,:,jk) ) * rau0 * zav_tide(:,:,jk) * wmask(:,:,jk)127 zkz(:,:) = zkz(:,:) + e3w_n(:,:,jk) * MAX( 0.e0, rn2(:,:,jk) ) * rau0 * zav_tide(:,:,jk) * wmask(:,:,jk) 129 128 END DO 130 129 … … 144 143 DO jj= 1, jpj 145 144 DO ji= 1, jpi 146 ztpc = ztpc + fse3w(ji,jj,jk) * e1e2t(ji,jj) &145 ztpc = ztpc + e3w_n(ji,jj,jk) * e1e2t(ji,jj) & 147 146 & * MAX( 0.e0, rn2(ji,jj,jk) ) * zav_tide(ji,jj,jk) * tmask(ji,jj,jk) * tmask_i(ji,jj) 148 147 END DO … … 238 237 zsum2(:,:) = 0.e0 239 238 DO jk= 2, jpk 240 zsum1(:,:) = zsum1(:,:) + zempba_3d_1(:,:,jk) * fse3w(:,:,jk) * wmask(:,:,jk)241 zsum2(:,:) = zsum2(:,:) + zempba_3d_2(:,:,jk) * fse3w(:,:,jk) * wmask(:,:,jk)239 zsum1(:,:) = zsum1(:,:) + zempba_3d_1(:,:,jk) * e3w_n(:,:,jk) * wmask(:,:,jk) 240 zsum2(:,:) = zsum2(:,:) + zempba_3d_2(:,:,jk) * e3w_n(:,:,jk) * wmask(:,:,jk) 242 241 END DO 243 242 DO jj = 1, jpj … … 256 255 ! 257 256 zempba_3d(ji,jj,jk) = ztpc 258 zsum (ji,jj) = zsum(ji,jj) + ztpc * fse3w(ji,jj,jk)257 zsum (ji,jj) = zsum(ji,jj) + ztpc * e3w_n(ji,jj,jk) 259 258 END DO 260 259 END DO … … 275 274 zkz(:,:) = 0.e0 ! Associated potential energy consummed over the whole water column 276 275 DO jk = 2, jpkm1 277 zkz(:,:) = zkz(:,:) + fse3w(:,:,jk) * MAX( 0.e0, rn2(:,:,jk) ) * rau0 * zavt_itf(:,:,jk) * wmask(:,:,jk)276 zkz(:,:) = zkz(:,:) + e3w_n(:,:,jk) * MAX( 0.e0, rn2(:,:,jk) ) * rau0 * zavt_itf(:,:,jk) * wmask(:,:,jk) 278 277 END DO 279 278 … … 293 292 DO jj= 1, jpj 294 293 DO ji= 1, jpi 295 ztpc = ztpc + e1e2t(ji,jj) * fse3w(ji,jj,jk) * MAX( 0.e0, rn2(ji,jj,jk) ) &294 ztpc = ztpc + e1e2t(ji,jj) * e3w_n(ji,jj,jk) * MAX( 0.e0, rn2(ji,jj,jk) ) & 296 295 & * zavt_itf(ji,jj,jk) * tmask(ji,jj,jk) * tmask_i(ji,jj) 297 296 END DO … … 447 446 DO jj = 1, jpj 448 447 DO ji = 1, jpi 449 ztpc = ztpc + fse3w(ji,jj,jk) * e1e2t(ji,jj) * zpc(ji,jj,jk) * wmask(ji,jj,jk) * tmask_i(ji,jj)448 ztpc = ztpc + e3w_n(ji,jj,jk) * e1e2t(ji,jj) * zpc(ji,jj,jk) * wmask(ji,jj,jk) * tmask_i(ji,jj) 450 449 END DO 451 450 END DO … … 461 460 zkz(:,:) = 0._wp 462 461 DO jk = 2, jpkm1 463 zkz(:,:) = zkz(:,:) + fse3w(:,:,jk) * MAX(0.e0, rn2(:,:,jk)) * rau0 * zav_tide(:,:,jk) * wmask(:,:,jk)462 zkz(:,:) = zkz(:,:) + e3w_n(:,:,jk) * MAX(0.e0, rn2(:,:,jk)) * rau0 * zav_tide(:,:,jk) * wmask(:,:,jk) 464 463 END DO 465 464 ! Here zkz should be equal to en_tmx ==> multiply by en_tmx/zkz … … 489 488 DO jj = 1, jpj 490 489 DO ji = 1, jpi 491 ztpc = ztpc + fse3w(ji,jj,jk) * e1e2t(ji,jj) * zpc(ji,jj,jk) * wmask(ji,jj,jk) * tmask_i(ji,jj)490 ztpc = ztpc + e3w_n(ji,jj,jk) * e1e2t(ji,jj) * zpc(ji,jj,jk) * wmask(ji,jj,jk) * tmask_i(ji,jj) 492 491 END DO 493 492 END DO
Note: See TracChangeset
for help on using the changeset viewer.