Changeset 7299 for branches/2016/dev_CMCC_2016/NEMOGCM/CONFIG/AMM12

Timestamp:

2016-11-22T12:19:58+01:00 (8 years ago)

Author:

lovato

Message:

Merge with CMCC changes from dev_r6522_SIMPLIF_3 - ticket #1729 & #1783

Location:

branches/2016/dev_CMCC_2016/NEMOGCM/CONFIG/AMM12

Files:

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

branches/2016/dev_CMCC_2016/NEMOGCM/CONFIG/AMM12/EXP00/namelist_cfg

@@ -189 +189 @@
 /
 !-----------------------------------------------------------------------
-&nam_tide      !   tide parameters (#ifdef key_tide)
-!-----------------------------------------------------------------------
+&nam_tide      !   tide parameters
+!-----------------------------------------------------------------------
+   ln_tide     = .true.
    clname(1)     =   'Q1'   !  name of constituent
    clname(2)     =   'O1'
@@ -208 +209 @@
 /
 !-----------------------------------------------------------------------
-&nambdy        !  unstructured open boundaries                          ("key_bdy")
+&nambdy        !  unstructured open boundaries
+    ln_bdy         = .true.
     nb_bdy         =  1
     cn_dyn2d       = 'flather'
@@ -216 +218 @@
 /
 !-----------------------------------------------------------------------
-&nambdy_dta      !  open boundaries - external data           ("key_bdy")
+&nambdy_dta      !  open boundaries - external data
 !-----------------------------------------------------------------------
 !          !  file name  ! frequency (hours) ! variable  ! time interp. !  clim  ! 'yearly'/ ! weights  ! rotation ! land/sea mask !

branches/2016/dev_CMCC_2016/NEMOGCM/CONFIG/AMM12/cpp_AMM12.fcm

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