Changeset 711 for trunk/NEMO/OPA_SRC

Timestamp:

2007-10-10T17:40:18+02:00 (17 years ago)

Author:

smasson

Message:

remove aminus aplus, see ticket:8

File:

• trunk/NEMO/OPA_SRC/DIA/diafwb.F90 (modified) (9 diffs)

trunk/NEMO/OPA_SRC/DIA/diafwb.F90

@@ -4 +4 @@
    !! Ocean diagnostics: freshwater budget
    !!======================================================================
+   !! History :  8.2  !  01-02  (E. Durand)  Original code
+   !!            8.5  !  02-06  (G. Madec)  F90: Free form and module
+   !!            9.0  !  05-11  (V. Garnier) Surface pressure gradient organization
+   !!----------------------------------------------------------------------
 #if ( defined key_orca_r2 || defined  key_orca_r4 ) && ! defined key_dynspg_rl && ! defined key_coupled
    !!----------------------------------------------------------------------
    !!   NOT "key_dynspg_rl" and "key_orca_r2 or 4"
    !!----------------------------------------------------------------------
+   !!----------------------------------------------------------------------
    !!   dia_fwb     : freshwater budget for global ocean configurations
    !!----------------------------------------------------------------------
-   !! * Modules used
    USE oce             ! ocean dynamics and tracers
    USE dom_oce         ! ocean space and time domain
-   USE sbc_oce         ! surface boundary condition: ocean
+   USE phycst          ! physical constants
+   USE sbc_oce         ! ???
    USE zdf_oce         ! ocean vertical physics
-   USE phycst          ! physical constants
    USE in_out_manager  ! I/O manager
    USE lib_mpp         ! distributed memory computing library
@@ -22 +26 @@
    PRIVATE
 
-   !! * Routine accessibility
    PUBLIC dia_fwb    ! routine called by step.F90
 
-   !! * Shared module variables
    LOGICAL, PUBLIC, PARAMETER ::   lk_diafwb = .TRUE.    !: fresh water budget flag
 
-   !! * Module variables
-   REAL(wp) ::   &
-      a_emp , a_precip, a_rnf,   &
-      a_sshb, a_sshn, a_salb, a_saln,   &
-      a_aminus, a_aplus
-   REAL(wp), DIMENSION(4) ::   &
-      a_flxi, a_flxo, a_temi, a_temo, a_sali, a_salo
+   REAL(wp)               ::   a_emp ,          &
+      &                        a_sshb, a_sshn, a_salb, a_saln
+   REAL(wp), DIMENSION(4) ::   a_flxi, a_flxo, a_temi, a_temo, a_sali, a_salo
 
    !! * Substitutions
@@ -40 +38 @@
 #  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
-   !!   OPA 9.0 , LOCEAN-IPSL (2005) 
-   !! $Id$
-   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
+   !!   OPA 9.0 , LOCEAN-IPSL (2006) 
+   !! $Header: $
+   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
 
@@ -52 +50 @@
       !!     
       !! ** Purpose :
-      !! 
-      !! ** Method :
-      !! 
-      !! History :
-      !!   8.2  !  01-02  (E. Durand)  Original code
-      !!   8.5  !  02-06  (G. Madec)  F90: Free form and module
-      !!   9.0  !  05-11  (V. Garnier) Surface pressure gradient organization
       !!----------------------------------------------------------------------
-      !! * Arguments
       INTEGER, INTENT( in ) ::   kt      ! ocean time-step index
-
-      !! * Local declarations
-      CHARACTER (len=32) ::  clname
+      !!
       INTEGER :: inum             ! temporary logical unit
       INTEGER :: ji, jj, jk, jt   ! dummy loop indices
@@ -82 +70 @@
 
          a_emp    = 0.e0
-         a_precip = 0.e0
-         a_rnf    = 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
-         a_aminus = 0.e0
-         a_aplus  = 0.e0
          ! sshb used because diafwb called after tranxt (i.e. after the swap)
          a_sshb = SUM( e1t(:,:) * e2t(:,:) * sshb(:,:) * tmask_i(:,:) )
@@ -105 +89 @@
       a_emp    = SUM( e1t(:,:) * e2t(:,:) * emp   (:,:) * tmask_i(:,:) )
       IF( lk_mpp )   CALL mpp_sum( a_emp    )       ! sum over the global domain
-#if defined key_flx_bulk_monthly || defined key_flx_bulk_daily
-      a_precip = SUM( e1t(:,:) * e2t(:,:) * watm  (:,:) * tmask_i(:,:) )
-      IF( lk_mpp )   CALL mpp_sum( a_precip )       ! sum over the global domain
-#endif
-      a_rnf    = SUM( e1t(:,:) * e2t(:,:) * runoff(:,:) * tmask_i(:,:) )
-      IF( lk_mpp )   CALL mpp_sum( a_rnf    )       ! sum over the global domain
-
-      IF( aminus /= 0.e0 ) a_aminus = a_aminus + ( MIN( aplus, aminus ) / aminus )
-      IF( aplus  /= 0.e0 ) a_aplus  = a_aplus  + ( MIN( aplus, aminus ) / aplus  )
 
       IF( kt == nitend ) THEN
@@ -139 +114 @@
          IF( lk_mpp )   CALL mpp_sum( zvol )      ! sum over the global domain
          
-         a_aminus = a_aminus / ( nitend - nit000 + 1 )
-         a_aplus  = a_aplus  / ( nitend - nit000 + 1 )
-
          ! Conversion in m3
          a_emp    = a_emp * rdttra(1) * 1.e-3 
-         a_precip = a_precip * rdttra(1) * 1.e-3 / rday
-         a_rnf    = a_rnf * rdttra(1) * 1.e-3
          
-         ! Alpha1=Alpha0-Rest/(Precip+runoff)
-         !  C A U T I O N : precipitations are negative !!     
-         
+         ! emp correction to bring back the mean ssh to zero
          zempnew = a_sshn / ( ( nitend - nit000 + 1 ) * rdt ) * 1.e3 / zarea
 
@@ -386 +354 @@
       IF ( kt == nitend .AND. cp_cfg == "orca" ) THEN
 
-         clname = 'STRAIT.dat'
-         CALL ctlopn( inum, clname, 'UNKNOWN', 'FORMATTED', 'SEQUENTIAL',   &
+         CALL ctlopn( inum, 'STRAIT.dat', 'UNKNOWN', 'FORMATTED', 'SEQUENTIAL',   &
             &         1, numout, lwp, 1 )
          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) '  precip = ',a_precip,' m3 =', a_precip/(FLOAT(nitend-nit000+1)*rdttra(1)) * 1.e-6,' Sv'
-         WRITE(inum,9010) '  a_rnf  = ',a_rnf,   ' m3 =', a_rnf   /(FLOAT(nitend-nit000+1)*rdttra(1)) * 1.e-6,' Sv'
          WRITE(inum,*)
          WRITE(inum,9010) '  zarea =',zarea
@@ -414 +379 @@
          WRITE(inum,9020) '  diff      =',(a_saln-a_salb)/zvol,' psu'
          WRITE(inum,9020) '  S-SLevitus=',a_saln/zvol,' psu'
-         WRITE(inum,*)
-         WRITE(inum,*)    'Coeff : '
-         WRITE(inum,9030) '  Alpha+   =  ', a_aplus
-         WRITE(inum,9030) '  Alpha-   =  ', a_aminus
-         WRITE(inum,*)
          WRITE(inum,*)
          WRITE(inum,*)    'Gibraltar : '