#
# ChangeLog for branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/oce_trc.F90
#
# Generated by Trac 1.0.1
# 2024-05-28T14:49:56+02:00

Mon, 02 Aug 2010 10:57:40 GMT cetlod [2038]
	* branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/C14b/par_c14b.F90 (modified)
	* branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/C14b/trcctl_c14b.F90 (deleted)
	* branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/C14b/trcini_c14b.F90 (modified)
	* branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/C14b/trclsm_c14b.F90 (deleted)
	* branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/C14b/trcnam_c14b.F90 (added)
	* branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/C14b/trcsms_c14b.F90 (modified)
	* branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/CFC/par_cfc.F90 (modified)
	* branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/CFC/trcctl_cfc.F90 (deleted)
	* branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/CFC/trcini_cfc.F90 (modified)
	* branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/CFC/trclsm_cfc.F90 (deleted)
	* branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/CFC/trcnam_cfc.F90 (added)
	* branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/CFC/trcsms_cfc.F90 (modified)
	* branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/LOBSTER/par_lobster.F90 (modified)
	* branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/LOBSTER/trcbio.F90 (modified)
	* branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/LOBSTER/trcctl_lobster.F90 (deleted)
	* branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/LOBSTER/trcexp.F90 (modified)
	* branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/LOBSTER/trcini_lobster.F90 (modified)
	* branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/LOBSTER/trclsm_lobster.F90 (deleted)
	* branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/LOBSTER/trcnam_lobster.F90 (added)
	* branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/LOBSTER/trcopt.F90 (modified)
	* branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/LOBSTER/trcrst_lobster.F90 (modified)
	* branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/LOBSTER/trcsed.F90 (modified)
	* branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/LOBSTER/trcsms_lobster.F90 (modified)
	* branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/MY_TRC/par_my_trc.F90 (modified)
	* branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/MY_TRC/trcctl_my_trc.F90 (deleted)
	* branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/MY_TRC/trcini_my_trc.F90 (modified)
	* branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/MY_TRC/trclsm_my_trc.F90 (deleted)
	* branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/MY_TRC/trcnam_my_trc.F90 (added)
	* branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/MY_TRC/trcsms_my_trc.F90 (modified)
	* branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/PISCES/p4zflx.F90 (modified)
	* branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/PISCES/p4zlys.F90 (modified)
	* branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/PISCES/p4zmeso.F90 (modified)
	* branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/PISCES/p4zmicro.F90 (modified)
	* branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/PISCES/p4zmort.F90 (modified)
	* branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/PISCES/p4zopt.F90 (modified)
	* branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/PISCES/p4zprod.F90 (modified)
	* branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/PISCES/p4zrem.F90 (modified)
	* branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/PISCES/p4zsed.F90 (modified)
	* branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/PISCES/p4zsink.F90 (modified)
	* branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/PISCES/par_pisces.F90 (modified)
	* branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/PISCES/sms_pisces.F90 (modified)
	* branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/PISCES/trcctl_pisces.F90 (deleted)
	* branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/PISCES/trcini_pisces.F90 (modified)
	* branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/PISCES/trclsm_pisces.F90 (deleted)
	* branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/PISCES/trcnam_pisces.F90 (added)
	* branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/PISCES/trcrst_pisces.F90 (modified)
	* branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/PISCES/trcsms_pisces.F90 (modified)
	* branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/oce_trc.F90 (modified)
	* branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/par_trc.F90 (modified)
	* branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/trc.F90 (modified)
	* branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/trcctl.F90 (deleted)
	* branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/trcdia.F90 (modified)
	* branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/trcini.F90 (modified)
	* branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/trclec.F90 (deleted)
	* branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/trcnam.F90 (added)
	* branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/trcrst.F90 (modified)
	* branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/trcsms.F90 (modified)
	* branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/trcstp.F90 (modified)
	* branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/trcwri.F90 (modified)

	Apply the merge to passive tracers, see ticket:693


Thu, 29 Jul 2010 10:27:39 GMT cetlod [2023]
	* branches/DEV_r2006_merge_TRA_TRC (copied)

	Create a specific branch for the merge of active and passive tracers ...


Thu, 24 Jun 2010 13:38:43 GMT acc [1950]
	* branches/DEV_r1784_mid_year_merge_2010 (copied)

	ticket #684 step 1: Create branch for mid year branch; start at the ...