#
# ChangeLog for NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src
#
# Generated by Trac 1.0.1
# 2024-04-24T11:34:53+02:00

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 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