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

    r5930 r6140  
    66&namrun        !   parameters of the run 
    77!----------------------------------------------------------------------- 
     8   nn_no       =       0   !  job number (no more used...) 
     9   cn_exp      =  "ORCA2"  !  experience name 
     10   nn_it000    =       1   !  first time step 
     11   nn_itend    =     300   !  last  time step (std 5475) 
    812/ 
    913!----------------------------------------------------------------------- 
    … …  
    2428&namzgr        !   vertical coordinate 
    2529!----------------------------------------------------------------------- 
     30   ln_zps      = .true.    !  z-coordinate - partial steps 
    2631/ 
    2732!----------------------------------------------------------------------- 
    … …  
    9398/ 
    9499!----------------------------------------------------------------------- 
    95 &nambbc        !   bottom temperature boundary condition 
    96 !----------------------------------------------------------------------- 
     100&nambbc        !   bottom temperature boundary condition                (default: NO) 
     101!----------------------------------------------------------------------- 
     102   ln_trabbc   = .true.    !  Apply a geothermal heating at the ocean bottom 
    97103/ 
    98104!----------------------------------------------------------------------- 
    … …  
    161167   !                                !   = 21 F(i,j,t)  =Treguier et al. JPO 1997 formulation 
    162168   !                                !   = 30 F(i,j,k)  =ldf_c2d + ldf_c1d 
    163 /!----------------------------------------------------------------------- 
     169/ 
     170!----------------------------------------------------------------------- 
    164171&namtra_dmp    !   tracer: T & S newtonian damping 
    165172!----------------------------------------------------------------------- 
    … …  
    181188&namdyn_hpg    !   Hydrostatic pressure gradient option 
    182189!----------------------------------------------------------------------- 
    183    ln_hpg_zco  = .false.   !  z-coordinate - full steps 
     190   ln_hpg_sco  = .true.    !  s-coordinate (standard jacobian formulation) 
    184191   ln_hpg_zps  = .false.   !  z-coordinate - partial steps (interpolation) 
    185    ln_hpg_sco  = .false.   !  s-coordinate (standard jacobian formulation) 
    186    ln_hpg_djc  = .false.   !  s-coordinate (Density Jacobian with Cubic polynomial) 
    187    ln_hpg_prj  = .true.    !  s-coordinate (Pressure Jacobian scheme) 
    188192/ 
    189193!----------------------------------------------------------------------- 
    … …  
    247251/ 
    248252!----------------------------------------------------------------------- 
    249 &namhsb       !  Heat and salt budgets 
    250 !----------------------------------------------------------------------- 
    251 / 
    252 !----------------------------------------------------------------------- 
    253 &namdyn_nept  !   Neptune effect (simplified: lateral and vertical diffusions removed) 
    254 !----------------------------------------------------------------------- 
     253&namhsb       !  Heat and salt budgets                                  (default F) 
     254!----------------------------------------------------------------------- 
     255   ln_diahsb  = .true.    !  check the heat and salt budgets (T) or not (F) 
    255256/ 
    256257!----------------------------------------------------------------------- 
Note: See TracChangeset for help on using the changeset viewer.