Changeset 2436 for branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/DTA/dtasal.F90

Timestamp:

2010-11-25T20:03:49+01:00 (13 years ago)

Author:

gm

Message:

v3.3beta: suppress obsolete key_orca_lev10

File:

• branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/DTA/dtasal.F90 (modified) (4 diffs)

branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/DTA/dtasal.F90

@@ -21 +21 @@
    USE in_out_manager  ! I/O manager
    USE phycst          ! physical constants
-#if defined key_orca_lev10
-   USE lbclnk          ! ocean lateral boundary conditions (or mpp link)
-#endif
 
    IMPLICIT NONE
@@ -63 +60 @@
 #endif
       REAL(wp)::   zl
-#if defined key_orca_lev10
-      INTEGER ::   ikr, ikw, ikt, jjk 
-      REAL(wp)::   zfac
-#endif
       REAL(wp), DIMENSION(jpk) :: zsaldta         ! auxiliary array for interpolation
       CHARACTER(len=100)       :: cn_dir          ! Root directory for location of ssr files
@@ -99 +92 @@
              CALL ctl_stop( 'dta_sal: unable to allocate sf_sal structure' )   ;   RETURN
          ENDIF
-
-#if defined key_orca_lev10
-                                ALLOCATE( sf_sal(1)%fnow(jpi,jpj,jpkdta)   )
-         IF( sn_sal%ln_tint )   ALLOCATE( sf_sal(1)%fdta(jpi,jpj,jpkdta,2) )
-#else
                                 ALLOCATE( sf_sal(1)%fnow(jpi,jpj,jpk)   )
          IF( sn_sal%ln_tint )   ALLOCATE( sf_sal(1)%fdta(jpi,jpj,jpk,2) )
-#endif
          !                         ! fill sf_sal with sn_sal and control print
          CALL fld_fill( sf_sal, (/ sn_sal /), cn_dir, 'dta_sal', 'Salinity data', 'namdta_sal' )
@@ -166 +153 @@
 #endif   
         
-#if defined key_orca_lev10
-      DO jjk = 1, 5
-         s_dta(:,:,jjk) = sf_sal(1)%fnow(:,:,1)
-      ENDDO
-      DO jk = 1, jpk-20,10
-         ikr =  INT(jk/10) + 1
-         ikw =  (ikr-1) *10 + 1
-         ikt =  ikw + 5
-         DO jjk=ikt,ikt+9
-            zfac = ( gdept_0(jjk   ) - gdepw_0(ikt) ) / ( gdepw_0(ikt+10) - gdepw_0(ikt) )
-            s_dta(:,:,jjk) = sf_sal(1)%fnow(:,:,ikr) + ( sf_sal(1)%fnow(:,:,ikr+1) - sf_sal(1)%fnow(:,:,ikr) ) * zfac
-         END DO
-      END DO
-      DO jjk = jpk-5, jpk
-         s_dta(:,:,jjk) = sf_sal(1)%fnow(:,:,jpkdta-1)
-      END DO
-      ! fill the overlap areas
-      CALL lbc_lnk (s_dta(:,:,:),'Z',-999.,'no0')        
-#else
       s_dta(:,:,:)=sf_sal(1)%fnow(:,:,:)
-#endif
         
       IF( ln_sco ) THEN