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 7646 for trunk/NEMOGCM/CONFIG/ORCA2_LIM3/EXP00/namelist_ice_cfg – NEMO

Ignore:
Timestamp:
2017-02-06T10:25:03+01:00 (7 years ago)
Author:
timgraham
Message:

Merge of dev_merge_2016 into trunk. UPDATE TO ARCHFILES NEEDED for XIOS2.
LIM_SRC_s/limrhg.F90 to follow in next commit due to change of kind (I'm unable to do it in this commit).
Merged using the following steps:

1) svn merge --reintegrate ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk .
2) Resolve minor conflicts in sette.sh and namelist_cfg for ORCA2LIM3 (due to a change in trunk after branch was created)
3) svn commit
4) svn switch ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk
5) svn merge ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2016/dev_merge_2016 .
6) At this stage I checked out a clean copy of the branch to compare against what is about to be committed to the trunk.
6) svn commit #Commit code to the trunk

In this commit I have also reverted a change to Fcheck_archfile.sh which was causing problems on the Paris machine.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/NEMOGCM/CONFIG/ORCA2_LIM3/EXP00/namelist_ice_cfg

    r4690 r7646  
    11!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
    2 !! NEMO/LIM-2 : Ice configuration namelist. Overwrites SHARED/namelist_ice_lim2_ref 
     2!! LIM3 configuration namelist: Overwrites SHARED/namelist_ice_lim3_ref 
     3!!              1 - Generic parameters                 (namicerun) 
     4!!              2 - Diagnostics                        (namicediag) 
     5!!              3 - Ice initialization                 (namiceini) 
     6!!              4 - Ice discretization                 (namiceitd) 
     7!!              5 - Ice dynamics and transport         (namicedyn) 
     8!!              6 - Ice diffusion                      (namicehdf) 
     9!!              7 - Ice thermodynamics                 (namicethd) 
     10!!              8 - Ice salinity                       (namicesal) 
     11!!              9 - Ice mechanical redistribution      (namiceitdme) 
    312!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
    4  
    5 !----------------------------------------------------------------------- 
    6 &namicerun     !   Share parameters for dynamics/advection/thermo 
    7 !----------------------------------------------------------------------- 
     13!------------------------------------------------------------------------------ 
     14&namicerun     !   Generic parameters 
     15!------------------------------------------------------------------------------ 
    816/ 
    9 !----------------------------------------------------------------------- 
    10 &namiceini     !   ice initialisation 
    11 !----------------------------------------------------------------------- 
     17!------------------------------------------------------------------------------ 
     18&namicediag    !   Diagnostics 
     19!------------------------------------------------------------------------------ 
    1220/ 
    13 !----------------------------------------------------------------------- 
    14 &namicedyn     !   ice dynamic 
    15 !----------------------------------------------------------------------- 
     21!------------------------------------------------------------------------------ 
     22&namiceini     !   Ice initialization 
     23!------------------------------------------------------------------------------ 
    1624/ 
    17 !----------------------------------------------------------------------- 
    18 &namicethd     !   ice thermodynamic 
    19 !----------------------------------------------------------------------- 
     25!------------------------------------------------------------------------------ 
     26&namiceitd     !   Ice discretization 
     27!------------------------------------------------------------------------------ 
    2028/ 
    21 !----------------------------------------------------------------------- 
    22 &namicesal     !   ice salinity 
    23 !----------------------------------------------------------------------- 
     29!------------------------------------------------------------------------------ 
     30&namicedyn     !   Ice dynamics and transport 
     31!------------------------------------------------------------------------------ 
    2432/ 
    25 !----------------------------------------------------------------------- 
    26 &namiceitdme   !   parameters for mechanical redistribution of ice  
    27 !----------------------------------------------------------------------- 
     33!------------------------------------------------------------------------------ 
     34&namicehdf     !   Ice horizontal diffusion 
     35!------------------------------------------------------------------------------ 
    2836/ 
    29 !----------------------------------------------------------------------- 
    30 &namicedia     !   ice diagnostics 
    31 !----------------------------------------------------------------------- 
     37!------------------------------------------------------------------------------ 
     38&namicethd     !   Ice thermodynamics 
     39!------------------------------------------------------------------------------ 
    3240/ 
     41!------------------------------------------------------------------------------ 
     42&namicesal     !   Ice salinity 
     43!------------------------------------------------------------------------------ 
     44/ 
     45!------------------------------------------------------------------------------ 
     46&namiceitdme   !   Ice mechanical redistribution (ridging and rafting) 
     47!------------------------------------------------------------------------------ 
     48/ 
Note: See TracChangeset for help on using the changeset viewer.