Changeset 6138 for branches/2015/dev_r5803_NOC_WAD/NEMOGCM/CONFIG/GYRE_BFM

Timestamp:

2015-12-21T11:24:43+01:00 (8 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/GYRE_BFM

Files:

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

branches/2015/dev_r5803_NOC_WAD/NEMOGCM/CONFIG/GYRE_BFM/EXP00/namelist_cfg

@@ -67 +67 @@
    ppkth2      =  999999.0               !
    ppacr2      =  999999.0               !
-/
-!-----------------------------------------------------------------------
-&namsplit      !   time splitting parameters                            ("key_dynspg_ts")
-!-----------------------------------------------------------------------
 /
 !-----------------------------------------------------------------------
@@ -287 +283 @@
 /
 !-----------------------------------------------------------------------
-!namdyn_spg    !   surface pressure gradient   (CPP key only)
-!-----------------------------------------------------------------------
+&namdyn_spg    !   surface pressure gradient
+!-----------------------------------------------------------------------
+   ln_dynspg_ts  = .true.  !  split-explicit free surface
+/
 !-----------------------------------------------------------------------
 &namdyn_ldf    !   lateral diffusion on momentum
@@ -345 +343 @@
 /
 !-----------------------------------------------------------------------
-&namsol        !   elliptic solver / island / free surface
-!-----------------------------------------------------------------------
-   nn_solv     =      2    !  elliptic solver: =1 preconditioned conjugate gradient (pcg)
-   nn_nmin     =    210    !  minimum of iterations for the SOR solver
-   rn_sor      =  1.96     !  optimal coefficient for SOR solver (to be adjusted with the domain)
-/
-!-----------------------------------------------------------------------
 &nammpp        !   Massively Parallel Processing                        ("key_mpp_mpi)
 !-----------------------------------------------------------------------

branches/2015/dev_r5803_NOC_WAD/NEMOGCM/CONFIG/GYRE_BFM/cpp_GYRE_BFM.fcm

@@ -1 @@
-bld::tool::fppkeys key_dynspg_flt key_zdftke key_top key_my_trc key_mpp_mpi key_iomput
+bld::tool::fppkeys key_zdftke key_top key_my_trc key_mpp_mpi key_iomput
 inc $BFMDIR/src/nemo/bfm.fcm