Changeset 469 for trunk/NEMO/NST_SRC/agrif_opa_sponge.F90

Timestamp:

2006-05-10T19:51:23+02:00 (18 years ago)

Author:

opalod

Message:

nemo_v1_update_059:RB: adapt agrif interface to new coordinate

File:

• trunk/NEMO/NST_SRC/agrif_opa_sponge.F90 (modified) (6 diffs)

trunk/NEMO/NST_SRC/agrif_opa_sponge.F90

@@ -143 +143 @@
           DO jj = 1, jpjm1
             DO ji = 1, jpim1
-#if defined key_s_coord || defined key_partial_steps
+#if defined key_zco
+               zabe1 = umasktemp(ji,jj,jk) * zspe1ur(ji,jj)
+               zabe2 = vmasktemp(ji,jj,jk) * zspe2vr(ji,jj)
+#else
                zabe1 = umasktemp(ji,jj,jk) * zspe1ur(ji,jj) * fse3u(ji,jj,jk)
                zabe2 = vmasktemp(ji,jj,jk) * zspe2vr(ji,jj) * fse3v(ji,jj,jk)
-#else
-               zabe1 = umasktemp(ji,jj,jk) * zspe1ur(ji,jj)
-               zabe2 = vmasktemp(ji,jj,jk) * zspe2vr(ji,jj)
 #endif
                ztu(ji,jj,jk) = zabe1 * ( tbdiff(ji+1,jj  ,jk) - tbdiff(ji,jj,jk) )
@@ -159 +159 @@
          DO jj = 2,jpjm1
             DO ji = 2,jpim1
-#if defined key_s_coord || defined key_partial_steps
+#if defined key_zco
+               zbtr = zspbtr2(ji,jj)
+#else
                zbtr = zspbtr2(ji,jj) / fse3t(ji,jj,jk)
-#else
-               zbtr = zspbtr2(ji,jj)
 #endif
                ! horizontal diffusive trends
@@ -316 +316 @@
          DO jj = 2, jpjm1
             DO ji = 2, jpim1   ! vector opt.
-#if defined key_s_coord || defined key_partial_steps
+#if defined key_zco
+               hdivdiff(ji,jj,jk) = (  e2u(ji,jj) * ubdiff(ji,jj,jk) &
+               - e2u(ji-1,jj  ) * ubdiff(ji-1,jj  ,jk)      &
+     &               + e1v(ji,jj) * vbdiff(ji,jj,jk) - &
+     &              e1v(ji  ,jj-1) * vbdiff(ji  ,jj-1,jk)  )   &
+     &            / ( e1t(ji,jj) * e2t(ji,jj) )
+#else
                hdivdiff(ji,jj,jk) =   &
                   (  e2u(ji,jj)*fse3u(ji,jj,jk) * & 
@@ -325 +331 @@
                   fse3v(ji  ,jj-1,jk)  * vbdiff(ji  ,jj-1,jk)  )    &
                   / ( e1t(ji,jj) * e2t(ji,jj) * fse3t(ji,jj,jk) )
-#else
-               hdivdiff(ji,jj,jk) = (  e2u(ji,jj) * ubdiff(ji,jj,jk) &
-               - e2u(ji-1,jj  ) * ubdiff(ji-1,jj  ,jk)      &
-     &               + e1v(ji,jj) * vbdiff(ji,jj,jk) - & 
-     &              e1v(ji  ,jj-1) * vbdiff(ji  ,jj-1,jk)  )   &
-     &            / ( e1t(ji,jj) * e2t(ji,jj) )
 #endif
             END DO
@@ -350 +350 @@
          DO jj = 2, jpjm1
             DO ji = 2, jpim1   ! vector opt.
-#if defined key_s_coord || defined key_partial_steps
+#if defined key_zco
+               ! horizontal diffusive trends
+               ze2u = rotdiff (ji,jj,jk)
+               ze1v = hdivdiff(ji,jj,jk)
+               zua = - (                ze2u                  - &
+               rotdiff (ji,jj-1,jk) ) / e2u(ji,jj)   &
+                     + ( hdivdiff(ji+1,jj,jk) -     &
+                ze1v                  ) / e1u(ji,jj)
+
+               zva = + (                ze2u                  - &
+               rotdiff (ji-1,jj,jk) ) / e1v(ji,jj)   &
+                     + ( hdivdiff(ji,jj+1,jk) -       &
+                ze1v                  ) / e2v(ji,jj)
+#else
                ze2u = rotdiff (ji,jj,jk)*fse3f(ji,jj,jk)
                ze1v = hdivdiff(ji,jj,jk)
@@ -363 +376 @@
                      + ( hdivdiff(ji,jj+1,jk) - ze1v    &
                     ) / e2v(ji,jj)
-#else
-               ! horizontal diffusive trends
-               ze2u = rotdiff (ji,jj,jk)
-               ze1v = hdivdiff(ji,jj,jk)
-               zua = - (                ze2u                  - &
-               rotdiff (ji,jj-1,jk) ) / e2u(ji,jj)   &
-                     + ( hdivdiff(ji+1,jj,jk) -     &
-                ze1v                  ) / e1u(ji,jj)
-
-               zva = + (                ze2u                  - &
-               rotdiff (ji-1,jj,jk) ) / e1v(ji,jj)   &
-                     + ( hdivdiff(ji,jj+1,jk) -       &
-                ze1v                  ) / e2v(ji,jj)
 #endif