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/C1D_PAPA/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/C1D_PAPA/EXP00/namelist_cfg

    r5930 r6140  
    3030&namzgr        !   vertical coordinate 
    3131!----------------------------------------------------------------------- 
     32   ln_zps      = .true.    !  z-coordinate - partial steps 
    3233/ 
    3334!----------------------------------------------------------------------- 
     
    4142   rn_bathy    = 4198.     !  value of the bathymetry. if (=0) bottom flat at jpkm1 
    4243   nn_msh      =    0      !  create (=1) a mesh file or not (=0) 
    43    rn_rdt      =  360.     !  time step for the dynamics (and tracer if nn_acc=0) 
    44    rn_rdtmin   =  360.     !  minimum time step on tracers (used if nn_acc=1) 
    45    rn_rdtmax   =  360.     !  maximum time step on tracers (used if nn_acc=1) 
     44   rn_rdt      =  360.     !  time step for the dynamics  
    4645   jphgr_msh   =       1                 !  type of horizontal mesh 
    4746   ppglam0     =    -150.0               !  longitude of first raw and column T-point (jphgr_msh = 1) 
     
    196195/ 
    197196!----------------------------------------------------------------------- 
    198 &nambbc        !   bottom temperature boundary condition 
    199 !----------------------------------------------------------------------- 
    200    ln_trabbc   = .false.   !  Apply a geothermal heating at the ocean bottom 
    201    nn_geoflx   =    0      !  geothermal heat flux: = 0 no flux 
     197&nambbc        !   bottom temperature boundary condition                (default: NO) 
     198!----------------------------------------------------------------------- 
    202199/ 
    203200!----------------------------------------------------------------------- 
     
    260257/ 
    261258!----------------------------------------------------------------------- 
    262 &namdyn_spg    !   surface pressure gradient 
     259&namdyn_spg    !   surface pressure gradient                            (default: NO spg) 
    263260!----------------------------------------------------------------------- 
    264261/ 
     
    342339!----------------------------------------------------------------------- 
    343340/ 
    344 !----------------------------------------------------------------------- 
    345 &namdyn_nept  !   Neptune effect (simplified: lateral and vertical diffusions removed) 
    346 !----------------------------------------------------------------------- 
    347    ln_neptramp       = .false.  ! ramp down Neptune velocity in shallow water 
    348 / 
Note: See TracChangeset for help on using the changeset viewer.