Changeset 6138 for branches/2015/dev_r5803_NOC_WAD/NEMOGCM/CONFIG/ORCA2_SAS_LIM/cpp_ORCA2_SAS_LIM.fcm

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

File:

• branches/2015/dev_r5803_NOC_WAD/NEMOGCM/CONFIG/ORCA2_SAS_LIM/cpp_ORCA2_SAS_LIM.fcm (modified) (1 diff)

branches/2015/dev_r5803_NOC_WAD/NEMOGCM/CONFIG/ORCA2_SAS_LIM/cpp_ORCA2_SAS_LIM.fcm

@@ -1 @@
- bld::tool::fppkeys key_trabbl key_lim2 key_dynspg_flt key_zdftke key_zdfddm key_zdftmx key_iomput key_mpp_mpi
+ bld::tool::fppkeys key_trabbl key_lim2 key_zdftke key_zdfddm key_zdftmx key_iomput key_mpp_mpi