Changeset 600

Timestamp:

2007-02-20T15:32:37+01:00 (17 years ago)

Author:

opalod

Message:

nemo_v2_bugfix_008 : CT : - use the correct ln_zps logical name instead of lk_zps

• use gdep[tw]_0(:) field instead of gdep[tw](:)

Location:

trunk/NEMO/OPA_SRC/DTA

Files:

• dtasal.F90 (modified) (2 diffs)
• dtatem.F90 (modified) (2 diffs)

trunk/NEMO/OPA_SRC/DTA/dtasal.F90

@@ -133 +133 @@
         
 #if defined key_orca_lev10
-        if (lk_zps) stop
+        if (ln_zps) stop
         zsal(:,:,:,:) = 0.
         CALL iom_get (numsdt,jpdom_data,'vosaline',zsal(:,:,:,1),nsal1)
@@ -247 +247 @@
               ikt = ikw + 5
               DO jjk = ikt , ikt + 9
-                 zfac = ( gdept(jjk) - gdepw(ikt) ) / ( gdepw(ikt+10) - gdepw(ikt) )
+                 zfac = ( gdept_0(jjk) - gdepw_0(ikt) ) / ( gdepw_0(ikt+10) - gdepw_0(ikt) )
                  saldta(:,:,jjk,jl) = zsal(:,:,ikr,jl) + ( zsal(:,:,ikr+1,jl) - zsal(:,:,ikr,jl) ) * zfac
               END DO

trunk/NEMO/OPA_SRC/DTA/dtatem.F90

@@ -138 +138 @@
          
 #if defined key_orca_lev10
-         if (lk_zps) stop
+         if (ln_zps) stop
          ztem(:,:,:,:) = 0.
          CALL iom_get (numtdt,jpdom_data,'votemper',ztem(:,:,:,1),ntem1)
@@ -243 +243 @@
                ikt =  ikw + 5
                DO jjk=ikt,ikt+9
-                  zfac = ( gdept(jjk   ) - gdepw(ikt) ) / ( gdepw(ikt+10) - gdepw(ikt) )
+                  zfac = ( gdept_0(jjk   ) - gdepw_0(ikt) ) / ( gdepw_0(ikt+10) - gdepw_0(ikt) )
                   temdta(:,:,jjk,jl) = ztem(:,:,ikr,jl) + ( ztem(:,:,ikr+1,jl) - ztem(:,:,ikr,jl) ) * zfac
                END DO