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 10413 for NEMO/trunk/tests – NEMO

Changeset 10413 for NEMO/trunk/tests


Ignore:
Timestamp:
2018-12-18T18:59:59+01:00 (5 years ago)
Author:
clem
Message:

merge dev_r9947_SI3_advection with the trunk. All sette tests passed. There is probably a conservation issue with the new advection scheme that I should solve but the routine icedyn_adv_umx.F90 is going to change anyway in the next couple of weeks. At worst, the old routine can be plugged without harm

Location:
NEMO/trunk/tests
Files:
27 added
4 edited

Legend:

Unmodified
Added
Removed

  • NEMO/trunk/tests/ICEDYN/EXPREF/1_namelist_ice_cfg

    r9801 r10413  
    11!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
    2 !! SI3 namelist:   
     2!! SI3 configuration namelist: Overwrites SHARED/namelist_ice_ref 
    33!!              1 - Generic parameters                 (nampar) 
    44!!              2 - Ice thickness discretization       (namitd) 
    … …  
    3333&namdyn         !   Ice dynamics 
    3434!------------------------------------------------------------------------------ 
    35    ln_dynFULL       = .false.         !  dyn.: full ice dynamics               (rheology + advection + ridging/rafting + correction) 
     35   ln_dynALL        = .false.         !  dyn.: full ice dynamics               (rheology + advection + ridging/rafting + correction) 
    3636   ln_dynRHGADV     = .true.          !  dyn.: no ridge/raft & no corrections  (rheology + advection) 
    37    ln_dynADV        = .false.         !  dyn.: only advection w prescribed vel.(rn_uvice + advection) 
     37   ln_dynADV1D      = .false.         !  dyn.: only advection 1D                  (Schar & Smolarkiewicz 1996 test case) 
     38   ln_dynADV2D      = .false.         !  dyn.: only advection 2D w prescribed vel.(rn_uvice + advection) 
    3839      rn_uice       =   0.5           !        prescribed ice u-velocity 
    3940      rn_vice       =   0.            !        prescribed ice v-velocity 

  • NEMO/trunk/tests/ICEDYN/EXPREF/file_def_nemo-ice.xml

    r9740 r10413  
    2121        <field field_ref="snwvolu"          name="snvolu" /> 
    2222        <field field_ref="icethic"          name="sithic" /> 
     23        <field field_ref="icethic"          name="sithic_max" operation="maximum" /> 
     24        <field field_ref="icethic"          name="sithic_min" operation="minimum" /> 
     25        <field field_ref="iceneg_pres"      name="sineg_pres" /> 
     26        <field field_ref="iceneg_volu"      name="sineg_volu" /> 
     27        <field field_ref="fasticepres"      name="fasticepres" /> 
    2328        <field field_ref="icevolu"          name="sivolu" /> 
    2429        <field field_ref="iceconc"          name="siconc" /> 

  • NEMO/trunk/tests/ICEDYN/EXPREF/namelist_ice_cfg

    r10075 r10413  
    3333&namdyn         !   Ice dynamics 
    3434!------------------------------------------------------------------------------ 
    35    ln_dynFULL       = .false.         !  dyn.: full ice dynamics               (rheology + advection + ridging/rafting + correction) 
     35   ln_dynALL        = .false.         !  dyn.: full ice dynamics               (rheology + advection + ridging/rafting + correction) 
    3636   ln_dynRHGADV     = .true.          !  dyn.: no ridge/raft & no corrections  (rheology + advection) 
    37    ln_dynADV        = .false.         !  dyn.: only advection w prescribed vel.(rn_uvice + advection) 
     37   ln_dynADV1D      = .false.         !  dyn.: only advection 1D                  (Schar & Smolarkiewicz 1996 test case) 
     38   ln_dynADV2D      = .false.         !  dyn.: only advection 2D w prescribed vel.(rn_uvice + advection) 
    3839      rn_uice       =   0.5           !        prescribed ice u-velocity 
    3940      rn_vice       =   0.            !        prescribed ice v-velocity 
    … …  
    9596   sn_tmi = 'initice'                 , -12 ,'tmi'   ,  .false.  , .true., 'yearly'  , '' , '', '' 
    9697   sn_smi = 'initice'                 , -12 ,'smi'   ,  .false.  , .true., 'yearly'  , '' , '', '' 
    97    cn_dir ='./' 
     98   cn_dir='./' 
    9899/ 
    99100!------------------------------------------------------------------------------ 

  • NEMO/trunk/tests/demo_cfgs.txt

    r9789 r10413  
    44OVERFLOW OCE 
    55ICEDYN OCE NST SAS ICE 
     6ICEADV OCE SAS ICE 
    67VORTEX OCE NST 
    78WAD OCE 
     9 
Note: See TracChangeset for help on using the changeset viewer.