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 6060 for branches/2015/dev_merge_2015/NEMOGCM/CONFIG/ORCA2_LIM – NEMO

Ignore:
Timestamp:
2015-12-16T10:25:22+01:00 (9 years ago)
Author:
timgraham
Message:

Merged dev_r5836_noc2_VVL_BY_DEFAULT into branch

Location:
branches/2015/dev_merge_2015/NEMOGCM/CONFIG/ORCA2_LIM
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/2015/dev_merge_2015/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/1_namelist_cfg

    r5930 r6060  
    2929&namzgr        !   vertical coordinate 
    3030!----------------------------------------------------------------------- 
     31   ln_zps      = .true.    !  z-coordinate - partial steps 
     32   ln_linssh   = .true.    !  linear free surface 
    3133/ 
    3234!----------------------------------------------------------------------- 
     
    5658/ 
    5759!----------------------------------------------------------------------- 
     60&namsplit      !   time splitting parameters                            ("key_dynspg_ts") 
     61!----------------------------------------------------------------------- 
     62/ 
     63!----------------------------------------------------------------------- 
    5864&namcrs        !   Grid coarsening for dynamics output and/or 
    5965               !   passive tracer coarsened online simulations 
     
    121127/ 
    122128!----------------------------------------------------------------------- 
    123 &nambbc        !   bottom temperature boundary condition 
    124 !----------------------------------------------------------------------- 
     129&nambbc        !   bottom temperature boundary condition                (default: NO) 
     130!----------------------------------------------------------------------- 
     131   ln_trabbc   = .true.    !  Apply a geothermal heating at the ocean bottom 
    125132/ 
    126133!----------------------------------------------------------------------- 
     
    194201   ln_dynvor_een = .true.  !  energy & enstrophy scheme 
    195202      nn_een_e3f = 1             !  e3f = masked averaging of e3t divided by 4 (=0) or by the sum of mask (=1) 
     203   ln_dynvor_msk = .true.  !  vorticity multiplied by fmask (=T) or not (=F) (all vorticity schemes) 
    196204/ 
    197205!----------------------------------------------------------------------- 
    198206&namdyn_hpg    !   Hydrostatic pressure gradient option 
    199207!----------------------------------------------------------------------- 
    200 / 
    201 !----------------------------------------------------------------------- 
    202 &namdyn_spg    !   surface pressure gradient 
    203 !----------------------------------------------------------------------- 
    204    ln_dynspg_ts  = .true.  !  split-explicit free surface 
    205208/ 
    206209!----------------------------------------------------------------------- 
     
    246249/ 
    247250!----------------------------------------------------------------------- 
     251&namsol        !   elliptic solver / island / free surface  
     252!----------------------------------------------------------------------- 
     253/ 
     254!----------------------------------------------------------------------- 
    248255&nammpp        !   Massively Parallel Processing                        ("key_mpp_mpi) 
    249256!----------------------------------------------------------------------- 
  • branches/2015/dev_merge_2015/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist_cfg

    r5930 r6060  
    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 
     31   ln_linssh   = .true.    !  linear free surface 
    2632/ 
    2733!----------------------------------------------------------------------- 
     
    4854/ 
    4955!----------------------------------------------------------------------- 
     56&namsplit      !   time splitting parameters                            ("key_dynspg_ts") 
     57!----------------------------------------------------------------------- 
     58/ 
     59!----------------------------------------------------------------------- 
    5060&namcrs        !   Grid coarsening for dynamics output and/or 
    5161               !   passive tracer coarsened online simulations 
     
    93103/ 
    94104!----------------------------------------------------------------------- 
    95 &nambbc        !   bottom temperature boundary condition 
    96 !----------------------------------------------------------------------- 
     105&nambbc        !   bottom temperature boundary condition                (default: NO) 
     106!----------------------------------------------------------------------- 
     107   ln_trabbc   = .true.    !  Apply a geothermal heating at the ocean bottom 
    97108/ 
    98109!----------------------------------------------------------------------- 
     
    177188   ln_dynvor_mix = .false. !  mixed scheme 
    178189   ln_dynvor_een = .true.  !  energy & enstrophy scheme 
    179       nn_een_e3f = 1             !  e3f = masked averaging of e3t divided by 4 (=0) or by the sum of mask (=1) 
     190      nn_een_e3f = 0             !  e3f = masked averaging of e3t divided by 4 (=0) or by the sum of mask (=1) 
    180191/ 
    181192!----------------------------------------------------------------------- 
    182193&namdyn_hpg    !   Hydrostatic pressure gradient option 
    183194!----------------------------------------------------------------------- 
    184 / 
    185 !----------------------------------------------------------------------- 
    186 &namdyn_spg    !   surface pressure gradient 
    187 !----------------------------------------------------------------------- 
    188    ln_dynspg_ts  = .true.  !  split-explicit free surface 
    189195/ 
    190196!----------------------------------------------------------------------- 
     
    229235/ 
    230236!----------------------------------------------------------------------- 
     237&namsol        !   elliptic solver / island / free surface 
     238!----------------------------------------------------------------------- 
     239/ 
     240!----------------------------------------------------------------------- 
    231241&nammpp        !   Massively Parallel Processing                        ("key_mpp_mpi) 
    232242!----------------------------------------------------------------------- 
  • branches/2015/dev_merge_2015/NEMOGCM/CONFIG/ORCA2_LIM/cpp_ORCA2_LIM.fcm

    r5930 r6060  
    1 bld::tool::fppkeys key_trabbl key_lim2 key_zdftke key_zdfddm key_zdftmx  key_mpp_mpi key_iomput 
     1bld::tool::fppkeys key_trabbl key_lim2 key_zdftke key_zdfddm key_zdftmx  key_mpp_mpi key_iomput key_nosignedzero 
Note: See TracChangeset for help on using the changeset viewer.