Changeset 2240 for branches/DEV_r2106_LOCEAN2010/NEMO/OPA_SRC/DOM

Timestamp:

2010-10-13T10:48:48+02:00 (14 years ago)

Author:

cetlod

Message:

Suppression of key_zco everywhere in the code

Location:

branches/DEV_r2106_LOCEAN2010/NEMO/OPA_SRC/DOM

Files:

• dom_oce.F90 (modified) (2 diffs)
• domvvl.F90 (modified) (1 diff)
• domwri.F90 (modified) (2 diffs)
• domzgr.F90 (modified) (4 diffs)
• domzgr_substitute.h90 (modified) (2 diffs)

branches/DEV_r2106_LOCEAN2010/NEMO/OPA_SRC/DOM/dom_oce.F90

@@ -120 +120 @@
    LOGICAL, PUBLIC ::   ln_zps     =  .FALSE.   !: z-coordinate - partial step
    LOGICAL, PUBLIC ::   ln_sco     =  .FALSE.   !: s-coordinate or hybrid z-s coordinate
-#if defined key_zco
-   LOGICAL, PUBLIC, PARAMETER ::   lk_zco = .TRUE.    !: z-coordinate flag (1D arrays)
-#else
-   LOGICAL, PUBLIC, PARAMETER ::   lk_zco = .FALSE.   !: z-coordinate flag (3D arrays)
 
    !! All coordinates
@@ -133 +129 @@
    REAL(wp), PUBLIC, DIMENSION(jpi,jpj,jpk) ::   e3vw            !: analytical vertical scale factors at  VW--
    REAL(wp), PUBLIC, DIMENSION(jpi,jpj,jpk) ::   e3w   , e3uw    !:                                        W--UW  points (m)
-#endif
 #if defined key_vvl
    LOGICAL, PUBLIC, PARAMETER ::   lk_vvl = .TRUE.    !: variable grid flag

branches/DEV_r2106_LOCEAN2010/NEMO/OPA_SRC/DOM/domvvl.F90

@@ -62 +62 @@
       ENDIF
 
-      IF( lk_zco )   CALL ctl_stop( 'dom_vvl : key_zco is incompatible with variable volume option key_vvl')
 
       fsdept(:,:,:) = gdept (:,:,:)

branches/DEV_r2106_LOCEAN2010/NEMO/OPA_SRC/DOM/domwri.F90

@@ -168 +168 @@
       CALL iom_rstput( 0, 0, inum4, 'mbathy', zprt, ktype = jp_i2 )
             
-#if ! defined key_zco
       IF( ln_sco ) THEN                                         ! s-coordinate
          CALL iom_rstput( 0, 0, inum4, 'hbatt', hbatt )         !    ! depth
@@ -235 +234 @@
       ENDIF
       
-#endif
       
       IF( ln_zco ) THEN

branches/DEV_r2106_LOCEAN2010/NEMO/OPA_SRC/DOM/domzgr.F90

@@ -74 +74 @@
       !!              - vertical coordinate (gdep., e3.) depending on the 
       !!                coordinate chosen :
-      !!                   ln_zco=T   z-coordinate   (forced if lk_zco)
+      !!                   ln_zco=T   z-coordinate   
       !!                   ln_zps=T   z-coordinate with partial steps
       !!                   ln_zco=T   s-coordinate 
@@ -103 +103 @@
       IF( ln_sco ) ioptio = ioptio + 1
       IF ( ioptio /= 1 )   CALL ctl_stop( ' none or several vertical coordinate options used' )
-      IF( lk_zco ) THEN
-          IF(lwp) WRITE(numout,*) '          z-coordinate with reduced incore memory requirement'
-          IF( ln_zps .OR. ln_sco )   CALL ctl_stop( ' reduced memory with zps or sco option is impossible' )
-      ENDIF
 
       ! Build the vertical coordinate system
@@ -679 +675 @@
       !! ** Purpose :   define the z-coordinate system
       !!
-      !! ** Method  :   set 3D coord. arrays to reference 1D array if lk_zco=T
+      !! ** Method  :   set 3D coord. arrays to reference 1D array 
       !!----------------------------------------------------------------------
       INTEGER  ::   jk
       !!----------------------------------------------------------------------
       !
-      IF( .NOT.lk_zco ) THEN
-         DO jk = 1, jpk
-            fsdept(:,:,jk) = gdept_0(jk)
-            fsdepw(:,:,jk) = gdepw_0(jk)
-            fsde3w(:,:,jk) = gdepw_0(jk)
-            fse3t (:,:,jk) = e3t_0(jk)
-            fse3u (:,:,jk) = e3t_0(jk)
-            fse3v (:,:,jk) = e3t_0(jk)
-            fse3f (:,:,jk) = e3t_0(jk)
-            fse3w (:,:,jk) = e3w_0(jk)
-            fse3uw(:,:,jk) = e3w_0(jk)
-            fse3vw(:,:,jk) = e3w_0(jk)
-         END DO
-      ENDIF
+      DO jk = 1, jpk
+         fsdept(:,:,jk) = gdept_0(jk)
+         fsdepw(:,:,jk) = gdepw_0(jk)
+         fsde3w(:,:,jk) = gdepw_0(jk)
+         fse3t (:,:,jk) = e3t_0(jk)
+         fse3u (:,:,jk) = e3t_0(jk)
+         fse3v (:,:,jk) = e3t_0(jk)
+         fse3f (:,:,jk) = e3t_0(jk)
+         fse3w (:,:,jk) = e3w_0(jk)
+         fse3uw(:,:,jk) = e3w_0(jk)
+         fse3vw(:,:,jk) = e3w_0(jk)
+      END DO
       !
    END SUBROUTINE zgr_zco
 
-#if defined key_zco
-   !!----------------------------------------------------------------------
-   !!   'key_zco' :                                              "pure" zco (gdep & e3 are 1D arrays)
-   !!----------------------------------------------------------------------
-   SUBROUTINE zgr_zps      ! Empty routine
-   END SUBROUTINE zgr_zps
-   SUBROUTINE zgr_sco      ! Empty routine
-   END SUBROUTINE zgr_sco
-
-#else
    !!----------------------------------------------------------------------
    !!   Default option :                      zco, zps and/or sco available (gedp & e3 are 3D arrays)
@@ -1558 +1542 @@
    END SUBROUTINE zgr_sco
 
-#endif
 
    !!======================================================================

branches/DEV_r2106_LOCEAN2010/NEMO/OPA_SRC/DOM/domzgr_substitute.h90

@@ -8 +8 @@
    !!            3.1  !  2009-02  (G. Madec, M. Leclair)  pure z* coordinate
    !!----------------------------------------------------------------------
-#if defined key_zco
-! reference for pure z-coordinate (1D - no i,j and time dependency)
-#   define  fsdept_0(i,j,k)  gdept_0(k)
-#   define  fsdepw_0(i,j,k)  gdepw_0(k)
-#   define  fsde3w_0(i,j,k)  gdepw_0(k)
-#   define  fse3t_0(i,j,k)   e3t_0(k)
-#   define  fse3u_0(i,j,k)   e3t_0(k)
-#   define  fse3v_0(i,j,k)   e3t_0(k)
-#   define  fse3f_0(i,j,k)   e3t_0(k)
-#   define  fse3w_0(i,j,k)   e3w_0(k)
-#   define  fse3uw_0(i,j,k)  e3w_0(k)
-#   define  fse3vw_0(i,j,k)  e3w_0(k)
-#else
 ! reference for s- or zps-coordinate (3D no time dependency)
 #   define  fsdept_0(i,j,k)  gdept(i,j,k)
@@ -32 +19 @@
 #   define  fse3uw_0(i,j,k)  e3uw(i,j,k)
 #   define  fse3vw_0(i,j,k)  e3vw(i,j,k)
-#endif
 #if defined key_vvl
 ! s* or z*-coordinate (3D + time dependency) + use of additional now arrays (..._1)