Changeset 469 for trunk/NEMO/NST_SRC/agrif_opa_interp.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_interp.F90 (modified) (10 diffs)

trunk/NEMO/NST_SRC/agrif_opa_interp.F90

@@ -196 +196 @@
         DO jj=1,jpj
           ua(1:2,jj,jk) = (uatemp(1:2,jj,jk)/(rhoy*e2u(1:2,jj)))
-#if defined key_partial_steps
+#if ! defined key_zco
            ua(1:2,jj,jk) = ua(1:2,jj,jk) / fse3u(1:2,jj,jk)
 #endif
@@ -252 +252 @@
         Do jj=1,jpj
            va(2,jj,jk) = (vatemp(2,jj,jk)/(rhox*e1v(2,jj)))*vmask(2,jj,jk)
-#if defined key_partial_steps
+#if ! defined key_zco
            va(2,jj,jk) = va(2,jj,jk) / fse3v(2,jj,jk)
 #endif           
@@ -273 +273 @@
           ua(nlci-2:nlci-1,jj,jk) = (uatemp(nlci-2:nlci-1,jj,jk)/(rhoy*e2u(nlci-2:nlci-1,jj)))
 
-#if defined key_partial_steps
+#if ! defined key_zco
            ua(nlci-2:nlci-1,jj,jk) = ua(nlci-2:nlci-1,jj,jk) / fse3u(nlci-2:nlci-1,jj,jk)
 #endif
@@ -333 +333 @@
         Do jj=1,jpj-1
            va(nlci-1,jj,jk) = (vatemp(nlci-1,jj,jk)/(rhox*e1v(nlci-1,jj)))*vmask(nlci-1,jj,jk)
-#if defined key_partial_steps
+#if ! defined key_zco
            va(nlci-1,jj,jk) = va(nlci-1,jj,jk) / fse3v(nlci-1,jj,jk)
 #endif
@@ -352 +352 @@
         DO ji=1,jpi
           va(ji,1:2,jk) = (vatemp(ji,1:2,jk)/(rhox*e1v(ji,1:2)))
-#if defined key_partial_steps
+#if ! defined key_zco
            va(ji,1:2,jk) = va(ji,1:2,jk) / fse3v(ji,1:2,jk)
 #endif
@@ -408 +408 @@
         DO ji=1,jpi
         ua(ji,2,jk) = (uatemp(ji,2,jk)/(rhoy*e2u(ji,2)))*umask(ji,2,jk) 
-#if defined key_partial_steps
+#if ! defined key_zco
            ua(ji,2,jk) = ua(ji,2,jk) / fse3u(ji,2,jk)
 #endif                
@@ -427 +427 @@
         DO ji=1,jpi
           va(ji,nlcj-2:nlcj-1,jk) = (vatemp(ji,nlcj-2:nlcj-1,jk)/(rhox*e1v(ji,nlcj-2:nlcj-1)))
-#if defined key_partial_steps
+#if ! defined key_zco
            va(ji,nlcj-2:nlcj-1,jk) = va(ji,nlcj-2:nlcj-1,jk) / fse3v(ji,nlcj-2:nlcj-1,jk)
 #endif
@@ -484 +484 @@
         DO ji=1,jpi
           ua(ji,nlcj-1,jk) = (uatemp(ji,nlcj-1,jk)/(rhoy*e2u(ji,nlcj-1)))*umask(ji,nlcj-1,jk)
-#if defined key_partial_steps
+#if ! defined key_zco
            ua(ji,nlcj-1,jk) = ua(ji,nlcj-1,jk) / fse3u(ji,nlcj-1,jk)
 #endif          
@@ -510 +510 @@
        DO ji=i1,i2
          tabres(ji,jj,jk) = e2u(ji,jj) * un(ji,jj,jk)
-#if defined key_partial_steps
+#if ! defined key_zco
           tabres(ji,jj,jk) = tabres(ji,jj,jk) * fse3u(ji,jj,jk)
 #endif
@@ -543 +543 @@
        DO ji=i1,i2
          tabres(ji,jj,jk) = e1v(ji,jj) * vn(ji,jj,jk)
-#if defined key_partial_steps
+#if ! defined key_zco
           tabres(ji,jj,jk) = tabres(ji,jj,jk) * fse3v(ji,jj,jk)
 #endif