# # ChangeLog for branches/2014/dev_MERGE_2014 # # Generated by Trac 1.0.1 # 2024-03-28T18:09:25+01:00 Mon, 15 Dec 2014 16:11:51 GMT timgraham [4989] * branches/2014/dev_MERGE_2014 (modified) Merged head of trunk into branch (to retain continuity to help future ... Mon, 15 Dec 2014 14:34:30 GMT timgraham [4988] * branches/2014/dev_MERGE_2014/NEMOGCM/CONFIG/cfg.txt (modified) Correction to previous commit Mon, 15 Dec 2014 14:02:07 GMT timgraham [4986] * branches/2014/dev_MERGE_2014/NEMOGCM/CONFIG/cfg.txt (modified) Minor correction to cfg.txt (removed lines that should be added by SETTE ... Fri, 12 Dec 2014 18:43:51 GMT mathiot [4985] * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/TRA/zpshde.F90 (modified) add initialisation + rm useless IF Fri, 12 Dec 2014 09:12:46 GMT smasson [4983] * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/SBC/cpl_oasis3.F90 (modified) dev_MERGE_2014: minor bugfix in the coupled interface Wed, 10 Dec 2014 09:49:53 GMT mathiot [4981] * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/IOM/restart.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/SBC/sbcrnf.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfddm.F90 (modified) add missing wrk_dealloc, add some _wp missing, change in domvvl (IBM ... Sat, 06 Dec 2014 08:40:23 GMT gm [4977] * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/DIA/diahsb.F90 (modified) add missing dealloc in diahsb + style improvements Fri, 05 Dec 2014 17:59:57 GMT clem [4976] * branches/2014/dev_MERGE_2014/NEMOGCM/CONFIG/SHARED/field_def.xml (modified) bug fix Fri, 05 Dec 2014 17:46:18 GMT clem [4975] * branches/2014/dev_MERGE_2014/NEMOGCM/CONFIG/SHARED/field_def.xml (modified) bug fix Fri, 05 Dec 2014 17:21:34 GMT clem [4974] * branches/2014/dev_MERGE_2014/NEMOGCM/CONFIG/ORCA2_LIM3/EXP00/iodef.xml (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/CONFIG/SHARED/field_def.xml (modified) removing few unused outputs Fri, 05 Dec 2014 15:38:53 GMT clem [4973] * branches/2014/dev_MERGE_2014/NEMOGCM/CONFIG/cfg.txt (modified) remove my config (spitzbergen) from the list Fri, 05 Dec 2014 15:28:42 GMT clem [4972] * branches/2014/dev_MERGE_2014/NEMOGCM/CONFIG/SHARED/namelist_ice_lim3_ref (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/CONFIG/cfg.txt (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/LIM_SRC_3/ice.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/LIM_SRC_3/limadv.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/LIM_SRC_3/limdiahsb.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/LIM_SRC_3/limdyn.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/LIM_SRC_3/limitd_me.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/LIM_SRC_3/limitd_th.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/LIM_SRC_3/limrhg.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/LIM_SRC_3/limrst.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/LIM_SRC_3/limsbc.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/LIM_SRC_3/limthd.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/LIM_SRC_3/limthd_dh.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/LIM_SRC_3/limthd_dif.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/LIM_SRC_3/limthd_ent.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/LIM_SRC_3/limthd_lac.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/LIM_SRC_3/limtrp.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/LIM_SRC_3/limupdate1.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/LIM_SRC_3/limupdate2.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/LIM_SRC_3/limvar.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/LIM_SRC_3/limwri.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/BDY/bdyice_lim.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim.F90 (modified) LIM3 cleaning (1st part) with modification in the ice namelist. 2nd part ... Thu, 04 Dec 2014 09:02:01 GMT smasson [4971] * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/SBC/cpl_oasis3.F90 (modified) dev_MERGE_2014: correct minor error in previous commit Thu, 04 Dec 2014 08:52:33 GMT smasson [4970] * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90 (modified) dev_MERGE_2014: correct syntaxe error in previous commit Thu, 04 Dec 2014 08:45:59 GMT smasson [4969] * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/SBC/cpl_oasis3.F90 (modified) dev_MERGE_2014: minor bugfix in the compilation interface Wed, 03 Dec 2014 14:41:09 GMT acc [4968] * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90 (modified) Branch dev_MERGE_2014. Correct logic deciding initialisation of fse3t_n ... Wed, 03 Dec 2014 14:06:15 GMT smasson [4967] * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/LIM_SRC_2/limsbc_2.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/LIM_SRC_2/limthd_2.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/LIM_SRC_3/limdiahsb.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/LIM_SRC_3/limsbc.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/LIM_SRC_3/limwri.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/DIA/diahsb.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/DYN/sshwzv.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/OBS/ddatetoymdhms.h90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_prof.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_seaice.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_sla.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_sst.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_vel.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_cice.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/SBC/sbcisf.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_eiv.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/TRA/trasbc.F90 (modified) dev_MERGE_2014: add iom_use Tue, 02 Dec 2014 16:01:18 GMT clem [4964] * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/LIM_SRC_3/limthd_dif.F90 (modified) LIM3 debug Tue, 02 Dec 2014 16:00:20 GMT clem [4963] * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/LIM_SRC_3/limtrp.F90 (modified) LIM3 debug Tue, 02 Dec 2014 14:57:40 GMT cetlod [4959] * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/LDF/ldfslp.F90 (modified) 2014/dev_MERGE_2014 : fix out of bounds in ldfslp Tue, 02 Dec 2014 14:33:14 GMT cetlod [4958] * branches/2014/dev_MERGE_2014/NEMOGCM/ARCH/arch-X64_ADA.fcm (added) * branches/2014/dev_MERGE_2014/NEMOGCM/ARCH/arch-X64_ADA_O0.fcm (added) * branches/2014/dev_MERGE_2014/NEMOGCM/ARCH/arch-x3750_ADA.fcm (deleted) * branches/2014/dev_MERGE_2014/NEMOGCM/ARCH/arch-x3750_ADA_O0.fcm (deleted) * branches/2014/dev_MERGE_2014/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-X64_ADA (added) * branches/2014/dev_MERGE_2014/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-X64_ADA_O0 (added) * branches/2014/dev_MERGE_2014/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-x3750_ADA (deleted) * branches/2014/dev_MERGE_2014/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-x3750_ADA_O0 (deleted) * branches/2014/dev_MERGE_2014/NEMOGCM/SETTE/sette.sh (modified) 2014/dev_MERGE_2014 : change x3750_ADA computer name to X64_ADA Tue, 02 Dec 2014 14:21:47 GMT acc [4957] * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/DOM/domain.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/ICB/icb_oce.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/ICB/icbutl.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_core.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/SBC/sbcisf.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/TRD/trdini.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/TRD/trdmxl.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/ZDF/zdftmx.F90 (modified) Branch dev_MERGE_2014. Style changes and implementation of ICB bugfix ... Tue, 02 Dec 2014 13:38:40 GMT cetlod [4956] * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/SBC/sbc_ice.F90 (modified) 2014/dev_MERGE_2014 : remove undefined adn unused lim3 variable Tue, 02 Dec 2014 13:32:57 GMT cetlod [4955] * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/SBC/sbc_ice.F90 (modified) 2014/dev_MERGE_2014 : fix on badly allocated lim3 variables Tue, 02 Dec 2014 11:13:44 GMT cbricaud [4953] * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_core.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/ZDF/zdftmx.F90 (modified) add missing (IF lwm) Tue, 02 Dec 2014 10:50:42 GMT cbricaud [4952] * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/DOM/domain.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/TRD/trdini.F90 (modified) add missing (IF lwm) Tue, 02 Dec 2014 10:43:05 GMT cbricaud [4951] * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/DOM/domain.F90 (modified) add missing (IF lwm) Tue, 02 Dec 2014 10:39:17 GMT cetlod [4950] * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/TRA/eosbn2.F90 (modified) 2014/dev_MERGE_2014 : add missing (IF lwm) before writing on numond Tue, 02 Dec 2014 10:35:48 GMT cetlod [4949] * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/DIA/diaar5.F90 (modified) 2014/dev_MERGE_2014: bugfix on diaar5 Tue, 02 Dec 2014 10:33:14 GMT timgraham [4948] * branches/2014/dev_MERGE_2014/NEMOGCM/SETTE/param.cfg (modified) Fix for paths in param.cfg Tue, 02 Dec 2014 10:08:21 GMT cetlod [4947] * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90 (modified) 2014/dev_MERGE_2014 : initialization of OBS variables Tue, 02 Dec 2014 09:38:20 GMT cetlod [4946] * branches/2014/dev_MERGE_2014/NEMOGCM/ARCH/OLD/NOC/arch-ALTIX_NAUTILUS.fcm (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/ARCH/arch-ALTIX_NAUTILUS_MPT.fcm (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/CONFIG/GYRE/EXP00/namelist_cfg (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/CONFIG/GYRE/cpp_GYRE.fcm (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/CONFIG/GYRE_BFM/EXP00/namelist_cfg (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/CONFIG/GYRE_PISCES/EXP00/namelist_cfg (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/CONFIG/GYRE_PISCES/cpp_GYRE_PISCES.fcm (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/1_namelist_cfg (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/CONFIG/ORCA2_LIM3/EXP00/1_namelist_cfg (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/CONFIG/SHARED/field_def.xml (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/CONFIG/SHARED/namelist_ref (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/CONFIG/cfg.txt (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/LIM_SRC_2/limhdf_2.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/LIM_SRC_2/limistate_2.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/LIM_SRC_2/limsbc_2.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/LIM_SRC_2/limthd_2.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/LIM_SRC_2/limthd_zdf_2.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/LIM_SRC_3/limdiahsb.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/LIM_SRC_3/limhdf.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/LIM_SRC_3/limistate.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/LIM_SRC_3/limsbc.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/LIM_SRC_3/limthd.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/LIM_SRC_3/limthd_dh.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/LIM_SRC_3/limthd_dif.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/LIM_SRC_3/limthd_lac.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/LIM_SRC_3/thd_ice.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OFF_SRC/dtadyn.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OOO_SRC/nemogcm.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/C1D/dyndmp.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/C1D/step_c1d.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/DIA/diafwb.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/DIA/diahsb.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/DIA/diaptr.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/DOM/istate.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/DOM/phycst.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/DYN/dynadv_cen2.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/DYN/dynadv_ubs.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/DYN/dynbfr.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/DYN/dynkeg.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/DYN/dynldf.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/DYN/dynldf_bilap.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/DYN/dynldf_bilapg.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/DYN/dynldf_iso.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/DYN/dynldf_lap.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/DYN/dynnxt.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_exp.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_flt.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/DYN/dynvor.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/DYN/dynzad.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/DYN/dynzdf.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/DYN/dynzdf_imp.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/IOM/in_out_manager.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/IOM/restart.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/LDF/ldfeiv.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/LDF/ldfslp.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/SBC/cpl_oasis3.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/SBC/cpl_oasis4.F90 (deleted) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/SBC/oasis4_date.F90 (deleted) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/SBC/sbc_ice.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/SBC/sbc_oce.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_clio.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_core.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_mfs.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/SBC/sbcfwb.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_cice.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_if.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim_2.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/SBC/sbcisf.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/SBC/sbcssm.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/SBC/sbcssr.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/TRA/eosbn2.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_cen2.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_muscl.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_muscl2.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_qck.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_tvd.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_ubs.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/TRA/trabbc.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/TRA/trabbl.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/TRA/tradmp.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/TRA/traldf.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_iso_grif.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/TRA/tranpc.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/TRA/tranxt.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/TRA/traqsr.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/TRA/trasbc.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/TRA/trazdf.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/TRA/zpshde.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/TRD/trd_oce.F90 (copied) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/TRD/trddyn.F90 (copied) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/TRD/trdglo.F90 (copied) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/TRD/trdicp.F90 (deleted) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/TRD/trdicp_oce.F90 (deleted) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/TRD/trdini.F90 (copied) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/TRD/trdken.F90 (copied) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/TRD/trdmld.F90 (deleted) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/TRD/trdmld_oce.F90 (deleted) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/TRD/trdmld_rst.F90 (deleted) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/TRD/trdmod.F90 (deleted) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/TRD/trdmod_oce.F90 (deleted) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/TRD/trdmod_trc.F90 (deleted) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/TRD/trdmxl.F90 (copied) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/TRD/trdmxl_oce.F90 (copied) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/TRD/trdmxl_rst.F90 (copied) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/TRD/trdpen.F90 (copied) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/TRD/trdtra.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/TRD/trdtrc.F90 (copied) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/TRD/trdvor.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/TRD/trdvor_oce.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfbfr.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfddm.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfevd.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfkpp.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfmxl.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/ZDF/zdftke.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/oce.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/par_oce.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/step.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/step_oce.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/vectopt_loop_substitute.h90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/SAS_SRC/sbcssm.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/TOP_SRC/C14b/trcsms_c14b.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/TOP_SRC/CFC/trcsms_cfc.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/TOP_SRC/MY_TRC/trcsms_my_trc.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/TOP_SRC/PISCES/P2Z/p2zbio.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/TOP_SRC/PISCES/P2Z/p2zexp.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/TOP_SRC/PISCES/P2Z/p2zopt.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/TOP_SRC/PISCES/P2Z/p2zsed.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/TOP_SRC/PISCES/P2Z/p2zsms.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zopt.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zsms.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/TOP_SRC/PISCES/trcnam_pisces.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/TOP_SRC/TRP/trcbbl.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/TOP_SRC/TRP/trcdmp.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/TOP_SRC/TRP/trcldf.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/TOP_SRC/TRP/trcnxt.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/TOP_SRC/TRP/trcrad.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/TOP_SRC/TRP/trcsbc.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/TOP_SRC/TRP/trczdf.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/TOP_SRC/TRP/trdmld_trc.F90 (deleted) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/TOP_SRC/TRP/trdmld_trc_rst.F90 (deleted) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/TOP_SRC/TRP/trdmod_trc.F90 (deleted) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/TOP_SRC/TRP/trdmod_trc_oce.F90 (deleted) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/TOP_SRC/TRP/trdmxl_trc.F90 (copied) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/TOP_SRC/TRP/trdmxl_trc_rst.F90 (copied) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/TOP_SRC/TRP/trdtrc.F90 (copied) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/TOP_SRC/TRP/trdtrc_oce.F90 (copied) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/TOP_SRC/oce_trc.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/TOP_SRC/trcini.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/TOP_SRC/trcnam.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/TOP_SRC/trcrst.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/TOP_SRC/trcstp.F90 (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/SETTE/param.cfg (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/SETTE/sette.sh (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/TOOLS/COMPILE/bld.cfg (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/TOOLS/COMPILE/bld_preproagr.cfg (modified) * branches/2014/dev_MERGE_2014/NEMOGCM/TOOLS/COMPILE/bldxag.cfg (modified) 2014/dev_MERGE_2014 : merge in changes from dev_CNRS_CICE Mon, 01 Dec 2014 16:27:06 GMT cetlod [4944] * branches/2014/dev_MERGE_2014 (copied) create the final branch with all the new 2014 dev. Mon, 01 Dec 2014 15:56:41 GMT acc [4941] * branches/2014/dev_r4879_UKMO_NOC_MERGE/NEMOGCM/CONFIG/SHARED/1_namelist_ref (modified) Branch dev_r4879_UKMO_NOC_MERGE. Fixed incorrect relative path. ...