Changeset 760


Ignore:
Timestamp:
2007-12-10T12:57:02+01:00 (14 years ago)
Author:
ctlod
Message:

phasing [OFF-TOP]_SRC directories with the trunk, to get changeset from 723 to 730

Location:
branches/dev_001_SBC/NEMO
Files:
165 edited

Legend:

Unmodified
Added
Removed
  • branches/dev_001_SBC/NEMO/OFF_SRC/DIA/dianam.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    2121   !!---------------------------------------------------------------------- 
    2222   !!   OPA 9.0 , LOCEAN-IPSL (2005)  
    23    !! $Id$ 
     23   !! $Header$  
    2424   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    2525   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/OFF_SRC/DOM/dom_oce.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    66   !!---------------------------------------------------------------------- 
    77   !!   OPA 9.0 , LOCEAN-IPSL  (2005) 
    8    !!   $Id$ 
     8   !!   $Header$ 
    99   !!   This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    1010   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/OFF_SRC/DOM/domain.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    4242   !!---------------------------------------------------------------------- 
    4343   !!   OPA 9.0 , LOCEAN-IPSL  (2005) 
    44    !!   $Id$ 
     44   !!   $Header$ 
    4545   !!   This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    4646   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/OFF_SRC/DOM/domcfg.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    2222   !!---------------------------------------------------------------------- 
    2323   !!   OPA 9.0 , LOCEAN-IPSL (2005)  
    24    !! $Id$ 
     24   !! $Header$  
    2525   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    2626   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/OFF_SRC/DOM/dommsk.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    2525   !!---------------------------------------------------------------------- 
    2626   !!   OPA 9.0 , LOCEAN-IPSL  (2005) 
    27    !!   $Id$ 
     27   !!   $Header$ 
    2828   !!   This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    2929   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/OFF_SRC/DOM/domrea.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    2222   !!---------------------------------------------------------------------- 
    2323   !!   OPA 9.0 , LOCEAN-IPSL  (2005) 
    24    !!   $Id$ 
     24   !!   $Header$ 
    2525   !!   This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    2626   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/OFF_SRC/DOM/domrea_dimg.h90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    3232      !!---------------------------------------------------------------------- 
    3333      !!   OPA 9.0 , LOCEAN-IPSL  (2005) 
    34       !!   $Id$ 
     34      !!   $Header$ 
    3535      !!   This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    3636      !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/OFF_SRC/DOM/domrea_fdir.h90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    33   !!---------------------------------------------------------------------- 
    44   !!   OPA 9.0 , LOCEAN-IPSL  (2005) 
    5    !!   $Id$ 
     5   !!   $Header$ 
    66   !!   This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    77   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/OFF_SRC/DOM/domstp.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    2828   !!---------------------------------------------------------------------- 
    2929   !!   OPA 9.0 , LOCEAN-IPSL (2005)  
    30    !! $Id$ 
     30   !! $Header$  
    3131   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 
    3232   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/OFF_SRC/DOM/domzgr_substitute.h90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    77   !!---------------------------------------------------------------------- 
    88   !!  OPA 9.0 , LOCEAN-IPSL (2005)  
    9    !! $Id$ 
    10    !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 
    11    !!---------------------------------------------------------------------- 
    129   !! 
    1310   !! History : 
  • branches/dev_001_SBC/NEMO/OFF_SRC/DYN/dynspg_oce.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    55   !!====================================================================== 
    66   !!   OPA 9.0 , LOCEAN-IPSL  (2005) 
    7    !!   $Id$ 
     7   !!   $Header$ 
    88   !!   This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    99   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/OFF_SRC/IOM/in_out_manager.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    8282   !!---------------------------------------------------------------------- 
    8383   !!  OPA 9.0 , LOCEAN-IPSL (2005)  
    84    !! $Id$ 
     84   !! $Header$  
    8585   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 
    8686   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/OFF_SRC/IOM/iom.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    3838   !!---------------------------------------------------------------------- 
    3939   !!  OPA 9.0 , LOCEAN-IPSL (2006) 
    40    !! $Id$ 
     40   !! $Header$ 
    4141   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 
    4242   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/OFF_SRC/IOM/iom_def.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    88   !!--------------------------------------------------------------------------------- 
    99   !! OPA 9.0 , LOCEAN-IPSL (2006)  
    10    !! $Id$ 
     10   !! $Header$  
    1111   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 
    1212   !!--------------------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/OFF_SRC/IOM/iom_ioipsl.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    3636   !!---------------------------------------------------------------------- 
    3737   !!  OPA 9.0 , LOCEAN-IPSL (2006) 
    38    !! $Id$ 
     38   !! $Header$ 
    3939   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 
    4040   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/OFF_SRC/IOM/iom_nf90.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    3636   !!---------------------------------------------------------------------- 
    3737   !!  OPA 9.0 , LOCEAN-IPSL (2006) 
    38    !! $Id$ 
     38   !! $Header$ 
    3939   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 
    4040   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/OFF_SRC/IOM/iom_rstdimg.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    3333   !!---------------------------------------------------------------------- 
    3434   !!  OPA 9.0 , LOCEAN-IPSL (2006) 
    35    !! $Id$ 
     35   !! $Header$ 
    3636   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 
    3737   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/OFF_SRC/LDF/ldfeiv.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    2828   !!---------------------------------------------------------------------- 
    2929   !!  OPA 9.0 , LOCEAN-IPSL (2005) 
    30    !! $Id$ 
     30   !! $Header$ 
    3131   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    3232   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/OFF_SRC/LDF/ldfeiv_substitute.h90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    77   !!---------------------------------------------------------------------- 
    88   !!   OPA 9.0 , LOCEAN-IPSL  (2005) 
    9    !!   $Id$ 
     9   !!   $Header$ 
    1010   !!   This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    1111   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/OFF_SRC/LDF/ldfslp.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    4848   !!---------------------------------------------------------------------- 
    4949   !!   OPA 9.0 , LOCEAN-IPSL (2005)  
    50    !! $Id$ 
    51    !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 
    5250   !!---------------------------------------------------------------------- 
    5351 
  • branches/dev_001_SBC/NEMO/OFF_SRC/LDF/ldftra.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    3636   !!--------------------------------------------------------------------------------- 
    3737   !!   OPA 9.0 , LOCEAN-IPSL (2005)  
    38    !! $Id$ 
     38   !! $Header$ 
    3939   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    4040   !!--------------------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/OFF_SRC/LDF/ldftra_c1d.h90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    55   !!---------------------------------------------------------------------- 
    66   !!   OPA 9.0 , LOCEAN-IPSL  (2005) 
    7    !!   $Id$ 
     7   !!   $Header$ 
    88   !!   This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    99   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/OFF_SRC/LDF/ldftra_c2d.h90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    55   !!---------------------------------------------------------------------- 
    66   !!   OPA 9.0 , LOCEAN-IPSL  (2005) 
    7    !!   $Id$ 
     7   !!   $Header$ 
    88   !!   This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    99   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/OFF_SRC/LDF/ldftra_c3d.h90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    55   !!---------------------------------------------------------------------- 
    66   !!   OPA 9.0 , LOCEAN-IPSL  (2005) 
    7    !!   $Id$ 
     7   !!   $Header$ 
    88   !!   This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    99   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/OFF_SRC/LDF/ldftra_oce.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    1111   !!---------------------------------------------------------------------- 
    1212   !!   OPA 9.0 , LOCEAN-IPSL  (2005) 
    13    !!   $Id$ 
     13   !!   $Header$ 
    1414   !!   This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    1515   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/OFF_SRC/LDF/ldftra_substitute.h90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    66   !!---------------------------------------------------------------------- 
    77   !!   OPA 9.0 , LOCEAN-IPSL  (2005) 
    8    !!   $Id$ 
     8   !!   $Header$ 
    99   !!   This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    1010   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/OFF_SRC/SBC/blk_oce.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    88   !!---------------------------------------------------------------------- 
    99   !!   OPA 9.0 , LOCEAN-IPSL  (2005) 
    10    !!   $Id$ 
     10   !!   $Header$ 
    1111   !!   This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    1212   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/OFF_SRC/SBC/flxrnf.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    4848   !!---------------------------------------------------------------------- 
    4949   !!   OPA 9.0 , LOCEAN-IPSL (2005)  
    50    !! $Id$ 
     50   !! $Header$  
    5151   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    5252   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/OFF_SRC/SBC/flxrnf_ORCA_R05.h90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    3434   !!---------------------------------------------------------------------- 
    3535   !!   OPA 9.0 , LOCEAN-IPSL  (2005) 
    36    !!   $Id$ 
     36   !!   $Header$ 
    3737   !!   This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    3838   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/OFF_SRC/SBC/flxrnf_ORCA_R2.h90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    3939   !!---------------------------------------------------------------------- 
    4040   !!   OPA 9.0 , LOCEAN-IPSL  (2005) 
    41    !!   $Id$ 
     41   !!   $Header$ 
    4242   !!   This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    4343   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/OFF_SRC/SBC/flxrnf_ORCA_R4.h90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    3737   !!---------------------------------------------------------------------- 
    3838   !!   OPA 9.0 , LOCEAN-IPSL  (2005) 
    39    !!   $Id$ 
     39   !!   $Header$ 
    4040   !!   This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    4141   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/OFF_SRC/SBC/ocesbc.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    55   !!====================================================================== 
    66   !!   OPA 9.0 , LOCEAN-IPSL  (2005) 
    7    !!   $Id$ 
     7   !!   $Header$ 
    88   !!   This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    99   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/OFF_SRC/SBC/taumod.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    99   !!---------------------------------------------------------------------- 
    1010   !!   OPA 9.0 , LOCEAN-IPSL  (2005) 
    11    !!   $Id$ 
     11   !!   $Header$ 
    1212   !!   This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    1313   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/OFF_SRC/SOL/sol_oce.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    1111   !!---------------------------------------------------------------------- 
    1212   !!  OPA 9.0 , LOCEAN-IPSL (2005)  
    13    !! $Id$ 
     13   !! $Header$ 
    1414   !!---------------------------------------------------------------------- 
    1515   !! * Modules used 
  • branches/dev_001_SBC/NEMO/OFF_SRC/TRA/trabbl.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    1313   !!---------------------------------------------------------------------- 
    1414   !!   OPA 9.0 , LOCEAN-IPSL  (2005) 
    15    !!   $Id$ 
     15   !!   $Header$ 
    1616   !!   This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    1717   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/OFF_SRC/TRA/traqsr.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    1010   !!---------------------------------------------------------------------- 
    1111   !!   OPA 9.0 , LOCEAN-IPSL  (2005) 
    12    !!   $Id$ 
     12   !!   $Header$ 
    1313   !!   This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    1414   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/OFF_SRC/TRA/zpshde.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    3333   !!---------------------------------------------------------------------- 
    3434   !!  OPA 9.0 , LOCEAN-IPSL (2005)  
    35    !! $Id$ 
     35   !! $Header$  
    3636   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    3737   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/OFF_SRC/ZDF/zdf.matrixsolver.h90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    2626   !!---------------------------------------------------------------------- 
    2727   !!   OPA 9.0 , LOCEAN-IPSL  (2005) 
    28    !!   $Id$ 
     28   !!   $Header$ 
    2929   !!   This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    3030   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/OFF_SRC/ZDF/zdf.matrixsolver.vopt.h90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    2626   !!---------------------------------------------------------------------- 
    2727   !!   OPA 9.0 , LOCEAN-IPSL  (2005) 
    28    !!   $Id$ 
     28   !!   $Header$ 
    2929   !!   This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    3030   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/OFF_SRC/ZDF/zdf_oce.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    99   !!---------------------------------------------------------------------- 
    1010   !!   OPA 9.0 , LOCEAN-IPSL  (2005) 
    11    !!   $Id$ 
     11   !!   $Header$ 
    1212   !!   This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    1313   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/OFF_SRC/ZDF/zdfddm.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    1212   !!---------------------------------------------------------------------- 
    1313   !!   OPA 9.0 , LOCEAN-IPSL  (2005) 
    14    !!   $Id$ 
     14   !!   $Header$ 
    1515   !!   This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    1616   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/OFF_SRC/ZDF/zdfini.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    99   !!---------------------------------------------------------------------- 
    1010   !!   OPA 9.0 , LOCEAN-IPSL  (2005) 
    11    !!   $Id$ 
     11   !!   $Header$ 
    1212   !!   This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    1313   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/OFF_SRC/ZDF/zdfmxl.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    3939   !!---------------------------------------------------------------------- 
    4040   !!   OPA 9.0 , LOCEAN-IPSL (2005)  
    41    !! $Id$ 
     41   !! $Header$  
    4242   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    4343   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/OFF_SRC/ctlopn.f90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    3535      !!---------------------------------------------------------------------- 
    3636      !!  OPA 9.0 , LOCEAN-IPSL (2005)  
    37       !! $Id$ 
     37      !! $Header$  
    3838      !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    3939      !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/OFF_SRC/daymod.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    3333   !!---------------------------------------------------------------------- 
    3434   !!  OPA 9.0 , LOCEAN-IPSL (2005)  
    35    !! $Id$ 
     35   !! $Header$  
    3636   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    3737   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/OFF_SRC/dtadyn.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    6767      vdta   ,   & ! meridional velocity at two consecutive times 
    6868      wdta   ,   & ! vertical velocity at two consecutive times 
     69#if defined key_trc_diatrd 
     70      hdivdta,   & ! horizontal divergence 
     71#endif 
    6972      avtdta       ! vertical diffusivity coefficient 
     73 
    7074 
    7175#if defined key_ldfslp 
     
    120124   !!---------------------------------------------------------------------- 
    121125   !!   OPA 9.0 , LOCEAN-IPSL  (2005) 
    122    !!   $Id$ 
     126   !!   $Header: /home/opalod/NEMOCVSROOT/NEMO/OFF_SRC/dtadyn.F90,v 1.8 2007/10/12 09:05:29 opalod Exp $ 
    123127   !!   This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    124128   !!---------------------------------------------------------------------- 
     
    319323                vdta(:,:,:,1)=vdta(:,:,:,2) 
    320324                wdta(:,:,:,1)=wdta(:,:,:,2) 
     325#if defined key_trc_diatrd 
     326                hdivdta(:,:,:,1)=hdivdta(:,:,:,2) 
     327#endif 
    321328                avtdta(:,:,:,1)=avtdta(:,:,:,2) 
    322329                tdta(:,:,:,1)=tdta(:,:,:,2) 
     
    412419                udta(:,:,:,1) = udta(:,:,:,2) 
    413420                vdta(:,:,:,1) = vdta(:,:,:,2) 
    414                 wdta(:,:,:,1)= wdta(:,:,:,2) 
     421                wdta(:,:,:,1) = wdta(:,:,:,2) 
     422#if defined key_trc_diatrd 
     423                hdivdta(:,:,:,1)=hdivdta(:,:,:,2) 
     424#endif 
    415425                avtdta(:,:,:,1) = avtdta(:,:,:,2) 
    416426                tdta(:,:,:,1) = tdta(:,:,:,2) 
     
    508518                    vn(:,:,:)=vdta(:,:,:,2) 
    509519                    wn(:,:,:)=wdta(:,:,:,2) 
     520#if defined key_trc_diatrd 
     521                    hdivn(:,:,:)=hdivdta(:,:,:,2) 
     522#endif 
    510523#if defined key_trc_zdfddm 
    511524                    avs(:,:,:)=avtdta(:,:,:,2) 
     
    570583                    vn(:,:,:) = zweighm1 * vdta(:,:,:,1) + zweigh * vdta(:,:,:,2) 
    571584                    wn(:,:,:) = zweighm1 * wdta(:,:,:,1) + zweigh * wdta(:,:,:,2) 
     585#if defined key_trc_diatrd 
     586                    hdivn(:,:,:) = zweighm1 * hdivdta(:,:,:,1) + zweigh * hdivdta(:,:,:,2) 
     587#endif 
    572588#if defined key_zdfddm 
    573589                    avs(:,:,:)= zweighm1 * avtdta(:,:,:,1) + zweigh * avtdta(:,:,:,2) 
     
    745761      CALL iom_get ( numfl_t, jpdom_data, 'vosaline', zs   (:,:,:), jkenr ) 
    746762      CALL iom_get ( numfl_t, jpdom_data, 'somixhgt', zmld (:,:  ), jkenr ) 
    747       CALL iom_get ( numfl_t, jpdom_data, 'sowaflup', zemp (:,:  ), jkenr ) 
     763      CALL iom_get ( numfl_t, jpdom_data, 'sowaflcd', zemp (:,:  ), jkenr ) 
    748764      CALL iom_get ( numfl_t, jpdom_data, 'soshfldo', zqsr (:,:  ), jkenr ) 
    749765      CALL iom_get ( numfl_t, jpdom_data, 'soicecov', zice (:,:  ), jkenr ) 
     
    850866         zw(:,:,jk) = zw(:,:,jk+1) - fse3t(:,:,jk) * zhdiv(:,:,jk) 
    851867      END DO 
     868 
    852869      wdta(:,:,:,2) = zw(:,:,:) * tmask(:,:,:) 
    853  
     870#if defined key_trc_diatrd 
     871      hdivdta(:,:,:,2) = zhdiv(:,:,:) * tmask(:,:,:) 
     872#endif 
    854873 
    855874      tdta(:,:,:,2)   = zt(:,:,:)   * tmask(:,:,:) 
  • branches/dev_001_SBC/NEMO/OFF_SRC/eosbn2.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    5151   !!---------------------------------------------------------------------- 
    5252   !!   OPA 9.0 , LOCEAN-IPSL (2005)  
    53    !! $Id$ 
     53   !! $Header$  
    5454   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    5555   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/OFF_SRC/istate.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    2828   !!---------------------------------------------------------------------- 
    2929   !!   OPA 9.0 , LOCEAN-IPSL  (2005) 
    30    !!   $Id$ 
     30   !!   $Header$ 
    3131   !!   This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    3232   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/OFF_SRC/lbclnk.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    9393      !!---------------------------------------------------------------------- 
    9494      !!  OPA 9.0 , LOCEAN-IPSL (2005)  
    95       !! $Id$ 
     95      !! $Header$  
    9696      !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    9797      !!---------------------------------------------------------------------- 
     
    361361      !!---------------------------------------------------------------------- 
    362362      !!  OPA 9.0 , LOCEAN-IPSL (2005)  
    363       !! $Id$ 
     363      !! $Header$  
    364364      !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    365365      !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/OFF_SRC/lib_cray.f90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    1010!!---------------------------------------------------------------------- 
    1111!!  OPA 9.0 , LOCEAN-IPSL (2005)  
    12 !! $Id$ 
     12!! $Header$  
    1313!! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    1414!!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/OFF_SRC/lib_isml.f90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    1515!!---------------------------------------------------------------------- 
    1616!!  OPA 9.0 , LOCEAN-IPSL (2005)  
    17 !! $Id$ 
     17!! $Header$  
    1818!! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    1919!!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/OFF_SRC/lib_mpp.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    4747   !!---------------------------------------------------------------------- 
    4848   !!  OPA 9.0 , LOCEAN-IPSL (2005)  
    49    !! $Id$ 
     49   !! $Header$  
    5050   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    5151   !!--------------------------------------------------------------------- 
     
    266266   !!---------------------------------------------------------------------- 
    267267   !!  OPA 9.0 , LOCEAN-IPSL (2005)  
    268    !! $Id$ 
     268   !! $Header$  
    269269   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    270270   !!--------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/OFF_SRC/lib_print.f90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    2121   !!---------------------------------------------------------------------- 
    2222   !!  OPA 9.0 , LOCEAN-IPSL (2005)  
    23    !! $Id$ 
     23   !! $Header$  
    2424   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    2525   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/OFF_SRC/model.f90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    1313   !!---------------------------------------------------------------------- 
    1414   !!  OPA 9.0 , LOCEAN-IPSL (2005)  
    15    !! $Id$ 
     15   !! $Header$  
    1616   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    1717   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/OFF_SRC/mppini.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    2929   !!---------------------------------------------------------------------- 
    3030   !!   OPA 9.0 , LOCEAN-IPSL (2005)  
    31    !! $Id$ 
     31   !! $Header$  
    3232   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    3333   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/OFF_SRC/mppini_2.h90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    7171      !!---------------------------------------------------------------------- 
    7272      !!  OPA 9.0 , LOCEAN-IPSL (2005)  
    73       !! $Id$ 
     73      !! $Header$  
    7474      !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    7575      !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/OFF_SRC/oce.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    88   !!---------------------------------------------------------------------- 
    99   !!   OPA 9.0 , LOCEAN-IPSL  (2005) 
    10    !!   $Id$ 
     10   !!   $Header$ 
    1111   !!   This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    1212   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/OFF_SRC/ocfzpt.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    2222   !!---------------------------------------------------------------------- 
    2323   !! OPA 9.0 , LOCEAN-IPSL (2005)  
    24    !! $Id$ 
     24   !! $Header$  
    2525   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    2626   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/OFF_SRC/opa.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    3939   !!---------------------------------------------------------------------- 
    4040   !!   OPA 9.0 , LOCEAN-IPSL  (2005) 
    41    !!   $Id$ 
     41   !!   $Header$ 
    4242   !!   This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    4343   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/OFF_SRC/par_EEL_R2.h90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    55   !!---------------------------------------------------------------------- 
    66   !!  OPA 9.0 , LOCEAN-IPSL (2005)  
    7    !! $Id$ 
     7   !! $Header$  
    88   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    99   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/OFF_SRC/par_EEL_R5.h90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    55   !!---------------------------------------------------------------------- 
    66   !!  OPA 9.0 , LOCEAN-IPSL (2005)  
    7    !! $Id$ 
     7   !! $Header$  
    88   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    99   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/OFF_SRC/par_EEL_R6.h90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    55   !!---------------------------------------------------------------------- 
    66   !!  OPA 9.0 , LOCEAN-IPSL (2005)  
    7    !! $Id$ 
     7   !! $Header$  
    88   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    99   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/OFF_SRC/par_GYRE.h90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    55   !!---------------------------------------------------------------------- 
    66   !!  OPA 9.0 , LOCEAN-IPSL (2005)  
    7    !! $Id$ 
     7   !! $Header$  
    88   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    99   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/OFF_SRC/par_ORCA_R025.h90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    66   !!---------------------------------------------------------------------- 
    77   !!  OPA 9.0 , LOCEAN-IPSL (2005)  
    8    !! $Id$ 
     8   !! $Header$  
    99   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    1010   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/OFF_SRC/par_ORCA_R05.h90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    66   !!---------------------------------------------------------------------- 
    77   !!  OPA 9.0 , LOCEAN-IPSL (2005)  
    8    !! $Id$ 
     8   !! $Header$  
    99   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    1010   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/OFF_SRC/par_ORCA_R2.h90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    66   !!---------------------------------------------------------------------- 
    77   !!  OPA 9.0 , LOCEAN-IPSL (2005)  
    8    !! $Id$ 
     8   !! $Header$  
    99   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    1010   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/OFF_SRC/par_ORCA_R4.h90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    66   !!---------------------------------------------------------------------- 
    77   !!  OPA 9.0 , LOCEAN-IPSL (2005)  
    8    !! $Id$ 
     8   !! $Header$  
    99   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    1010   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/OFF_SRC/par_kind.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    88   !!---------------------------------------------------------------------- 
    99   !!   OPA 9.0 , LOCEAN-IPSL (2005)  
    10    !! $Id$ 
     10   !! $Header$  
    1111   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    1212   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/OFF_SRC/par_oce.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    99   !!---------------------------------------------------------------------- 
    1010   !!  OPA 9.0 , LOCEAN-IPSL (2005)  
    11    !! $Id$ 
     11   !! $Header$  
    1212   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    1313   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/OFF_SRC/phycst.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    7272      !!---------------------------------------------------------------------- 
    7373      !!  OPA 9.0 , LOCEAN-IPSL (2005)  
    74       !! $Id$ 
     74      !! $Header$  
    7575      !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    7676      !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/OFF_SRC/prtctl.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    3232   !!---------------------------------------------------------------------- 
    3333   !!   OPA 9.0 , LOCEAN-IPSL (2005)  
    34    !! $Id$ 
     34   !! $Header$  
    3535   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    3636   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/OFF_SRC/step.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    3333   !!---------------------------------------------------------------------- 
    3434   !!   OPA 9.0 , LOCEAN-IPSL (2005) 
    35    !! $Id$ 
     35   !! $Header$ 
    3636   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    3737   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/OFF_SRC/stpctl.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    4747      !!---------------------------------------------------------------------- 
    4848      !!   OPA 9.0 , LOCEAN-IPSL  (2005) 
    49       !!   $Id$ 
     49      !!   $Header$ 
    5050      !!   This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    5151      !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/OFF_SRC/vectopt_loop_substitute.h90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    77   !!---------------------------------------------------------------------- 
    88   !!  OPA 9.0 , LOCEAN-IPSL (2005)  
    9    !! $Id$ 
     9   !! $Header$  
    1010   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    1111   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/TOP_SRC/SMS/p4zbio.F

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    11 
    2 CCC $Id$ 
     2CCC $Header$  
    33CCC  TOP 1.0 , LOCEAN-IPSL (2005)  
    44C This software is governed by CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
  • branches/dev_001_SBC/NEMO/TOP_SRC/SMS/p4zbio.kriest.h

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    1 CC---------------------------------------------------------------------- 
    2 CC  TOP 1.0 , LOCEAN-IPSL (2005)  
    3 CC $Id$ 
    4 CC This software is governed by CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    5 CC---------------------------------------------------------------------- 
     1 
    62 
    73CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC 
  • branches/dev_001_SBC/NEMO/TOP_SRC/SMS/p4zbio.std.h

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    1 CC---------------------------------------------------------------------- 
    2 CC  TOP 1.0 , LOCEAN-IPSL (2005)  
    3 CC $Id$ 
    4 CC This software is governed by CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    5 CC---------------------------------------------------------------------- 
    6  
    71CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC 
    82CCC p4zbio : PISCES MODEL  - Standard parameterization 
  • branches/dev_001_SBC/NEMO/TOP_SRC/SMS/p4zche.F

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    11 
    2 CCC $Id$ 
     2CCC $Header$  
    33CCC  TOP 1.0 , LOCEAN-IPSL (2005)  
    44C This software is governed by CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
  • branches/dev_001_SBC/NEMO/TOP_SRC/SMS/p4zday.F

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    1 CCC$Id$ 
     1CCC$Header$ 
    22CCC  TOP 1.0 , LOCEAN-IPSL (2005) 
    33C This software is governed by CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
  • branches/dev_001_SBC/NEMO/TOP_SRC/SMS/p4zdiat.F

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    11 
    2 CCC $Id$ 
     2CCC $Header$  
    33CCC  TOP 1.0 , LOCEAN-IPSL (2005)  
    44C This software is governed by CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
  • branches/dev_001_SBC/NEMO/TOP_SRC/SMS/p4zflx.F

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    11 
    2 CCC $Id$ 
     2CCC $Header$  
    33CCC  TOP 1.0 , LOCEAN-IPSL (2005)  
    44C This software is governed by CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
  • branches/dev_001_SBC/NEMO/TOP_SRC/SMS/p4zint.F

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    11 
    2 CCC $Id$ 
     2CCC $Header$  
    33CCC  TOP 1.0 , LOCEAN-IPSL (2005)  
    44C This software is governed by CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
  • branches/dev_001_SBC/NEMO/TOP_SRC/SMS/p4zlim.F

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    11 
    2 CCC $Id$ 
     2CCC $Header$  
    33CCC  TOP 1.0 , LOCEAN-IPSL (2005)  
    44C This software is governed by CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
  • branches/dev_001_SBC/NEMO/TOP_SRC/SMS/p4zlys.F

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    11 
    2 CCC $Id$ 
     2CCC $Header$  
    33CCC  TOP 1.0 , LOCEAN-IPSL (2005)  
    44C This software is governed by CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
  • branches/dev_001_SBC/NEMO/TOP_SRC/SMS/p4zmeso.F

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    11 
    2 CCC $Id$ 
     2CCC $Header: /home/opalod/NEMOCVSROOT/NEMO/TOP_SRC/SMS/p4zmeso.F,v 1.8 2007/10/12 09:32:52 opalod Exp $  
    33CCC  TOP 1.0 , LOCEAN-IPSL (2005)  
    44C This software is governed by CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
  • branches/dev_001_SBC/NEMO/TOP_SRC/SMS/p4zmicro.F

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    11 
    2 CCC $Id$ 
     2CCC $Header$  
    33CCC  TOP 1.0 , LOCEAN-IPSL (2005)  
    44C This software is governed by CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
  • branches/dev_001_SBC/NEMO/TOP_SRC/SMS/p4znano.F

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    11 
    2 CCC $Id$ 
     2CCC $Header$  
    33CCC  TOP 1.0 , LOCEAN-IPSL (2005)  
    44C This software is governed by CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
  • branches/dev_001_SBC/NEMO/TOP_SRC/SMS/p4zopt.F

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    11 
    2 CCC $Id$ 
     2CCC $Header$  
    33CCC  TOP 1.0 , LOCEAN-IPSL (2005)  
    44C This software is governed by CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
  • branches/dev_001_SBC/NEMO/TOP_SRC/SMS/p4zprg.F

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    11 
    2 CCC $Id$ 
     2CCC $Header$  
    33CCC  TOP 1.0 , LOCEAN-IPSL (2005)  
    44C This software is governed by CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
  • branches/dev_001_SBC/NEMO/TOP_SRC/SMS/p4zprod.F

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    11 
    2 CCC $Id$ 
     2CCC $Header$  
    33CCC  TOP 1.0 , LOCEAN-IPSL (2005)  
    44C This software is governed by CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
  • branches/dev_001_SBC/NEMO/TOP_SRC/SMS/p4zrem.F

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    11 
    2 CCC $Id$ 
     2CCC $Header: /home/opalod/NEMOCVSROOT/NEMO/TOP_SRC/SMS/p4zrem.F,v 1.8 2007/10/12 09:28:41 opalod Exp $  
    33CCC  TOP 1.0 , LOCEAN-IPSL (2005)  
    44C This software is governed by CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
     
    5050      REAL zsatur,zsatur2,znusil,zdepbac(jpi,jpj,jpk) 
    5151      REAL zlamfac,zstep,fesatur(jpi,jpj,jpk) 
     52      REAL ztempbac(jpi,jpj) 
    5253C 
    5354C      Time step duration for the biology 
     
    5960C      -------------------------------------------------- 
    6061C 
    61         DO jk=1,12 
    62          zdepbac(:,:,jk)=min(0.7*(trn(:,:,jk,jpzoo)+2*trn(:,:,jk,jpmes)) 
    63      &     ,4E-6) 
     62        DO jk=1,jpkm1 
     63          DO jj = 1, jpj 
     64            DO ji = 1, jpi 
     65         IF (fsdept(ji,jj,jk).lt.120.) THEN 
     66         zdepbac(ji,jj,jk)=min(0.7*(trn(ji,jj,jk,jpzoo) 
     67     &     +2*trn(ji,jj,jk,jpmes)),4E-6) 
     68         ztempbac(ji,jj)=zdepbac(ji,jj,jk) 
     69         ELSE 
     70         zdepbac(ji,jj,jk)=min(1.,120./fsdept(ji,jj,jk)) 
     71     &      *ztempbac(ji,jj) 
     72         ENDIF 
     73            END DO 
     74          END DO 
    6475        END DO 
    65 C 
    66 C      Vertical decay of the bacterial activity 
    67 C      ---------------------------------------- 
    68 C 
    69          do jk=13,jpk 
    70            do jj=1,jpj 
    71              do ji=1,jpi 
    72          zdepbac(ji,jj,jk)=min(1.,fsdept(ji,jj,12)/fsdept(ji,jj,jk)) 
    73      &      *zdepbac(ji,jj,12) 
    74              end do 
    75            end do 
    76          end do 
    7776 
    7877         DO jk = 1,jpkm1 
     
    253252         zlamfac=min(1.,zlamfac) 
    254253#if ! defined key_trc_kriest 
    255          xlam1b=(80.*(trn(ji,jj,jk,jpdoc)+40E-6)+698. 
     254         xlam1b=(80.*(trn(ji,jj,jk,jpdoc)+35E-6)+698. 
    256255     &    *trn(ji,jj,jk,jppoc)+1.05E4*trn(ji,jj,jk,jpgoc)) 
    257      &    *zdiss(ji,jj,jk)+1E-5*(1.-zlamfac)+xlam1*max(0., 
     256     &    *zdiss(ji,jj,jk)+1E-4*(1.-zlamfac)+xlam1*max(0., 
    258257     &    (trn(ji,jj,jk,jpfer)*1E9-1.)) 
    259258#else 
    260          xlam1b=(80.*(trn(ji,jj,jk,jpdoc)+40E-6)+698. 
     259         xlam1b=(80.*(trn(ji,jj,jk,jpdoc)+35E-6)+698. 
    261260     &    *trn(ji,jj,jk,jppoc)) 
    262      &    *zdiss(ji,jj,jk)+1E-5*(1.-zlamfac)+xlam1*max(0., 
     261     &    *zdiss(ji,jj,jk)+1E-4*(1.-zlamfac)+xlam1*max(0., 
    263262     &    (trn(ji,jj,jk,jpfer)*1E9-1.)) 
    264263#endif 
    265264 
    266265 
    267          xaggdfe(ji,jj,jk)=xlam1b*zstep*0.76*(trn(ji,jj,jk,jpfer) 
     266         xaggdfe(ji,jj,jk)=xlam1b*zstep*0.5*(trn(ji,jj,jk,jpfer) 
    268267     &     -xfeequi) 
    269268#    if defined key_off_degrad 
  • branches/dev_001_SBC/NEMO/TOP_SRC/SMS/p4zsed.F

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    11 
    2 CCC $Id$ 
     2CCC $Header: /home/opalod/NEMOCVSROOT/NEMO/TOP_SRC/SMS/p4zsed.F,v 1.9 2007/10/12 09:35:04 opalod Exp $  
    33CCC  TOP 1.0 , LOCEAN-IPSL (2005)  
    44C This software is governed by CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
     
    102102     &      +(rivinp(ji,jj)+nitdep(ji,jj))*rfact2 
    103103          trn(ji,jj,1,jpfer) = trn(ji,jj,1,jpfer) 
    104      &      +rivinp(ji,jj)*9E-5*rfact2 
     104     &      +rivinp(ji,jj)*3E-5*rfact2 
    105105          trn(ji,jj,1,jpsil) = trn(ji,jj,1,jpsil) 
    106106     &      +sidep(ji,jj)+cotdep(ji,jj)*rfact2/6. 
     
    140140C    ------------------------------------------------------------- 
    141141C 
    142         DO jj=2,jpjm1 
    143           DO ji=2,jpim1 
     142        DO jj=1,jpj 
     143          DO ji=1,jpi 
    144144            ikt=max(mbathy(ji,jj)-1,1) 
    145             zfact=e1t(ji,jj)*e2t(ji,jj)/rjjss 
     145            zfact=e1t(ji,jj)*e2t(ji,jj)/rjjss*tmask_i(ji,jj) 
    146146            sumsedsi=sumsedsi+zfact*trn(ji,jj,ikt,jpdsi) 
    147147#if ! defined key_trc_kriest 
     
    152152            sumsedcal=sumsedcal+trn(ji,jj,ikt,jpcal)*wscal(ji,jj,ikt) 
    153153     &          *2.*zfact 
     154#if  defined key_trc_kriest 
    154155            sumsedpo4=sumsedpo4+ 
    155156     &          (trn(ji,jj,ikt,jppoc)*wsbio3(ji,jj,ikt))*zfact 
     157#else 
     158            sumsedpo4=sumsedpo4+(trn(ji,jj,ikt,jpgoc)*wsbio4(ji,jj,ikt) 
     159     &    +trn(ji,jj,ikt,jppoc)*wsbio3(ji,jj,ikt))*zfact 
     160#endif 
    156161          END DO 
    157162        END DO 
     
    246251            DO ji=2,jpi-1 
    247252        denitot=denitot+denitr(ji,jj,jk)*rdenit*e1t(ji,jj)*e2t(ji,jj) 
    248      &    *fse3t(ji,jj,jk)*tmask(ji,jj,jk)*znegtr(ji,jj,jk) 
     253     &    *fse3t(ji,jj,jk)*tmask(ji,jj,jk)*tmask_i(ji,jj) 
     254     &    *znegtr(ji,jj,jk) 
    249255            END DO 
    250256          END DO 
     
    274280      nitrpottot=0. 
    275281      DO jk=1,jpkm1 
    276         DO jj=2,jpj-1 
    277           DO ji=2,jpi-1 
     282        DO jj=1,jpj 
     283          DO ji=1,jpi 
    278284        nitrpottot=nitrpottot+nitrpot(ji,jj,jk)*e1t(ji,jj) 
    279      &    *e2t(ji,jj)*tmask(ji,jj,jk)*fse3t(ji,jj,jk) 
     285     &    *e2t(ji,jj)*tmask(ji,jj,jk)*tmask_i(ji,jj)*fse3t(ji,jj,jk) 
    280286          END DO 
    281287        END DO 
  • branches/dev_001_SBC/NEMO/TOP_SRC/SMS/p4zsink.F

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    2828CC      original  : 2004 - O. Aumont  
    2929CC---------------------------------------------------------------------- 
    30  
    31 CC---------------------------------------------------------------------- 
    32 CC  TOP 1.0 , LOCEAN-IPSL (2005)  
    33 CC $Id$ 
    34 CC This software is governed by CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    35 CC---------------------------------------------------------------------- 
    36  
    3730CC parameters and commons 
    3831CC ====================== 
  • branches/dev_001_SBC/NEMO/TOP_SRC/SMS/p4zsink.kriest.h

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    1 CC---------------------------------------------------------------------- 
    2 CC  TOP 1.0 , LOCEAN-IPSL (2005)  
    3 CC $Id$ 
    4 CC This software is governed by CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    5 CC---------------------------------------------------------------------- 
    6  
    71CCCCCC PISCES MODEL: Kriest parameterization 
    82CDIR$ LIST 
  • branches/dev_001_SBC/NEMO/TOP_SRC/SMS/p4zsink.std.h

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    1 CC---------------------------------------------------------------------- 
    2 CC  TOP 1.0 , LOCEAN-IPSL (2005)  
    3 CC $Id$ 
    4 CC This software is governed by CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    5 CC---------------------------------------------------------------------- 
    61 
    72CDIR$ LIST 
     
    3328         DO jj=1,jpj 
    3429           DO ji=1,jpi 
    35        zfact=max(0.,fsdepw(ji,jj,jk+1)-hmld(ji,jj))/2000. 
     30       zfact=max(0.,fsdepw(ji,jj,jk+1)-hmld(ji,jj))/4000. 
    3631       wsbio4(ji,jj,jk)=wsbio2+(200.-wsbio2)*zfact 
    3732             END DO 
     
    105100C    ---------------------------------------------- 
    106101C 
    107          xagg3=0.66*zstep*trn(ji,jj,jk,jppoc)*trn(ji,jj,jk,jppoc) 
     102         xagg3=0.66*zstep*trn(ji,jj,jk,jppoc)*trn(ji,jj,jk,jpgoc) 
    108103#    if defined key_off_degrad 
    109104     &     *facvol(ji,jj,jk) 
    110105#    endif 
    111106 
    112          xagg4=0.*zstep*trn(ji,jj,jk,jppoc)*trn(ji,jj,jk,jpgoc) 
     107         xagg4=0.*zstep*trn(ji,jj,jk,jppoc)*trn(ji,jj,jk,jppoc) 
    113108#    if defined key_off_degrad 
    114109     &     *facvol(ji,jj,jk) 
  • branches/dev_001_SBC/NEMO/TOP_SRC/SMS/p4zsink2.F

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    11 
    2 CCC $Id$ 
     2CCC $Header$  
    33CCC  TOP 1.0 , LOCEAN-IPSL (2005)  
    44C This software is governed by CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
  • branches/dev_001_SBC/NEMO/TOP_SRC/SMS/p4zslow.F

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    11 
    2 CCC $Id$ 
     2CCC $Header$  
    33CCC  TOP 1.0 , LOCEAN-IPSL (2005)  
    44C This software is governed by CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
  • branches/dev_001_SBC/NEMO/TOP_SRC/SMS/par_sms.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    1212   !!---------------------------------------------------------------------- 
    1313   !!  TOP 1.0 , LOCEAN-IPSL (2005)  
    14    !! $Id$ 
     14   !! $Header$  
    1515   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    1616   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/TOP_SRC/SMS/par_sms_cfc.h90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    66   !!---------------------------------------------------------------------- 
    77   !!  TOP 1.0 , LOCEAN-IPSL (2005)  
    8    !! $Id$ 
     8   !! $Header$  
    99   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    1010   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/TOP_SRC/SMS/par_sms_lobster1.h90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    2020!!---------------------------------------------------------------------- 
    2121!!  TOP 1.0,  LOCEAN-IPSL (2005) 
    22 !! $Id$ 
     22!! $Header$ 
    2323!! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    2424!!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/TOP_SRC/SMS/par_sms_pisces.h90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    33   !! pisces model :   assign a parameter to name individual tracers 
    44   !!====================================================================== 
    5  
    6    !!---------------------------------------------------------------------- 
    7    !!  TOP 1.0 , LOCEAN-IPSL (2005)  
    8    !! $Id$ 
    9    !! This software is governed by CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    10    !!---------------------------------------------------------------------- 
    115 
    126   INTEGER, PARAMETER ::  jpdiabio = 1 
  • branches/dev_001_SBC/NEMO/TOP_SRC/SMS/sms.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    88   !!---------------------------------------------------------------------- 
    99   !!  TOP 1.0 , LOCEAN-IPSL (2005)  
    10    !! $Id$ 
     10   !! $Header$  
    1111   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    1212   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/TOP_SRC/SMS/sms_cfc.h90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    66   !!---------------------------------------------------------------------- 
    77   !!  TOP 1.0 , LOCEAN-IPSL (2005)  
    8    !! $Id$ 
     8   !! $Header$  
    99   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    1010   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/TOP_SRC/SMS/sms_lobster1.h90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    1616!!--------------------------------------------------------------------- 
    1717!!  TOP 1.0 , LOCEAN-IPSL (2005)  
    18    !! $Id$ 
     18   !! $Header$  
    1919   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    2020!!--------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/TOP_SRC/SMS/sms_pisces.h90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    1313!! 
    1414!! 
    15    !!---------------------------------------------------------------------- 
    16    !!  TOP 1.0 , LOCEAN-IPSL (2005)  
    17    !! $Id$ 
    18    !! This software is governed by CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    19    !!---------------------------------------------------------------------- 
    20  
    2115#if defined key_trc_pisces 
    2216!! 
     
    7266      REAL(wp), DIMENSION(jpi,jpj,jpk) :: & 
    7367         sio3eq, fekeq 
    74 !! 
    75 !!---------------------------------------------------------------------- 
    76 !! 
    77 !!  Variable for simplified sediments 
    78 !! 
    79 !! --------------------------------------------------------------------- 
    80 !! 
    81       REAL(wp), DIMENSION(jpi,jpj) :: &  
    82          sedpoc, sedcal, sedsil 
    83  
    84       REAL(wp) :: & 
    85          sedlam,sedlostpoc, sedlostsil,sedlostcal 
    86  
    8768 
    8869!! 
  • branches/dev_001_SBC/NEMO/TOP_SRC/SMS/trcbio.F

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    11 
    2 CCC $Id$ 
     2CCC $Header: /home/opalod/NEMOCVSROOT/NEMO/TOP_SRC/SMS/trcbio.F,v 1.9 2007/10/12 09:36:28 opalod Exp $  
    33CCC  TOP 1.0 , LOCEAN-IPSL (2005)  
    44C This software is governed by CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
     
    9898#if defined key_trc_diaadd 
    9999      REAL ze3t(jpi,jpj,jpk) 
    100 endif 
     100#endif 
    101101      REAL zdet,zzoo,zphy,zno3,znh4,zdom,zlno3,zlnh4,zle,zlt 
    102102      REAL zno3phy, znh4phy, zphynh4, zphydom, zphydet, zphyzoo, zdetzoo 
  • branches/dev_001_SBC/NEMO/TOP_SRC/SMS/trcctl.cfc.h90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    1    !!---------------------------------------------------------------------- 
    2    !!  TOP 1.0 , LOCEAN-IPSL (2005)  
    3    !! $Id$ 
    4    !! This software is governed by CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    5    !!---------------------------------------------------------------------- 
     1! $Id$ 
    62!!! 
    73!!! Modifications: 
  • branches/dev_001_SBC/NEMO/TOP_SRC/SMS/trcctl.lobster1.h90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    11!!---------------------------------------------------------------------- 
    22!!  TOP 1.0,  LOCEAN-IPSL (2005) 
    3 !! $Id$ 
     3!! $Header$ 
    44!! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    55!!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/TOP_SRC/SMS/trcctl.pisces.h90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    22   !!---------------------------------------------------------------------- 
    33   !!  TOP 1.0 , LOCEAN-IPSL (2005)  
    4    !! $Id$ 
     4   !! $Header$  
    55   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    66   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/TOP_SRC/SMS/trcexp.F

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    1 CCC $Id$ 
     1CCC $Header$  
    22      SUBROUTINE trcexp(kt) 
    33#if defined key_passivetrc && defined key_trc_lobster1  
  • branches/dev_001_SBC/NEMO/TOP_SRC/SMS/trcfreons.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    4040   !!---------------------------------------------------------------------- 
    4141   !!  TOP 1.0 , LOCEAN-IPSL (2005)  
    42    !! $Id$ 
     42   !! $Header$  
    4343   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    4444   !!---------------------------------------------------------------------- 
     
    241241      !!--------------------------------------------------------------------- 
    242242      !!  TOP 1.0 , LOCEAN-IPSL (2005)  
    243    !! $Id$ 
     243   !! $Header$  
    244244   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    245245      !!---------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/TOP_SRC/SMS/trcini.cfc.h90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    2727      !!--------------------------------------------------------------------- 
    2828      !!  TOP 1.0 , LOCEAN-IPSL (2005)  
    29    !! $Id$ 
     29   !! $Header$  
    3030   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    3131      !!--------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/TOP_SRC/SMS/trcini.lobster1.h90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    2121      !!---------------------------------------------------------------------- 
    2222      !!  TOP 1.0 , LOCEAN-IPSL (2005)  
    23    !! $Id$ 
     23   !! $Header$  
    2424   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    2525      !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/TOP_SRC/SMS/trcini.pisces.h90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    3737      !!---------------------------------------------------------------------- 
    3838      !!  TOP 1.0 , LOCEAN-IPSL (2005)  
    39       !! $Id$ 
     39      !! $Header: /home/opalod/NEMOCVSROOT/NEMO/TOP_SRC/SMS/trcini.pisces.h90,v 1.9 2007/10/12 09:35:04 opalod Exp $  
    4040      !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    4141      !!---------------------------------------------------------------------- 
     
    169169            DO ji = 2, jpim1 
    170170               sumdepsi = sumdepsi + dustmo(ji,jj,jm)/(12.*rmoss)*8.8        & 
    171                   *0.075/28.1*e1t(ji,jj)*e2t(ji,jj)*tmask(ji,jj,1) 
     171                  *0.075/28.1*e1t(ji,jj)*e2t(ji,jj)*tmask(ji,jj,1)*tmask_i(ji,jj) 
    172172            END DO 
    173173         END DO 
     
    200200         DO ji=2,jpim1 
    201201            rivpo4input=rivpo4input+rivinp(ji,jj)*(e1t(ji,jj)*e2t(ji,jj)    & 
    202                *fse3t(ji,jj,1))*tmask(ji,jj,1)*raass 
     202               *fse3t(ji,jj,1))*tmask(ji,jj,1)*tmask_i(ji,jj)*raass 
    203203            rivalkinput=rivalkinput+cotdep(ji,jj)*(e1t(ji,jj)*e2t(ji,jj)    & 
    204                *fse3t(ji,jj,1))*tmask(ji,jj,1)*raass 
     204               *fse3t(ji,jj,1))*tmask(ji,jj,1)*tmask_i(ji,jj)*raass 
    205205            nitdepinput=nitdepinput+nitdep(ji,jj)*(e1t(ji,jj)*e2t(ji,jj)    & 
    206                *fse3t(ji,jj,1))*tmask(ji,jj,1)*raass 
     206               *fse3t(ji,jj,1))*tmask(ji,jj,1)*tmask_i(ji,jj)*raass 
    207207         END DO 
    208208      END DO 
  • branches/dev_001_SBC/NEMO/TOP_SRC/SMS/trclsm.cfc.h90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    1919      !!---------------------------------------------------------------------- 
    2020      !!  TOP 1.0 , LOCEAN-IPSL (2005)  
    21    !! $Id$ 
     21   !! $Header$  
    2222   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    2323      !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/TOP_SRC/SMS/trclsm.lobster1.h90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    2727      !!--------------------------------------------------------------------- 
    2828      !!  TOP 1.0 , LOCEAN-IPSL (2005)  
    29    !! $Id$ 
     29   !! $Header$  
    3030   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    3131      !!--------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/TOP_SRC/SMS/trclsm.pisces.h90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    2727      !!--------------------------------------------------------------------- 
    2828      !!  TOP 1.0 , LOCEAN-IPSL (2005)  
    29    !! $Id$ 
     29   !! $Header: /home/opalod/NEMOCVSROOT/NEMO/TOP_SRC/SMS/trclsm.pisces.h90,v 1.7 2007/10/17 14:50:13 opalod Exp $  
    3030   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    3131      !!--------------------------------------------------------------------- 
     
    3636      NAMELIST/natext/ atcco2 
    3737      NAMELIST/natbio/caco3r, kdca, nca, part,                       & 
    38          &          dispo0,conc0,oxymin,grosip, sedlam,              & 
    39          &          sedlostpoc,sedlostcal,sedlostsil,nrdttrc,        & 
     38         &          dispo0,conc0,oxymin,grosip, nrdttrc,              & 
    4039         &          pislope, excret,wsbio,wchl,wchld,resrat,mprat,mzrat,   & 
    4140         &          grazrat,xprefc,xprefp,unass,xkgraz,xkmort,xksi1, & 
     
    102101            &   ' Phosphate half saturation                  =', conc0 
    103102         WRITE(numout,*)      & 
    104             &   ' Sediment bioturbation factor               =', sedlam 
    105          WRITE(numout,*)      & 
    106             &   ' Sediment burying ratio for POC             =', sedlostpoc 
    107          WRITE(numout,*)      & 
    108             &   ' Sediment burying ratio for CACO3           =', sedlostcal 
    109          WRITE(numout,*)      & 
    110             &   ' Sediment burying ratio for SI              =', sedlostsil 
    111          WRITE(numout,*)      & 
    112103            &   ' frequence pour la biologie                 =', nrdttrc 
    113104         WRITE(numout,*)      & 
  • branches/dev_001_SBC/NEMO/TOP_SRC/SMS/trcopt.F

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    1 CC $Id$ 
     1CC $Header$ 
    22CDIR$ LIST 
    33      SUBROUTINE trcopt(kt) 
  • branches/dev_001_SBC/NEMO/TOP_SRC/SMS/trcsed.F

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    1 CC $Id$ 
     1CC $Header: /home/opalod/NEMOCVSROOT/NEMO/TOP_SRC/SMS/trcsed.F,v 1.7 2007/10/12 09:36:28 opalod Exp $ 
    22CDIR$ LIST 
    33      SUBROUTINE trcsed(kt) 
     
    8989#if defined key_trc_diaadd 
    9090      REAL ze3t(jpi,jpj,jpk) 
    91 endif 
     91#endif 
    9292CC---------------------------------------------------------------------- 
    9393CC statement functions 
  • branches/dev_001_SBC/NEMO/TOP_SRC/SMS/trp_trc.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    66   !!====================================================================== 
    77   !!  TOP 1.0,  LOCEAN-IPSL (2005) 
    8    !! $Id$ 
     8   !! $Header$ 
    99   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    1010   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/TOP_SRC/TRP/trcadv_cen2.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    2626   !!---------------------------------------------------------------------- 
    2727   !!   TOP 1.0 , LOCEAN-IPSL (2005)  
    28    !! $Id$ 
     28   !! $Header$  
    2929   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    3030   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/TOP_SRC/TRP/trcadv_muscl.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    2727   !!---------------------------------------------------------------------- 
    2828   !!   TOP 1.0 , LOCEAN-IPSL (2005)  
    29    !! $Id$ 
     29   !! $Header: /home/opalod/NEMOCVSROOT/NEMO/TOP_SRC/TRP/trcadv_muscl.F90,v 1.13 2007/10/12 09:26:30 opalod Exp $  
    3030   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    3131   !!---------------------------------------------------------------------- 
     
    103103 
    104104      DO jn = 1, jptra 
    105  
     105#if defined key_trc_diatrd 
     106        DO jk = 1,jpk 
     107           DO jj = 1,jpj 
     108              DO ji = 1,jpi 
     109                 IF (luttrd(jn)) trtrd(ji,jj,jk,ikeep(jn),1) = 0. 
     110                 IF (luttrd(jn)) trtrd(ji,jj,jk,ikeep(jn),2) = 0. 
     111                 IF (luttrd(jn)) trtrd(ji,jj,jk,ikeep(jn),3) = 0. 
     112              END DO 
     113            END DO 
     114          END DO 
     115#endif 
    106116         ! I. Horizontal advective fluxes 
    107117         ! ------------------------------ 
  • branches/dev_001_SBC/NEMO/TOP_SRC/TRP/trcadv_muscl2.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    3030   !!---------------------------------------------------------------------- 
    3131   !!   TOP 1.0 , LOCEAN-IPSL (2005)  
    32    !! $Id$ 
     32   !! $Header$  
    3333   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    3434   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/TOP_SRC/TRP/trcadv_smolar.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    3131   !!---------------------------------------------------------------------- 
    3232   !!   TOP 1.0 , LOCEAN-IPSL (2005)  
    33    !! $Id$ 
     33   !! $Header$  
    3434   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    3535   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/TOP_SRC/TRP/trcadv_tvd.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    2828   !!---------------------------------------------------------------------- 
    2929   !!   TOP 1.0 , LOCEAN-IPSL (2005)  
    30    !! $Id$ 
     30   !! $Header$  
    3131   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    3232   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/TOP_SRC/TRP/trcbbc.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    4141   !!---------------------------------------------------------------------- 
    4242   !!  TOP 1.0 , LOCEAN-IPSL (2005)  
    43    !! $Id$ 
     43   !! $Header$  
    4444   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    4545   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/TOP_SRC/TRP/trcbbl.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    6161   !!---------------------------------------------------------------------- 
    6262   !!   TOP 1.0 , LOCEAN-IPSL (2005)  
    63    !! $Id$ 
     63   !! $Header$  
    6464   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    6565   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/TOP_SRC/TRP/trcbbl_adv.h90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    55   !!---------------------------------------------------------------------- 
    66   !!   TOP 1.0 , LOCEAN-IPSL (2005)  
    7    !! $Id$ 
     7   !! $Header$  
    88   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    99   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/TOP_SRC/TRP/trcdmp.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    3737   !!---------------------------------------------------------------------- 
    3838   !!   TOP 1.0 , LOCEAN-IPSL (2005)  
    39    !! $Id$ 
     39   !! $Header: /home/opalod/NEMOCVSROOT/NEMO/TOP_SRC/TRP/trcdmp.F90,v 1.12 2007/10/12 09:26:30 opalod Exp $  
    4040   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    4141   !!---------------------------------------------------------------------- 
     
    108108#    if defined key_trc_diatrd 
    109109                        ! save the trends for diagnostics 
    110                         IF (luttrd(jn)) trtrd(ji,jj,jk,ikeep(jn),jpdiatrc) = ztra 
     110                        IF (luttrd(jn)) trtrd(ji,jj,jk,ikeep(jn),jpdiatrc-1) = ztra 
    111111#    endif 
    112112                     END DO 
     
    129129#    if defined key_trc_diatrd 
    130130                        ! save the trends for diagnostics 
    131                         IF (luttrd(jn)) trtrd(ji,jj,jk,ikeep(jn),jpdiatrc) = ztra 
     131                        IF (luttrd(jn)) trtrd(ji,jj,jk,ikeep(jn),jpdiatrc-1) = ztra 
    132132#    endif 
    133133                     END DO 
     
    149149#    if defined key_trc_diatrd 
    150150                        ! save the trends for diagnostics 
    151                         IF (luttrd(jn)) trtrd(ji,jj,jk,ikeep(jn),jpdiatrc) = ztra 
     151                        IF (luttrd(jn)) trtrd(ji,jj,jk,ikeep(jn),jpdiatrc-1) = ztra 
    152152#    endif 
    153153                     END DO 
  • branches/dev_001_SBC/NEMO/TOP_SRC/TRP/trcldf_bilap.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    2525   !!---------------------------------------------------------------------- 
    2626   !!   TOP 1.0 , LOCEAN-IPSL (2005)  
    27    !! $Id$ 
     27   !! $Header: /home/opalod/NEMOCVSROOT/NEMO/TOP_SRC/TRP/trcldf_bilap.F90,v 1.12 2007/10/12 09:26:30 opalod Exp $  
    2828   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    2929   !!---------------------------------------------------------------------- 
     
    148148                     ikv = MIN ( mbathy(ji,jj), mbathy(ji  ,jj+1) ) - 1 
    149149                     IF( iku == jk ) THEN 
    150                         ztu(ji,jj,jk) = zeeu(ji,jj) * gtru(ji,jj) 
     150                        ztu(ji,jj,jk) = zeeu(ji,jj) * gtru(ji,jj,jn) 
    151151                     ENDIF 
    152152                     IF( ikv == jk ) THEN 
    153                         ztv(ji,jj,jk) = zeev(ji,jj) * gtrv(ji,jj) 
     153                        ztv(ji,jj,jk) = zeev(ji,jj) * gtrv(ji,jj,jn) 
    154154                     ENDIF 
    155155                  END DO 
  • branches/dev_001_SBC/NEMO/TOP_SRC/TRP/trcldf_bilapg.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    2828   !!---------------------------------------------------------------------- 
    2929   !!   TOP 1.0 , LOCEAN-IPSL (2005)  
    30    !! $Id$ 
     30   !! $Header$  
    3131   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    3232   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/TOP_SRC/TRP/trcldf_iso.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    2727   !!---------------------------------------------------------------------- 
    2828   !!   TOP 1.0 , LOCEAN-IPSL (2005)  
    29    !! $Id$ 
     29   !! $Header: /home/opalod/NEMOCVSROOT/NEMO/TOP_SRC/TRP/trcldf_iso.F90,v 1.10 2007/10/12 09:26:30 opalod Exp $  
    3030   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    3131   !!---------------------------------------------------------------------- 
     
    9595      REAL(wp), DIMENSION(jpi,jpj) ::   & 
    9696         zftug, zftvg 
     97 
     98#if defined key_trc_diatrd 
     99      REAL(wp) ::   & 
     100         ztagu, ztagv 
     101#endif 
     102 
    97103#endif 
    98104 
     
    202208               END DO 
    203209            END DO 
     210 
     211#if defined key_trc_diatrd 
     212#   if defined key_trcldf_eiv 
     213            DO jj = 2 , jpjm1 
     214               DO ji = fs_2, fs_jpim1   ! vector opt. 
     215                  zbtr= 1. / ( e1t(ji,jj) * e2t(ji,jj) * fse3t(ji,jj,jk) ) 
     216                  ztagu = ( zftug(ji,jj) - zftug(ji-1,jj  ) ) * zbtr 
     217                  ztagv = ( zftvg(ji,jj) - zftvg(ji  ,jj-1) ) * zbtr 
     218                  IF (luttrd(jn)) trtrd (ji,jj,jk,ikeep(jn),4) = trtrd(ji,jj,jk,ikeep(jn),4) - ztagu 
     219                  IF (luttrd(jn)) trtrd (ji,jj,jk,ikeep(jn),5) = trtrd(ji,jj,jk,ikeep(jn),5) - ztagv 
     220                  IF (luttrd(jn)) trtrd (ji,jj,jk,ikeep(jn),7) = ztagu 
     221                  IF (luttrd(jn)) trtrd (ji,jj,jk,ikeep(jn),8) = ztagv 
     222               END DO 
     223             END DO 
     224#   endif 
     225#endif 
     226 
    204227            !                                          ! =============== 
    205228         END DO                                        !   End of slab   
  • branches/dev_001_SBC/NEMO/TOP_SRC/TRP/trcldf_iso_zps.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    2626   !!---------------------------------------------------------------------- 
    2727   !!   TOP 1.0 , LOCEAN-IPSL (2005)  
    28    !! $Id$ 
     28   !! $Header: /home/opalod/NEMOCVSROOT/NEMO/TOP_SRC/TRP/trcldf_iso_zps.F90,v 1.11 2007/10/12 09:26:30 opalod Exp $  
    2929   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    3030   !!---------------------------------------------------------------------- 
     
    8585      REAL(wp) ::   & 
    8686         zabe1, zabe2, zcof1, zcof2,   &  ! temporary scalars 
    87          zmsku, zmskv, zbtr, ztra,     & 
    88          ztagu, ztagv 
     87         zmsku, zmskv, zbtr, ztra        
    8988 
    9089      REAL(wp), DIMENSION(jpi,jpj) ::   & 
     
    102101         zuwk1, zvwk1,                 & 
    103102         zcg1,zcg2 
     103 
     104#if defined key_trc_diatrd 
     105      REAL(wp) ::   & 
     106         ztagu, ztagv 
     107#endif 
     108 
    104109#endif 
    105110      CHARACTER (len=22) :: charout 
     
    118123      DO jn = 1, jptra 
    119124 
     125#if defined key_trcldf_eiv && key_trc_diatrd 
    120126         ztagu = 0.e0 
    121127         ztagv = 0.e0 
     128#endif 
    122129 
    123130         ! Horizontal passive tracer gradient  
     
    234241                  IF (luttrd(jn)) trtrd (ji,jj,jk,ikeep(jn),4) = trtrd(ji,jj,jk,ikeep(jn),4) - ztagu 
    235242                  IF (luttrd(jn)) trtrd (ji,jj,jk,ikeep(jn),5) = trtrd(ji,jj,jk,ikeep(jn),5) - ztagv 
     243                  IF (luttrd(jn)) trtrd (ji,jj,jk,ikeep(jn),7) = ztagu 
     244                  IF (luttrd(jn)) trtrd (ji,jj,jk,ikeep(jn),8) = ztagv 
    236245               END DO 
    237246            END DO 
  • branches/dev_001_SBC/NEMO/TOP_SRC/TRP/trcldf_lap.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    2424   !!---------------------------------------------------------------------- 
    2525   !!   TOP 1.0 , LOCEAN-IPSL (2005)  
    26    !! $Id$ 
     26   !! $Header$  
    2727   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    2828   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/TOP_SRC/TRP/trcnxt.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    2424   !!---------------------------------------------------------------------- 
    2525   !!   TOP 1.0 , LOCEAN-IPSL (2005)  
    26    !! $Id$ 
     26   !! $Header$  
    2727   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    2828   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/TOP_SRC/TRP/trcrad.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    2323   !!---------------------------------------------------------------------- 
    2424   !!   TOP 1.0 , LOCEAN-IPSL (2005)  
    25    !! $Id$ 
     25   !! $Header$  
    2626   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    2727   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/TOP_SRC/TRP/trcsbc.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    2424   !!---------------------------------------------------------------------- 
    2525   !!   TOP 1.0 , LOCEAN-IPSL (2005)  
    26    !! $Id$ 
     26   !! $Header: /home/opalod/NEMOCVSROOT/NEMO/TOP_SRC/TRP/trcsbc.F90,v 1.10 2007/10/12 09:26:30 opalod Exp $  
    2727   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    2828   !!---------------------------------------------------------------------- 
     
    7474      zsrau = 1. / rauw 
    7575      IF( .NOT. ln_sco )  zse3t = 1. / fse3t(1,1,1) 
     76#if defined key_trc_diatrd 
     77      DO jn = 1, jptra 
     78        IF (luttrd(jn)) trtrd(:,:,:,ikeep(jn),jpdiatrc) = 0.0 
     79      END DO 
     80#endif 
    7681 
    7782      DO jn = 1, jptra 
     
    8590               ! add the trend to the general tracer trend 
    8691               tra(ji,jj,1,jn) = tra(ji,jj,1,jn) + ztra 
     92#if defined key_trc_diatrd 
     93               IF (luttrd(jn)) trtrd(ji,jj,1,ikeep(jn),jpdiatrc) = trtrd(ji,jj,1,jn,jpdiatrc)+ztra 
     94#endif 
    8795            END DO 
    8896         END DO 
  • branches/dev_001_SBC/NEMO/TOP_SRC/TRP/trcstp.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    2525   !!---------------------------------------------------------------------- 
    2626   !!   TOP 1.0 , LOCEAN-IPSL (2005)  
    27    !! $Id$ 
     27   !! $Header$  
    2828   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    2929   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/TOP_SRC/TRP/trctrp.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    5151   !!---------------------------------------------------------------------- 
    5252   !!   TOP 1.0 , LOCEAN-IPSL (2005)  
    53    !! $Id$ 
     53   !! $Header$  
    5454   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    5555   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/TOP_SRC/TRP/trctrp_ctl.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    2828   !!---------------------------------------------------------------------- 
    2929   !!   TOP 1.0 , LOCEAN-IPSL (2005)  
    30    !! $Id$ 
     30   !! $Header$  
    3131   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    3232   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/TOP_SRC/TRP/trctrp_lec.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    7575   !!---------------------------------------------------------------------- 
    7676   !!   TOP 1.0 , LOCEAN-IPSL (2005)  
    77    !! $Id$ 
     77   !! $Header$  
    7878   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    7979   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/TOP_SRC/TRP/trczdf_exp.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    3030   !!---------------------------------------------------------------------- 
    3131   !!   TOP 1.0 , LOCEAN-IPSL (2005)  
    32    !! $Id$ 
     32   !! $Header$  
    3333   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    3434   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/TOP_SRC/TRP/trczdf_imp.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    2929   !!---------------------------------------------------------------------- 
    3030   !!   TOP 1.0 , LOCEAN-IPSL (2005)  
    31    !! $Id$ 
     31   !! $Header$  
    3232   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    3333   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/TOP_SRC/TRP/trczdf_iso.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    3333   !!---------------------------------------------------------------------- 
    3434   !!   TOP 1.0 , LOCEAN-IPSL (2005)  
    35    !! $Id$ 
     35   !! $Header: /home/opalod/NEMOCVSROOT/NEMO/TOP_SRC/TRP/trczdf_iso.F90,v 1.13 2007/10/12 09:26:30 opalod Exp $  
    3636   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    3737   !!---------------------------------------------------------------------- 
     
    343343                  !  WARNING trtrd(ji,jj,jk,6) used for vertical gent velocity trend 
    344344                  !                           not for damping !!! 
    345                   IF (luttrd(jn)) trtrd(ji,jj,jk,ikeep(jn),6) = ztavg 
     345                  IF (luttrd(jn)) trtrd(ji,jj,jk,ikeep(jn),9) = ztavg 
    346346#   endif 
    347347                  IF (luttrd(jn)) trtrd(ji,jj,jk,ikeep(jn),6) = ztav - ztavg 
  • branches/dev_001_SBC/NEMO/TOP_SRC/TRP/trczdf_iso_vopt.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    3636   !!---------------------------------------------------------------------- 
    3737   !!   TOP 1.0 , LOCEAN-IPSL (2005)  
    38    !! $Id$ 
     38   !! $Header: /home/opalod/NEMOCVSROOT/NEMO/TOP_SRC/TRP/trczdf_iso_vopt.F90,v 1.12 2007/10/12 09:26:30 opalod Exp $  
    3939   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    4040   !!---------------------------------------------------------------------- 
     
    548548                  ztavg = ( zwx(ji,jj,jk) - zwx(ji,jj,jk+1) ) * zbtr 
    549549                  !  WARNING trtrd(ji,jj,jk,7) used for vertical gent velocity trend  not for damping !!! 
    550                   IF (luttrd(jn)) trtrd(ji,jj,jk,ikeep(jn),7) = ztavg 
     550                  IF (luttrd(jn)) trtrd(ji,jj,jk,ikeep(jn),9) = ztavg 
    551551#   endif 
    552552                  IF (luttrd(jn)) trtrd(ji,jj,jk,ikeep(jn),6) = ztav - ztavg 
  • branches/dev_001_SBC/NEMO/TOP_SRC/TRP/zpshde_trc.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    3030   !!---------------------------------------------------------------------- 
    3131   !!   TOP 1.0 , LOCEAN-IPSL (2005)  
    32    !! $Id$ 
     32   !! $Header$  
    3333   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    3434   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/TOP_SRC/agrif_top_interp.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    1010   !!---------------------------------------------------------------------- 
    1111   !!  OPA 9.0 , LOCEAN-IPSL (2005)  
    12    !! $Id$ 
     12   !! $Header$  
    1313   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    1414   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/TOP_SRC/agrif_top_update.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    1010   !!---------------------------------------------------------------------- 
    1111   !!  OPA 9.0 , LOCEAN-IPSL (2005)  
    12    !! $Id$ 
     12   !! $Header$  
    1313   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    1414   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/TOP_SRC/initrc.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    1010   !!------------------------------------------------------- 
    1111   !!  TOP 1.0,  LOCEAN-IPSL (2005)  
    12    !! $Id$ 
     12   !! $Header$  
    1313   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    1414   !!------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/TOP_SRC/oce_trc.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    88   !!---------------------------------------------------------------------- 
    99   !!  TOP 1.0,  LOCEAN-IPSL (2005) 
    10    !! $Id$ 
     10   !! $Header: /home/opalod/NEMOCVSROOT/NEMO/TOP_SRC/oce_trc.F90,v 1.17 2007/05/28 02:55:05 opalod Exp $ 
    1111   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    1212   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/TOP_SRC/par_trc.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    1111   !!---------------------------------------------------------------------- 
    1212   !!  TOP 1.0,  LOCEAN-IPSL (2005) 
    13    !! $Id$ 
     13   !! $Header: /home/opalod/NEMOCVSROOT/NEMO/TOP_SRC/par_trc.F90,v 1.6 2007/10/12 09:22:19 opalod Exp $ 
    1414   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    1515   !!---------------------------------------------------------------------- 
     
    2929!! we keep 3 more trends for eddy induced flux (gent velocity) 
    3030#    if defined key_trcdmp 
     31   INTEGER , PARAMETER :: jpdiatrc = 11 
     32#    else 
    3133   INTEGER , PARAMETER :: jpdiatrc = 10 
    32 #    else 
    33    INTEGER , PARAMETER :: jpdiatrc = 9 
    3434#    endif 
    3535#  else 
    3636#    if defined key_trcdmp 
     37   INTEGER , PARAMETER :: jpdiatrc = 8 
     38#    else 
    3739   INTEGER , PARAMETER :: jpdiatrc = 7 
    38 #    else 
    39    INTEGER , PARAMETER :: jpdiatrc = 6 
    4040#    endif 
    4141#  endif 
  • branches/dev_001_SBC/NEMO/TOP_SRC/par_trc_trp.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    88   !!---------------------------------------------------------------------- 
    99   !!  TOP 1.0,  LOCEAN-IPSL (2005)  
    10    !! $Id$ 
     10   !! $Header$  
    1111   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    1212   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/TOP_SRC/passivetrc_substitute.h90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    66   !!---------------------------------------------------------------------- 
    77   !!  TOP 1.0,  LOCEAN-IPSL (2005) 
    8    !! $Id$ 
     8   !! $Header$ 
    99   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    1010   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/TOP_SRC/prtctl_trc.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    3232   !!---------------------------------------------------------------------- 
    3333   !!   OPA 9.0 , LOCEAN-IPSL (2005)  
    34    !! $Id$ 
     34   !! $Header$  
    3535   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    3636   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/TOP_SRC/trc.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    1111   !!---------------------------------------------------------------------- 
    1212   !!  TOP 1.0,  LOCEAN-IPSL (2005)  
    13    !! $Id$ 
     13   !! $Header$  
    1414   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    1515   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/TOP_SRC/trcctl.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    1010   !!========================================================================= 
    1111   !!  TOP 1.0,  LOCEAN-IPSL (2005)  
    12    !! $Id$ 
     12   !! $Header$  
    1313   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    1414   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/TOP_SRC/trcdia.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    77   !!========================================================================== 
    88   !!  TOP 1.0,  LOCEAN-IPSL (2005)  
    9    !! $Id$ 
     9   !! $Header$  
    1010   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    1111   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/TOP_SRC/trcdit.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    22   !!---------------------------------------------------------------------- 
    33   !!  TOP 1.0,  LOCEAN-IPSL (2005)  
    4    !! $Id$ 
     4   !! $Header: /home/opalod/NEMOCVSROOT/NEMO/TOP_SRC/trcdit.F90,v 1.9 2007/10/12 09:22:19 opalod Exp $  
    55   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    66   !!---------------------------------------------------------------------- 
     
    418418                  IF (jl.eq.7) THEN 
    419419! short and long title for x gent velocity for tracer 
    420                       WRITE (cltra,'("XGV",16a)') ctrcnm(jn) 
     420                      WRITE (cltra,'("XGV_",16a)') ctrcnm(jn) 
    421421                      WRITE (cltral,'("X gent velocity trend for ",53a)')  & 
    422422                      &      ctrcnl(jn)(1:53) 
     
    436436# endif 
    437437# if defined key_trcdmp 
    438                   IF (jl.eq.jpdiatrc)  THEN 
     438                  IF (jl.eq.jpdiatrc-1)  THEN 
    439439! last trends for tracer damping : short and long title 
    440440                      WRITE (cltra,'("TDM_",16a)') ctrcnm(jn) 
     
    443443                  END IF 
    444444# endif 
     445                  IF (jl.eq.jpdiatrc)  THEN 
     446! last trends for tracer damping : short and long title 
     447                      WRITE (cltra,'("SBC_",16a)') ctrcnm(jn) 
     448                      WRITE (cltral,'("Surface boundary flux ",58a)')  & 
     449                      &      ctrcnl(jn)(1:58) 
     450                  END IF 
     451 
    445452                  call flush(numout) 
    446453                  cltrau=ctrcun(jn) ! UNIT for tracer /trends 
     
    518525# endif 
    519526# if defined key_trcdmp 
    520                   IF (jl.eq.jpdiatrc) THEN 
     527                  IF (jl.eq.jpdiatrc-1) THEN 
    521528! short for x gent velocity for tracer 
    522529                      WRITE (cltra,'("TDM_",16a)') ctrcnm(jn) 
    523530                  END IF 
    524531# endif 
     532                  IF (jl.eq.jpdiatrc) THEN 
     533! short for surface boundary conditions for tracer 
     534                      WRITE (cltra,'("SBC_",a)') ctrcnm(jn) 
     535                  END IF 
    525536 
    526537                  CALL histwrite(nit6(jn), cltra, it, trtrd(:,:,:,ikeep(jn),jl)  & 
  • branches/dev_001_SBC/NEMO/TOP_SRC/trcdta.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    55   !!===================================================================== 
    66   !!  TOP 1.0,  LOCEAN-IPSL (2005)  
    7    !! $Id$ 
     7   !! $Header$  
    88   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    99   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/TOP_SRC/trcdtr.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    88   !!======================================================================================= 
    99   !!  TOP 1.0,  LOCEAN-IPSL (2005) 
    10    !! $Id$ 
     10   !! $Header: /home/opalod/NEMOCVSROOT/NEMO/TOP_SRC/trcdtr.F90,v 1.8 2007/10/17 14:48:56 opalod Exp $ 
    1111   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    1212   !!---------------------------------------------------------------------- 
     
    143143      xksi(:,:)=2.E-6 
    144144 
    145 !! initialize Silicate and Calcite and POC in sediments 
    146 !! --------------------------------------------------- 
    147       sedcal(:,:) = 0. 
    148       sedsil(:,:) = 0. 
    149       sedpoc(:,:) = 0. 
    150  
    151145      IF(lwp) WRITE(numout,*) 'Initialization of PISCES tracers done' 
    152146      IF(lwp) WRITE(numout,*) ' ' 
  • branches/dev_001_SBC/NEMO/TOP_SRC/trcini.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    1010   !!---------------------------------------------------------------------- 
    1111   !!  TOP 1.0,  LOCEAN-IPSL (2005)  
    12    !! $Id$ 
     12   !! $Header$  
    1313   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    1414   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/TOP_SRC/trclec.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    77   !!========================================================================= 
    88   !!  TOP 1.0,  LOCEAN-IPSL (2005)  
    9    !! $Id$ 
     9   !! $Header$  
    1010   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    1111   !!---------------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/TOP_SRC/trclsm.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    88   !!================================================================= 
    99   !!  TOP 1.0,  LOCEAN-IPSL (2005)  
    10    !! $Id$ 
     10   !! $Header$  
    1111   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    1212   !!----------------------------------------------------------------- 
  • branches/dev_001_SBC/NEMO/TOP_SRC/trcrst.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    88   !!====================================================================== 
    99   !!  TOP 1.0,  LOCEAN-IPSL (2005)  
    10    !! $Id$ 
     10   !! $Header: /home/opalod/NEMOCVSROOT/NEMO/TOP_SRC/trcrst.F90,v 1.11 2007/10/17 14:48:56 opalod Exp $  
    1111   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    1212   !!---------------------------------------------------------------------- 
     
    205205      CALL iom_get( numrtr, jpdom_local, 'Silicalim', xksi(:,:) )  
    206206      xksimax = xksi 
    207  
    208       CALL iom_get( numrtr, jpdom_local, 'SED'//ctrcnm(jppoc), sedpoc(:,:) )  
    209       CALL iom_get( numrtr, jpdom_local, 'SED'//ctrcnm(jpcal), sedcal(:,:) )  
    210       CALL iom_get( numrtr, jpdom_local, 'SED'//ctrcnm(jpsil), sedsil(:,:) )  
    211207 
    212208#elif defined key_cfc 
     
    446442         CALL iom_rstput( kt, nitrst, numrtw, 'Silicalim', xksi(:,:) ) 
    447443 
    448          CALL iom_rstput( kt, nitrst, numrtw, 'SED'//ctrcnm(jppoc), sedpoc(:,:) ) 
    449          CALL iom_rstput( kt, nitrst, numrtw, 'SED'//ctrcnm(jpcal), sedcal(:,:) ) 
    450          CALL iom_rstput( kt, nitrst, numrtw, 'SED'//ctrcnm(jpsil), sedsil(:,:) ) 
    451           
    452444#elif defined key_cfc 
    453445         DO jn=1,jptra 
  • branches/dev_001_SBC/NEMO/TOP_SRC/trcsms.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r760  
    88   !!=========================================================================================== 
    99   !!  TOP 1.0,  LOCEAN-IPSL (2005)  
    10    !! $Id$ 
     10   !! $Header$  
    1111   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    1212   !!---------------------------------------------------------------------- 
Note: See TracChangeset for help on using the changeset viewer.