Changeset 5930 for trunk/NEMOGCM/CONFIG/AMM12

Timestamp:

2015-11-26T17:07:10+01:00 (8 years ago)

Author:

jchanut

Message:

#1620 Merge free surface simplification into trunk

Location:

trunk/NEMOGCM/CONFIG/AMM12

Files:

• EXP00/namelist_cfg (modified) (3 diffs)
• cpp_AMM12.fcm (modified) (1 diff)

trunk/NEMOGCM/CONFIG/AMM12/EXP00/namelist_cfg

@@ -70 +70 @@
    ppkth2      =  999999.              !
    ppacr2      =  999999.
-/
-!-----------------------------------------------------------------------
-&namsplit      !   time splitting parameters                            ("key_dynspg_ts")
-!-----------------------------------------------------------------------
-   ln_bt_nn_auto =    .FALSE.          !  Set nn_baro automatically to be just below
-                                       !  a user defined maximum courant number (rn_bt_cmax)
-   nn_baro       =    30               !  Number of iterations of barotropic mode
 /
 !-----------------------------------------------------------------------
@@ -344 +337 @@
 /
 !-----------------------------------------------------------------------
-!namdyn_spg    !   surface pressure gradient   (CPP key only)
-!-----------------------------------------------------------------------
-!                          !  explicit free surface                     ("key_dynspg_exp")
-!                          !  filtered free surface                     ("key_dynspg_flt")
-!                          !  split-explicit free surface               ("key_dynspg_ts")
-
+&namdyn_spg    !   surface pressure gradient 
+!-----------------------------------------------------------------------
+   ln_dynspg_ts   = .true.    ! split-explicit free surface
+      ln_bt_auto    = .false.   ! Number of sub-step defined from:
+         nn_baro      = 30        ! =F : the number of sub-step in rn_rdt seconds
+/
 !-----------------------------------------------------------------------
 &namdyn_ldf    !   lateral diffusion on momentum
@@ -408 +401 @@
 /
 !-----------------------------------------------------------------------
-&namsol        !   elliptic solver / island / free surface
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
 &nammpp        !   Massively Parallel Processing                        ("key_mpp_mpi)
 !-----------------------------------------------------------------------

trunk/NEMOGCM/CONFIG/AMM12/cpp_AMM12.fcm

@@ -1 @@
- bld::tool::fppkeys  key_bdy key_tide key_dynspg_ts  key_zdfgls  key_vvl key_diainstant key_mpp_mpi key_iomput
+ bld::tool::fppkeys  key_bdy key_tide  key_zdfgls  key_vvl key_diainstant key_mpp_mpi key_iomput