Changeset 4427 for branches/2011/DEV_r2739_STFC_dCSE/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90

Timestamp:

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

Author:

trackstand2

Message:

First files changed on last FINISS work package. Stephen's work although
commited by Andy P.

File:

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

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

@@ -131 +131 @@
       ! -----------------------------------
       IF( lzoom       )   CALL zgr_bat_zoom     ! correct mbathy in case of zoom subdomain
-      IF( .NOT.lk_c1d )   CALL zgr_bat_ctl      ! check bathymetry (mbathy) and suppress isoated ocean points
+      IF( .NOT.lk_c1d )   CALL zgr_bat_ctl      ! check bathymetry (mbathy) and suppress isolated ocean points
                           CALL zgr_bot_level    ! deepest ocean level for t-, u- and v-points
       !
@@ -819 +819 @@
       jpkorig = jpk
       IF( domtrim_z ) THEN
-         mbkmax(:,:) = MAX(mbkt(:,:)+1, mbku(:,:), mbkv(:,:))
-!         jpkf = MIN(jpk, 1 + MAXVAL( mbkmax(:,:) ) )
+!        mbkmax(:,:) = MAX(mbkt(:,:)+1, mbku(:,:), mbkv(:,:))
+!        write(*,*) narea, ': SMPDBG: ji, jj, mbkt(ji,jj), mbku(ji,jj), mbkv(ji,jj), mbkmax(ji,jj)'
+         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
          jpkf = MAXVAL( mbkmax(:,:) )
          WRITE(*,*) narea,': ARPDBG: shallowest pt and jpkf = ', &
@@ -830 +836 @@
       ELSE
          WRITE(*,*) narea,': ARPDBG: NOT trimming domain in z'
+         mbkmax(:,:) = jpk
          jpkf = jpk
       END IF