Changeset 4468

Timestamp:

2014-02-04T13:18:14+01:00 (10 years ago)

Author:

trackstand2

Message:

Put back calc. of mbkmax in dom_zgr.

File:

• branches/2011/DEV_r2739_STFC_dCSE/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90 (modified) (5 diffs)

branches/2011/DEV_r2739_STFC_dCSE/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90

@@ -773 +773 @@
       USE wrk_nemo, ONLY:   zmbk => wrk_2d_1
       USE par_oce,  ONLY:   jpkf, jpkfm1
+      USE arpdebugging, ONLY: dump_array
       !!
       INTEGER ::   ji, jj   ! dummy loop indices
@@ -788 +789 @@
       IF(lwp) WRITE(numout,*) '    ~~~~~~~~~~~~~'
       !
-      !CALL dump_array(0, 'mbathy', mbathy, withHalos=.TRUE.)
+      CALL dump_array(0, 'mbathy', mbathy, withHalos=.TRUE.)
 
       mbkt(:,:) = MAX( mbathy(:,:) , 1 )    ! bottom k-index of T-level (=1 over land)
@@ -819 +820 @@
       jpkorig = jpk
       IF( domtrim_z ) THEN
-!!$         DO jj = 1, jpj
-!!$            DO ji = 1, jpi
-!!$               mbkmax(ji,jj) = MIN(jpk, MAX(mbkt(ji,jj)+1, mbku(ji,jj), mbkv(ji,jj)))
-!!$               ! write(*,*) narea, ': SMPDBG: ', ji, jj, mbkt(ji,jj), mbku(ji,jj), mbkv(ji,jj), mbkmax(ji,jj)
-!!$            END DO
-!!$         END DO
+         DO jj = 1, jpj
+            DO ji = 1, jpi
+               mbkmax(ji,jj) = MIN(jpk, MAX(mbkt(ji,jj)+1, mbku(ji,jj), mbkv(ji,jj)))
+               ! write(*,*) narea, ': SMPDBG: ', ji, jj, mbkt(ji,jj), mbku(ji,jj), mbkv(ji,jj), mbkmax(ji,jj)
+!!$               IF(mbkmax(ji,jj) /= jpkf)THEN
+!!$                  WRITE (*,*) narea,': ARPDBG: mbkmax at ',ji,jj,' in {mpp_init3,zgr_bot_level} = ',mbkmax(ji,jj),jpkf
+!!$               END IF
+            END DO
+         END DO
+
+         CALL dump_array(0, 'mbkmax', mbkmax)
+
          ! mbkmax computed in mpp_init3 because needed before ANY halo 
          ! swaps can be performed
@@ -1301 +1308 @@
       USE mapcomm_mod, ONLY: trimmed, cyclic_bc
       USE mapcomm_mod, ONLY: nidx, eidx, sidx, widx
-
+      USE arpdebugging, ONLY: dump_array
       !! DCSE_NEMO: wrk_nemo module variables renamed, need additional directives
 !FTRANS gsigw3 :I :I :z
@@ -1477 +1484 @@
       ENDIF
 
-!      CALL dump_array(0, 'hbatt', hbatt, withHalos=.FALSE.)
+      CALL dump_array(0, 'hbatt', hbatt, withHalos=.FALSE.)
 
       !                                        ! ==============================