Changeset 1461 for trunk/NEMO/OPA_SRC/DOM/domzgr.F90

Timestamp:

2009-06-08T17:17:54+02:00 (15 years ago)

Author:

rblod

Message:

Somme issues in s-coordinate, see ticket #440

File:

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

trunk/NEMO/OPA_SRC/DOM/domzgr.F90

@@ -1087 +1087 @@
       REAL(wp) :: hc = 150   ! Critical depth for s-sigma coordinates
 
-      REAL(wp), DIMENSION(jpi,jpj,jpk) ::   gsigw3, gsigt3, gsi3w3, esigt3, esigw3, esigtu3, esigtv3, esigtf3, esigwu3, esigwv3
+      REAL(wp), DIMENSION(jpi,jpj,jpk) ::   gsigw3 = 0.0d0
+      REAL(wp), DIMENSION(jpi,jpj,jpk) ::   gsigt3 = 0.0d0
+      REAL(wp), DIMENSION(jpi,jpj,jpk) ::   gsi3w3 = 0.0d0
+      REAL(wp), DIMENSION(jpi,jpj,jpk) ::   esigt3 = 0.0d0
+      REAL(wp), DIMENSION(jpi,jpj,jpk) ::   esigw3 = 0.0d0
+      REAL(wp), DIMENSION(jpi,jpj,jpk) ::   esigtu3 = 0.0d0
+      REAL(wp), DIMENSION(jpi,jpj,jpk) ::   esigtv3 = 0.0d0
+      REAL(wp), DIMENSION(jpi,jpj,jpk) ::   esigtf3 = 0.0d0
+      REAL(wp), DIMENSION(jpi,jpj,jpk) ::   esigwu3 = 0.0d0
+      REAL(wp), DIMENSION(jpi,jpj,jpk) ::   esigwv3 = 0.0d0
       !!
       NAMELIST/nam_zgr_sco/ sbot_max, sbot_min, theta, thetb, r_max, ln_s_sigma, bb, hc
@@ -1118 +1127 @@
       bathy(:,:) = MIN( sbot_max, bathy(:,:) )
 
+      DO jj = 1, jpj
+         DO ji = 1, jpi
+           IF (bathy(ji,jj) .gt. 0.0) THEN
+              bathy(ji,jj) = MAX( sbot_min, bathy(ji,jj) )
+           ENDIF
+         END DO
+      END DO
       !                                        ! =============================
       !                                        ! Define the envelop bathymetry   (hbatt)
@@ -1427 +1443 @@
 
       !
+!!    H. Liu, POL. April 2009. Added for passing the scale check for the new released vvl code.
+
+      fsdept(:,:,:) = gdept (:,:,:)
+      fsdepw(:,:,:) = gdepw (:,:,:)
+      fsde3w(:,:,:) = gdep3w(:,:,:)
+      fse3t (:,:,:) = e3t   (:,:,:)
+      fse3u (:,:,:) = e3u   (:,:,:)
+      fse3v (:,:,:) = e3v   (:,:,:)
+      fse3f (:,:,:) = e3f   (:,:,:)
+      fse3w (:,:,:) = e3w   (:,:,:)
+      fse3uw(:,:,:) = e3uw  (:,:,:)
+      fse3vw(:,:,:) = e3vw  (:,:,:)
+!!
       ! HYBRID : 
       DO jj = 1, jpj