Changeset 6905 for branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/DOM

Timestamp:

2016-09-02T10:53:03+02:00 (8 years ago)

Author:

gm

Message:

#1692 - branch SIMPLIF_2_usrdef: OVERFLOW configuration (zps case) + dommsk bug correction

File:

• branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90 (modified) (1 diff)

branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90

@@ -130 +130 @@
       ! ----------------------------
       !
+      tmask(:,:,:) = 0._wp
       DO jj = 1, jpj
          DO ji = 1, jpi
-            iktop = MAX( k_top(ji,jj) , 1 )
-            ikbot =      k_bot(ji,jj)
-            tmask(ji,jj,      1:iktop-1) = 0._wp      ! mask the iceshelves
-            tmask(ji,jj,iktop  :ikbot  ) = 1._wp
-            tmask(ji,jj,ikbot+1:jpk    ) = 0._wp      ! mask the ocean topography
+            iktop = k_top(ji,jj)
+            ikbot = k_bot(ji,jj)
+            IF( iktop /= 0 ) THEN       ! water in the column
+               tmask(ji,jj,iktop:ikbot  ) = 1._wp
+            ENDIF
          END DO  
       END DO