Changeset 4701

Timestamp:

2014-07-03T11:43:29+02:00 (10 years ago)

Author:

mathiot

Message:

wrong vertical mesh definition in case of vvl and ice shelf

File:

• branches/2014/dev_r4650_UKMO2_ice_shelves/NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90 (modified) (4 diffs)

branches/2014/dev_r4650_UKMO2_ice_shelves/NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90

@@ -171 +171 @@
       DO jj = 1,jpj
          DO ji = 1,jpi
-            DO jk = 1,mikt(ji,jj)-1
+            DO jk = 2,mikt(ji,jj)-1
                fsdept_n(ji,jj,jk) = gdept_0(ji,jj,jk)
                fsdepw_n(ji,jj,jk) = gdepw_0(ji,jj,jk)
@@ -178 +178 @@
                fsdepw_b(ji,jj,jk) = gdepw_0(ji,jj,jk)
             END DO
-            DO jk = mikt(ji,jj), jpk
+            IF (mikt(ji,jj) .GT. 1) THEN
+               jk = mikt(ji,jj)
+               fsdept_n(ji,jj,jk) = gdepw_0(ji,jj,jk) + 0.5_wp * fse3w_n(ji,jj,jk)
+               fsdepw_n(ji,jj,jk) = gdepw_0(ji,jj,jk)
+               fsde3w_n(ji,jj,jk) = fsdept_n(ji,jj,jk  ) - sshn   (ji,jj)
+               fsdept_b(ji,jj,jk) = gdepw_0(ji,jj,jk) + 0.5_wp * fse3w_b(ji,jj,jk)
+               fsdepw_b(ji,jj,jk) = gdepw_0(ji,jj,jk)
+            END IF
+            DO jk = mikt(ji,jj)+1, jpk
                fsdept_n(ji,jj,jk) = fsdept_n(ji,jj,jk-1) + fse3w_n(ji,jj,jk)
                fsdepw_n(ji,jj,jk) = fsdepw_n(ji,jj,jk-1) + fse3t_n(ji,jj,jk-1)
@@ -581 +589 @@
       !! * Local declarations
       REAL(wp), POINTER, DIMENSION(:,:,:) :: z_e3t_def
-      INTEGER                             :: jk       ! dummy loop indices
+      INTEGER                             :: ji,jj,jk       ! dummy loop indices
       !!----------------------------------------------------------------------
 
@@ -633 +641 @@
       fsdepw_n(:,:,1) = 0.0_wp
       fsde3w_n(:,:,1) = fsdept_n(:,:,1) - sshn(:,:)
-      DO jk = 2, jpk
-         fsdept_n(:,:,jk) = fsdept_n(:,:,jk-1) + fse3w_n(:,:,jk)
-         fsdepw_n(:,:,jk) = fsdepw_n(:,:,jk-1) + fse3t_n(:,:,jk-1)
-         fsde3w_n(:,:,jk) = fsdept_n(:,:,jk  ) - sshn   (:,:)
+      DO jj = 1,jpj
+         DO ji = 1,jpi
+            DO jk = 2,mikt(ji,jj)-1
+               fsdept_n(ji,jj,jk) = gdept_0(ji,jj,jk)
+               fsdepw_n(ji,jj,jk) = gdepw_0(ji,jj,jk)
+               fsde3w_n(ji,jj,jk) = gdept_0(ji,jj,jk) - sshn(ji,jj)
+            END DO
+            IF (mikt(ji,jj) .GT. 1) THEN
+               jk = mikt(ji,jj)
+               fsdept_n(ji,jj,jk) = gdepw_0(ji,jj,jk) + 0.5_wp * fse3w_n(ji,jj,jk)
+               fsdepw_n(ji,jj,jk) = gdepw_0(ji,jj,jk)
+               fsde3w_n(ji,jj,jk) = fsdept_n(ji,jj,jk  ) - sshn   (ji,jj)
+            END IF
+            DO jk = mikt(ji,jj)+1, jpk
+               fsdept_n(ji,jj,jk) = fsdept_n(ji,jj,jk-1) + fse3w_n(ji,jj,jk)
+               fsdepw_n(ji,jj,jk) = fsdepw_n(ji,jj,jk-1) + fse3t_n(ji,jj,jk-1)
+               fsde3w_n(ji,jj,jk) = fsdept_n(ji,jj,jk  ) - sshn   (ji,jj)
+            END DO
+         END DO
       END DO
       ! Local depth and Inverse of the local depth of the water column at u- and v- points