# # ChangeLog for branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC # # Generated by Trac 1.0.1 # 2024-04-20T00:20:37+02:00 Mon, 18 Dec 2017 16:33:07 GMT nicolasmartin [9119] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/icethd_zdf.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/icevar.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynnxt.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/trasbc.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRD/trddyn.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfosm.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/AGE/trcnam_age.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/trcbc.F90 (modified) Fix longer lines so should be harmless (passed SETTE compilations) Mon, 18 Dec 2017 15:17:39 GMT acc [9117] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbcwave.F90 (modified) Branch 2017/dev_merge_2017. Fix uninitialised variables in sbcwave.F90 + ... Mon, 18 Dec 2017 14:24:31 GMT jchanut [9116] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC/agrif_oce.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC/agrif_opa_interp.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC/agrif_opa_update.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC/agrif_user.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/divhor.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 (modified) Finalize AGRIF ghost cells implementation: ensure compatibility with bdy ... Mon, 18 Dec 2017 14:06:42 GMT acc [9115] * branches/2017/dev_merge_2017/DOC/TexFiles/Bibliography/Biblio.bib (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/LBC/lbc_lnk_multi_generic.h90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbc_oce.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbcwave.F90 (modified) Branch 2017/dev_merge_2017. Tidier version of sbcwave.F90 with ... Mon, 18 Dec 2017 09:43:17 GMT jchanut [9112] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 (modified) bugs with top & bottom friction Sat, 16 Dec 2017 08:40:24 GMT gm [9111] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynadv_cen2.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90 (modified) dev_merge_2017: bug ji,jj indices in sbccpl.F90 & dynadv_cen2.F90 Fri, 15 Dec 2017 18:26:36 GMT jchanut [9109] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 (modified) Correct advective velocities for wetting and drying Fri, 15 Dec 2017 18:05:36 GMT cetlod [9108] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfphy.F90 (modified) Bugfix on ZDF Fri, 15 Dec 2017 18:03:37 GMT cetlod [9107] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfphy.F90 (modified) Bugfix on ZDF Fri, 15 Dec 2017 18:02:00 GMT cetlod [9106] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfosm.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfphy.F90 (modified) Bugfix on ZDF Fri, 15 Dec 2017 17:59:18 GMT flavoni [9105] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/BDY/bdyini.F90 (modified) fix Fri, 15 Dec 2017 17:56:13 GMT gm [9104] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfddm.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfevd.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfgls.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfiwm.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfmxl.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfosm.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfphy.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfric.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfsh2.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdftke.F90 (modified) dev_merge_2017: ZDF: timing + lnk_multi + namelist cfg ctl Fri, 15 Dec 2017 17:52:43 GMT flavoni [9102] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/BDY/bdyini.F90 (modified) fix Fri, 15 Dec 2017 17:49:30 GMT cetlod [9101] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRD/trdmxl.F90 (modified) Bugfix in trdmxl Fri, 15 Dec 2017 17:43:46 GMT cetlod [9100] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRD/trdmxl.F90 (modified) Bugfix in trdmxl Fri, 15 Dec 2017 17:40:06 GMT cetlod [9099] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/trabbl.F90 (modified) Bugfix in trabbl Fri, 15 Dec 2017 17:38:45 GMT flavoni [9098] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/geo2ocean.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_cice.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbcisf.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbcwave.F90 (modified) change lbc_lnk in lbc_lnk_multi Fri, 15 Dec 2017 17:36:32 GMT cetlod [9097] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRD/trddyn.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRD/trdken.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRD/trdmxl.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRD/trdvor.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/USR/usrdef_sbc.F90 (modified) Use of lbclnk_multi in subdir USR & TRD Fri, 15 Dec 2017 17:26:58 GMT cetlod [9094] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/LDF/ldfc1d_c2d.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/LDF/ldfdyn.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/LDF/ldfslp.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/LDF/ldftra.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/eosbn2.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_cen.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_fct.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_mle.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_mus.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_qck.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/trabbl.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_lap_blp.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/tranpc.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/tranxt.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/trazdf.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/zpshde.F90 (modified) Use of lbclnk_multi in subdir LDF & TRA Fri, 15 Dec 2017 17:20:47 GMT flavoni [9093] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/LBC/lbc_lnk_multi_generic.h90 (modified) fix Fri, 15 Dec 2017 17:20:09 GMT flavoni [9092] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/wet_dry.F90 (modified) change lbc_lnk in lbc_lnk_multi Fri, 15 Dec 2017 17:14:31 GMT clem [9091] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfosm.F90 (modified) debug timing Fri, 15 Dec 2017 17:12:43 GMT flavoni [9090] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/BDY/bdydyn3d.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/BDY/bdyini.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/iscplrst.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynadv_ubs.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynldf_iso.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynldf_lap_blp.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynnxt.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/wet_dry.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/LBC/lbc_lnk_multi_generic.h90 (modified) change lbc_lnk in lbc_lnk_multi Fri, 15 Dec 2017 17:00:09 GMT gm [9089] * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/ISOMIP/EXP00/namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/ISOMIP/MY_SRC/usrdef_hgr.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/ISOMIP/MY_SRC/usrdef_nam.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/ISOMIP/MY_SRC/usrdef_zgr.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfdrg.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfgls.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfosm.F90 (modified) dev_merge_2017: bug correction in zdfdrg + ISOMIP cfg Fri, 15 Dec 2017 13:59:08 GMT vancop [9076] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/ice.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/icedyn.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/iceforcing.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/icestp.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/icethd.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/icethd_zdf_bl99.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk.F90 (modified) monocat to virtual_itd Fri, 15 Dec 2017 13:50:00 GMT timgraham [9075] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 (modified) Fix for uninitialised variable Fri, 15 Dec 2017 09:35:02 GMT acc [9069] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/LBC/mppini.F90 (modified) Branch 2017/dev_merge_2017. mpp minor changes to reinstate missing ... Thu, 14 Dec 2017 17:00:50 GMT jchanut [9065] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90 (modified) Revert to previous version Thu, 14 Dec 2017 15:55:30 GMT jchanut [9059] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90 (modified) Add SSH initialization in domvvl routine for any user defined test case ... Thu, 14 Dec 2017 12:03:31 GMT timgraham [9045] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 (modified) Add exlicit loops Thu, 14 Dec 2017 11:53:41 GMT timgraham [9044] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90 (modified) Remove wrk_alloc in asminc.F90 Thu, 14 Dec 2017 11:49:18 GMT acc [9043] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 (modified) Branch 2017/dev_merge_2017. revert renamed constants in dynspg_ts.F90 Thu, 14 Dec 2017 11:31:51 GMT acc [9042] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/wet_dry.F90 (modified) Branch 2017/dev_merge_2017. Stop wet_dry verbosity Thu, 14 Dec 2017 11:28:07 GMT timgraham [9041] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90 (modified) Fix in diaobs Thu, 14 Dec 2017 11:22:46 GMT timgraham [9040] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90 (modified) Fix in diaobs Thu, 14 Dec 2017 11:16:33 GMT timgraham [9039] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/wet_dry.F90 (modified) Bug fixes Thu, 14 Dec 2017 11:12:17 GMT acc [9037] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 (modified) Branch 2017/dev_merge_2017. Fix next compilation issue in dynspg_ts.F90 Thu, 14 Dec 2017 11:07:21 GMT acc [9036] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 (modified) Branch 2017/dev_merge_2017. Fix next compilation issue in dynspg_ts.F90 Thu, 14 Dec 2017 10:41:52 GMT acc [9035] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 (modified) Branch 2017/dev_merge_2017. Fix compilation issue in dynspg_ts.F90 Thu, 14 Dec 2017 10:34:11 GMT acc [9034] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90 (modified) Branch 2017/dev_merge_2017. Fix compilation issue in sbccpl.F90 Thu, 14 Dec 2017 10:29:10 GMT timgraham [9033] * branches/2017/dev_merge_2017/NEMOGCM (modified) * branches/2017/dev_merge_2017/NEMOGCM/ARCH/OLD/NOC/arch-ALTIX_NAUTILUS.fcm (modified) * branches/2017/dev_merge_2017/NEMOGCM/ARCH/arch-ALTIX_NAUTILUS_MPT.fcm (modified) * branches/2017/dev_merge_2017/NEMOGCM/ARCH/arch-openmpi_NAVITI_MERCATOR.fcm (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/SHARED/namelist_ref (modified) * branches/2017/dev_merge_2017/NEMOGCM/EXTERNAL/AGRIF (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbc_oce.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbcwave.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/TRP/trctrp.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/TOOLS/DOMAINcfg/namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/TOOLS/DOMAINcfg/namelist_ref (modified) * branches/2017/dev_merge_2017/NEMOGCM/TOOLS/DOMAINcfg/src/dom_oce.f90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/TOOLS/DOMAINcfg/src/domain.f90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/TOOLS/DOMAINcfg/src/domzgr.f90 (modified) Commit final files from merge of NEMOGCM and some fixes for waves (taooc ... Thu, 14 Dec 2017 10:03:50 GMT acc [9030] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90 (modified) Branch 2017/dev_merge_2017. Fix compilation issue in dynhpg.F90 Thu, 14 Dec 2017 09:54:39 GMT acc [9029] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbcwave.F90 (modified) Branch 2017/dev_merge_2017. Fix compilation issue in sbcwave.F90. ... Wed, 13 Dec 2017 17:08:50 GMT timgraham [9023] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/BDY/bdydyn2d.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/dom_oce.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/domain.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/domwri.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/divhor.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynnxt.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/sshwzv.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/wet_dry.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/OBS/obs_averg_h2d.F90 (copied) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/OBS/obs_mpp.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/OBS/obs_oper.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/OBS/obs_prep.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/OBS/obs_profiles_def.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_prof.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_surf.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/OBS/obs_readmdt.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/OBS/obs_sstbias.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/OBS/obs_surf_def.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/OBS/obs_write.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/OBS/obsinter_h2d.h90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/cpl_oasis3.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbc_oce.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbcrnf.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbctide.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbcwave.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/tide_mod.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/tideini.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/tranxt.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/trasbc.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/USR/usrdef_hgr.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/USR/usrdef_nam.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfgls.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/oce.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/step.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/step_oce.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/stpctl.F90 (modified) Merged METO_MERCATOR branch and resolved all conflicts in OPA_SRC Wed, 13 Dec 2017 14:58:53 GMT timgraham [9019] * branches/2017/dev_merge_2017 (modified) * branches/2017/dev_merge_2017/DOC (modified) * branches/2017/dev_merge_2017/DOC/NEMO_book.pdf (modified) * branches/2017/dev_merge_2017/DOC/Namelists/nam_tide (modified) * branches/2017/dev_merge_2017/DOC/Namelists/nam_vvl (modified) * branches/2017/dev_merge_2017/DOC/Namelists/nambbl (modified) * branches/2017/dev_merge_2017/DOC/Namelists/nambdy (modified) * branches/2017/dev_merge_2017/DOC/Namelists/nambdy_dta (modified) * branches/2017/dev_merge_2017/DOC/Namelists/namberg (modified) * branches/2017/dev_merge_2017/DOC/Namelists/nambfr (deleted) * branches/2017/dev_merge_2017/DOC/Namelists/namcfg (modified) * branches/2017/dev_merge_2017/DOC/Namelists/namcfg_orca1 (deleted) * branches/2017/dev_merge_2017/DOC/Namelists/namcrs (modified) * branches/2017/dev_merge_2017/DOC/Namelists/namctl (modified) * branches/2017/dev_merge_2017/DOC/Namelists/namdiu (modified) * branches/2017/dev_merge_2017/DOC/Namelists/namdom (modified) * branches/2017/dev_merge_2017/DOC/Namelists/namdrg (copied) * branches/2017/dev_merge_2017/DOC/Namelists/namdrg_bot (copied) * branches/2017/dev_merge_2017/DOC/Namelists/namdrg_top (copied) * branches/2017/dev_merge_2017/DOC/Namelists/namdyn_adv (modified) * branches/2017/dev_merge_2017/DOC/Namelists/namdyn_hpg (modified) * branches/2017/dev_merge_2017/DOC/Namelists/namdyn_ldf (modified) * branches/2017/dev_merge_2017/DOC/Namelists/namelist_dmp (deleted) * branches/2017/dev_merge_2017/DOC/Namelists/nameos (modified) * branches/2017/dev_merge_2017/DOC/Namelists/nammpp (modified) * branches/2017/dev_merge_2017/DOC/Namelists/namobs_example (deleted) * branches/2017/dev_merge_2017/DOC/Namelists/namsbc (modified) * branches/2017/dev_merge_2017/DOC/Namelists/namsbc_alb (deleted) * branches/2017/dev_merge_2017/DOC/Namelists/namsbc_ana (deleted) * branches/2017/dev_merge_2017/DOC/Namelists/namsbc_apr (modified) * branches/2017/dev_merge_2017/DOC/Namelists/namsbc_blk (copied) * branches/2017/dev_merge_2017/DOC/Namelists/namsbc_clio (deleted) * branches/2017/dev_merge_2017/DOC/Namelists/namsbc_core (deleted) * branches/2017/dev_merge_2017/DOC/Namelists/namsbc_cpl (modified) * branches/2017/dev_merge_2017/DOC/Namelists/namsbc_flx (modified) * branches/2017/dev_merge_2017/DOC/Namelists/namsbc_mfs (deleted) * branches/2017/dev_merge_2017/DOC/Namelists/namsbc_rnf (modified) * branches/2017/dev_merge_2017/DOC/Namelists/namsbc_sas (modified) * branches/2017/dev_merge_2017/DOC/Namelists/namsbc_ssr (modified) * branches/2017/dev_merge_2017/DOC/Namelists/namsbc_wave (modified) * branches/2017/dev_merge_2017/DOC/Namelists/namtra_adv (modified) * branches/2017/dev_merge_2017/DOC/Namelists/namtra_dmp (modified) * branches/2017/dev_merge_2017/DOC/Namelists/namtra_ldf (modified) * branches/2017/dev_merge_2017/DOC/Namelists/namtra_ldfeiv (modified) * branches/2017/dev_merge_2017/DOC/Namelists/namtra_qsr (modified) * branches/2017/dev_merge_2017/DOC/Namelists/namzdf (modified) * branches/2017/dev_merge_2017/DOC/Namelists/namzdf_ddm (deleted) * branches/2017/dev_merge_2017/DOC/Namelists/namzdf_gls (modified) * branches/2017/dev_merge_2017/DOC/Namelists/namzdf_iwm (copied) * branches/2017/dev_merge_2017/DOC/Namelists/namzdf_osm (copied) * branches/2017/dev_merge_2017/DOC/Namelists/namzdf_ric (modified) * branches/2017/dev_merge_2017/DOC/Namelists/namzdf_tke (modified) * branches/2017/dev_merge_2017/DOC/Namelists/namzdf_tmx (deleted) * branches/2017/dev_merge_2017/DOC/Namelists/namzdf_tmx_new (deleted) * branches/2017/dev_merge_2017/DOC/Namelists/namzgr (deleted) * branches/2017/dev_merge_2017/DOC/Namelists/namzgr_sco (deleted) * branches/2017/dev_merge_2017/DOC/TexFiles/Chapters/Chap_CFG.tex (modified) * branches/2017/dev_merge_2017/DOC/TexFiles/Chapters/Chap_DOM.tex (modified) * branches/2017/dev_merge_2017/DOC/TexFiles/Chapters/Chap_MISC.tex (modified) * branches/2017/dev_merge_2017/DOC/TexFiles/Chapters/Chap_SBC.tex (modified) * branches/2017/dev_merge_2017/DOC/TexFiles/Chapters/Chap_ZDF.tex (modified) * branches/2017/dev_merge_2017/DOC/TexFiles/Chapters/Introduction.tex (modified) * branches/2017/dev_merge_2017/DOC/TexFiles/Top_Matter.tex (modified) * branches/2017/dev_merge_2017/NEMOGCM (modified) * branches/2017/dev_merge_2017/NEMOGCM/ARCH/OLD/NOC/arch-ALTIX_NAUTILUS.fcm (modified) * branches/2017/dev_merge_2017/NEMOGCM/ARCH/arch-ALTIX_NAUTILUS_MPT.fcm (modified) * branches/2017/dev_merge_2017/NEMOGCM/ARCH/arch-X64_ADA.fcm (modified) * branches/2017/dev_merge_2017/NEMOGCM/ARCH/arch-X64_ADA_DEBUG.fcm (modified) * branches/2017/dev_merge_2017/NEMOGCM/ARCH/arch-macport_osx_debug.fcm (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AMM12/EXP00/namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AMM12/cpp_AMM12.fcm (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/C1D_PAPA/EXP00/namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/C1D_PAPA/cpp_C1D_PAPA.fcm (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/GYRE_BFM/EXP00/namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/GYRE_BFM/EXP00/namelist_top_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/GYRE_BFM/cpp_GYRE_BFM.fcm (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/GYRE_PISCES/EXP00/namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/GYRE_PISCES/EXP00/namelist_top_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/GYRE_PISCES/cpp_GYRE_PISCES.fcm (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_LIM3_PISCES/EXP00/1_context_nemo.xml (copied) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_LIM3_PISCES/EXP00/1_namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_LIM3_PISCES/EXP00/context_nemo.xml (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_LIM3_PISCES/EXP00/file_def_nemo-lim.xml (copied) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_LIM3_PISCES/EXP00/file_def_nemo-opa.xml (copied) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_LIM3_PISCES/EXP00/file_def_nemo-pisces.xml (copied) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_LIM3_PISCES/EXP00/file_def_nemo.xml (deleted) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_LIM3_PISCES/EXP00/iodef.xml (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_LIM3_PISCES/EXP00/namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_LIM3_PISCES/EXP00/namelist_ice_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_LIM3_PISCES/EXP00/namelist_top_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_LIM3_PISCES/cpp_ORCA2_LIM3_PISCES.fcm (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist_top_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/cpp_ORCA2_OFF_PISCES.fcm (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_OFF_TRC/EXP00/namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_OFF_TRC/cpp_ORCA2_OFF_TRC.fcm (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_SAS_LIM3/EXP00/file_def_nemo.xml (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_SAS_LIM3/EXP00/namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_SAS_LIM3/EXP00/namelist_ice_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_SAS_LIM3/cpp_ORCA2_SAS_LIM3.fcm (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/SHARED (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/SHARED/README_configs_namcfg_namdom (deleted) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/SHARED/field_def_nemo-lim.xml (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/SHARED/field_def_nemo-opa.xml (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/SHARED/namelist_ice_lim2_ref (deleted) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/SHARED/namelist_ice_lim3_ref (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/SHARED/namelist_ref (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/SHARED/namelist_top_ref (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/ISOMIP/EXP00/namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/ISOMIP/MY_SRC/usrdef_hgr.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/ISOMIP/MY_SRC/usrdef_sbc.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/ISOMIP/cpp_ISOMIP.fcm (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT2_flux_cen2_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT2_flux_ubs_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT2_vect_eenH_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT2_vect_een_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT2_vect_ene_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT2_vect_ens_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT4_flux_cen2_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT4_flux_ubs_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT4_vect_eenH_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT4_vect_een_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT4_vect_ene_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT4_vect_ens_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_cfg (copied) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/MY_SRC/usrdef_sbc.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/MY_SRC/zdfini.F90 (deleted) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/cpp_LOCK_EXCHANGE.fcm (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/OVERFLOW/EXP00/namelist_cfg (copied) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/OVERFLOW/EXP00/namelist_sco_FCT2_flux_ubs_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/OVERFLOW/EXP00/namelist_zps_FCT2_flux_ubs_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/OVERFLOW/EXP00/namelist_zps_FCT4_flux_ubs_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/OVERFLOW/EXP00/namelist_zps_FCT4_vect_een_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/OVERFLOW/MY_SRC/usrdef_sbc.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/OVERFLOW/MY_SRC/zdfini.F90 (deleted) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/OVERFLOW/cpp_OVERFLOW.fcm (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/SAS_BIPER/EXP00/1_namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/SAS_BIPER/EXP00/1_namelist_ice_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/SAS_BIPER/EXP00/1_namelist_ice_ref (copied) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/SAS_BIPER/EXP00/README (copied) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/SAS_BIPER/EXP00/domain_def_nemo.xml (copied) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/SAS_BIPER/EXP00/field_def_nemo-lim.xml (copied) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/SAS_BIPER/EXP00/field_def_nemo-opa.xml (copied) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/SAS_BIPER/EXP00/file_def_nemo-lim.xml (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/SAS_BIPER/EXP00/make_INITICE.py (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/SAS_BIPER/EXP00/namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/SAS_BIPER/EXP00/namelist_ice_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/SAS_BIPER/MY_SRC/par_oce.F90 (copied) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/SAS_BIPER/MY_SRC/usrdef_sbc.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/SAS_BIPER/MY_SRC/usrdef_zgr.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/WAD/EXP00/namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/WAD/MY_SRC/bdyini.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/WAD/MY_SRC/usrdef_sbc.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/WAD/cpp_WAD.fcm (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/cfg.txt (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/cfg.txt (modified) * branches/2017/dev_merge_2017/NEMOGCM/EXTERNAL/AGRIF (modified) * branches/2017/dev_merge_2017/NEMOGCM/EXTERNAL/AGRIF/LIB/decl.h (modified) * branches/2017/dev_merge_2017/NEMOGCM/EXTERNAL/AGRIF/nemo_mpi.h (copied) * branches/2017/dev_merge_2017/NEMOGCM/NEMO (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_2 (deleted) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/ice.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/ice1d.F90 (copied) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/icealb.F90 (copied) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/icecor.F90 (copied) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/icectl.F90 (copied) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/icedia.F90 (copied) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/icedyn.F90 (copied) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/icedyn_adv.F90 (copied) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/icedyn_adv_pra.F90 (copied) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/icedyn_adv_umx.F90 (copied) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/icedyn_rdgrft.F90 (copied) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/icedyn_rhg.F90 (copied) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/icedyn_rhg_evp.F90 (copied) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/iceforcing.F90 (copied) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/iceistate.F90 (copied) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/iceitd.F90 (copied) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/icerst.F90 (copied) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/icestp.F90 (copied) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/icetab.F90 (copied) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/icethd.F90 (copied) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/icethd_da.F90 (copied) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/icethd_dh.F90 (copied) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/icethd_do.F90 (copied) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/icethd_ent.F90 (copied) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/icethd_pnd.F90 (copied) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/icethd_sal.F90 (copied) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/icethd_zdf.F90 (copied) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/icethd_zdf_bl99.F90 (copied) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/iceupdate.F90 (copied) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/icevar.F90 (copied) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/icewri.F90 (copied) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/limadv_prather.F90 (deleted) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/limadv_umx.F90 (deleted) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/limcons.F90 (deleted) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/limctl.F90 (deleted) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/limdiahsb.F90 (deleted) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/limdyn.F90 (deleted) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/limhdf.F90 (deleted) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/limistate.F90 (deleted) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/limitd_me.F90 (deleted) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/limitd_th.F90 (deleted) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/limrhg.F90 (deleted) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/limrst.F90 (deleted) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/limsbc.F90 (deleted) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/limtab.F90 (deleted) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/limthd.F90 (deleted) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/limthd_da.F90 (deleted) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/limthd_dh.F90 (deleted) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/limthd_dif.F90 (deleted) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/limthd_ent.F90 (deleted) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/limthd_lac.F90 (deleted) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/limthd_sal.F90 (deleted) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/limtrp.F90 (deleted) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/limupdate1.F90 (deleted) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/limupdate2.F90 (deleted) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/limvar.F90 (deleted) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/limwri.F90 (deleted) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/thd_ice.F90 (deleted) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC/agrif_ice.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC/agrif_lim2_interp.F90 (deleted) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC/agrif_lim2_update.F90 (deleted) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC/agrif_lim3_interp.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC/agrif_lim3_update.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC/agrif_oce.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC/agrif_opa_interp.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC/agrif_opa_sponge.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC/agrif_opa_update.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC/agrif_top_interp.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC/agrif_top_sponge.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC/agrif_top_update.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC/agrif_user.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OFF_SRC/dtadyn.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OFF_SRC/nemogcm.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ASM/asmbkg.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/BDY/bdy_oce.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/BDY/bdydta.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/BDY/bdydyn2d.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/BDY/bdyice.F90 (copied) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/BDY/bdyice_lim.F90 (deleted) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/BDY/bdyini.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/C1D/dyncor_c1d.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/C1D/step_c1d.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/CRS/crs.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/CRS/crsdom.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/CRS/crsdomwri.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/CRS/crsfld.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/CRS/crsini.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/CRS/crslbclnk.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DIA/dia25h.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DIA/diaar5.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DIA/diacfl.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DIA/diadct.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DIA/diahth.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DIA/diaptr.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/daymod.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/depth_e3.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/dom_oce.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/domain.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/domhgr.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/domngb.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/domwri.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/dtatsd.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/iscplhsb.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/iscplini.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/iscplrst.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/istate.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/phycst.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/divhor.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynadv.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynadv_cen2.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynadv_ubs.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynbfr.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynkeg.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynldf.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynldf_iso.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynldf_lap_blp.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynnxt.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_exp.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynvor.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynzad.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynzdf.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynzdf_exp.F90 (deleted) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynzdf_imp.F90 (deleted) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/sshwzv.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/wet_dry.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ICB/icb_oce.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ICB/icbtrj.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ICB/icbutl.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/IOM/in_out_manager.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/IOM/iom_def.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/IOM/iom_nf90.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/IOM/prtctl.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/LBC/lbc_lnk_generic.h90 (copied) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/LBC/lbc_lnk_multi_generic.h90 (copied) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/LBC/lbc_nfd_ext_generic.h90 (copied) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/LBC/lbc_nfd_generic.h90 (copied) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/LBC/lbc_nfd_nogather_generic.h90 (copied) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/LBC/lbclnk.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/LBC/lbcnfd.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/LBC/mpp_bdy_generic.h90 (copied) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/LBC/mpp_lnk_generic.h90 (copied) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/LBC/mpp_nfd_generic.h90 (copied) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/LBC/mppini.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/LBC/mppini_2.h90 (deleted) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/LDF/ldfdyn.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/LDF/ldfslp.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/LDF/ldftra.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/albedo.F90 (deleted) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/fldread.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/ocealb.F90 (copied) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbc_ice.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbc_oce.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_algo_coare.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_algo_coare3p5.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_algo_ecmwf.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_algo_ncar.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbcfwb.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_cice.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim.F90 (deleted) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim_2.F90 (deleted) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbcisf.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbcssm.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbcwave.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/STO/stopar.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/eosbn2.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/traadv.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_cen.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_fct.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_mle.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_mus.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_qck.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_ubs.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/trabbc.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/trabbl.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/tradmp.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/traldf.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_iso.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_lap_blp.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_triad.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/tranpc.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/tranxt.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/traqsr.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/trasbc.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/trazdf.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/trazdf_exp.F90 (deleted) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/trazdf_imp.F90 (deleted) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/zpshde.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRD/trd_oce.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRD/trddyn.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRD/trdglo.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRD/trdken.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRD/trdmxl.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRD/trdpen.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRD/trdtra.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/USR/usrdef_sbc.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdf_oce.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfbfr.F90 (deleted) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfddm.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfddm_substitute.h90 (deleted) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfdrg.F90 (copied) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfevd.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfgls.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfini.F90 (deleted) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfiwm.F90 (copied) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfmxl.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfosm.F90 (copied) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfphy.F90 (copied) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfqiao.F90 (deleted) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfric.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfsh2.F90 (copied) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfswm.F90 (copied) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdftke.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdftmx.F90 (deleted) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/module_example (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/oce.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/par_oce.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/step.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/step_oce.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/stpctl.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/trc_oce.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/SAO_SRC/nemogcm.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/SAS_SRC/diawri.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/SAS_SRC/nemogcm.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/SAS_SRC/sbcssm.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/SAS_SRC/step.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/PISCES/P2Z/p2zopt.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/TRP/trcadv.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/TRP/trcbbl.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/TRP/trcdmp.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/TRP/trcldf.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/TRP/trcnxt.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/TRP/trcsbc.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/TRP/trctrp.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/TRP/trczdf.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/TRP/trdmxl_trc.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/oce_trc.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/trc.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/trcini.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/trcstp.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/trcsub.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-X64_MOBILIS (modified) * branches/2017/dev_merge_2017/NEMOGCM/SETTE/README (modified) * branches/2017/dev_merge_2017/NEMOGCM/SETTE/all_functions.sh (modified) * branches/2017/dev_merge_2017/NEMOGCM/SETTE/input_ISOMIP.cfg (copied) * branches/2017/dev_merge_2017/NEMOGCM/SETTE/param.cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/SETTE/sette.sh (modified) * branches/2017/dev_merge_2017/NEMOGCM/SETTE/sette_beginner.sh (modified) * branches/2017/dev_merge_2017/NEMOGCM/SETTE/sette_rpt.SAS.sh (copied) * branches/2017/dev_merge_2017/NEMOGCM/SETTE/sette_rpt.sh (modified) * branches/2017/dev_merge_2017/NEMOGCM/SETTE/sette_xios.sh (modified) * branches/2017/dev_merge_2017/NEMOGCM/TOOLS/DOMAINcfg/README_configs_namcfg_namdom (copied) * branches/2017/dev_merge_2017/NEMOGCM/TOOLS/DOMAINcfg/field_def.xml (modified) * branches/2017/dev_merge_2017/NEMOGCM/TOOLS/DOMAINcfg/namelist_ref (modified) Merge of dev_CNRS_2017 into branch Wed, 13 Dec 2017 14:56:18 GMT timgraham [9018] * branches/2017/dev_merge_2017 (copied) Merge of 2017 developments Wed, 22 Nov 2017 18:04:59 GMT gsamson [8789] * trunk/NEMOGCM/NEMO/OPA_SRC/ZDF/zdftmx.F90 (modified) fix ticket #1954 in trunk