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 6140 for trunk/NEMOGCM/CONFIG/GYRE_PISCES/EXP00/namelist_cfg – NEMO

Ignore:
Timestamp:
2015-12-21T12:35:23+01:00 (8 years ago)
Author:
timgraham
Message:

Merge of branches/2015/dev_merge_2015 back into trunk. Merge excludes NEMOGCM/TOOLS/OBSTOOLS/ for now due to issues with the change of file type. Will sort these manually with further commits.

Branch merged as follows:
In the working copy of branch ran:
svn merge ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@HEAD
Small conflicts due to bug fixes applied to trunk since the dev_merge_2015 was copied. Bug fixes were applied to the branch as well so these were easy to resolve.
Branch committed at this stage

In working copy run:
svn switch ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk
to switch working copy

Run:
svn merge --reintegrate ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2015/dev_merge_2015
to merge the branch into the trunk and then commit - no conflicts at this stage.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/NEMOGCM/CONFIG/GYRE_PISCES/EXP00/namelist_cfg

    r5930 r6140  
    2929&namzgr        !   vertical coordinate 
    3030!----------------------------------------------------------------------- 
    31    ln_zco      = .true.    !  z-coordinate - full    steps   (T/F)      ("key_zco" may also be defined) 
    32    ln_zps      = .false.   !  z-coordinate - partial steps   (T/F) 
     31   ln_zco      = .true.    !  z-coordinate - full    steps 
     32   ln_linssh   = .true.    !  linear free surface 
    3333/ 
    3434!----------------------------------------------------------------------- 
    … …  
    3636!----------------------------------------------------------------------- 
    3737   nn_bathy    =    0      !  compute (=0) or read (=1) the bathymetry file 
    38    rn_rdt      = 7200.     !  time step for the dynamics (and tracer if nn_acc=0) 
    39    rn_rdtmin   = 7200.           !  minimum time step on tracers (used if nn_acc=1) 
    40    rn_rdtmax   = 7200.           !  maximum time step on tracers (used if nn_acc=1) 
     38   rn_rdt      = 7200.     !  time step for the dynamics  
    4139   jphgr_msh   =       5                 !  type of horizontal mesh 
    4240   ppglam0     =       0.0               !  longitude of first raw and column T-point (jphgr_msh = 1) 
    … …  
    105103/ 
    106104!----------------------------------------------------------------------- 
    107 &nambbc        !   bottom temperature boundary condition 
    108 !----------------------------------------------------------------------- 
    109    ln_trabbc   = .false.   !  Apply a geothermal heating at the ocean bottom 
    110    nn_geoflx   =    0      !  geothermal heat flux: = 0 no flux 
     105&nambbc        !   bottom temperature boundary condition                (default: NO) 
     106!----------------------------------------------------------------------- 
    111107/ 
    112108!----------------------------------------------------------------------- 
    … …  
    260256!----------------------------------------------------------------------- 
    261257/ 
    262 !----------------------------------------------------------------------- 
    263 &namdyn_nept  !   Neptune effect (simplified: lateral and vertical diffusions removed) 
    264 !----------------------------------------------------------------------- 
    265    ln_neptramp       = .false.  ! ramp down Neptune velocity in shallow water 
    266 / 
Note: See TracChangeset for help on using the changeset viewer.