Changeset 4461

Timestamp:

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

Author:

trackstand2

Message:

Remove duplicate calc of mbkmax and add debug check on tmask

File:

• branches/2011/DEV_r2739_STFC_dCSE/NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90 (modified) (2 diffs)

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

@@ -204 +204 @@
 !!gm end
 
-!! smp FINISS 
-#if defined key_z_first
-      ! Reset mbkmax to be the first level for which tmask is zero
-      DO jj = 1, jpj
-         DO ji = 1, jpi
-            mbkmax(ji,jj) = 1 
-            kloop: DO jk = 1, jpkorig
-               IF (tmask(ji,jj,jk) == 0.0_wp) THEN
-                  mbkmax(ji,jj) = jk
-                  EXIT kloop
-               END IF 
-            END DO kloop
-            IF (mbkmax(ji,jj) > jpk) THEN
-               WRITE (*,*) 'FINISS error: mbkmax(',ji,',',jj,') > jpk (',jpk,') on subdomain ',narea
-               mbkmax(ji,jj) = jpk
-            END IF
-         END DO
-      END DO
-#endif
+!! smp FINISS ARP done in mpp_init3 now because needed prior to comms tests.
+!!$#if defined key_z_first
+!!$      ! Reset mbkmax to be the first level for which tmask is zero
+!!$      DO jj = 1, jpj
+!!$         DO ji = 1, jpi
+!!$            mbkmax(ji,jj) = 1 
+!!$            kloop: DO jk = 1, jpkorig
+!!$               IF (tmask(ji,jj,jk) == 0.0_wp) THEN
+!!$                  mbkmax(ji,jj) = jk
+!!$                  EXIT kloop
+!!$               END IF 
+!!$            END DO kloop
+!!$            IF (mbkmax(ji,jj) > jpk) THEN
+!!$               WRITE (*,*) 'FINISS error: mbkmax(',ji,',',jj,') > jpk (',jpk,') on subdomain ',narea
+!!$               mbkmax(ji,jj) = jpk
+!!$            END IF
+!!$         END DO
+!!$      END DO
+!!$#endif
 
       ! Interior domain mask (used for global sum)
@@ -494 +494 @@
          iwrk_not_released(2, 1)  )   CALL ctl_stop('dom_msk: failed to release workspace arrays')
       !
+!ARPDBG - check tmask values!
+      IF( ANY(tmask > 1.0_wp) )THEN
+         WRITE (*,*) narea,': ARPDBG: tmask > 1!'
+      END IF
+
    END SUBROUTINE dom_msk