Changeset 2528 for trunk/NEMOGCM/NEMO/OPA_SRC/DIA/diawri_dimg.h90

Timestamp:

2010-12-27T18:33:53+01:00 (13 years ago)

Author:

rblod

Message:

Update NEMOGCM from branch nemo_v3_3_beta

File:

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

trunk/NEMOGCM/NEMO/OPA_SRC/DIA/diawri_dimg.h90

@@ -2 +2 @@
   !!                        ***  diawri_dimg.h90  ***
   !!----------------------------------------------------------------------
-  !!   OPA 9.0 , LOCEAN-IPSL (2005) 
-  !! $Id$
-  !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
+  !! NEMO/OPA 3.3 , NEMO Consortium (2010)
+  !! $Id $
+  !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt)
   !!----------------------------------------------------------------------
 
-  SUBROUTINE dia_wri (kt)
+  SUBROUTINE dia_wri( kt )
     !!----------------------------------------------------------------------
     !!           *** routine dia_wri ***
@@ -42 +42 @@
     !!  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 4:  ( emp (:,:)-rnf(:,:) )   E-P flux (mm/day)
     !!  level 5:  tb  (:,:,1)-sst          model SST -forcing sst (degree C) ! deprecated
     !!  level 6:  bsfb(:,:)         streamfunction (m**3/s)
@@ -54 +54 @@
     !!  level 14: qct(:,:)                 equivalent flux due to treshold SST
     !!  level 15: fbt(:,:)                 feedback term .
-    !!  level 16: emps(:,:)                concentration/dilution water flux
+    !!  level 16: ( emps(:,:) - rnf(:,:) ) concentration/dilution water flux
     !!  level 17: fsalt(:,:)               Ice=>ocean net freshwater
     !!  level 18: gps(:,:)                 the surface pressure (m).
@@ -60 +60 @@
     !!  level 20: spgv(:,:)                the surface pressure gradient in Y direction.
     !! 
-    !! History 
-    !!      original  : 91-03 ()
-    !!      additions : 91-11 (G. Madec)
-    !!      additions : 92-06 (M. Imbard) correction restart file
-    !!      additions : 92-07 (M. Imbard) split into diawri and rstwri
-    !!      additions : 93-03 (M. Imbard) suppress writibm
-    !!      additions : 94-12 (M. Imbard) acces direct files
-    !!      additions : 97-2002 ( Clipper Group ) dimg files
-    !!                  dec 2003 ( J.M. Molines) f90, mpp output for OPA9.0
-    !!   9.0  !  05-05  (S. Theetten) add emps fsalt move gps spgu spgv 2 lines below
-    !!   9.0  !  05-11  (V. Garnier) Surface pressure gradient organization
+    !! History:  OPA  ! 1997-02 ( Clipper Group ) dimg files
+    !!            -   ! 2003-12 ( J.M. Molines) f90, mpp output for OPA9.0
+    !!   NEMO    1.0  ! 2005-05  (S. Theetten) add emps fsalt move gps spgu spgv 2 lines below
+    !!            -   ! 2005-11  (V. Garnier) Surface pressure gradient organization
     !!----------------------------------------------------------------------
-    !! * modules used
     USE lib_mpp
-
-    !! * Arguments
+    !!
     INTEGER ,INTENT(in) :: kt
-
-    !! * local declarations
+    !!
     INTEGER :: inbsel, jk
-!!  INTEGER :: iwrite
     INTEGER :: iyear,imon,iday
     INTEGER, SAVE :: nmoyct 
@@ -101 +90 @@
     CHARACTER(LEN=80) :: clmode
     CHARACTER(LEN= 4) :: clver
+    !!----------------------------------------------------------------------
     !
     !  Initialization
     !  ---------------
     !
-#ifdef key_diaspr
-    inbsel = 20
-#else
     inbsel = 17
-#endif
-#if defined key_flx_core
-    inbsel = 23
-#endif
-
-    IF( inbsel >  jpk) THEN
-       IF( lwp) WRITE(numout,*)  &
-            ' STOP inbsel =',inbsel,' is larger than jpk=',jpk
+
+    IF( inbsel >  jpk ) THEN
+       IF(lwp) WRITE(numout,*)  ' STOP inbsel =',inbsel,' is larger than jpk=',jpk
        STOP
     ENDIF
-
 
     iyear = ndastp/10000
@@ -167 +148 @@
        fsel(:,:,2 ) = fsel(:,:,2 ) + vtau(:,:) * vmask(:,:,1)
        fsel(:,:,3 ) = fsel(:,:,3 ) + qsr (:,:) + qns  (:,:) 
-       fsel(:,:,4 ) = fsel(:,:,4 ) + emp (:,:)
+       fsel(:,:,4 ) = fsel(:,:,4 ) + ( emp(:,:)-rnf(:,:) ) 
        !        fsel(:,:,5 ) = fsel(:,:,5 ) + tb  (:,:,1)  !RB not used
        fsel(:,:,6 ) = fsel(:,:,6 ) + sshn(:,:) 
@@ -179 +160 @@
        !        fsel(:,:,14) = fsel(:,:,14) + qct(:,:)
        !        fsel(:,:,15) = fsel(:,:,15) + fbt(:,:)
-       fsel(:,:,16) = fsel(:,:,16) + emps(:,:)
-#ifdef key_diaspr   
-       fsel(:,:,18) = fsel(:,:,18) + gps(:,:)/g 
-#endif
+       fsel(:,:,16) = fsel(:,:,16) + ( emps(:,:)-rnf(:,:) ) 
        !
        ! Output of dynamics and tracer fields and selected fields
@@ -210 +188 @@
           ! computed from the averaged gradients.
           !
-#ifdef key_diaspr
-          fsel(:,:,18)= gps(:,:)/g
-          fsel(:,:,19)= spgu(:,:)
-          fsel(:,:,20)= spgv(:,:)
-#endif
           ! mask mean field with tmask except utau vtau (1,2)
           DO jk=3,inbsel
@@ -242 +215 @@
           fsel(:,:,2 ) = vtau(:,:) * vmask(:,:,1)
           fsel(:,:,3 ) = (qsr (:,:) + qns (:,:)) * tmask(:,:,1)
-          fsel(:,:,4 ) = emp (:,:) * tmask(:,:,1)
+          fsel(:,:,4 ) = ( emp(:,:)-rnf(:,:) ) * tmask(:,:,1) 
           !         fsel(:,:,5 ) = (tb  (:,:,1) - sf_sst(1)%fnow(:,:) ) *tmask(:,:,1) !RB not used
 
@@ -255 +228 @@
           !         fsel(:,:,14) =  qct(:,:)
           !         fsel(:,:,15) =  fbt(:,:)
-          fsel(:,:,16) =  emps(:,:) * tmask(:,:,1)
-#ifdef key_diaspr           
-          fsel(:,:,18) =      gps(:,:) /g
-          fsel(:,:,19) =      spgu(:,:)
-          fsel(:,:,20) =      spgv(:,:)
-#endif
+          fsel(:,:,16) = ( emps(:,:)-rnf(:,:) ) * tmask(:,:,1) 
           !
           !         qct(:,:) = 0._wp
@@ -383 +351 @@
     !
 9000 FORMAT(a,"_",a,"_y",i4.4,"m",i2.2,"d",i2.2,".dimgproc")
-
+    !
   END SUBROUTINE dia_wri