Changeset 719 for trunk/NEMO/OPA_SRC/DIA/diawri_dimg.h90

Timestamp:

2007-10-16T16:59:56+02:00 (17 years ago)

Author:

ctlod

Message:

get back to the nemo_v2_3 version for trunk

File:

• trunk/NEMO/OPA_SRC/DIA/diawri_dimg.h90 (modified) (6 diffs, 1 prop)

trunk/NEMO/OPA_SRC/DIA/diawri_dimg.h90

@@ -3 +3 @@
   !!----------------------------------------------------------------------
   !!   OPA 9.0 , LOCEAN-IPSL (2005) 
-  !! $Id$
+  !! $Header$ 
   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
   !!----------------------------------------------------------------------
@@ -41 +41 @@
     !!    To be tested with a lot of procs !!!!
     !!
-    !!  level 1:  utau(:,:) * umask(:,:,1) zonal stress in N.m-2
-    !!  level 2:  vtau(:,:) * vmask(:,:,1) meridional stress in N. m-2
-    !!  level 3:  qsr + qns                total heat flux (W/m2)
-    !!  level 4:  emp (:,:)               E-P flux (mm/day)
+    !!  level 1:  taux(:,:) * umask(:,:,1) zonal stress in N.m-2
+    !!  level 2:  tauy(:,:) * vmask(:,:,1) meridional stress in N. m-2
+    !!  level 3:   qt  (:,:)               total heat flux (W/m2)
+    !!  level 4:   emp (:,:)               E-P flux (mm/day)
     !!  level 5:  tb  (:,:,1)-sst          model SST -forcing sst (degree C)
     !!  level 6:  bsfb(:,:)         streamfunction (m**3/s)
@@ -76 +76 @@
     !! * modules used
     USE lib_mpp
+    USE dtasst, ONLY : sst
 
     !! * Arguments
@@ -166 +167 @@
        sm(:,:,:)=sm(:,:,:) + sn (:,:,:)
        !
-       fsel(:,:,1 ) = fsel(:,:,1 ) + utau(:,:) * umask(:,:,1)
-       fsel(:,:,2 ) = fsel(:,:,2 ) + vtau(:,:) * vmask(:,:,1)
-       fsel(:,:,3 ) = fsel(:,:,3 ) + qsr (:,:) + qns  (:,:) 
+       fsel(:,:,1 ) = fsel(:,:,1 ) + taux(:,:) * umask(:,:,1)
+       fsel(:,:,2 ) = fsel(:,:,2 ) + tauy(:,:) * vmask(:,:,1)
+       fsel(:,:,3 ) = fsel(:,:,3 ) + qt  (:,:) 
        fsel(:,:,4 ) = fsel(:,:,4 ) + emp (:,:)
        fsel(:,:,5 ) = fsel(:,:,5 ) + tb  (:,:,1) - sst(:,:)
@@ -230 +231 @@
           fsel(:,:,20)= spgv(:,:)
 #endif
-          ! mask mean field with tmask except utau vtau (1,2)
+          ! mask mean field with tmask except taux tauy (1,2)
           DO jk=3,inbsel
             fsel(:,:,jk)=fsel(:,:,jk)*tmask(:,:,1)
@@ -255 +256 @@
           fsel(:,:,:) = 0._wp
           !
-          fsel(:,:,1 ) = utau(:,:) * umask(:,:,1)
-          fsel(:,:,2 ) = vtau(:,:) * vmask(:,:,1)
-          fsel(:,:,3 ) = (qsr (:,:) + qnr (:,:)) * tmask(:,:,1)
+          fsel(:,:,1 ) = taux(:,:) * umask(:,:,1)
+          fsel(:,:,2 ) = tauy(:,:) * vmask(:,:,1)
+          fsel(:,:,3 ) = qt  (:,:) * tmask(:,:,1)
           fsel(:,:,4 ) = emp (:,:) * tmask(:,:,1)
           fsel(:,:,5 ) = (tb  (:,:,1) -sst(:,:)) *tmask(:,:,1)