Changeset 2240 for branches/DEV_r2106_LOCEAN2010/NEMO/OFF_SRC

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/OFF_SRC

Files:

• domain.F90 (modified) (2 diffs)
• domrea.F90 (modified) (3 diffs)
• domrea_dimg.h90 (modified) (2 diffs)
• dtadyn.F90 (modified) (2 diffs)

branches/DEV_r2106_LOCEAN2010/NEMO/OFF_SRC/domain.F90

@@ -239 +239 @@
       !!              - 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 
@@ -268 +268 @@
       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
 
       IF( nprint == 1 .AND. lwp )   THEN

branches/DEV_r2106_LOCEAN2010/NEMO/OFF_SRC/domrea.F90

@@ -88 +88 @@
       REAL(wp), DIMENSION(jpi,jpj) :: &
          zprt
-#if ! defined key_zco
       INTEGER :: ik
-#endif
       !!----------------------------------------------------------------------
 
@@ -185 +183 @@
             ENDDO
          ENDDO
-
-#if ! defined key_zco
 
          IF( ln_sco ) THEN                                         ! s-coordinate
@@ -255 +251 @@
 
          ENDIF
-# endif
+
          IF( ln_zco ) THEN
            ! Vertical coordinates and scales factors

branches/DEV_r2106_LOCEAN2010/NEMO/OFF_SRC/domrea_dimg.h90

@@ -262 +262 @@
           mbathy=zprt*tmask(:,:,1)+1
 
-#if ! defined key_zco
           IF( ln_sco ) THEN                                         ! s-coordinate
              !
@@ -394 +393 @@
              READ(inum4,REC=irec) e3w_0(:)
           ENDIF
-#else
-          !
-          ! gdep
-          irec =  irecv(inum4) + (narea - 1 )
-          READ(inum4,REC=irec) gdept_0(:)
-          irecv(inum4) = irecv(inum4) + jpnij 
-          
-          irec =  irecv(inum4) + (narea - 1 )
-          READ(inum4,REC=irec) gdepw_0(:)
-          irecv(inum4) = irecv(inum4) + jpnij 
-          !
-          ! e3
-          irec =  irecv(inum4) + (narea - 1 )
-          READ(inum4,REC=irec) e3t_0(:)
-          irecv(inum4) = irecv(inum4) + jpnij 
-          
-          irec =  irecv(inum4) + (narea - 1 )
-          READ(inum4,REC=irec) e3w_0(:)
-          irecv(inum4) = irecv(inum4) + jpnij 
-         !
-#endif
          !                                     ! ============================
          !                                     !        close the files

branches/DEV_r2106_LOCEAN2010/NEMO/OFF_SRC/dtadyn.F90

@@ -568 +568 @@
          DO jj = 2, jpjm1
             DO ji = fs_2, fs_jpim1   ! vector opt.
-#if defined key_zco
-               zu  = pu(ji  ,jj  ,jk) * umask(ji  ,jj  ,jk) * e2u(ji  ,jj  )
-               zu1 = pu(ji-1,jj  ,jk) * umask(ji-1,jj  ,jk) * e2u(ji-1,jj  )
-               zv  = pv(ji  ,jj  ,jk) * vmask(ji  ,jj  ,jk) * e1v(ji  ,jj  )
-               zv1 = pv(ji  ,jj-1,jk) * vmask(ji  ,jj-1,jk) * e1v(ji  ,jj-1)
-               zet = 1. / ( e1t(ji,jj) * e2t(ji,jj) )
-#else
                zu  = pu(ji  ,jj  ,jk) * umask(ji  ,jj  ,jk) * e2u(ji  ,jj  ) * fse3u(ji  ,jj  ,jk)
                zu1 = pu(ji-1,jj  ,jk) * umask(ji-1,jj  ,jk) * e2u(ji-1,jj  ) * fse3u(ji-1,jj  ,jk)
@@ -580 +573 @@
                zv1 = pv(ji  ,jj-1,jk) * vmask(ji  ,jj-1,jk) * e1v(ji  ,jj-1) * fse3v(ji  ,jj-1,jk)
                zet = 1. / ( e1t(ji,jj) * e2t(ji,jj) * fse3t(ji,jj,jk) )
-#endif
                phdiv(ji,jj,jk) = ( zu - zu1 + zv - zv1 ) * zet 
             END DO