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/namzgr_sco – 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/namzgr_sco

    r3680 r6140  
    22&namzgr_sco    !   s-coordinate or hybrid z-s-coordinate 
    33!----------------------------------------------------------------------- 
    4    ln_s_sh94   = .true.    !  Song & Haidvogel 1994 hybrid S-sigma   (T)| 
     4   ln_s_sh94   = .false.    !  Song & Haidvogel 1994 hybrid S-sigma   (T)| 
    55   ln_s_sf12   = .false.   !  Siddorn & Furner 2012 hybrid S-z-sigma (T)| if both are false the NEMO tanh stretching is applied 
    66   ln_sigcrit  = .false.   !  use sigma coordinates below critical depth (T) or Z coordinates (F) for Siddorn & Furner stretch 
    … …  
    1313                        !!!!!!!  SH94 stretching coefficients  (ln_s_sh94 = .true.) 
    1414   rn_theta    =    6.0    !  surface control parameter (0<=theta<=20) 
    15    rn_bb       =    0.8    !  stretching with SH94 s-sigma    
     15   rn_bb       =    0.8    !  stretching with SH94 s-sigma 
    1616                        !!!!!!!  SF12 stretching coefficient  (ln_s_sf12 = .true.) 
    1717   rn_alpha    =    4.4    !  stretching with SF12 s-sigma 
    … …  
    2222   rn_zb_b     =   -0.2    !  offset for calculating Zb 
    2323                        !!!!!!!! Other stretching (not SH94 or SF12) [also uses rn_theta above] 
    24    rn_thetb    =    1.0    !  bottom control parameter  (0<=thetb<= 1)  
     24   rn_thetb    =    1.0    !  bottom control parameter  (0<=thetb<= 1) 
    2525/ 
Note: See TracChangeset for help on using the changeset viewer.