Changeset 1639

Timestamp:

2009-10-05T19:06:17+02:00 (15 years ago)

Author:

rblod

Message:

Fix some bigs in s-coordinate, see ticket #366 and #380

File:

• trunk/NEMO/OPA_SRC/DOM/domzgr.F90 (modified) (6 diffs)

trunk/NEMO/OPA_SRC/DOM/domzgr.F90

@@ -1139 +1139 @@
       !                                        ! Define the envelop bathymetry   (hbatt)
       !                                        ! =============================
-      ! Smooth the bathymetry (if required)
-      scosrf(:,:) = 0.e0              ! ocean surface depth (here zero: no under ice-shelf sea)
-      scobot(:,:) = bathy(:,:)        ! ocean bottom  depth
-      !
       ! use r-value to create hybrid coordinates
       DO jj = 1, jpj
@@ -1149 +1145 @@
          END DO
       END DO
+      ! 
+      ! Smooth the bathymetry (if required)
+      scosrf(:,:) = 0.e0              ! ocean surface depth (here zero: no under ice-shelf sea)
+      scobot(:,:) = bathy(:,:)        ! ocean bottom  depth
+      !
       jl = 0
       zrmax = 1.e0
@@ -1337 +1338 @@
                 esigw3(ji,jj,jk+1) = gsigt3(ji,jj,jk+1) - gsigt3(ji,jj,jk)
              END DO
-             esigw3(ji,jj,1) = esigw3(ji,jj,2)
-             esigt3(ji,jj,jpk) = esigt3(ji,jj,jpkm1)
+             esigw3(ji,jj,1  ) = 2.0_wp * (gsigt3(ji,jj,1  ) - gsigw3(ji,jj,1  ))
+             esigt3(ji,jj,jpk) = 2.0_wp * (gsigt3(ji,jj,jpk) - gsigw3(ji,jj,jpk))
 
              ! Coefficients for vertical depth as the sum of e3w scale factors
@@ -1351 +1352 @@
                 gdept (ji,jj,jk) = (scosrf(ji,jj)+(hbatt(ji,jj)-rn_hc)*gsigt3(ji,jj,jk)+rn_hc*zcoeft)
                 gdepw (ji,jj,jk) = (scosrf(ji,jj)+(hbatt(ji,jj)-rn_hc)*gsigw3(ji,jj,jk)+rn_hc*zcoefw)
-                gdep3w(ji,jj,jk) = (scosrf(ji,jj)+(hbatt(ji,jj)-rn_hc)*gsi3w3(ji,jj,jk)+rn_hc*zcoefw)
+                gdep3w(ji,jj,jk) = (scosrf(ji,jj)+(hbatt(ji,jj)-rn_hc)*gsi3w3(ji,jj,jk)+rn_hc*zcoeft)
              END DO
 
@@ -1402 +1403 @@
             esigw(jk+1) = gsigt(jk+1) - gsigt(jk)
          END DO
-         esigw( 1 ) = esigw(  2  )
-         esigt(jpk) = esigt(jpkm1)
+         esigw( 1 ) = 2.0_wp * (gsigt(1) - gsigw(1)) 
+         esigt(jpk) = 2.0_wp * (gsigt(jpk) - gsigw(jpk))
 
 !!gm  original form
@@ -1423 +1424 @@
             gdept (:,:,jk) = (scosrf(:,:)+(hbatt(:,:)-hift(:,:))*gsigt(jk)+hift(:,:)*zcoeft)
             gdepw (:,:,jk) = (scosrf(:,:)+(hbatt(:,:)-hift(:,:))*gsigw(jk)+hift(:,:)*zcoefw)
-            gdep3w(:,:,jk) = (scosrf(:,:)+(hbatt(:,:)-hift(:,:))*gsi3w(jk)+hift(:,:)*zcoefw)
+            gdep3w(:,:,jk) = (scosrf(:,:)+(hbatt(:,:)-hift(:,:))*gsi3w(jk)+hift(:,:)*zcoeft)
          END DO
 !!gm: e3uw, e3vw can be suppressed  (modif in dynzdf, dynzdf_iso, zdfbfr) (save 2 3D arrays)