New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 1804 for branches/dev_005_AWL/NEMO/TOP_SRC/PISCES – NEMO

Ignore:
Timestamp:
2010-02-08T11:51:02+01:00 (14 years ago)
Author:
sga
Message:

merge of trunk changes from r1782 to r1802 into NEMO branch dev_005_AWL

Location:
branches/dev_005_AWL/NEMO/TOP_SRC/PISCES
Files:
14 edited
1 copied

Legend:

Unmodified
Added
Removed

  • branches/dev_005_AWL/NEMO/TOP_SRC/PISCES/p4zbio.F90

    r1678 r1804  
    3939 
    4040   !!* Substitution 
    41 #  include "domzgr_substitute.h90" 
     41#  include "top_substitute.h90" 
    4242   !!---------------------------------------------------------------------- 
    4343   !! NEMO/TOP 2.0 , LOCEAN-IPSL (2007)  

  • branches/dev_005_AWL/NEMO/TOP_SRC/PISCES/p4zche.F90

    r1180 r1804  
    147147 
    148148   !!* Substitution 
    149 #include "domzgr_substitute.h90" 
     149#include "top_substitute.h90" 
    150150   !!---------------------------------------------------------------------- 
    151151   !! NEMO/TOP 2.0 , LOCEAN-IPSL (2007)  

  • branches/dev_005_AWL/NEMO/TOP_SRC/PISCES/p4zflx.F90

    r1737 r1804  
    5252 
    5353   !!* Substitution 
    54 #  include "domzgr_substitute.h90" 
     54#  include "top_substitute.h90" 
    5555   !!---------------------------------------------------------------------- 
    5656   !! NEMO/TOP 2.0 , LOCEAN-IPSL (2007)  

  • branches/dev_005_AWL/NEMO/TOP_SRC/PISCES/p4zlim.F90

    r1152 r1804  
    4141 
    4242   !!* Substitution 
    43 #  include "domzgr_substitute.h90" 
     43#  include "top_substitute.h90" 
    4444   !!---------------------------------------------------------------------- 
    4545   !! NEMO/TOP 2.0 , LOCEAN-IPSL (2007)  

  • branches/dev_005_AWL/NEMO/TOP_SRC/PISCES/p4zmeso.F90

    r1736 r1804  
    4545 
    4646   !!* Substitution 
    47 #  include "domzgr_substitute.h90" 
     47#  include "top_substitute.h90" 
    4848   !!---------------------------------------------------------------------- 
    4949   !! NEMO/TOP 2.0 , LOCEAN-IPSL (2007)  

  • branches/dev_005_AWL/NEMO/TOP_SRC/PISCES/p4zmicro.F90

    r1736 r1804  
    4343 
    4444   !!* Substitution 
    45 #  include "domzgr_substitute.h90" 
     45#  include "top_substitute.h90" 
    4646   !!---------------------------------------------------------------------- 
    4747   !! NEMO/TOP 2.0 , LOCEAN-IPSL (2007)  

  • branches/dev_005_AWL/NEMO/TOP_SRC/PISCES/p4zmort.F90

    r1736 r1804  
    4141 
    4242   !!* Substitution 
    43 #  include "domzgr_substitute.h90" 
     43#  include "top_substitute.h90" 
    4444   !!---------------------------------------------------------------------- 
    4545   !! NEMO/TOP 2.0 , LOCEAN-IPSL (2007)  

  • branches/dev_005_AWL/NEMO/TOP_SRC/PISCES/p4zopt.F90

    r1678 r1804  
    3535    
    3636   !!* Substitution 
    37 #  include "domzgr_substitute.h90" 
     37#  include "top_substitute.h90" 
    3838   !!---------------------------------------------------------------------- 
    3939   !! NEMO/TOP 2.0 , LOCEAN-IPSL (2007)  

  • branches/dev_005_AWL/NEMO/TOP_SRC/PISCES/p4zprod.F90

    r1736 r1804  
    5353 
    5454   !!* Substitution 
    55 #  include "domzgr_substitute.h90" 
     55#  include "top_substitute.h90" 
    5656   !!---------------------------------------------------------------------- 
    5757   !! NEMO/TOP 2.0 , LOCEAN-IPSL (2007)  

  • branches/dev_005_AWL/NEMO/TOP_SRC/PISCES/p4zrem.F90

    r1744 r1804  
    4545 
    4646   !!* Substitution 
    47 #  include "domzgr_substitute.h90" 
     47#  include "top_substitute.h90" 
    4848   !!---------------------------------------------------------------------- 
    4949   !! NEMO/TOP 2.0 , LOCEAN-IPSL (2007)  

  • branches/dev_005_AWL/NEMO/TOP_SRC/PISCES/p4zsink.F90

    r1736 r1804  
    6969 
    7070   !!* Substitution 
    71 #  include "domzgr_substitute.h90" 
     71#  include "top_substitute.h90" 
    7272   !!---------------------------------------------------------------------- 
    7373   !! NEMO/TOP 2.0 , LOCEAN-IPSL (2007)  

  • branches/dev_005_AWL/NEMO/TOP_SRC/PISCES/sms_pisces.F90

    r1678 r1804  
    3838   LOGICAL  ::   ln_pisdmp         !: relaxation or not of nutrients to a mean value 
    3939                                   !: when initialize from a restart file  
     40   LOGICAL  ::   ln_pisclo         !: Restoring or not of nutrients to initial value 
     41                                   !: on close seas 
    4042 
    4143   !!*  Biological fluxes for light 

  • branches/dev_005_AWL/NEMO/TOP_SRC/PISCES/trcini_pisces.F90

    r1542 r1804  
    3838      no3    =  31.04e-6 * 7.6 
    3939 
    40 #  include "domzgr_substitute.h90" 
    4140#  include "top_substitute.h90" 
    4241   !!---------------------------------------------------------------------- 

  • branches/dev_005_AWL/NEMO/TOP_SRC/PISCES/trclsm_pisces.F90

    r1581 r1804  
    6767      NAMELIST/nampisdia/ nwritedia, pisdia3d, pisdia2d     ! additional diagnostics 
    6868#endif 
    69       NAMELIST/nampisdmp/ ln_pisdmp 
     69      NAMELIST/nampisdmp/ ln_pisdmp, ln_pisclo 
    7070 
    7171      !!---------------------------------------------------------------------- 
    … …  
    188188         WRITE(numout,*) 
    189189         WRITE(numout,*) ' Namelist : nampisdmp' 
    190          WRITE(numout,*) '    Relaxation of tracer to glodap mean value    ln_pisdmp      =', ln_pisdmp 
     190         WRITE(numout,*) '    Relaxation of tracer to glodap mean value            ln_pisdmp      =', ln_pisdmp 
     191         WRITE(numout,*) '    Restoring of tracer to initial value  on closed seas  ln_pisclo      =', ln_pisclo 
    191192         WRITE(numout,*) ' ' 
    192193      ENDIF 
Note: See TracChangeset for help on using the changeset viewer.