Changeset 2207 for branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DIA/diafwb.F90

Timestamp:

2010-10-11T18:51:54+02:00 (14 years ago)

Author:

acc

Message:

#733 DEV_r2191_3partymerge2010. Merged in changes from devukmo2010 branch

File:

• branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DIA/diafwb.F90 (modified) (7 diffs)

branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DIA/diafwb.F90

@@ -30 +30 @@
    LOGICAL, PUBLIC, PARAMETER ::   lk_diafwb = .TRUE.    !: fresh water budget flag
 
-   REAL(wp)               ::   a_emp ,          &
+   REAL(wp)               ::   a_fwf ,          &
       &                        a_sshb, a_sshn, a_salb, a_saln
    REAL(wp), DIMENSION(4) ::   a_flxi, a_flxo, a_temi, a_temo, a_sali, a_salo
@@ -59 +59 @@
       REAL(wp) ::  ztemi(4), ztemo(4), zsali(4), zsalo(4), zflxi(4), zflxo(4)
       REAL(wp) ::  zt, zs, zu  
-      REAL(wp) ::  zsm0, zempnew
+      REAL(wp) ::  zsm0, zfwfnew
       !!----------------------------------------------------------------------
 
@@ -65 +65 @@
       zsm0 = 34.72654
 
-      ! To compute emp mean value mean emp
+      ! To compute fwf mean value mean fwf
 
       IF( kt == nit000 ) THEN
 
-         a_emp    = 0.e0
+         a_fwf    = 0.e0
          a_sshb   = 0.e0 ! valeur de ssh au debut de la simulation
          a_salb   = 0.e0 ! valeur de sal au debut de la simulation
@@ -87 +87 @@
       ENDIF
       
-      a_emp    = SUM( e1t(:,:) * e2t(:,:) * emp   (:,:) * tmask_i(:,:) )
-      IF( lk_mpp )   CALL mpp_sum( a_emp    )       ! sum over the global domain
+      a_fwf    = SUM( e1t(:,:) * e2t(:,:) * ( emp(:,:)-rnf(:,:) ) * tmask_i(:,:) ) 
+      IF( lk_mpp )   CALL mpp_sum( a_fwf    )       ! sum over the global domain
 
       IF( kt == nitend ) THEN
@@ -95 +95 @@
          zarea = 0.e0
          zvol  = 0.e0
-         zempnew = 0.e0
+         zfwfnew = 0.e0
          ! Mean sea level at nitend
          a_sshn = SUM( e1t(:,:) * e2t(:,:) * sshn(:,:) * tmask_i(:,:) )
@@ -115 +115 @@
          
          ! Conversion in m3
-         a_emp    = a_emp * rdttra(1) * 1.e-3 
+         a_fwf    = a_fwf * rdttra(1) * 1.e-3 
          
-         ! emp correction to bring back the mean ssh to zero
-         zempnew = a_sshn / ( ( nitend - nit000 + 1 ) * rdt ) * 1.e3 / zarea
+         ! fwf correction to bring back the mean ssh to zero
+         zfwfnew = a_sshn / ( ( nitend - nit000 + 1 ) * rdt ) * 1.e3 / zarea
 
       ENDIF
@@ -362 +362 @@
          WRITE(inum,*)
          WRITE(inum,*)    'Net freshwater budget '
-         WRITE(inum,9010) '  emp    = ',a_emp,   ' m3 =', a_emp   /(FLOAT(nitend-nit000+1)*rdttra(1)) * 1.e-6,' Sv'
+         WRITE(inum,9010) '  fwf    = ',a_fwf,   ' m3 =', a_fwf   /(FLOAT(nitend-nit000+1)*rdttra(1)) * 1.e-6,' Sv'
          WRITE(inum,*)
          WRITE(inum,9010) '  zarea =',zarea