#
# ChangeLog for branches/2017/dev_merge_2017/DOC/TexFiles/Chapters/Introduction.tex
#
# Generated by Trac 1.0.1
# 2024-05-21T03:51:16+02:00

Wed, 28 Feb 2018 09:29:22 GMT nicolasmartin [9363]
	* branches/2017/dev_merge_2017/DOC/TexFiles/Chapters/Annex_C.tex (modified)
	* branches/2017/dev_merge_2017/DOC/TexFiles/Chapters/Annex_E.tex (modified)
	* branches/2017/dev_merge_2017/DOC/TexFiles/Chapters/Chap_CFG.tex (modified)
	* branches/2017/dev_merge_2017/DOC/TexFiles/Chapters/Chap_DIA.tex (modified)
	* branches/2017/dev_merge_2017/DOC/TexFiles/Chapters/Chap_DOM.tex (modified)
	* branches/2017/dev_merge_2017/DOC/TexFiles/Chapters/Chap_DYN.tex (modified)
	* branches/2017/dev_merge_2017/DOC/TexFiles/Chapters/Chap_LBC.tex (modified)
	* branches/2017/dev_merge_2017/DOC/TexFiles/Chapters/Chap_LDF.tex (modified)
	* branches/2017/dev_merge_2017/DOC/TexFiles/Chapters/Chap_MISC.tex (modified)
	* branches/2017/dev_merge_2017/DOC/TexFiles/Chapters/Chap_Model_Basics.tex (modified)
	* branches/2017/dev_merge_2017/DOC/TexFiles/Chapters/Chap_Model_Basics_zstar.tex (modified)
	* branches/2017/dev_merge_2017/DOC/TexFiles/Chapters/Chap_OBS.tex (modified)
	* branches/2017/dev_merge_2017/DOC/TexFiles/Chapters/Chap_SBC.tex (modified)
	* branches/2017/dev_merge_2017/DOC/TexFiles/Chapters/Chap_STP.tex (modified)
	* branches/2017/dev_merge_2017/DOC/TexFiles/Chapters/Chap_TRA.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)

	Working with htlatex (LaTeX to HTML): disable floatrow package
	globally, ...


Mon, 26 Feb 2018 14:41:49 GMT nicolasmartin [9360]
	* branches/2017/dev_merge_2017/DOC/LaTeX2HTML.sh (modified)
	* branches/2017/dev_merge_2017/DOC/TexFiles/Chapters/Chap_STP.tex (modified)
	* branches/2017/dev_merge_2017/DOC/TexFiles/Chapters/Introduction.tex (modified)
	* branches/2017/dev_merge_2017/DOC/TexFiles/Preamble.tex (modified)

	Preamble.tex: some cleaning, use \path instead of \textit for path ...


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, 05 Oct 2016 14:26:13 GMT nicolasmartin [6997]
	* trunk/DOC/Figures (moved)
	* trunk/DOC/Figures/FIG_DOM_compare_coordinates_surface.eps (added)
	* trunk/DOC/Figures/Fig_ASM_obsdist_global.eps (added)
	* trunk/DOC/Figures/Fig_ASM_obsdist_local.eps (added)
	* trunk/DOC/Figures/Fig_BBL_adv.eps (added)
	* trunk/DOC/Figures/Fig_DYN_dynspg_ts.eps (added)
	* trunk/DOC/Figures/Fig_DYN_een_triad.eps (added)
	* trunk/DOC/Figures/Fig_GRIFF_MLB_triads.eps (added)
	* trunk/DOC/Figures/Fig_GRIFF_bdry_triads.eps (added)
	* trunk/DOC/Figures/Fig_GRIFF_qcells.eps (added)
	* trunk/DOC/Figures/Fig_GRIFF_triad_fluxes.eps (added)
	* trunk/DOC/Figures/Fig_GYRE.eps (added)
	* trunk/DOC/Figures/Fig_Gibraltar.eps (added)
	* trunk/DOC/Figures/Fig_Gibraltar2.eps (added)
	* trunk/DOC/Figures/Fig_IPSL_bande.eps (added)
	* trunk/DOC/Figures/Fig_ISO_triad.eps (added)
	* trunk/DOC/Figures/Fig_IV_adv_MUSCL.eps (added)
	* trunk/DOC/Figures/Fig_IV_adv_flx.eps (added)
	* trunk/DOC/Figures/Fig_I_earth_referential.eps (added)
	* trunk/DOC/Figures/Fig_I_ocean_bc.eps (added)
	* trunk/DOC/Figures/Fig_LBC_bdy_geom.eps (added)
	* trunk/DOC/Figures/Fig_LBC_jperio.eps (added)
	* trunk/DOC/Figures/Fig_LBC_nc_header.eps (added)
	* trunk/DOC/Figures/Fig_LBC_shlat.eps (added)
	* trunk/DOC/Figures/Fig_LBC_uv.eps (added)
	* trunk/DOC/Figures/Fig_LBC_zoom.eps (added)
	* trunk/DOC/Figures/Fig_LDF_ZDF1.eps (added)
	* trunk/DOC/Figures/Fig_MLF_forcing.eps (added)
	* trunk/DOC/Figures/Fig_North_Fold_T.eps (added)
	* trunk/DOC/Figures/Fig_OBS_dataplot_main.eps (added)
	* trunk/DOC/Figures/Fig_OBS_dataplot_prof.eps (added)
	* trunk/DOC/Figures/Fig_ORCA2_NH_mesh.eps (added)
	* trunk/DOC/Figures/Fig_ORCA_NH_mesh.eps (added)
	* trunk/DOC/Figures/Fig_ORCA_NH_msh05_e1_e2.eps (added)
	* trunk/DOC/Figures/Fig_ORCA_aniso.eps (added)
	* trunk/DOC/Figures/Fig_SBC_air_sea.eps (added)
	* trunk/DOC/Figures/Fig_SBC_dcy.eps (added)
	* trunk/DOC/Figures/Fig_SBC_diurnal.eps (added)
	* trunk/DOC/Figures/Fig_SBC_isf.eps (added)
	* trunk/DOC/Figures/Fig_TRA_Irradiance.eps (added)
	* trunk/DOC/Figures/Fig_TRA_geoth.eps (added)
	* trunk/DOC/Figures/Fig_TimeStepping_flowchart.eps (added)
	* trunk/DOC/Figures/Fig_ZDF_M2_K1_tmx.eps (added)
	* trunk/DOC/Figures/Fig_ZDF_TKE_time_scheme.eps (added)
	* trunk/DOC/Figures/Fig_adv_scheme.eps (added)
	* trunk/DOC/Figures/Fig_cell.eps (added)
	* trunk/DOC/Figures/Fig_cla.eps (added)
	* trunk/DOC/Figures/Fig_eiv_slp.eps (added)
	* trunk/DOC/Figures/Fig_hgr.eps (added)
	* trunk/DOC/Figures/Fig_index_hor.eps (added)
	* trunk/DOC/Figures/Fig_index_vert.eps (added)
	* trunk/DOC/Figures/Fig_mask_subasins.eps (added)
	* trunk/DOC/Figures/Fig_mixing_length.eps (added)
	* trunk/DOC/Figures/Fig_mpp.eps (added)
	* trunk/DOC/Figures/Fig_mppini2.eps (added)
	* trunk/DOC/Figures/Fig_npc.eps (added)
	* trunk/DOC/Figures/Fig_overlap.eps (added)
	* trunk/DOC/Figures/Fig_sco_function.eps (added)
	* trunk/DOC/Figures/Fig_z_zps_s_sps.eps (added)
	* trunk/DOC/Figures/Fig_z_zstar.eps (added)
	* trunk/DOC/Figures/Fig_z_zstar_s.eps (added)
	* trunk/DOC/Figures/Fig_z_zstar_s2.eps (added)
	* trunk/DOC/Figures/Fig_zdfddm.eps (added)
	* trunk/DOC/Figures/Fig_zgr.eps (added)
	* trunk/DOC/Figures/Fig_zgr_e3.eps (added)
	* trunk/DOC/Figures/NEMO_logo.eps (added)
	* trunk/DOC/Figures/NEMO_logo_Black.eps (added)
	* trunk/DOC/Figures/Partial_step_scheme.eps (added)
	* trunk/DOC/Figures/bathy_idl_z_zps_s.eps (added)
	* trunk/DOC/Figures/logo_ALL.eps (added)
	* trunk/DOC/Figures/logo_CMCC.eps (added)
	* trunk/DOC/Figures/logo_CNRS.eps (added)
	* trunk/DOC/Figures/logo_MERCATOR.eps (added)
	* trunk/DOC/Figures/logo_NERC.eps (added)
	* trunk/DOC/Figures/logo_UKMO.eps (added)
	* trunk/DOC/Figures/nemo_text_essai.eps (added)
	* trunk/DOC/LaTeX2HTML.sh (added)
	* trunk/DOC/NEMO_book.pdf (deleted)
	* trunk/DOC/NEMO_book.tex (modified)
	* trunk/DOC/NEMO_coding.conv.pdf (deleted)
	* trunk/DOC/NEMO_coding.conv.tex (modified)
	* trunk/DOC/Namelists (moved)
	* trunk/DOC/Namelists/nam_asminc (modified)
	* trunk/DOC/Namelists/nam_dia25h (modified)
	* trunk/DOC/Namelists/nam_diaharm (modified)
	* trunk/DOC/Namelists/nam_diatmb (modified)
	* trunk/DOC/Namelists/nam_tide (modified)
	* trunk/DOC/Namelists/nam_vvl (modified)
	* trunk/DOC/Namelists/nambbl (modified)
	* trunk/DOC/Namelists/nambdy_dta (modified)
	* trunk/DOC/Namelists/nambdy_tide (modified)
	* trunk/DOC/Namelists/namberg (modified)
	* trunk/DOC/Namelists/nambfr (modified)
	* trunk/DOC/Namelists/namcfg_orca1 (copied)
	* trunk/DOC/Namelists/namdct (modified)
	* trunk/DOC/Namelists/namdiu (modified)
	* trunk/DOC/Namelists/namdyn_vor (modified)
	* trunk/DOC/Namelists/namelist_dmp (copied)
	* trunk/DOC/Namelists/nameos (modified)
	* trunk/DOC/Namelists/namflo (modified)
	* trunk/DOC/Namelists/namhsb (modified)
	* trunk/DOC/Namelists/namnc4 (modified)
	* trunk/DOC/Namelists/namobs (modified)
	* trunk/DOC/Namelists/namobs_example (copied)
	* trunk/DOC/Namelists/namptr (modified)
	* trunk/DOC/Namelists/namsbc (modified)
	* trunk/DOC/Namelists/namsbc_alb (modified)
	* trunk/DOC/Namelists/namsbc_apr (modified)
	* trunk/DOC/Namelists/namsbc_cpl (modified)
	* trunk/DOC/Namelists/namsbc_iscpl (modified)
	* trunk/DOC/Namelists/namsbc_isf (modified)
	* trunk/DOC/Namelists/namsbc_rnf (modified)
	* trunk/DOC/Namelists/namsbc_sas (modified)
	* trunk/DOC/Namelists/namsbc_ssr (modified)
	* trunk/DOC/Namelists/namsbc_wave (modified)
	* trunk/DOC/Namelists/namsto (modified)
	* trunk/DOC/Namelists/namtra_adv (modified)
	* trunk/DOC/Namelists/namtra_adv_mle (modified)
	* trunk/DOC/Namelists/namtra_ldf (modified)
	* trunk/DOC/Namelists/namtrd (modified)
	* trunk/DOC/Namelists/namtsd (modified)
	* trunk/DOC/Namelists/namwad (modified)
	* trunk/DOC/Namelists/namzdf (modified)
	* trunk/DOC/Namelists/namzdf_gls (modified)
	* trunk/DOC/Namelists/namzdf_ric (modified)
	* trunk/DOC/Namelists/namzdf_tke (modified)
	* trunk/DOC/Namelists/namzgr_sco (modified)
	* trunk/DOC/TexFiles/Bibliography (moved)
	* trunk/DOC/TexFiles/Chapters/Abstracts_Foreword.tex (modified)
	* trunk/DOC/TexFiles/Chapters/Annex_A.tex (modified)
	* trunk/DOC/TexFiles/Chapters/Annex_B.tex (modified)
	* trunk/DOC/TexFiles/Chapters/Annex_C.tex (modified)
	* trunk/DOC/TexFiles/Chapters/Annex_D.tex (modified)
	* trunk/DOC/TexFiles/Chapters/Annex_E.tex (modified)
	* trunk/DOC/TexFiles/Chapters/Annex_ISO.tex (modified)
	* trunk/DOC/TexFiles/Chapters/Chap_ASM.tex (modified)
	* trunk/DOC/TexFiles/Chapters/Chap_CFG.tex (modified)
	* trunk/DOC/TexFiles/Chapters/Chap_Conservation.tex (modified)
	* trunk/DOC/TexFiles/Chapters/Chap_DIA.tex (modified)
	* trunk/DOC/TexFiles/Chapters/Chap_DIU.tex (modified)
	* trunk/DOC/TexFiles/Chapters/Chap_DOM.tex (modified)
	* trunk/DOC/TexFiles/Chapters/Chap_DYN.tex (modified)
	* trunk/DOC/TexFiles/Chapters/Chap_LBC.tex (modified)
	* trunk/DOC/TexFiles/Chapters/Chap_LDF.tex (modified)
	* trunk/DOC/TexFiles/Chapters/Chap_MISC.tex (modified)
	* trunk/DOC/TexFiles/Chapters/Chap_Model_Basics.tex (modified)
	* trunk/DOC/TexFiles/Chapters/Chap_Model_Basics_zstar.tex (modified)
	* trunk/DOC/TexFiles/Chapters/Chap_OBS.tex (modified)
	* trunk/DOC/TexFiles/Chapters/Chap_SBC.tex (modified)
	* trunk/DOC/TexFiles/Chapters/Chap_STO.tex (modified)
	* trunk/DOC/TexFiles/Chapters/Chap_STP.tex (modified)
	* trunk/DOC/TexFiles/Chapters/Chap_TRA.tex (modified)
	* trunk/DOC/TexFiles/Chapters/Chap_ZDF.tex (modified)
	* trunk/DOC/TexFiles/Chapters/Introduction.tex (modified)
	* trunk/DOC/TexFiles/Namelist_tools (deleted)
	* trunk/DOC/TexFiles/Styles (added)
	* trunk/DOC/TexFiles/Styles/NEMO.ist (moved)
	* trunk/DOC/TexFiles/Styles/ametsoc.bst (moved)
	* trunk/DOC/TexFiles/Styles/math_abbrev.sty (moved)
	* trunk/DOC/clean.sh (moved)
	* trunk/DOC/namelist_split.sh (moved)

	Duplication of changes in DOC directory for the trunk


