Changeset 656 for trunk/NEMO

Timestamp:

2007-04-18T11:37:17+02:00 (17 years ago)

Author:

opalod

Message:

nemo_v2_update_017:CE:taking into account the new vertical configuration

Location:

trunk/NEMO/TOP_SRC/SMS

Files:

• trcbio.F (modified) (4 diffs)
• trcsed.F (modified) (3 diffs)

trunk/NEMO/TOP_SRC/SMS/trcbio.F

@@ -95 +95 @@
       INTEGER kt
       INTEGER ji,jj,jk,jn
-      REAL ztot(jpi), ze3t(jpk)
+      REAL ztot(jpi)
+#if defined key_trc_diaadd
+      REAL ze3t(jpi,jpj,jpk)
+endif
       REAL zdet,zzoo,zphy,zno3,znh4,zdom,zlno3,zlnh4,zle,zlt
       REAL zno3phy, znh4phy, zphynh4, zphydom, zphydet, zphyzoo, zdetzoo
@@ -117 +120 @@
 #if defined key_trc_diaadd
 C convert fluxes in per day
+      ze3t(:,:,:) = 0.
       DO jk=1,jpkbm1
-        ze3t(jk)=e3t(jk)*86400.
-      END DO 
-      DO jk=jpkb,jpk
-        ze3t(jk)=0.
+        DO jj = 2, jpjm1
+          DO ji = 2, jpim1
+            ze3t(ji,jj,jk)=fse3t(ji,jj,jk)*86400.
+          END DO
+        END DO
       END DO 
 #endif
@@ -282 +287 @@
 #endif
 #if defined key_trc_diaadd
-            trc2d(ji,jj,1)=trc2d(ji,jj,1)+zno3phy*ze3t(jk)          
-            trc2d(ji,jj,2)=trc2d(ji,jj,2)+znh4phy*ze3t(jk)
-            trc2d(ji,jj,3)=trc2d(ji,jj,3)+zphydom*ze3t(jk)
-            trc2d(ji,jj,4)=trc2d(ji,jj,4)+zphynh4*ze3t(jk)
-            trc2d(ji,jj,5)=trc2d(ji,jj,5)+zphyzoo*ze3t(jk)
-            trc2d(ji,jj,6)=trc2d(ji,jj,6)+zphydet*ze3t(jk)
-            trc2d(ji,jj,7)=trc2d(ji,jj,7)+zdetzoo*ze3t(jk)
+            trc2d(ji,jj,1)=trc2d(ji,jj,1)+zno3phy*ze3t(ji,jj,jk)          
+            trc2d(ji,jj,2)=trc2d(ji,jj,2)+znh4phy*ze3t(ji,jj,jk)
+            trc2d(ji,jj,3)=trc2d(ji,jj,3)+zphydom*ze3t(ji,jj,jk)
+            trc2d(ji,jj,4)=trc2d(ji,jj,4)+zphynh4*ze3t(ji,jj,jk)
+            trc2d(ji,jj,5)=trc2d(ji,jj,5)+zphyzoo*ze3t(ji,jj,jk)
+            trc2d(ji,jj,6)=trc2d(ji,jj,6)+zphydet*ze3t(ji,jj,jk)
+            trc2d(ji,jj,7)=trc2d(ji,jj,7)+zdetzoo*ze3t(ji,jj,jk)
 c trend number 8 is in trcsed.F            
-            trc2d(ji,jj,9)=trc2d(ji,jj,9)+zzoodet*ze3t(jk)
-            trc2d(ji,jj,10)=trc2d(ji,jj,10)+zzoobod*ze3t(jk)
-            trc2d(ji,jj,11)=trc2d(ji,jj,11)+zzoonh4*ze3t(jk)
-            trc2d(ji,jj,12)=trc2d(ji,jj,12)+zzoodom*ze3t(jk)
-            trc2d(ji,jj,13)=trc2d(ji,jj,13)+znh4no3*ze3t(jk)
-            trc2d(ji,jj,14)=trc2d(ji,jj,14)+zdomnh4*ze3t(jk)
-            trc2d(ji,jj,15)=trc2d(ji,jj,15)+zdetnh4*ze3t(jk)
+            trc2d(ji,jj,9)=trc2d(ji,jj,9)+zzoodet*ze3t(ji,jj,jk)
+            trc2d(ji,jj,10)=trc2d(ji,jj,10)+zzoobod*ze3t(ji,jj,jk)
+            trc2d(ji,jj,11)=trc2d(ji,jj,11)+zzoonh4*ze3t(ji,jj,jk)
+            trc2d(ji,jj,12)=trc2d(ji,jj,12)+zzoodom*ze3t(ji,jj,jk)
+            trc2d(ji,jj,13)=trc2d(ji,jj,13)+znh4no3*ze3t(ji,jj,jk)
+            trc2d(ji,jj,14)=trc2d(ji,jj,14)+zdomnh4*ze3t(ji,jj,jk)
+            trc2d(ji,jj,15)=trc2d(ji,jj,15)+zdetnh4*ze3t(ji,jj,jk)
              
             trc2d(ji,jj,16)=trc2d(ji,jj,16)+(zno3phy+znh4phy-zphynh4
-     $          -zphydom-zphyzoo-zphydet)*ze3t(jk)
+     $          -zphydom-zphyzoo-zphydet)*ze3t(ji,jj,jk)
             trc2d(ji,jj,17)=trc2d(ji,jj,17)+(zphyzoo+zdetzoo-zzoodet
-     $          -zzoobod-zzoonh4-zzoodom) *ze3t(jk)
-            trc2d(ji,jj,18)=trc2d(ji,jj,18)+zdetdom*ze3t(jk)
+     $          -zzoobod-zzoonh4-zzoodom) *ze3t(ji,jj,jk)
+            trc2d(ji,jj,18)=trc2d(ji,jj,18)+zdetdom*ze3t(ji,jj,jk)
 c trend number 19 is in trcexp.F
             trc3d(ji,jj,jk,1)= zno3phy *86400     
@@ -440 +445 @@
 #endif
 #if defined key_trc_diaadd
-            trc2d(ji,jj,1)=trc2d(ji,jj,1)+zno3phy*ze3t(jk)          
-            trc2d(ji,jj,2)=trc2d(ji,jj,2)+znh4phy*ze3t(jk)
-            trc2d(ji,jj,3)=trc2d(ji,jj,3)+zphydom*ze3t(jk)
-            trc2d(ji,jj,4)=trc2d(ji,jj,4)+zphynh4*ze3t(jk)
-            trc2d(ji,jj,5)=trc2d(ji,jj,5)+zphyzoo*ze3t(jk)
-            trc2d(ji,jj,6)=trc2d(ji,jj,6)+zphydet*ze3t(jk)
-            trc2d(ji,jj,7)=trc2d(ji,jj,7)+zdetzoo*ze3t(jk)
+            trc2d(ji,jj,1)=trc2d(ji,jj,1)+zno3phy*ze3t(ji,jj,jk)          
+            trc2d(ji,jj,2)=trc2d(ji,jj,2)+znh4phy*ze3t(ji,jj,jk)
+            trc2d(ji,jj,3)=trc2d(ji,jj,3)+zphydom*ze3t(ji,jj,jk)
+            trc2d(ji,jj,4)=trc2d(ji,jj,4)+zphynh4*ze3t(ji,jj,jk)
+            trc2d(ji,jj,5)=trc2d(ji,jj,5)+zphyzoo*ze3t(ji,jj,jk)
+            trc2d(ji,jj,6)=trc2d(ji,jj,6)+zphydet*ze3t(ji,jj,jk)
+            trc2d(ji,jj,7)=trc2d(ji,jj,7)+zdetzoo*ze3t(ji,jj,jk)
 Cc trend number 8 is in trcsed.F            
-            trc2d(ji,jj,9)=trc2d(ji,jj,9)+zzoodet*ze3t(jk)
-            trc2d(ji,jj,10)=trc2d(ji,jj,10)+zzoobod*ze3t(jk)
-            trc2d(ji,jj,11)=trc2d(ji,jj,11)+zzoonh4*ze3t(jk)
-            trc2d(ji,jj,12)=trc2d(ji,jj,12)+zzoodom*ze3t(jk)
-            trc2d(ji,jj,13)=trc2d(ji,jj,13)+znh4no3*ze3t(jk)
-            trc2d(ji,jj,14)=trc2d(ji,jj,14)+zdomnh4*ze3t(jk)
-            trc2d(ji,jj,15)=trc2d(ji,jj,15)+zdetnh4*ze3t(jk)
+            trc2d(ji,jj,9)=trc2d(ji,jj,9)+zzoodet*ze3t(ji,jj,jk)
+            trc2d(ji,jj,10)=trc2d(ji,jj,10)+zzoobod*ze3t(ji,jj,jk)
+            trc2d(ji,jj,11)=trc2d(ji,jj,11)+zzoonh4*ze3t(ji,jj,jk)
+            trc2d(ji,jj,12)=trc2d(ji,jj,12)+zzoodom*ze3t(ji,jj,jk)
+            trc2d(ji,jj,13)=trc2d(ji,jj,13)+znh4no3*ze3t(ji,jj,jk)
+            trc2d(ji,jj,14)=trc2d(ji,jj,14)+zdomnh4*ze3t(ji,jj,jk)
+            trc2d(ji,jj,15)=trc2d(ji,jj,15)+zdetnh4*ze3t(ji,jj,jk)
              
             trc2d(ji,jj,16)=trc2d(ji,jj,16)+(zno3phy+znh4phy-zphynh4
-     $          -zphydom-zphyzoo-zphydet)*ze3t(jk)
+     $          -zphydom-zphyzoo-zphydet)*ze3t(ji,jj,jk)
             trc2d(ji,jj,17)=trc2d(ji,jj,17)+(zphyzoo+zdetzoo-zzoodet
-     $          -zzoobod-zzoonh4-zzoodom) *ze3t(jk)
-            trc2d(ji,jj,18)=trc2d(ji,jj,18)+zdetdom*ze3t(jk)
+     $          -zzoobod-zzoonh4-zzoodom) *ze3t(ji,jj,jk)
+            trc2d(ji,jj,18)=trc2d(ji,jj,18)+zdetdom*ze3t(ji,jj,jk)
 
             trc3d(ji,jj,jk,1)= zno3phy *86400     

trunk/NEMO/TOP_SRC/SMS/trcsed.F

@@ -86 +86 @@
       INTEGER ji,jj,jk
       REAL ze3tr,ztra
-      REAL zwork(jpi,jpk),ze3t(jpk)
+      REAL zwork(jpi,jpk)
+#if defined key_trc_diaadd
+      REAL ze3t(jpi,jpj,jpk)
+endif
 CC----------------------------------------------------------------------
 CC statement functions
@@ -97 +100 @@
 CCC---------------------------------------------------------------------
 C
-#     if defined key_trc_diaadd
+#if defined key_trc_diaadd
+C convert fluxes in per day
+      ze3t(:,:,:) = 0.
       DO jk=1,jpkbm1
-        ze3t(jk)=e3t(jk)*86400.
+        DO jj = 2, jpjm1
+          DO ji = 2, jpim1
+            ze3t(ji,jj,jk)=fse3t(ji,jj,jk)*86400.
+          END DO
+        END DO
       END DO 
-      DO jk=jpkb,jpk
-        ze3t(jk)=0.
-      END DO 
-#     endif
+#endif
+
 C
 C vertical slab
@@ -147 +154 @@
 #            endif
 #if defined key_trc_diaadd
-            trc2d(ji,jj,8)=trc2d(ji,jj,8)+ztra*ze3t(jk)
+            trc2d(ji,jj,8)=trc2d(ji,jj,8)+ztra*ze3t(ji,jj,jk)
 #endif
                 END DO