#
# ChangeLog for trunk/DOC/TexFiles/Chapters/Chap_Model_Basics.tex
#
# Generated by Trac 1.0.1
# 2024-07-14T19:08:57+02:00

Thu, 04 Feb 2016 23:47:05 GMT gm [6289]
	* trunk/DOC/NEMO_book.pdf (modified)
	* trunk/DOC/NEMO_book.tex (modified)
	* trunk/DOC/TexFiles/Biblio/Biblio.bib (modified)
	* trunk/DOC/TexFiles/Chapters/Abstracts_Foreword.tex (modified)
	* trunk/DOC/TexFiles/Chapters/Annex_C.tex (modified)
	* trunk/DOC/TexFiles/Chapters/Annex_D.tex (modified)
	* trunk/DOC/TexFiles/Chapters/Annex_ISO.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_SBC.tex (modified)
	* trunk/DOC/TexFiles/Chapters/Chap_STO.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/Figures/Fig_obc_north.pdf (deleted)
	* trunk/DOC/TexFiles/Namelist/nam_asminc (added)
	* trunk/DOC/TexFiles/Namelist/nam_dia25h (modified)
	* trunk/DOC/TexFiles/Namelist/nam_diaharm (added)
	* trunk/DOC/TexFiles/Namelist/nam_diatmb (modified)
	* trunk/DOC/TexFiles/Namelist/nam_dmp_create (deleted)
	* trunk/DOC/TexFiles/Namelist/nam_vvl (added)
	* trunk/DOC/TexFiles/Namelist/namasm (deleted)
	* trunk/DOC/TexFiles/Namelist/nambbc (added)
	* trunk/DOC/TexFiles/Namelist/nambdy_dta2 (deleted)
	* trunk/DOC/TexFiles/Namelist/nambdy_index (deleted)
	* trunk/DOC/TexFiles/Namelist/nambdy_tide (modified)
	* trunk/DOC/TexFiles/Namelist/namberg (modified)
	* trunk/DOC/TexFiles/Namelist/namc1d (added)
	* trunk/DOC/TexFiles/Namelist/namc1d_dyndmp (added)
	* trunk/DOC/TexFiles/Namelist/namc1d_uvd (added)
	* trunk/DOC/TexFiles/Namelist/namcfg (added)
	* trunk/DOC/TexFiles/Namelist/namcla (deleted)
	* trunk/DOC/TexFiles/Namelist/namcrs (added)
	* trunk/DOC/TexFiles/Namelist/namctl (modified)
	* trunk/DOC/TexFiles/Namelist/namdia_harm (deleted)
	* trunk/DOC/TexFiles/Namelist/namdiu (modified)
	* trunk/DOC/TexFiles/Namelist/namdom (modified)
	* trunk/DOC/TexFiles/Namelist/namdyn_nept (deleted)
	* trunk/DOC/TexFiles/Namelist/namdyn_vor (modified)
	* trunk/DOC/TexFiles/Namelist/nammpp_dyndist (deleted)
	* trunk/DOC/TexFiles/Namelist/namobc (deleted)
	* trunk/DOC/TexFiles/Namelist/namobs (modified)
	* trunk/DOC/TexFiles/Namelist/namrun (modified)
	* trunk/DOC/TexFiles/Namelist/namsbc (modified)
	* trunk/DOC/TexFiles/Namelist/namsbc_iscpl (modified)
	* trunk/DOC/TexFiles/Namelist/namsbc_isf (modified)
	* trunk/DOC/TexFiles/Namelist/namsol (deleted)
	* trunk/DOC/TexFiles/Namelist/namsplit (deleted)
	* trunk/DOC/TexFiles/Namelist/namsto (added)
	* trunk/DOC/TexFiles/Namelist/namtra_adv_mle (added)
	* trunk/DOC/TexFiles/Namelist/namtra_bbc (deleted)
	* trunk/DOC/TexFiles/Namelist/namtra_ldf (modified)
	* trunk/DOC/TexFiles/Namelist/namtra_ldfeiv (added)
	* trunk/DOC/TexFiles/Namelist/namwad (added)
	* trunk/DOC/TexFiles/Namelist/namzdf_kpp (deleted)
	* trunk/DOC/TexFiles/Namelist/namzdf_ric (modified)
	* trunk/DOC/TexFiles/Namelist_tools (added)
	* trunk/DOC/TexFiles/Namelist_tools/namcfg_orca1 (moved)
	* trunk/DOC/TexFiles/Namelist_tools/namelist_dmp (added)
	* trunk/DOC/TexFiles/Namelist_tools/namobs_example (moved)
	* trunk/DOC/TexFiles/namelist_split.sh (added)

	#1673 DOC of the trunk - Update, see associated wiki page for ...


Mon, 21 Dec 2015 11:35:23 GMT timgraham [6140]
	* trunk (modified)
	* trunk/DOC (modified)
	* trunk/DOC/NEMO_book.pdf (modified)
	* trunk/DOC/NEMO_book.tex (modified)
	* trunk/DOC/TexFiles/Biblio/Biblio.bib (modified)
	* trunk/DOC/TexFiles/Chapters/Abstracts_Foreword.tex (modified)
	* trunk/DOC/TexFiles/Chapters/Annex_C.tex (modified)
	* trunk/DOC/TexFiles/Chapters/Chap_DIA.tex (modified)
	* trunk/DOC/TexFiles/Chapters/Chap_DIU.tex (copied)
	* trunk/DOC/TexFiles/Chapters/Chap_DOM.tex (modified)
	* trunk/DOC/TexFiles/Chapters/Chap_DYN.tex (modified)
	* trunk/DOC/TexFiles/Chapters/Chap_LDF.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_STP.tex (modified)
	* trunk/DOC/TexFiles/Chapters/Chap_TRA.tex (modified)
	* trunk/DOC/TexFiles/Chapters/Introduction.tex (modified)
	* trunk/DOC/TexFiles/Namelist/nam_dia25h (copied)
	* trunk/DOC/TexFiles/Namelist/nam_diatmb (copied)
	* trunk/DOC/TexFiles/Namelist/nam_tide (modified)
	* trunk/DOC/TexFiles/Namelist/namagrif (modified)
	* trunk/DOC/TexFiles/Namelist/nambbl (modified)
	* trunk/DOC/TexFiles/Namelist/nambdy (modified)
	* trunk/DOC/TexFiles/Namelist/nambdy_dta (modified)
	* trunk/DOC/TexFiles/Namelist/nambdy_tide (modified)
	* trunk/DOC/TexFiles/Namelist/namberg (modified)
	* trunk/DOC/TexFiles/Namelist/nambfr (modified)
	* trunk/DOC/TexFiles/Namelist/namctl (modified)
	* trunk/DOC/TexFiles/Namelist/namdct (modified)
	* trunk/DOC/TexFiles/Namelist/namdiu (copied)
	* trunk/DOC/TexFiles/Namelist/namdom (modified)
	* trunk/DOC/TexFiles/Namelist/namdyn_adv (modified)
	* trunk/DOC/TexFiles/Namelist/namdyn_hpg (modified)
	* trunk/DOC/TexFiles/Namelist/namdyn_ldf (modified)
	* trunk/DOC/TexFiles/Namelist/namdyn_spg (modified)
	* trunk/DOC/TexFiles/Namelist/namdyn_vor (modified)
	* trunk/DOC/TexFiles/Namelist/nameos (modified)
	* trunk/DOC/TexFiles/Namelist/namhsb (modified)
	* trunk/DOC/TexFiles/Namelist/namlbc (modified)
	* trunk/DOC/TexFiles/Namelist/namobs (modified)
	* trunk/DOC/TexFiles/Namelist/namobs_example (modified)
	* trunk/DOC/TexFiles/Namelist/namptr (modified)
	* trunk/DOC/TexFiles/Namelist/namrun (modified)
	* trunk/DOC/TexFiles/Namelist/namsbc (modified)
	* trunk/DOC/TexFiles/Namelist/namsbc_apr (modified)
	* trunk/DOC/TexFiles/Namelist/namsbc_core (modified)
	* trunk/DOC/TexFiles/Namelist/namsbc_cpl (modified)
	* trunk/DOC/TexFiles/Namelist/namsbc_iscpl (copied)
	* trunk/DOC/TexFiles/Namelist/namsbc_isf (modified)
	* trunk/DOC/TexFiles/Namelist/namsbc_mfs (modified)
	* trunk/DOC/TexFiles/Namelist/namsbc_rnf (modified)
	* trunk/DOC/TexFiles/Namelist/namsbc_sas (modified)
	* trunk/DOC/TexFiles/Namelist/namsbc_ssr (modified)
	* trunk/DOC/TexFiles/Namelist/namsbc_wave (modified)
	* trunk/DOC/TexFiles/Namelist/namtra_adv (modified)
	* trunk/DOC/TexFiles/Namelist/namtra_dmp (modified)
	* trunk/DOC/TexFiles/Namelist/namtra_ldf (modified)
	* trunk/DOC/TexFiles/Namelist/namtra_qsr (modified)
	* trunk/DOC/TexFiles/Namelist/namtrd (modified)
	* trunk/DOC/TexFiles/Namelist/namtsd (modified)
	* trunk/DOC/TexFiles/Namelist/namzdf_gls (modified)
	* trunk/DOC/TexFiles/Namelist/namzdf_tke (modified)
	* trunk/DOC/TexFiles/Namelist/namzgr (modified)
	* trunk/DOC/TexFiles/Namelist/namzgr_sco (modified)
	* trunk/NEMOGCM (modified)
	* trunk/NEMOGCM/ARCH/CMCC/arch-PW6_calypso.fcm (deleted)
	* trunk/NEMOGCM/ARCH/CMCC/arch-PW6_calypso_debug.fcm (deleted)
	* trunk/NEMOGCM/ARCH/CMCC/arch-PW6_calypso_tools.fcm (deleted)
	* trunk/NEMOGCM/ARCH/CMCC/arch-ifort_athena.fcm (modified)
	* trunk/NEMOGCM/ARCH/CMCC/arch-ifort_athena_xios.fcm (modified)
	* trunk/NEMOGCM/ARCH/OLD/NOC/arch-ALTIX_NAUTILUS.fcm (modified)
	* trunk/NEMOGCM/ARCH/arch-ALTIX_NAUTILUS_MPT.fcm (modified)
	* trunk/NEMOGCM/ARCH/arch-X64_MOBILIS.fcm (modified)
	* trunk/NEMOGCM/ARCH/arch-openmpi_NAVITI_MERCATOR.fcm (modified)
	* trunk/NEMOGCM/CONFIG/AMM12/EXP00/iodef.xml (modified)
	* trunk/NEMOGCM/CONFIG/AMM12/EXP00/namelist_cfg (modified)
	* trunk/NEMOGCM/CONFIG/AMM12/cpp_AMM12.fcm (modified)
	* trunk/NEMOGCM/CONFIG/C1D_PAPA/EXP00/namelist_cfg (modified)
	* trunk/NEMOGCM/CONFIG/GYRE/EXP00/namelist_cfg (modified)
	* trunk/NEMOGCM/CONFIG/GYRE_BFM/EXP00/namelist_cfg (modified)
	* trunk/NEMOGCM/CONFIG/GYRE_PISCES/EXP00/namelist_cfg (modified)
	* trunk/NEMOGCM/CONFIG/GYRE_XIOS/EXP00/namelist_cfg (modified)
	* trunk/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/1_namelist_cfg (modified)
	* trunk/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist_cfg (modified)
	* trunk/NEMOGCM/CONFIG/ORCA2_LIM/cpp_ORCA2_LIM.fcm (modified)
	* trunk/NEMOGCM/CONFIG/ORCA2_LIM3/EXP00/1_namelist_cfg (modified)
	* trunk/NEMOGCM/CONFIG/ORCA2_LIM3/EXP00/namelist_cfg (modified)
	* trunk/NEMOGCM/CONFIG/ORCA2_LIM3/cpp_ORCA2_LIM3.fcm (modified)
	* trunk/NEMOGCM/CONFIG/ORCA2_LIM_CFC_C14b/EXP00/1_namelist_cfg (modified)
	* trunk/NEMOGCM/CONFIG/ORCA2_LIM_CFC_C14b/EXP00/namelist_cfg (modified)
	* trunk/NEMOGCM/CONFIG/ORCA2_LIM_PISCES/EXP00/namelist_cfg (modified)
	* trunk/NEMOGCM/CONFIG/ORCA2_LIM_PISCES/EXP00/namelist_top_cfg (modified)
	* trunk/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist_cfg (modified)
	* trunk/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist_top_cfg (modified)
	* trunk/NEMOGCM/CONFIG/ORCA2_SAS_LIM/EXP00/namelist_cfg (modified)
	* trunk/NEMOGCM/CONFIG/ORCA2_SAS_LIM/cpp_ORCA2_SAS_LIM.fcm (modified)
	* trunk/NEMOGCM/CONFIG/SHARED/field_def.xml (modified)
	* trunk/NEMOGCM/CONFIG/SHARED/namelist_ref (modified)
	* trunk/NEMOGCM/CONFIG/SHARED/namelist_top_ref (modified)
	* trunk/NEMOGCM/CONFIG/cfg.txt (modified)
	* trunk/NEMOGCM/CONFIG/uspcfg.txt (modified)
	* trunk/NEMOGCM/EXTERNAL/AGRIF (modified)
	* trunk/NEMOGCM/NEMO/LIM_SRC_2/iceini_2.F90 (modified)
	* trunk/NEMOGCM/NEMO/LIM_SRC_2/limrst_2.F90 (modified)
	* trunk/NEMOGCM/NEMO/LIM_SRC_2/limsbc_2.F90 (modified)
	* trunk/NEMOGCM/NEMO/LIM_SRC_2/limthd_2.F90 (modified)
	* trunk/NEMOGCM/NEMO/LIM_SRC_2/limwri_2.F90 (modified)
	* trunk/NEMOGCM/NEMO/LIM_SRC_2/limwri_dimg_2.h90 (deleted)
	* trunk/NEMOGCM/NEMO/LIM_SRC_3/limistate.F90 (modified)
	* trunk/NEMOGCM/NEMO/LIM_SRC_3/limrst.F90 (modified)
	* trunk/NEMOGCM/NEMO/LIM_SRC_3/limsbc.F90 (modified)
	* trunk/NEMOGCM/NEMO/LIM_SRC_3/limthd.F90 (modified)
	* trunk/NEMOGCM/NEMO/LIM_SRC_3/limwri.F90 (modified)
	* trunk/NEMOGCM/NEMO/LIM_SRC_3/limwri_dimg.h90 (deleted)
	* trunk/NEMOGCM/NEMO/NST_SRC/agrif_opa_interp.F90 (modified)
	* trunk/NEMOGCM/NEMO/NST_SRC/agrif_opa_sponge.F90 (modified)
	* trunk/NEMOGCM/NEMO/NST_SRC/agrif_opa_update.F90 (modified)
	* trunk/NEMOGCM/NEMO/NST_SRC/agrif_top_interp.F90 (modified)
	* trunk/NEMOGCM/NEMO/NST_SRC/agrif_top_sponge.F90 (modified)
	* trunk/NEMOGCM/NEMO/NST_SRC/agrif_top_update.F90 (modified)
	* trunk/NEMOGCM/NEMO/NST_SRC/agrif_user.F90 (modified)
	* trunk/NEMOGCM/NEMO/OFF_SRC/domrea.F90 (modified)
	* trunk/NEMOGCM/NEMO/OFF_SRC/dtadyn.F90 (modified)
	* trunk/NEMOGCM/NEMO/OFF_SRC/nemogcm.F90 (modified)
	* trunk/NEMOGCM/NEMO/OOO_SRC (deleted)
	* trunk/NEMOGCM/NEMO/OPA_SRC/ASM/asmbkg.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/BDY/bdy_oce.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/BDY/bdydta.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/BDY/bdydyn.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/BDY/bdydyn3d.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/BDY/bdyini.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/BDY/bdylib.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/BDY/bdytides.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/BDY/bdytra.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/BDY/bdyvol.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/C1D/c1d.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/C1D/domc1d.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/C1D/dtauvd.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/C1D/dyncor_c1d.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/C1D/dyndmp.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/C1D/step_c1d.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/CRS/crs.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/CRS/crsdom.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/CRS/crsdomwri.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/CRS/crsfld.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/CRS/crsini.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/CRS/crslbclnk.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/DIA/dia25h.F90 (copied)
	* trunk/NEMOGCM/NEMO/OPA_SRC/DIA/diaar5.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/DIA/diacfl.F90 (copied)
	* trunk/NEMOGCM/NEMO/OPA_SRC/DIA/diadct.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/DIA/diadimg.F90 (deleted)
	* trunk/NEMOGCM/NEMO/OPA_SRC/DIA/diafwb.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/DIA/diaharm.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/DIA/diahsb.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/DIA/diahth.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/DIA/dianam.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/DIA/diaptr.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/DIA/diatmb.F90 (copied)
	* trunk/NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/DIA/diawri_dimg.h90 (deleted)
	* trunk/NEMOGCM/NEMO/OPA_SRC/DIU (copied)
	* trunk/NEMOGCM/NEMO/OPA_SRC/DOM/daymod.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/DOM/dom_oce.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/DOM/domain.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/DOM/domcfg.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/DOM/domhgr.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/DOM/domngb.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/DOM/domstp.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr_substitute.h90 (deleted)
	* trunk/NEMOGCM/NEMO/OPA_SRC/DOM/dtatsd.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/DOM/iscplhsb.F90 (copied)
	* trunk/NEMOGCM/NEMO/OPA_SRC/DOM/iscplini.F90 (copied)
	* trunk/NEMOGCM/NEMO/OPA_SRC/DOM/iscplrst.F90 (copied)
	* trunk/NEMOGCM/NEMO/OPA_SRC/DOM/istate.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/DYN/divhor.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynadv.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynadv_cen2.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynadv_ubs.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynbfr.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynldf.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynldf_iso.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynldf_lap_blp.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynnxt.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_exp.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynvor.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynzad.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynzdf.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynzdf_exp.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynzdf_imp.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/DYN/sshwzv.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/FLO/flo4rk.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/FLO/floblk.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/FLO/flodom.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/FLO/florst.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/FLO/flowri.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/ICB/icb_oce.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/ICB/icbrst.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/IOM/in_out_manager.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/IOM/iom_def.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/IOM/iom_ioipsl.F90 (deleted)
	* trunk/NEMOGCM/NEMO/OPA_SRC/IOM/iom_nf90.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/IOM/iom_rstdimg.F90 (deleted)
	* trunk/NEMOGCM/NEMO/OPA_SRC/IOM/restart.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/LBC/lbclnk.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/LBC/lbcnfd.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/LBC/mppini.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/LBC/mppini_2.h90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/LDF/ldfc1d_c2d.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/LDF/ldfdyn.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/LDF/ldfslp.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/LDF/ldftra.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/OBS/obs_fbm.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/OBS/obs_grd_bruteforce.h90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/OBS/obs_grid.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/OBS/obs_inter_sup.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/OBS/obs_mpp.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/OBS/obs_oper.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/OBS/obs_prep.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/OBS/obs_prof_io.F90 (deleted)
	* trunk/NEMOGCM/NEMO/OPA_SRC/OBS/obs_profiles_def.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_altbias.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_prof.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_seaice.F90 (deleted)
	* trunk/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_sla.F90 (deleted)
	* trunk/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_sst.F90 (deleted)
	* trunk/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_surf.F90 (copied)
	* trunk/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_vel.F90 (deleted)
	* trunk/NEMOGCM/NEMO/OPA_SRC/OBS/obs_readmdt.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/OBS/obs_rot_vel.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/OBS/obs_seaice.F90 (deleted)
	* trunk/NEMOGCM/NEMO/OPA_SRC/OBS/obs_seaice_io.F90 (deleted)
	* trunk/NEMOGCM/NEMO/OPA_SRC/OBS/obs_sla.F90 (deleted)
	* trunk/NEMOGCM/NEMO/OPA_SRC/OBS/obs_sla_io.F90 (deleted)
	* trunk/NEMOGCM/NEMO/OPA_SRC/OBS/obs_sla_types.F90 (deleted)
	* trunk/NEMOGCM/NEMO/OPA_SRC/OBS/obs_sst.F90 (deleted)
	* trunk/NEMOGCM/NEMO/OPA_SRC/OBS/obs_sst_io.F90 (deleted)
	* trunk/NEMOGCM/NEMO/OPA_SRC/OBS/obs_sstbias.F90 (copied)
	* trunk/NEMOGCM/NEMO/OPA_SRC/OBS/obs_surf_def.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/OBS/obs_types.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/OBS/obs_vel_io.F90 (deleted)
	* trunk/NEMOGCM/NEMO/OPA_SRC/OBS/obs_write.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/OBS/obsprof_io.h90 (deleted)
	* trunk/NEMOGCM/NEMO/OPA_SRC/OBS/obsseaice_io.h90 (deleted)
	* trunk/NEMOGCM/NEMO/OPA_SRC/OBS/obssla_io.h90 (deleted)
	* trunk/NEMOGCM/NEMO/OPA_SRC/OBS/obssla_types.h90 (deleted)
	* trunk/NEMOGCM/NEMO/OPA_SRC/OBS/obssst_io.h90 (deleted)
	* trunk/NEMOGCM/NEMO/OPA_SRC/OBS/obsvel_io.h90 (deleted)
	* trunk/NEMOGCM/NEMO/OPA_SRC/SBC/fldread.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/SBC/geo2ocean.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/SBC/sbc_oce.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/SBC/sbcana.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/SBC/sbcapr.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_core.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_mfs.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/SBC/sbcdcy.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/SBC/sbcflx.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/SBC/sbcfwb.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_cice.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_if.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim_2.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/SBC/sbcisf.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/SBC/sbcrnf.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/SBC/sbcssm.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/SBC/sbcssr.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/SBC/sbctide.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/SBC/sbcwave.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/SBC/tideini.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/TRA/eosbn2.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/TRA/traadv.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_cen.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_fct.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_mle.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_mus.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_qck.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_ubs.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/TRA/trabbc.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/TRA/trabbl.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/TRA/tradmp.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/TRA/traldf.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_blp.F90 (deleted)
	* trunk/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_iso.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_lap.F90 (deleted)
	* trunk/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_lap_blp.F90 (copied)
	* trunk/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_triad.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/TRA/tranpc.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/TRA/tranxt.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/TRA/traqsr.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/TRA/trasbc.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/TRA/trazdf.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/TRA/trazdf_exp.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/TRA/trazdf_imp.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/TRA/zpshde.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/TRD/trd_oce.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/TRD/trddyn.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/TRD/trdglo.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/TRD/trdini.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/TRD/trdken.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/TRD/trdmxl.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/TRD/trdmxl_rst.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/TRD/trdpen.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/TRD/trdtra.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/TRD/trdvor.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfbfr.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfddm.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfevd.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfgls.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfmxl.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfric.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/ZDF/zdftke.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/ZDF/zdftmx.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/lib_fortran.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/lib_print.f90 (deleted)
	* trunk/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/oce.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/step.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/step_oce.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/stpctl.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/trc_oce.F90 (modified)
	* trunk/NEMOGCM/NEMO/SAO_SRC (copied)
	* trunk/NEMOGCM/NEMO/SAS_SRC/daymod.F90 (modified)
	* trunk/NEMOGCM/NEMO/SAS_SRC/diawri.F90 (modified)
	* trunk/NEMOGCM/NEMO/SAS_SRC/nemogcm.F90 (modified)
	* trunk/NEMOGCM/NEMO/SAS_SRC/sbcssm.F90 (modified)
	* trunk/NEMOGCM/NEMO/SAS_SRC/step.F90 (modified)
	* trunk/NEMOGCM/NEMO/TOP_SRC/C14b/trcsms_c14b.F90 (modified)
	* trunk/NEMOGCM/NEMO/TOP_SRC/CFC/trcsms_cfc.F90 (modified)
	* trunk/NEMOGCM/NEMO/TOP_SRC/MY_TRC/trcsms_my_trc.F90 (modified)
	* trunk/NEMOGCM/NEMO/TOP_SRC/MY_TRC/trcwri_my_trc.F90 (modified)
	* trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P2Z/p2zbio.F90 (modified)
	* trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P2Z/p2zexp.F90 (modified)
	* trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P2Z/p2zopt.F90 (modified)
	* trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P2Z/p2zsed.F90 (modified)
	* trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zbio.F90 (modified)
	* trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zche.F90 (modified)
	* trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zfechem.F90 (modified)
	* trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zflx.F90 (modified)
	* trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zopt.F90 (modified)
	* trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zprod.F90 (modified)
	* trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zrem.F90 (modified)
	* trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zsbc.F90 (modified)
	* trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zsed.F90 (modified)
	* trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zsink.F90 (modified)
	* trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zsms.F90 (modified)
	* trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/SED/sedrst.F90 (modified)
	* trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/trcwri_pisces.F90 (modified)
	* trunk/NEMOGCM/NEMO/TOP_SRC/TRP/trcadv.F90 (modified)
	* trunk/NEMOGCM/NEMO/TOP_SRC/TRP/trcdmp.F90 (modified)
	* trunk/NEMOGCM/NEMO/TOP_SRC/TRP/trcldf.F90 (modified)
	* trunk/NEMOGCM/NEMO/TOP_SRC/TRP/trcnxt.F90 (modified)
	* trunk/NEMOGCM/NEMO/TOP_SRC/TRP/trcsbc.F90 (modified)
	* trunk/NEMOGCM/NEMO/TOP_SRC/TRP/trctrp.F90 (modified)
	* trunk/NEMOGCM/NEMO/TOP_SRC/TRP/trczdf.F90 (modified)
	* trunk/NEMOGCM/NEMO/TOP_SRC/TRP/trdmxl_trc.F90 (modified)
	* trunk/NEMOGCM/NEMO/TOP_SRC/TRP/trdmxl_trc_rst.F90 (modified)
	* trunk/NEMOGCM/NEMO/TOP_SRC/trc.F90 (modified)
	* trunk/NEMOGCM/NEMO/TOP_SRC/trcbc.F90 (modified)
	* trunk/NEMOGCM/NEMO/TOP_SRC/trcbdy.F90 (copied)
	* trunk/NEMOGCM/NEMO/TOP_SRC/trcdia.F90 (modified)
	* trunk/NEMOGCM/NEMO/TOP_SRC/trcdta.F90 (modified)
	* trunk/NEMOGCM/NEMO/TOP_SRC/trcini.F90 (modified)
	* trunk/NEMOGCM/NEMO/TOP_SRC/trcnam.F90 (modified)
	* trunk/NEMOGCM/NEMO/TOP_SRC/trcrst.F90 (modified)
	* trunk/NEMOGCM/NEMO/TOP_SRC/trcstp.F90 (modified)
	* trunk/NEMOGCM/NEMO/TOP_SRC/trcsub.F90 (modified)
	* trunk/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-XC40_METO (modified)
	* trunk/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-ifort_athena (copied)
	* trunk/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-ifort_athena_xios (copied)
	* trunk/NEMOGCM/SETTE/input_ORCA2_LIM.cfg (modified)
	* trunk/NEMOGCM/SETTE/prepare_job.sh (modified)
	* trunk/NEMOGCM/SETTE/sette.sh (modified)
	* trunk/NEMOGCM/SETTE/sette_rpt (modified)
	* trunk/NEMOGCM/SETTE/sette_rpt.sh (copied)
	* trunk/NEMOGCM/TOOLS/NESTING/src/agrif_create_restart.f90 (modified)
	* trunk/NEMOGCM/TOOLS/REBUILD_NEMO/icb_combrest.py (copied)
	* trunk/NEMOGCM/TOOLS/SCOORD_GEN (copied)
	* trunk/NEMOGCM/TOOLS/SIREN/cfg/variable.cfg (modified)
	* trunk/NEMOGCM/TRUST (deleted)
	* trunk/NEMOGCM/fcm-make/inc/keys-amm12.cfg (modified)
	* trunk/NEMOGCM/fcm-make/inc/keys-gyre.cfg (modified)
	* trunk/NEMOGCM/fcm-make/inc/keys-gyre_pisces.cfg (modified)
	* trunk/NEMOGCM/fcm-make/inc/keys-orca2_lim.cfg (modified)
	* trunk/NEMOGCM/fcm-make/inc/keys-orca2_lim3.cfg (modified)
	* trunk/NEMOGCM/fcm-make/inc/keys-orca2_lim_cfc.cfg (modified)
	* trunk/NEMOGCM/fcm-make/inc/keys-orca2_lim_pisces.cfg (modified)
	* trunk/NEMOGCM/fcm-make/inc/keys-orca2_sas_lim.cfg (modified)

	Merge of branches/2015/dev_merge_2015 back into trunk. Merge excludes ...


Fri, 14 Mar 2014 11:25:49 GMT smasson [4528]
	* trunk (moved)

	move dev_MERGE_2013 for 3.6 alpha onto the trunk, see #1257


Wed, 20 Nov 2013 15:41:35 GMT cetlod [4291]
	* branches/2013/dev_MERGE_2013 (copied)

	Step 1: Created dev_MERGE_2013 branch, see ticket #1185


