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 6138 for branches/2015/dev_r5803_NOC_WAD/NEMOGCM/CONFIG/ORCA2_LIM/EXP00 – NEMO

Ignore:
Timestamp:
2015-12-21T11:24:43+01:00 (9 years ago)
Author:
acc
Message:

Branch 2015/dev_r5803_NOC_WAD. Merge in trunk changes up to 6058 (just prior to merge of vvl by default branch onto dev_merge_2015). Conflicts in dynspg_ts.F90 only - all resolved

Location:
branches/2015/dev_r5803_NOC_WAD/NEMOGCM/CONFIG/ORCA2_LIM/EXP00
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/2015/dev_r5803_NOC_WAD/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/1_namelist_cfg

    r5870 r6138  
    5454   rn_rdtmin   = 14400.          !  minimum time step on tracers (used if nn_acc=1) 
    5555   rn_rdtmax   = 14400.          !  maximum time step on tracers (used if nn_acc=1) 
    56 / 
    57 !----------------------------------------------------------------------- 
    58 &namsplit      !   time splitting parameters                            ("key_dynspg_ts") 
    59 !----------------------------------------------------------------------- 
    6056/ 
    6157!----------------------------------------------------------------------- 
    … …  
    198194   ln_dynvor_een = .true.  !  energy & enstrophy scheme 
    199195      nn_een_e3f = 1             !  e3f = masked averaging of e3t divided by 4 (=0) or by the sum of mask (=1) 
    200    ln_dynvor_msk = .true.  !  vorticity multiplied by fmask (=T) or not (=F) (all vorticity schemes) 
    201196/ 
    202197!----------------------------------------------------------------------- 
    203198&namdyn_hpg    !   Hydrostatic pressure gradient option 
    204199!----------------------------------------------------------------------- 
     200/ 
     201!----------------------------------------------------------------------- 
     202&namdyn_spg    !   surface pressure gradient 
     203!----------------------------------------------------------------------- 
     204   ln_dynspg_ts  = .true.  !  split-explicit free surface 
    205205/ 
    206206!----------------------------------------------------------------------- 
    … …  
    246246/ 
    247247!----------------------------------------------------------------------- 
    248 &namsol        !   elliptic solver / island / free surface  
    249 !----------------------------------------------------------------------- 
    250 / 
    251 !----------------------------------------------------------------------- 
    252248&nammpp        !   Massively Parallel Processing                        ("key_mpp_mpi) 
    253249!----------------------------------------------------------------------- 

  • branches/2015/dev_r5803_NOC_WAD/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist_cfg

    r5870 r6138  
    4646   ppkth2      =  999999.              ! 
    4747   ppacr2      =  999999.              ! 
    48 / 
    49 !----------------------------------------------------------------------- 
    50 &namsplit      !   time splitting parameters                            ("key_dynspg_ts") 
    51 !----------------------------------------------------------------------- 
    5248/ 
    5349!----------------------------------------------------------------------- 
    … …  
    188184/ 
    189185!----------------------------------------------------------------------- 
     186&namdyn_spg    !   surface pressure gradient 
     187!----------------------------------------------------------------------- 
     188   ln_dynspg_ts  = .true.  !  split-explicit free surface 
     189/ 
     190!----------------------------------------------------------------------- 
    190191&namdyn_ldf    !   lateral diffusion on momentum 
    191192!----------------------------------------------------------------------- 
    … …  
    228229/ 
    229230!----------------------------------------------------------------------- 
    230 &namsol        !   elliptic solver / island / free surface 
    231 !----------------------------------------------------------------------- 
    232 / 
    233 !----------------------------------------------------------------------- 
    234231&nammpp        !   Massively Parallel Processing                        ("key_mpp_mpi) 
    235232!----------------------------------------------------------------------- 
Note: See TracChangeset for help on using the changeset viewer.