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 12377 for NEMO/trunk/cfgs/SPITZ12/EXPREF/namelist_cfg – NEMO

Ignore:
Timestamp:
2020-02-12T15:39:06+01:00 (4 years ago)
Author:
acc
Message:

The big one. Merging all 2019 developments from the option 1 branch back onto the trunk.

This changeset reproduces 2019/dev_r11943_MERGE_2019 on the trunk using a 2-URL merge
onto a working copy of the trunk. I.e.:

svn merge --ignore-ancestry \

svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/NEMO/trunk \
svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/NEMO/branches/2019/dev_r11943_MERGE_2019 ./

The --ignore-ancestry flag avoids problems that may otherwise arise from the fact that
the merge history been trunk and branch may have been applied in a different order but
care has been taken before this step to ensure that all applicable fixes and updates
are present in the merge branch.

The trunk state just before this step has been branched to releases/release-4.0-HEAD
and that branch has been immediately tagged as releases/release-4.0.2. Any fixes
or additions in response to tickets on 4.0, 4.0.1 or 4.0.2 should be done on
releases/release-4.0-HEAD. From now on future 'point' releases (e.g. 4.0.2) will
remain unchanged with periodic releases as needs demand. Note release-4.0-HEAD is a
transitional naming convention. Future full releases, say 4.2, will have a release-4.2
branch which fulfills this role and the first point release (e.g. 4.2.0) will be made
immediately following the release branch creation.

2020 developments can be started from any trunk revision later than this one.

Location:
NEMO/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • NEMO/trunk

    • Property svn:externals
      •  

        old new  
        33^/utils/build/mk@HEAD         mk 
        44^/utils/tools@HEAD            tools 
        5 ^/vendors/AGRIF/dev@HEAD      ext/AGRIF 
         5^/vendors/AGRIF/dev_r11615_ENHANCE-04_namelists_as_internalfiles_agrif@HEAD      ext/AGRIF 
        66^/vendors/FCM@HEAD            ext/FCM 
        77^/vendors/IOIPSL@HEAD         ext/IOIPSL 
  • NEMO/trunk/cfgs/SPITZ12/EXPREF/namelist_cfg

    r12206 r12377  
    107107   sn_snow     = 'MARv3.6-9km-Svalbard-2hourly_spitz' ,  2. ,  'snow'    ,   .true.    , .false. , 'yearly'  , 'weights_bilin', '' , '' 
    108108   sn_slp      = 'MARv3.6-9km-Svalbard-2hourly_spitz' ,  2. ,  'slp'     ,   .true.    , .false. , 'yearly'  , 'weights_bilin', '' , '' 
    109    sn_tdif     = 'MARv3.6-9km-Svalbard-2hourly_spitz' ,  2. ,  'tdif'    ,   .true.    , .false. , 'yearly'  , 'weights_bilin', '' , '' 
    110109/ 
    111110!----------------------------------------------------------------------- 
     
    139138&nam_tide      !   tide parameters                                      (default: OFF) 
    140139!----------------------------------------------------------------------- 
    141    ln_tide     = .true.      ! Activate tides 
    142       ln_tide_pot   = .false.                !  use tidal potential forcing 
    143       clname(1)     =   'M2'    !  name of constituent 
    144       clname(2)    =   'S2' 
    145       clname(3)    =   'N2' 
    146       clname(4)    =   'K2' 
    147       clname(5)    =   'K1' 
    148       clname(6)    =   'O1' 
    149       clname(7)    =   'P1' 
    150       clname(8)    =   'Q1' 
     140   ln_tide     = .true.           ! Activate tides 
     141      ln_tide_pot       = .false. !  use tidal potential forcing 
     142      sn_tide_cnames(1) =   'M2'  !  name of constituent 
     143      sn_tide_cnames(2) =   'S2' 
     144      sn_tide_cnames(3) =   'N2' 
     145      sn_tide_cnames(4) =   'K2' 
     146      sn_tide_cnames(5) =   'K1' 
     147      sn_tide_cnames(6) =   'O1' 
     148      sn_tide_cnames(7) =   'P1' 
     149      sn_tide_cnames(8) =   'Q1' 
    151150/ 
    152151!----------------------------------------------------------------------- 
     
    349348!!   namdiu       Cool skin and warm layer models                       (default: OFF) 
    350349!!   namflo       float parameters                                      (default: OFF) 
    351 !!   nam_diaharm  Harmonic analysis of tidal constituents               (default: OFF) 
    352350!!   nam_diadct   transports through some sections                      (default: OFF) 
    353351!!   nam_dia25h   25h Mean Output                                       (default: OFF) 
Note: See TracChangeset for help on using the changeset viewer.