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/DOC/TexFiles/Namelist/namdyn_hpg – 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/DOC/TexFiles/Namelist/namdyn_hpg

    r5120 r6140  
    11!----------------------------------------------------------------------- 
    2 &namdyn_hpg    !   Hydrostatic pressure gradient option 
     2&namdyn_hpg    !   Hydrostatic pressure gradient option                 (default: zps) 
    33!----------------------------------------------------------------------- 
    44   ln_hpg_zco  = .false.   !  z-coordinate - full steps 
    55   ln_hpg_zps  = .true.    !  z-coordinate - partial steps (interpolation) 
    66   ln_hpg_sco  = .false.   !  s-coordinate (standard jacobian formulation) 
    7    ln_hpg_isf  = .false.   !  s-coordinate (sco ) adapted to ice shelf cavity 
     7   ln_hpg_isf  = .false.   !  s-coordinate (sco ) adapted to isf 
    88   ln_hpg_djc  = .false.   !  s-coordinate (Density Jacobian with Cubic polynomial) 
    99   ln_hpg_prj  = .false.   !  s-coordinate (Pressure Jacobian scheme) 
    10    ln_dynhpg_imp = .false. !  time stepping: semi-implicit time scheme  (T) 
    11                                  !           centered      time scheme  (F) 
    1210/ 
Note: See TracChangeset for help on using the changeset viewer.