#
# ChangeLog for NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019
#
# Generated by Trac 1.0.1
# 2024-04-23T14:29:43+02:00

Wed, 29 Jan 2020 11:12:54 GMT smueller [12351]
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/fldread.F90 (modified)

	Rectification of a defect that halved the maximum length of the
	interval ...


Tue, 28 Jan 2020 16:13:55 GMT mathiot [12347]
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbcmod.F90 (modified)

	change comments about lbc_lnk for icb (#2113)


Tue, 28 Jan 2020 14:26:14 GMT acc [12345]
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DIA/diadetide.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DIA/diamlr.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/IOM/iom.F90 (modified)

	Branch dev_r12072_MERGE_OPTION2_2019. Fixed ticket #2372. Changes to ...


Tue, 28 Jan 2020 10:10:01 GMT acc [12342]
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/ISF/isfcav.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/ISF/isfcpl.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbcblk.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/TDE/tide_mod.F90 (modified)

	Branch 2019/dev_r12072_MERGE_OPTION2_2019. Implement recommended
	changes ...


Mon, 27 Jan 2020 13:49:13 GMT cetlod [12338]
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/SHARED/field_def_nemo-ice.xml (modified)

	MG2019_OPT2 : defining ice transport component on U/V grid ;
	otherwise ...


Thu, 16 Jan 2020 09:34:13 GMT cetlod [12327]
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/trcbc.F90 (modified)

	dev_r12072_MERGE_OPTION2_2019: minor fix to avoid compilation error
	when ...


Mon, 06 Jan 2020 08:35:01 GMT cetlod [12302]
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/CFC/trcsms_cfc.F90 (modified)

	dev_r12072_MERGE_OPTION2_2019: Minor fix on CFC to avoid bad ...


Mon, 30 Dec 2019 19:39:49 GMT mathiot [12298]
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/LDF/ldftra.F90 (modified)

	fix #2360


Sat, 21 Dec 2019 10:48:18 GMT cetlod [12282]
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p4zprod.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p5zprod.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/trcwri.F90 (modified)

	bugfix in dev_r12072_MERGE_OPTION2_2019 : initialise local array in ...


Wed, 18 Dec 2019 15:42:19 GMT mathiot [12275]
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/ICB/icbthm.F90 (modified)

	fix icb reproducibility (ticket #2238)


Wed, 18 Dec 2019 12:41:43 GMT mathiot [12270]
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/ISF/isfutils.F90 (modified)

	fix bugs in isfutils debug subroutines found during icb
	reproducibility ...


Wed, 18 Dec 2019 10:28:06 GMT mathiot [12268]
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/TRA/eosbn2.F90 (modified)

	remove useless lbc_lnk in eosbn2 (rab2d and insitu2d) as suggested in ...


Mon, 16 Dec 2019 13:36:58 GMT cetlod [12257]
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/ORCA2_ICE_PISCES/EXPREF/namelist_ice_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/SHARED/field_def_nemo-pisces.xml (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p4zbc.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p4zfechem.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p4zflx.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p4zligand.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p4zlim.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p4zlys.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p4zmeso.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p4zmicro.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p4zopt.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p4zprod.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p4zrem.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p4zsed.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p4zsink.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p5zlim.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p5zmeso.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p5zmicro.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p5zprod.F90 (modified)

	dev_r12072_MERGE_OPTION2_2019: Cleaning PISCES diagnostics output ; ...


Mon, 16 Dec 2019 12:52:49 GMT smasson [12256]
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/BDY/bdydta.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/fldread.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/step.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/SAS/step.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/trcbc.F90 (modified)

	rev12232_dev_r12072_MERGE_OPTION2_2019: bugfix in fldread offset in
	bdy, ...


Sat, 14 Dec 2019 12:46:52 GMT smasson [12251]
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/AGRIF_DEMO/EXPREF/1_namelist_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/AGRIF_DEMO/EXPREF/2_namelist_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/AGRIF_DEMO/EXPREF/3_namelist_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/AGRIF_DEMO/EXPREF/namelist_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/AMM12/EXPREF/context_nemo.xml (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/AMM12/EXPREF/file_def_nemo-oce.xml (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/AMM12/EXPREF/namelist_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/C1D_PAPA/EXPREF/namelist_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/GYRE_BFM/EXPREF/namelist_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/GYRE_PISCES/EXPREF/namelist_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/ORCA2_ICE_PISCES/EXPREF/namelist_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/ORCA2_OFF_PISCES/EXPREF/namelist_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/ORCA2_OFF_TRC/EXPREF/namelist_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/ORCA2_SAS_ICE/EXPREF/namelist_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/SHARED (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/SHARED/field_def_nemo-oce.xml (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/SHARED/grid_def_nemo.xml (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/SHARED/namelist_ref (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/SPITZ12/EXPREF/namelist_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/doc (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/doc/latex/NEMO/subfiles/chap_DIA.tex (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/doc/namelists/nam_diatmb (deleted)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/ICE/icedyn_adv.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/ICE/icedyn_adv_pra.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/ICE/icedyn_adv_umx.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/BDY/bdyini.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/BDY/bdyvol.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DIA/diatmb.F90 (deleted)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DIA/diawri.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DYN/divhor.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DYN/dynspg_ts.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/IOM/iom.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/LDF/ldfdyn.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/LDF/ldfslp.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/cpl_oasis3.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/fldread.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbc_oce.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbccpl.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbcrnf.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/nemogcm.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p4zmeso.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p4zmicro.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/trcini.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/trcstp.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/CANAL/EXPREF/field_def_nemo-oce.xml (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/CANAL/EXPREF/namelist_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/CANAL/MY_SRC/diawri.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/ICE_ADV1D/EXPREF/namelist_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/ICE_ADV1D/EXPREF/namelist_cfg_120pts (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/ICE_ADV1D/EXPREF/namelist_cfg_240pts (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/ICE_ADV1D/EXPREF/namelist_cfg_60pts (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/ICE_ADV2D/EXPREF/namelist_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/ICE_AGRIF/EXPREF/1_namelist_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/ICE_AGRIF/EXPREF/namelist_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/ISOMIP/EXPREF/namelist_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT2_flux_ubs_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/OVERFLOW/EXPREF/namelist_zps_FCT4_flux_ubs_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/VORTEX/EXPREF/1_namelist_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/VORTEX/EXPREF/namelist_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/WAD/EXPREF/namelist_cfg (modified)

	rev12232_dev_r12072_MERGE_OPTION2_2019: merge trunk 12072:12248, all ...


Fri, 13 Dec 2019 15:45:41 GMT gsamson [12247]
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/SHARED/namelist_ice_ref (modified)

	turn off adaptive EVP (turned on in r12166) to avoid sea-ice
	stability ...


Fri, 13 Dec 2019 15:11:51 GMT smasson [12246]
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/BDY/bdydta.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/BDY/bdytides.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DOM/daymod.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DOM/dom_oce.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DYN/dynspg_ts.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/fldread.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/step.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OFF/dtadyn.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/SAS/daymod.F90 (deleted)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/SAS/step.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/trcbc.F90 (modified)

	rev12232_dev_r12072_MERGE_OPTION2_2019: add modifications from ...


Fri, 13 Dec 2019 10:29:33 GMT mathiot [12241]
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/ISF/isfstp.F90 (modified)

	change in comments in a ctl_stop


Thu, 12 Dec 2019 12:15:13 GMT cetlod [12210]
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/SHARED (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/SHARED/namelist_ref (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/doc (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/doc/latex/NEMO/subfiles/chap_misc.tex (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/doc/namelists/namctl (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/ABL/ablmod.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/ICE/icecor.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/ICE/icectl.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/ICE/icedyn_rdgrft.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/ICE/icedyn_rhg.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/ICE/icedyn_rhg_evp.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/ICE/icethd.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/ICE/iceupdate.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/C1D/dyncor_c1d.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/C1D/dyndmp.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DOM/daymod.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DYN/dynadv_cen2.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DYN/dynadv_ubs.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DYN/dynhpg.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DYN/dynkeg.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DYN/dynldf.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DYN/dynldf_iso.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DYN/dynnxt.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DYN/dynspg.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DYN/dynvor.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DYN/dynzad.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DYN/dynzdf.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DYN/sshwzv.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/IOM/in_out_manager.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/IOM/prtctl.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/LBC/mppini.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/LDF/ldfslp.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/cpl_oasis3.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbcblk.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbcmod.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/TRA/eosbn2.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/TRA/traadv.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/TRA/trabbc.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/TRA/trabbl.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/TRA/tradmp.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/TRA/traldf.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/TRA/tranxt.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/TRA/traqsr.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/TRA/trasbc.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/TRA/trazdf.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/TRD/trdmxl.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/ZDF/zdfddm.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/ZDF/zdfdrg.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/ZDF/zdfgls.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/ZDF/zdfiwm.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/ZDF/zdfmxl.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/ZDF/zdfosm.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/ZDF/zdftke.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/nemogcm.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/stpctl.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OFF/dtadyn.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OFF/nemogcm.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/SAO/nemogcm.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/SAS/daymod.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/SAS/nemogcm.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/SAS/sbcssm.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/SAS/stpctl.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P2Z/p2zbio.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P2Z/p2zexp.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P2Z/p2zopt.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P2Z/p2zsed.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p4zagg.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p4zbio.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p4zfechem.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p4zflx.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p4zligand.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p4zlys.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p4zmeso.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p4zmicro.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p4zmort.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p4zpoc.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p4zprod.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p4zrem.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p4zsed.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p4zsink.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p5zmeso.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p5zmicro.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p5zmort.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p5zprod.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/SED/trcdmp_sed.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/TRP/trcadv.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/TRP/trcbbl.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/TRP/trcdmp.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/TRP/trcldf.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/TRP/trcnxt.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/TRP/trcrad.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/TRP/trcsbc.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/TRP/trczdf.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/prtctl_trc.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/trcini.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/trcsms.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/trcstp.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/BENCH/MY_SRC/zdfiwm.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/CANAL/MY_SRC/stpctl.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/CANAL/MY_SRC/trazdf.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/ISOMIP+/MY_SRC/eosbn2.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/ISOMIP+/MY_SRC/isfstp.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/ISOMIP+/MY_SRC/tradmp.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/STATION_ASF/EXPREF/namelist_coare3p6-noskin_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/STATION_ASF/EXPREF/namelist_coare3p6_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/STATION_ASF/EXPREF/namelist_ecmwf-noskin_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/STATION_ASF/EXPREF/namelist_ecmwf_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/STATION_ASF/EXPREF/namelist_ncar_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/STATION_ASF/MY_SRC/nemogcm.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/STATION_ASF/MY_SRC/sbcssm.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/STATION_ASF/MY_SRC/stpctl.F90 (modified)

	dev_merge_option2 : merge in fix_sn_cfctl_ticket2328 branch


Thu, 12 Dec 2019 11:29:12 GMT cetlod [12209]
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/trcbc.F90 (modified)

	Minor bugfix in trcbc.F90


Thu, 12 Dec 2019 10:41:48 GMT cetlod [12204]
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019 (modified)

	minor updates


Thu, 12 Dec 2019 09:10:28 GMT cetlod [12203]
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DIA/diaptr.F90 (modified)

	den_merge_option2 : minor bug correction


Thu, 12 Dec 2019 08:59:50 GMT cetlod [12202]
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/C1D_PAPA/MY_SRC/usrdef_nam.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/SHARED (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/doc (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/ABL/sbcabl.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/ICE/icealb.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/ICE/icedia.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/ICE/icedyn.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/ICE/icedyn_adv.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/ICE/icedyn_rdgrft.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/ICE/icedyn_rhg.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/ICE/iceistate.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/ICE/iceitd.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/ICE/icesbc.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/ICE/icestp.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/ICE/icethd.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/ICE/icethd_da.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/ICE/icethd_do.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/ICE/icethd_pnd.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/ICE/icethd_sal.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/ICE/icethd_zdf.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/NST/agrif_user.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/ASM/asminc.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/BDY/bdydta.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/BDY/bdyini.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/BDY/bdytides.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/C1D/c1d.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/C1D/dtauvd.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/C1D/dyndmp.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/CRS/crsini.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DIA/dia25h.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DIA/diadct.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DIA/diahsb.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DIA/diaptr.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DIA/diatmb.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DIU/diurnal_bulk.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DOM/closea.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DOM/domain.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DOM/dommsk.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DOM/domvvl.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DOM/dtatsd.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DYN/dynadv.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DYN/dynhpg.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DYN/dynspg.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DYN/dynvor.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DYN/wet_dry.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/FLO/floats.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/ICB/icbini.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/IOM/in_out_manager.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/ISF/isfstp.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/LBC/lib_mpp.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/LBC/mppini.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/LDF/ldfdyn.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/LDF/ldftra.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/OBS/diaobs.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbcapr.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbcblk.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbccpl.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbcflx.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbcice_cice.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbcice_if.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbcmod.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbcrnf.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbcssr.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbcwave.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/STO/stopar.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/TDE/tide_mod.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/TRA/eosbn2.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/TRA/traadv.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/TRA/trabbc.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/TRA/trabbl.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/TRA/tradmp.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/TRA/tramle.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/TRA/traqsr.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/TRD/trdini.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/TRD/trdmxl.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/USR/usrdef_nam.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/ZDF/zdfdrg.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/ZDF/zdfgls.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/ZDF/zdfiwm.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/ZDF/zdfosm.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/ZDF/zdfphy.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/ZDF/zdfric.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/ZDF/zdftke.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/module_example (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/nemogcm.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OFF/dtadyn.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OFF/nemogcm.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/SAO/nemogcm.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/SAO/sao_data.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/SAS/nemogcm.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/SAS/sbcssm.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/AGE/trcnam_age.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/C14/trcnam_c14.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/CFC/trcnam_cfc.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P2Z/p2zbio.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P2Z/p2zopt.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P2Z/p2zsed.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p4zbc.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p4zfechem.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p4zflx.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p4zligand.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p4zlim.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p4zlys.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p4zmeso.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p4zmicro.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p4zmort.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p4zopt.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p4zpoc.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p4zprod.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p4zrem.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p4zsed.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p4zsms.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p5zlim.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p5zmeso.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p5zmicro.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p5zmort.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p5zprod.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/SED/sedini.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/sms_pisces.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/trcnam_pisces.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/TRP/trcadv.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/TRP/trcdmp.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/TRP/trcldf.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/TRP/trcrad.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/TRP/trcsink.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/trc.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/trcbc.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/trcdta.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/trcice.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/trcnam.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/BENCH/MY_SRC/usrdef_nam.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/BENCH/MY_SRC/zdfiwm.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/CANAL/MY_SRC/domvvl.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/CANAL/MY_SRC/usrdef_nam.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/ICE_ADV1D/MY_SRC/usrdef_nam.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/ICE_ADV2D/MY_SRC/usrdef_nam.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/ICE_AGRIF/MY_SRC/usrdef_nam.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/ISOMIP+/MY_SRC/dtatsd.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/ISOMIP+/MY_SRC/eosbn2.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/ISOMIP+/MY_SRC/isfstp.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/ISOMIP+/MY_SRC/tradmp.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/ISOMIP/MY_SRC/usrdef_nam.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/LOCK_EXCHANGE/MY_SRC/usrdef_nam.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/OVERFLOW/MY_SRC/usrdef_nam.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/STATION_ASF/MY_SRC/nemogcm.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/STATION_ASF/MY_SRC/sbcssm.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/STATION_ASF/MY_SRC/usrdef_nam.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/VORTEX/MY_SRC/domvvl.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/VORTEX/MY_SRC/usrdef_nam.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/WAD/MY_SRC/usrdef_nam.F90 (modified)

	dev_merge_option2 : merge in dev_r11613_ENHANCE- ...


Wed, 11 Dec 2019 16:23:52 GMT cetlod [12195]
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/VORTEX/EXPREF/1_context_nemo.xml (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/VORTEX/EXPREF/context_nemo.xml (modified)

	dev_merge_option2 : update context file


Wed, 11 Dec 2019 16:00:27 GMT laurent [12192]
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbc_oce.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbcblk.F90 (modified)

	Skin temperature is back to Celsius (formerly Kelvin)!


Wed, 11 Dec 2019 15:56:06 GMT jchanut [12191]
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/CHANGES.rst (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/CONTRIBUTING.rst (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/INSTALL.rst (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/LICENSE (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/README.rst (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/REFERENCES.bib (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/SHARED (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/SHARED/field_def_nemo-oce.xml (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/SHARED/namelist_ref (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/ref_cfgs.txt (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/doc (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/doc/latex/global/ametsoc.bst (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/ext (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/NST/agrif_all_update.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/NST/agrif_ice_update.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/NST/agrif_oce.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/NST/agrif_oce_interp.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/NST/agrif_oce_sponge.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/NST/agrif_oce_update.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/NST/agrif_top_interp.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/NST/agrif_top_sponge.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/NST/agrif_top_update.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/NST/agrif_user.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/NST/vremap.F90 (copied)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DYN/dynspg_ts.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests (modified)
	* utils/build/makenemo (modified)

	Add dev_AGRIF-01-05_merged branch, e.g. 2019 AGRIF dev


Wed, 11 Dec 2019 15:40:16 GMT smueller [12190]
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019 (modified)

	Modification of the location of the external tools directory to ...


Wed, 11 Dec 2019 14:06:19 GMT gsamson [12185]
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/SHARED/grid_def_nemo.xml (modified)

	put back ABL grid in grid_def_nemo.xml


Wed, 11 Dec 2019 13:35:26 GMT smueller [12184]
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/AGRIF_DEMO/EXPREF/1_namelist_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/AGRIF_DEMO/EXPREF/2_namelist_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/AGRIF_DEMO/EXPREF/3_namelist_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/AGRIF_DEMO/EXPREF/namelist_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/AMM12/EXPREF/context_nemo.xml (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/AMM12/EXPREF/file_def_nemo-oce.xml (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/AMM12/EXPREF/namelist_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/C1D_PAPA/EXPREF/namelist_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/GYRE_BFM/EXPREF/namelist_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/GYRE_PISCES/EXPREF/namelist_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/ORCA2_ICE_PISCES/EXPREF/namelist_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/ORCA2_OFF_PISCES/EXPREF/namelist_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/ORCA2_OFF_TRC/EXPREF/namelist_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/ORCA2_SAS_ICE/EXPREF/namelist_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/SHARED (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/SHARED/field_def_nemo-oce.xml (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/SHARED/grid_def_nemo.xml (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/SHARED/namelist_ref (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/SPITZ12/EXPREF/namelist_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/doc (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/doc/latex/NEMO/subfiles/chap_DIA.tex (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/doc/latex/global/ametsoc.bst (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/doc/namelists/nam_diaharm (deleted)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/BDY/bdydta.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/BDY/bdyini.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/BDY/bdytides.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DIA/diadetide.F90 (copied)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DIA/diaharm.F90 (deleted)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DIA/diamlr.F90 (copied)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DYN/dynspg.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DYN/dynspg_ts.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/IOM/iom.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbctide.F90 (deleted)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/tide.h90 (deleted)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/tide_mod.F90 (deleted)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/tideini.F90 (deleted)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/updtide.F90 (deleted)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/TDE (copied)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/nemogcm.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/step.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/step_oce.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/CANAL/EXPREF/field_def_nemo-oce.xml (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/CANAL/EXPREF/namelist_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/ICE_ADV1D/EXPREF/namelist_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/ICE_ADV1D/EXPREF/namelist_cfg_120pts (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/ICE_ADV1D/EXPREF/namelist_cfg_240pts (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/ICE_ADV1D/EXPREF/namelist_cfg_60pts (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/ICE_ADV2D/EXPREF/namelist_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/ICE_AGRIF/EXPREF/1_namelist_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/ICE_AGRIF/EXPREF/namelist_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/ISOMIP/EXPREF/namelist_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT2_flux_ubs_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/OVERFLOW/EXPREF/namelist_zps_FCT4_flux_ubs_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/VORTEX/EXPREF/1_namelist_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/VORTEX/EXPREF/namelist_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/WAD/EXPREF/namelist_cfg (modified)

	Merging of the developments in ^/NEMO/branches/2019 ...


Wed, 11 Dec 2019 13:00:24 GMT mathiot [12183]
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbcblk.F90 (modified)

	minor changes on sbcblk to compile with Cray


Wed, 11 Dec 2019 11:32:37 GMT laurent [12181]
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/STATION_ASF/EXPREF/namelist_coare3p6-noskin_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/STATION_ASF/EXPREF/namelist_coare3p6_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/STATION_ASF/EXPREF/namelist_ecmwf-noskin_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/STATION_ASF/EXPREF/namelist_ecmwf_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/STATION_ASF/EXPREF/namelist_ncar_cfg (modified)

	Remove useless "ln_iscpl" from "namrun" in namelist_*_cfg of
	STATION_ASF ...


Wed, 11 Dec 2019 11:09:17 GMT laurent [12179]
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/ABL/sbcabl.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbc_oce.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbcblk.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/STATION_ASF/EXPREF/context_nemo.xml (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/STATION_ASF/MY_SRC/iom.F90 (deleted)

	Bug fix in skin temperature! use of "tsk_m" array!


Wed, 11 Dec 2019 10:09:28 GMT cetlod [12173]
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DOM/closea.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbcclo.F90 (modified)

	Minor bugfixes


Wed, 11 Dec 2019 09:55:06 GMT cetlod [12172]
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/SHARED (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/SHARED/field_def_nemo-oce.xml (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/SHARED/namelist_ref (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/doc (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/doc/latex/global/ametsoc.bst (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DOM/closea.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DOM/domain.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DOM/domzgr.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbcclo.F90 (copied)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbcmod.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbcrnf.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/par_oce.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests (modified)

	dev_merge_option2 : merge in ENHANCE-03_closea branch


Wed, 11 Dec 2019 09:18:26 GMT cetlod [12169]
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/ISF/isfcpl.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/ISF/isfutils.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbcmod.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/TRA/tranxt.F90 (modified)

	Bugfixes


Wed, 11 Dec 2019 08:53:24 GMT cetlod [12166]
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/SHARED (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/SHARED/field_def_nemo-oce.xml (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/SHARED/namelist_ice_ref (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/SHARED/namelist_ref (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/WED025 (copied)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/ref_cfgs.txt (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/doc (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/doc/latex/global/ametsoc.bst (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/BDY/bdyvol.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DIA/diahsb.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DIA/diawri.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DOM/dom_oce.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DOM/domain.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DOM/domvvl.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DOM/domwri.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DOM/domzgr.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DOM/iscplhsb.F90 (deleted)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DOM/iscplini.F90 (deleted)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DOM/iscplrst.F90 (deleted)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DOM/istate.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DYN/divhor.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DYN/dynhpg.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DYN/dynnxt.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DYN/dynspg_ts.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DYN/dynzdf.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DYN/sshwzv.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/IOM/iom.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/IOM/restart.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/ISF (copied)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/LDF/ldfslp.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/LDF/ldftra.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbc_oce.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbccpl.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbcfwb.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbcisf.F90 (deleted)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbcmod.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbcrnf.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbcssm.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/TRA/traisf.F90 (copied)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/TRA/tranxt.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/TRA/trasbc.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/ZDF/zdfmxl.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/nemogcm.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/step.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/step_oce.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/ISOMIP+ (copied)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/ISOMIP/EXPREF/file_def_nemo-oce.xml (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/ISOMIP/EXPREF/namelist_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT2_flux_cen2_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT2_flux_ubs_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT2_vect_eenH_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT2_vect_een_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT2_vect_ene_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT2_vect_ens_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT4_flux_cen2_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT4_flux_ubs_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT4_vect_eenH_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT4_vect_een_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT4_vect_ene_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT4_vect_ens_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/VORTEX/MY_SRC/domvvl.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/demo_cfgs.txt (modified)

	dev_merge_option2 : merge in ENHANCE-02_ISF_nemo branch


Tue, 10 Dec 2019 17:01:35 GMT cetlod [12164]
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/ORCA2_ICE_ABL/EXPREF/axis_def_nemo.xml (added)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/ORCA2_ICE_ABL/EXPREF/context_nemo.xml (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/SHARED/axis_def_nemo.xml (modified)

	Update ORCA2_ICE_ABL configuration


Tue, 10 Dec 2019 16:57:47 GMT cetlod [12163]
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/CHANGES.rst (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/CONTRIBUTING.rst (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/INSTALL.rst (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/LICENSE (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/README.rst (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/REFERENCES.bib (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/doc (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/doc/latex/NEMO/main/bibliography.bib (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/doc/latex/NEMO/subfiles/chap_SBC.tex (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/doc/latex/global/ametsoc.bst (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/doc/namelists/namsbc_blk (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/ext (modified)
	* utils/build/makenemo (modified)

	Commit changes in DOC


Tue, 10 Dec 2019 15:52:37 GMT laurent [12161]
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/doc/latex/NEMO/main/bibliography.bib (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/doc/latex/NEMO/subfiles/chap_SBC.tex (modified)

	Improving the SBCBLK doc...


Tue, 10 Dec 2019 15:42:49 GMT laurent [12160]
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/doc/latex/NEMO/main/bibliography.bib (modified)

	Improving the SBCBLK doc...


Tue, 10 Dec 2019 15:34:01 GMT laurent [12159]
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/doc/latex/NEMO/main/bibliography.bib (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/doc/latex/NEMO/subfiles/chap_SBC.tex (modified)

	Improving the SBCBLK doc...


Tue, 10 Dec 2019 14:56:14 GMT laurent [12155]
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbcblk.F90 (modified)

	LB: less verbose in the humidity sanity/consistence test...


Tue, 10 Dec 2019 14:44:23 GMT cetlod [12154]
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/AGRIF_DEMO/EXPREF/1_namelist_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/AGRIF_DEMO/EXPREF/2_namelist_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/AGRIF_DEMO/EXPREF/2_namelist_ice_ref (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/AGRIF_DEMO/EXPREF/2_namelist_ref (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/AGRIF_DEMO/EXPREF/3_namelist_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/AGRIF_DEMO/EXPREF/namelist_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/C1D_PAPA/EXPREF/namelist_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/ORCA2_ICE_ABL (copied)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/ORCA2_ICE_ABL/EXPREF/file_def_nemo-oce.xml (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/ORCA2_ICE_ABL/EXPREF/namelist_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/ORCA2_ICE_PISCES/EXPREF/namelist_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/ORCA2_SAS_ICE/EXPREF/namelist_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/SHARED (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/SHARED/field_def_nemo-oce.xml (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/SHARED/namelist_ref (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/SPITZ12/EXPREF/namelist_cfg (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/ref_cfgs.txt (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/ABL (copied)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/ABL/ablmod.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/ABL/sbcabl.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/ICE/icesbc.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/ICE/icevar.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DIA/diawri.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/IOM/in_out_manager.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/IOM/iom.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/IOM/iom_nf90.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/abl.F90 (copied)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/cpl_oasis3.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/cyclone.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/fldread.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbc_oce.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbcabl.F90 (copied)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbcapr.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbcblk.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbcblk_algo_coare.F90 (deleted)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbcblk_algo_coare3p0.F90 (copied)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbcblk_algo_coare3p5.F90 (deleted)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbcblk_algo_coare3p6.F90 (copied)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbcblk_algo_ecmwf.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbcblk_algo_ncar.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbcblk_phy.F90 (copied)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbcblk_skin_coare.F90 (copied)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbcblk_skin_ecmwf.F90 (copied)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbccpl.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbcdcy.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbcice_cice.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbcisf.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbcmod.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbcrnf.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbctide.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/tideini.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/TRA/traadv_fct.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/ZDF/zdfiwm.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/SAS/diawri.F90 (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/STATION_ASF (copied)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/demo_cfgs.txt (modified)
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/test_cases.bib (modified)

	commit


Tue, 10 Dec 2019 13:41:18 GMT cetlod [12146]
	* NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019 (copied)

	Created option2 merge branch, from dev_r12072_TOP-01_ENHANCE-11_CEthe


Sat, 07 Dec 2019 14:04:18 GMT cetlod [12113]
	* NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/cfgs/SHARED/namelist_ref (modified)
	* NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/src/OCE/SBC/sbcssr.F90 (modified)

	Minor corrections