Changeset 613 for trunk/NEMO/OFF_SRC

Timestamp:

2007-02-21T13:52:34+01:00 (17 years ago)

Author:

opalod

Message:

nemo_v2_bugfix_021:CE:taking into account the 3D array of vertical scale factors in case of partial steps

File:

• trunk/NEMO/OFF_SRC/DOM/domrea.F90 (modified) (4 diffs)

trunk/NEMO/OFF_SRC/DOM/domrea.F90

@@ -96 +96 @@
       REAL(wp), DIMENSION(1,1,jpk) :: &
          zt1d
+#if ! defined key_zco
+      INTEGER :: ik
+#endif
       !!----------------------------------------------------------------------
 
@@ -185 +188 @@
          mbathy(:,:) = zprt(:,:) * tmask(:,:,1) + 1
 
+
+         ! Vertical coordinates and scales factors
+         !
+         CALL iom_get( inum4, jpdom_unknown, 'gdept_0', zt1d, kstart=(/1,1,1/), kcount=(/1,1,jpk/) ) ! depth
+         gdept_0(:) = zt1d(1,1,:) 
+         CALL iom_get( inum4, jpdom_unknown, 'gdepw_0', zt1d, kstart=(/1,1,1/), kcount=(/1,1,jpk/) )
+         gdepw_0(:) = zt1d(1,1,:) 
+         CALL iom_get( inum4, jpdom_unknown, 'e3t_0', zt1d, kstart=(/1,1,1/), kcount=(/1,1,jpk/) )
+         e3t_0(:) = zt1d(1,1,:) 
+         CALL iom_get( inum4, jpdom_unknown, 'e3w_0', zt1d, kstart=(/1,1,1/), kcount=(/1,1,jpk/) )
+         e3w_0(:) = zt1d(1,1,:) 
+
 #if ! defined key_zco
+
+         CALL iom_get( inum4, jpdom_data, 'e3t', e3t ) ! scale factors
+         CALL iom_get( inum4, jpdom_data, 'e3u', e3u )
+         CALL iom_get( inum4, jpdom_data, 'e3v', e3v )
+         CALL iom_get( inum4, jpdom_data, 'e3w', e3w )
+ 
+         DO jk = 1,jpk
+            gdept(:,:,jk) = gdept_0(jk)
+            gdepw(:,:,jk) = gdepw_0(jk)
+         END DO
+         
          IF( ln_sco ) THEN                                         ! s-coordinate
+
             CALL iom_get( inum4, jpdom_data, 'hbatt', hbatt )
             CALL iom_get( inum4, jpdom_data, 'hbatu', hbatu )
@@ -203 +230 @@
             esigw(:) = zt1d(1,1,:) 
 
-            CALL iom_get( inum4, jpdom_data, 'e3t', e3t ) ! scale factors
-            CALL iom_get( inum4, jpdom_data, 'e3u', e3u )
-            CALL iom_get( inum4, jpdom_data, 'e3v', e3v )
-            CALL iom_get( inum4, jpdom_data, 'e3w', e3w )
-
-            CALL iom_get( inum4, jpdom_unknown, 'gdept_0', zt1d, kstart=(/1,1,1/), kcount=(/1,1,jpk/) ) ! depth
-            gdept_0(:) = zt1d(1,1,:) 
-            CALL iom_get( inum4, jpdom_unknown, 'gdepw_0', zt1d, kstart=(/1,1,1/), kcount=(/1,1,jpk/) )
-            gdepw_0(:) = zt1d(1,1,:) 
          ENDIF
 
-         IF( ln_zps ) THEN                                         ! z-coordinate - partial steps
+         IF( ln_zps ) THEN   
+                                      ! z-coordinate - partial steps
             CALL iom_get( inum4, jpdom_data, 'hdept', hdept )   ! depth
             CALL iom_get( inum4, jpdom_data, 'hdepw', hdepw )
-
-            CALL iom_get( inum4, jpdom_data, 'e3t', e3t ) ! scale factors
-            CALL iom_get( inum4, jpdom_data, 'e3u', e3u )
-            CALL iom_get( inum4, jpdom_data, 'e3v', e3v )
-            CALL iom_get( inum4, jpdom_data, 'e3w', e3w )
-            !                                                          ! reference z-coord.
-            CALL iom_get( inum4, jpdom_unknown, 'gdept_0', zt1d, kstart=(/1,1,1/), kcount=(/1,1,jpk/) ) 
-            gdept_0(:) = zt1d(1,1,:) 
-            CALL iom_get( inum4, jpdom_unknown, 'gdepw_0', zt1d, kstart=(/1,1,1/), kcount=(/1,1,jpk/) )
-            gdepw_0(:) = zt1d(1,1,:) 
-            CALL iom_get( inum4, jpdom_unknown, 'e3t_0', zt1d, kstart=(/1,1,1/), kcount=(/1,1,jpk/) )
-            e3t_0(:) = zt1d(1,1,:) 
-            CALL iom_get( inum4, jpdom_unknown, 'e3w_0', zt1d, kstart=(/1,1,1/), kcount=(/1,1,jpk/) )
-            e3w_0(:) = zt1d(1,1,:) 
- 
-            DO jk = 1,jpk
-               gdept(:,:,jk) = gdept(jk)
-               gdepw(:,:,jk) = gdepw(jk)
-            END DO
          
             DO jj = 1, jpj
@@ -249 +249 @@
                END DO
             END DO
+
          ENDIF
             
-
-# else
-         !                                                                     !  z-coord.
-         CALL iom_get( inum4, jpdom_unknown, 'gdept_0', zt1d, kstart=(/1,1,1/), kcount=(/1,1,jpk/) ) ! depth  
-         gdept_0(:) = zt1d(1,1,:) 
-         CALL iom_get( inum4, jpdom_unknown, 'gdepw_0', zt1d, kstart=(/1,1,1/), kcount=(/1,1,jpk/) )
-         gdepw_0(:) = zt1d(1,1,:) 
-         CALL iom_get( inum4, jpdom_unknown, 'e3t_0', zt1d, kstart=(/1,1,1/), kcount=(/1,1,jpk/) ) ! scale factors
-         e3t_0(:) = zt1d(1,1,:) 
-         CALL iom_get( inum4, jpdom_unknown, 'e3w_0', zt1d, kstart=(/1,1,1/), kcount=(/1,1,jpk/) )
-         e3w_0(:) = zt1d(1,1,:) 
-
 # endif