#
# ChangeLog for branches/2011/dev_MERCATOR_2011_MERGE
#
# Generated by Trac 1.0.1
# 2024-07-12T20:26:54+02:00

Mon, 07 Nov 2011 09:25:44 GMT cbricaud [3046]
	* branches/2011/dev_MERCATOR_2011_MERGE/DOC/TexFiles/Chapters/Chap_DIA.tex (modified)
	* branches/2011/dev_MERCATOR_2011_MERGE/DOC/TexFiles/Namelist/namdia_harm (copied)
	* branches/2011/dev_MERCATOR_2011_MERGE/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/iodef.xml (modified)
	* branches/2011/dev_MERCATOR_2011_MERGE/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist (modified)
	* branches/2011/dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/DIA/diaharm.F90 (copied)
	* branches/2011/dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/DIA/surdetermine.F90 (copied)
	* branches/2011/dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/SBC/tide.h90 (copied)
	* branches/2011/dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/SBC/tide_mod.F90 (copied)
	* branches/2011/dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/step.F90 (modified)
	* branches/2011/dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/step_oce.F90 (modified)

	add changes from dev_r2787_MERCATOR2_tidalharm in ...


Mon, 07 Nov 2011 09:07:04 GMT cbricaud [3045]
	* branches/2011/dev_MERCATOR_2011_MERGE/trunk (copied)

	copy rev 2787 in branch


Wed, 02 Nov 2011 07:56:59 GMT cbricaud [3035]
	* branches/2011/dev_MERCATOR_2011_MERGE (copied)

	Create branch for the merge of all MERCATOR 2011 developments.


Mon, 27 Jun 2011 09:54:00 GMT cetlod [2787]
	* trunk/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/cpp_ORCA2_OFF_PISCES.fcm (modified)
	* trunk/NEMOGCM/NEMO/OFF_SRC/domrea.F90 (modified)
	* trunk/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfmxl.F90 (modified)
	* trunk/NEMOGCM/NEMO/TOP_SRC/MY_TRC/trcini_my_trc.F90 (modified)
	* trunk/NEMOGCM/NEMO/TOP_SRC/oce_trc.F90 (modified)

	Bug correction in NEMO/OFFLINE, see ticket #841