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 899 for trunk/NEMO/TOP_SRC – NEMO

Changeset 899 for trunk/NEMO/TOP_SRC


Ignore:
Timestamp:
2008-04-22T18:15:19+02:00 (16 years ago)
Author:
rblod
Message:

First set of modifications related to 1D update : cometic changes, see ticket #117

Location:
trunk/NEMO/TOP_SRC
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/NEMO/TOP_SRC/SMS/p4zsed.F

    r728 r899  
    296296        DO jj=1,jpj 
    297297          DO ji=1,jpi 
    298 #if ! defined key_cfg_1d && ( defined key_orca_r4 || defined key_orca_r2 || defined key_orca_r05 || defined key_orca_r025 ) 
     298#if ! defined key_c1d && ( defined key_orca_r4 || defined key_orca_r2 || defined key_orca_r05 || defined key_orca_r025 ) 
    299299        zfact=nitrpot(ji,jj,jk)*denitot/nitrpottot 
    300300#else 

  • trunk/NEMO/TOP_SRC/TRP/trcbbl.F90

    r719 r899  
    55   !!                                  layer scheme 
    66   !!============================================================================== 
    7 #if  defined key_passivetrc && ( defined key_trcbbl_dif   ||   defined key_trcbbl_adv ) && ! defined key_cfg_1d 
     7#if  defined key_passivetrc && ( defined key_trcbbl_dif   ||   defined key_trcbbl_adv ) && ! defined key_c1d 
    88   !!---------------------------------------------------------------------- 
    99   !!   'key_trcbbl_dif'   or            diffusive bottom boundary layer 

  • trunk/NEMO/TOP_SRC/trc.F90

    r719 r899  
    194194  !!  1D configuration 
    195195  !! -------------------------------------------------- 
    196 #if defined key_cfg_1d 
     196#if defined key_cf1d 
    197197      LOGICAL, PARAMETER ::   lk_trccfg_1d   = .TRUE.   !: 1D pass. tracer configuration flag 
    198198#else    

  • trunk/NEMO/TOP_SRC/trcrst.F90

    r794 r899  
    110110 
    111111#if defined key_trc_pisces  
    112 #   if ! defined key_cfg_1d && ( defined key_orca_r4 || defined key_orca_r2 || defined key_orca_r05 || defined key_orca_r025 ) 
     112#   if ! defined key_c1d && ( defined key_orca_r4 || defined key_orca_r2 || defined key_orca_r05 || defined key_orca_r025 ) 
    113113      REAL(wp) ::  ztrasum 
    114114#   endif 
    … …  
    218218#if defined key_trc_pisces  
    219219 
    220 #if ! defined key_cfg_1d && ( defined key_orca_r4 || defined key_orca_r2 || defined key_orca_r05 || defined key_orca_r025 )  
     220#if ! defined key_c1d && ( defined key_orca_r4 || defined key_orca_r2 || defined key_orca_r05 || defined key_orca_r025 )  
    221221 
    222222      ztrasum = 0. 
Note: See TracChangeset for help on using the changeset viewer.