Changeset 462 for trunk/NEMO/OPA_SRC

Timestamp:

2006-05-10T19:20:08+02:00 (18 years ago)

Author:

opalod

Message:

nemo_v1_update_053:RB: light update of trends part (supppress key_partial_steps)

Location:

trunk/NEMO/OPA_SRC/TRD

Files:

• trdmod.F90 (modified) (4 diffs)
• trdvor.F90 (modified) (1 diff)

trunk/NEMO/OPA_SRC/TRD/trdmod.F90

@@ -223 +223 @@
                   DO jj = 2, jpjm1
                      DO ji = fs_2, fs_jpim1   ! vector opt.
-# if defined key_s_coord || defined key_partial_steps
+# if defined key_zco
+                        zbtr = zbtr2(ji,jj)
+                        zfui = 0.5 * e2u(ji  ,jj) * zun(ji,  jj,jk)
+                        zfui1= 0.5 * e2u(ji-1,jj) * zun(ji-1,jj,jk)
+# else         
                         zbtr = zbtr2(ji,jj) / fse3t(ji,jj,jk)
-
                         zfui = 0.5 * e2u(ji  ,jj) * fse3u(ji,  jj,jk) * zun(ji,  jj,jk)
                         zfui1= 0.5 * e2u(ji-1,jj) * fse3u(ji-1,jj,jk) * zun(ji-1,jj,jk)
-# else         
-                        zbtr = zbtr2(ji,jj)
-
-                        zfui = 0.5 * e2u(ji  ,jj) * zun(ji,  jj,jk)
-                        zfui1= 0.5 * e2u(ji-1,jj) * zun(ji-1,jj,jk)
 # endif
                         ! save i- advective trend 
@@ -250 +248 @@
                   DO jj = 2, jpjm1
                      DO ji = fs_2, fs_jpim1   ! vector opt.
-# if defined key_s_coord || defined key_partial_steps
+# if defined key_zco
+                        zbtr = zbtr2(ji,jj)
+                        zfvj = 0.5 * e1v(ji,jj  ) * zvn(ji,jj  ,jk)
+                        zfvj1= 0.5 * e1v(ji,jj-1) * zvn(ji,jj-1,jk)
+# else         
                         zbtr = zbtr2(ji,jj) / fse3t(ji,jj,jk)
-
                         zfvj = 0.5 * e1v(ji,jj  ) * fse3v(ji,jj  ,jk) * zvn(ji,jj  ,jk)
                         zfvj1= 0.5 * e1v(ji,jj-1) * fse3v(ji,jj-1,jk) * zvn(ji,jj-1,jk)
-# else         
-                        zbtr = zbtr2(ji,jj)
-
-                        zfvj = 0.5 * e1v(ji,jj  ) * zvn(ji,jj  ,jk)
-                        zfvj1= 0.5 * e1v(ji,jj-1) * zvn(ji,jj-1,jk)
 # endif
                         ! save j- advective trend 
@@ -322 +318 @@
                   DO jj = 2, jpjm1      
                      DO ji = fs_2, fs_jpim1   ! vector opt.
-# if defined key_s_coord || defined key_partial_steps
+# if defined key_zco
+                        zbtr = zbtr2(ji,jj)
+                        zfui = e2u(ji  ,jj) * zun(ji,  jj,jk)   &
+                           & - e2u(ji-1,jj) * zun(ji-1,jj,jk)
+# else      
                         zbtr = zbtr2(ji,jj) / fse3t(ji,jj,jk)
                         zfui =  e2u(ji  ,jj) * fse3u(ji,  jj,jk) * zun(ji,  jj,jk)   &
                            & -  e2u(ji-1,jj) * fse3u(ji-1,jj,jk) * zun(ji-1,jj,jk)
-# else      
-                        zbtr = zbtr2(ji,jj)
-                        zfui = e2u(ji  ,jj) * zun(ji,  jj,jk)   &
-                           & - e2u(ji-1,jj) * zun(ji-1,jj,jk)
 # endif
                         ! save i- advective trend 
@@ -347 +343 @@
                   DO jj = 2, jpjm1      
                      DO ji = fs_2, fs_jpim1   ! vector opt.
-# if defined key_s_coord || defined key_partial_steps
+# if defined key_zco
+                        zbtr = zbtr2(ji,jj)
+                        zfvj = e1v(ji,jj  ) * zvn(ji,jj  ,jk)   &
+                           & - e1v(ji,jj-1) * zvn(ji,jj-1,jk)
+# else      
                         zbtr = zbtr2(ji,jj) / fse3t(ji,jj,jk)
                         zfvj =  e1v(ji,jj  ) * fse3v(ji,jj  ,jk) * zvn(ji,jj  ,jk)   &
                            & -  e1v(ji,jj-1) * fse3v(ji,jj-1,jk) * zvn(ji,jj-1,jk)
-# else      
-                        zbtr = zbtr2(ji,jj)
-                        zfvj = e1v(ji,jj  ) * zvn(ji,jj  ,jk)   &
-                           & - e1v(ji,jj-1) * zvn(ji,jj-1,jk)
 # endif
                         ! save j- advective trend 

trunk/NEMO/OPA_SRC/TRD/trdvor.F90

@@ -23 +23 @@
    USE daymod          ! calandar
    USE dianam          ! build the name of file (routine)
-   USE ldfslp          ! iso-neutral slopes
    USE zdfmxl          ! mixed layer depth
    USE ioipsl          ! NetCDF library