Changeset 723 for trunk/NEMO/OFF_SRC

Timestamp:

2007-10-22T11:31:44+02:00 (17 years ago)

Author:

cetlod

Message:

computation of horizontal divergence needed for vertical active trends, see ticket:12

File:

• trunk/NEMO/OFF_SRC/dtadyn.F90 (modified) (8 diffs)

trunk/NEMO/OFF_SRC/dtadyn.F90

@@ -67 +67 @@
       vdta   ,   & ! meridional velocity at two consecutive times
       wdta   ,   & ! vertical velocity at two consecutive times
+#if defined key_trc_diatrd
+      hdivdta,   & ! horizontal divergence
+#endif
       avtdta       ! vertical diffusivity coefficient
+
 
 #if defined key_ldfslp
@@ -120 +124 @@
    !!----------------------------------------------------------------------
    !!   OPA 9.0 , LOCEAN-IPSL  (2005)
-   !!   $Header$
+   !!   $Header: /home/opalod/NEMOCVSROOT/NEMO/OFF_SRC/dtadyn.F90,v 1.8 2007/10/12 09:05:29 opalod Exp $
    !!   This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt
    !!----------------------------------------------------------------------
@@ -319 +323 @@
                 vdta(:,:,:,1)=vdta(:,:,:,2)
                 wdta(:,:,:,1)=wdta(:,:,:,2)
+#if defined key_trc_diatrd
+                hdivdta(:,:,:,1)=hdivdta(:,:,:,2)
+#endif
                 avtdta(:,:,:,1)=avtdta(:,:,:,2)
                 tdta(:,:,:,1)=tdta(:,:,:,2)
@@ -412 +419 @@
                 udta(:,:,:,1) = udta(:,:,:,2)
                 vdta(:,:,:,1) = vdta(:,:,:,2)
-                wdta(:,:,:,1)= wdta(:,:,:,2)
+                wdta(:,:,:,1) = wdta(:,:,:,2)
+#if defined key_trc_diatrd
+                hdivdta(:,:,:,1)=hdivdta(:,:,:,2)
+#endif
                 avtdta(:,:,:,1) = avtdta(:,:,:,2)
                 tdta(:,:,:,1) = tdta(:,:,:,2)
@@ -508 +518 @@
                     vn(:,:,:)=vdta(:,:,:,2)
                     wn(:,:,:)=wdta(:,:,:,2)
+#if defined key_trc_diatrd
+                    hdivn(:,:,:)=hdivdta(:,:,:,2)
+#endif
 #if defined key_trc_zdfddm
                     avs(:,:,:)=avtdta(:,:,:,2)
@@ -570 +583 @@
                     vn(:,:,:) = zweighm1 * vdta(:,:,:,1) + zweigh * vdta(:,:,:,2)
                     wn(:,:,:) = zweighm1 * wdta(:,:,:,1) + zweigh * wdta(:,:,:,2)
+#if defined key_trc_diatrd
+                    hdivn(:,:,:) = zweighm1 * hdivdta(:,:,:,1) + zweigh * hdivdta(:,:,:,2)
+#endif
 #if defined key_zdfddm
                     avs(:,:,:)= zweighm1 * avtdta(:,:,:,1) + zweigh * avtdta(:,:,:,2)
@@ -745 +761 @@
       CALL iom_get ( numfl_t, jpdom_data, 'vosaline', zs   (:,:,:), jkenr )
       CALL iom_get ( numfl_t, jpdom_data, 'somixhgt', zmld (:,:  ), jkenr )
-      CALL iom_get ( numfl_t, jpdom_data, 'sowaflup', zemp (:,:  ), jkenr )
+      CALL iom_get ( numfl_t, jpdom_data, 'sowaflcd', zemp (:,:  ), jkenr )
       CALL iom_get ( numfl_t, jpdom_data, 'soshfldo', zqsr (:,:  ), jkenr )
       CALL iom_get ( numfl_t, jpdom_data, 'soicecov', zice (:,:  ), jkenr )
@@ -850 +866 @@
          zw(:,:,jk) = zw(:,:,jk+1) - fse3t(:,:,jk) * zhdiv(:,:,jk)
       END DO
+
       wdta(:,:,:,2) = zw(:,:,:) * tmask(:,:,:)
-
+#if defined key_trc_diatrd
+      hdivdta(:,:,:,2) = zhdiv(:,:,:) * tmask(:,:,:)
+#endif
 
       tdta(:,:,:,2)   = zt(:,:,:)   * tmask(:,:,:)