# # ChangeLog for branches/2015/dev_merge_2015 # # Generated by Trac 1.0.1 # 2024-04-28T01:33:08+02:00 Mon, 21 Dec 2015 11:19:17 GMT timgraham [6139] * branches/2015/dev_merge_2015 (modified) * branches/2015/dev_merge_2015/NEMOGCM (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90 (modified) Merged in head of trunk Sun, 20 Dec 2015 12:10:33 GMT gm [6136] * branches/2015/dev_merge_2015/NEMOGCM/CONFIG/SHARED/namelist_ref (modified) * branches/2015/dev_merge_2015/NEMOGCM/CONFIG/SHARED/namelist_top_ref (modified) dev_merge_2015: Namelist(_top)_ref : remove duplication of namsbc_wave ... Fri, 18 Dec 2015 15:01:55 GMT lovato [6134] * branches/2015/dev_merge_2015/NEMOGCM/CONFIG/SHARED/namelist_top_ref (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OFF_SRC/dtadyn.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OFF_SRC/nemogcm.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/SBC/sbcrnf.F90 (modified) Add changes proposed in ticket #1252 and #1645 (related to runoff data ... Fri, 18 Dec 2015 13:52:13 GMT jchanut [6131] * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DYN/dynzdf.F90 (modified) Correct momentum vertical diffusion tendencies, #1584 Fri, 18 Dec 2015 13:35:10 GMT flavoni [6129] * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90 (modified) add missing lines in diawri.F90 for linssh case, see tickets 1370 and ... Fri, 18 Dec 2015 13:33:27 GMT delrosso [6128] * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/SBC/fldread.F90 (modified) fix for ticket 1599 Fri, 18 Dec 2015 13:02:05 GMT flavoni [6127] * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/SBC/sbcrnf.F90 (modified) remove useless modification for runoff, see ticket 1591 Fri, 18 Dec 2015 12:56:08 GMT acc [6124] * branches/2015/dev_merge_2015/NEMOGCM/ARCH/arch-X64_MOBILIS.fcm (modified) * branches/2015/dev_merge_2015/NEMOGCM/SETTE/sette_rpt.sh (added) Branch dev_merge_2015. Added new bash version of sette report utility ... Fri, 18 Dec 2015 12:43:58 GMT vancop [6122] * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90 (modified) sbccpl.F90 ticket 1654 Fri, 18 Dec 2015 09:24:52 GMT cetlod [6115] * branches/2015/dev_merge_2015/NEMOGCM/CONFIG/ORCA2_LIM_PISCES/EXP00/namelist_top_cfg (modified) * branches/2015/dev_merge_2015/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist_top_cfg (modified) The MUSCL adevction has been bugfixed. We can now re-used it for PISCES ... Fri, 18 Dec 2015 09:21:01 GMT mathiot [6114] * branches/2015/dev_merge_2015/NEMOGCM/CONFIG/uspcfg.txt (modified) update uspconfig Fri, 18 Dec 2015 09:20:09 GMT cbricaud [6112] * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/ZDF/zdftke.F90 (modified) Langmuir cell parameterization should not be used below sea ice. see ... Fri, 18 Dec 2015 08:49:42 GMT cetlod [6111] * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_mus.F90 (modified) bugfix in MUSCL advection scheme Thu, 17 Dec 2015 18:21:15 GMT lovato [6108] * branches/2015/dev_merge_2015/NEMOGCM/ARCH/CMCC/arch-PW6_calypso.fcm (deleted) * branches/2015/dev_merge_2015/NEMOGCM/ARCH/CMCC/arch-PW6_calypso_debug.fcm (deleted) * branches/2015/dev_merge_2015/NEMOGCM/ARCH/CMCC/arch-PW6_calypso_tools.fcm (deleted) * branches/2015/dev_merge_2015/NEMOGCM/ARCH/CMCC/arch-ifort_athena.fcm (modified) * branches/2015/dev_merge_2015/NEMOGCM/ARCH/CMCC/arch-ifort_athena_xios.fcm (modified) * branches/2015/dev_merge_2015/NEMOGCM/CONFIG/AMM12/EXP00/namelist_cfg (modified) * branches/2015/dev_merge_2015/NEMOGCM/CONFIG/C1D_PAPA/EXP00/namelist_cfg (modified) * branches/2015/dev_merge_2015/NEMOGCM/CONFIG/GYRE/EXP00/namelist_cfg (modified) * branches/2015/dev_merge_2015/NEMOGCM/CONFIG/GYRE_BFM/EXP00/namelist_cfg (modified) * branches/2015/dev_merge_2015/NEMOGCM/CONFIG/GYRE_PISCES/EXP00/namelist_cfg (modified) * branches/2015/dev_merge_2015/NEMOGCM/CONFIG/GYRE_XIOS/EXP00/namelist_cfg (modified) * branches/2015/dev_merge_2015/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/1_namelist_cfg (modified) * branches/2015/dev_merge_2015/NEMOGCM/CONFIG/ORCA2_LIM3/EXP00/1_namelist_cfg (modified) * branches/2015/dev_merge_2015/NEMOGCM/CONFIG/ORCA2_LIM_CFC_C14b/EXP00/1_namelist_cfg (modified) * branches/2015/dev_merge_2015/NEMOGCM/CONFIG/ORCA2_LIM_CFC_C14b/EXP00/namelist_cfg (modified) * branches/2015/dev_merge_2015/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist_cfg (modified) * branches/2015/dev_merge_2015/NEMOGCM/CONFIG/SHARED/namelist_ref (modified) * branches/2015/dev_merge_2015/NEMOGCM/CONFIG/SHARED/namelist_top_ref (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/LIM_SRC_2/iceini_2.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/LIM_SRC_2/limrst_2.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/LIM_SRC_2/limwri_2.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/LIM_SRC_2/limwri_dimg_2.h90 (deleted) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/LIM_SRC_3/limrst.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/LIM_SRC_3/limwri.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/LIM_SRC_3/limwri_dimg.h90 (deleted) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OFF_SRC/domrea.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/BDY/bdy_oce.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/BDY/bdytides.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/C1D/domc1d.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/CRS/crsfld.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DIA/dia25h.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DIA/diadimg.F90 (deleted) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DIA/diafwb.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DIA/diaharm.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DIA/dianam.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DIA/diawri_dimg.h90 (deleted) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DOM/daymod.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DOM/dom_oce.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DOM/domain.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DOM/domstp.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DYN/dynzdf.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/IOM/in_out_manager.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/IOM/iom_def.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/IOM/iom_ioipsl.F90 (deleted) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/IOM/iom_rstdimg.F90 (deleted) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/IOM/restart.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/LBC/mppini.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/SBC/fldread.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/SBC/sbcdcy.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/SBC/sbcfwb.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/SBC/sbctide.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/TRA/traadv.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_fct.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_mus.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_qck.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_ubs.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_iso.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_triad.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/TRA/tranxt.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/TRA/trazdf.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/TRA/trazdf_exp.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/TRA/trazdf_imp.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/TRD/trdmxl.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/TRD/trdmxl_rst.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/TRD/trdtra.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/TRD/trdvor.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/SAS_SRC/daymod.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/SAS_SRC/diawri.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/TOP_SRC/MY_TRC/trcsms_my_trc.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/TOP_SRC/MY_TRC/trcwri_my_trc.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zsms.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/TOP_SRC/PISCES/SED/sedrst.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/TOP_SRC/TRP/trcadv.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/TOP_SRC/TRP/trcnxt.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/TOP_SRC/TRP/trcsbc.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/TOP_SRC/TRP/trctrp.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/TOP_SRC/TRP/trczdf.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/TOP_SRC/TRP/trdmxl_trc.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/TOP_SRC/TRP/trdmxl_trc_rst.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/TOP_SRC/trc.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/TOP_SRC/trcbc.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/TOP_SRC/trcbdy.F90 (added) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/TOP_SRC/trcdia.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/TOP_SRC/trcdta.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/TOP_SRC/trcini.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/TOP_SRC/trcnam.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/TOP_SRC/trcrst.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-ifort_athena (added) * branches/2015/dev_merge_2015/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-ifort_athena_xios (added) * branches/2015/dev_merge_2015/NEMOGCM/TOOLS/NESTING/src/agrif_create_restart.f90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/TOOLS/OBSTOOLS/src/in_out_manager.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/TOOLS/SIREN/cfg/variable.cfg (modified) dev_merge_2015 : Merge dev_CMCC_merge_2015 Thu, 17 Dec 2015 17:04:16 GMT acc [6105] * branches/2015/dev_merge_2015/NEMOGCM/SETTE/sette_rpt (modified) Branch 2015/dev_MERGE_2015. Update sette_rpt to check tracer.stat and ... Thu, 17 Dec 2015 16:37:44 GMT cetlod [6104] * branches/2015/dev_merge_2015/NEMOGCM/CONFIG/cfg.txt (modified) update configuration file : cfg.txt Thu, 17 Dec 2015 16:35:55 GMT cetlod [6103] * branches/2015/dev_merge_2015/NEMOGCM/CONFIG/ORCA2_LIM_PISCES/EXP00/namelist_top_cfg (modified) * branches/2015/dev_merge_2015/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist_top_cfg (modified) * branches/2015/dev_merge_2015/NEMOGCM/CONFIG/cfg.txt (modified) use FCT scheme for PISCES at the moment rather than MUSCL Thu, 17 Dec 2015 15:37:10 GMT cetlod [6100] * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OFF_SRC/dommsk.F90 (deleted) dev_merge_2015 : remove the dommsk.F90 routine in OFF_SRC as it should ... Thu, 17 Dec 2015 14:43:53 GMT cetlod [6095] * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OFF_SRC/domrea.F90 (modified) Add time varying part of vertical coordinate system in offline Thu, 17 Dec 2015 11:48:50 GMT cbricaud [6083] * branches/2015/dev_merge_2015/NEMOGCM/NEMO/LIM_SRC_3/limistate.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/ICB/icbrst.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90 (modified) modifications from Mercator merge ( dev_5974_MERCATOR10_LIMINI ) and fix ... Thu, 17 Dec 2015 10:58:38 GMT mathiot [6082] * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg.F90 (modified) remove compatibility test between dynspg_ts and isf Thu, 17 Dec 2015 10:29:09 GMT timgraham [6081] * branches/2015/dev_merge_2015/NEMOGCM/CONFIG/ORCA2_LIM3/EXP00/namelist_cfg (modified) Bug fix in ORCA2_LIM3 namelist Thu, 17 Dec 2015 10:14:17 GMT timgraham [6080] * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DOM/iscplrst.F90 (modified) Another missed file Thu, 17 Dec 2015 10:07:26 GMT timgraham [6078] * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfmxl.F90 (modified) One file that was missed from commit for sette bug fixes Thu, 17 Dec 2015 09:36:39 GMT timgraham [6077] * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OFF_SRC/domrea.F90 (modified) Added missing namelist variable in domrea.F90 Thu, 17 Dec 2015 09:12:15 GMT timgraham [6076] * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OFF_SRC/dommsk.F90 (modified) Removed a print statements that referenced an old subroutine (prihin) Thu, 17 Dec 2015 08:50:30 GMT timgraham [6075] * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DIA/diacfl.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DIA/diahsb.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DIU/cool_skin.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DOM/domain.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DOM/iscplhsb.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DOM/iscplini.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DOM/iscplrst.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obs_oper.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obs_prep.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/SBC/sbcisf.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/TRA/zpshde.F90 (modified) Lots of bug fixes to get sette to compile Wed, 16 Dec 2015 16:42:24 GMT mathiot [6074] * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DOM/iscplhsb.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DOM/iscplrst.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/TRA/trasbc.F90 (modified) change variable names Wed, 16 Dec 2015 16:37:14 GMT timgraham [6073] * branches/2015/dev_merge_2015 (modified) * branches/2015/dev_merge_2015/DOC (modified) * branches/2015/dev_merge_2015/DOC/NEMO_book.pdf (modified) * branches/2015/dev_merge_2015/DOC/NEMO_book.tex (modified) * branches/2015/dev_merge_2015/DOC/TexFiles/Biblio/Biblio.bib (modified) * branches/2015/dev_merge_2015/DOC/TexFiles/Chapters/Chap_DIA.tex (modified) * branches/2015/dev_merge_2015/DOC/TexFiles/Chapters/Chap_DIU.tex (copied) * branches/2015/dev_merge_2015/DOC/TexFiles/Chapters/Chap_DOM.tex (modified) * branches/2015/dev_merge_2015/DOC/TexFiles/Chapters/Chap_OBS.tex (modified) * branches/2015/dev_merge_2015/DOC/TexFiles/Chapters/Chap_SBC.tex (modified) * branches/2015/dev_merge_2015/DOC/TexFiles/Namelist/nam_dia25h (copied) * branches/2015/dev_merge_2015/DOC/TexFiles/Namelist/nam_diatmb (copied) * branches/2015/dev_merge_2015/DOC/TexFiles/Namelist/namctl (modified) * branches/2015/dev_merge_2015/DOC/TexFiles/Namelist/namdiu (copied) * branches/2015/dev_merge_2015/DOC/TexFiles/Namelist/namdom (modified) * branches/2015/dev_merge_2015/DOC/TexFiles/Namelist/namobs (modified) * branches/2015/dev_merge_2015/DOC/TexFiles/Namelist/namobs_example (modified) * branches/2015/dev_merge_2015/DOC/TexFiles/Namelist/namrun (modified) * branches/2015/dev_merge_2015/DOC/TexFiles/Namelist/namsbc (modified) * branches/2015/dev_merge_2015/DOC/TexFiles/Namelist/namsbc_iscpl (copied) * branches/2015/dev_merge_2015/DOC/TexFiles/Namelist/namsbc_isf (modified) * branches/2015/dev_merge_2015/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/1_namelist_cfg (modified) * branches/2015/dev_merge_2015/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist_cfg (modified) * branches/2015/dev_merge_2015/NEMOGCM/CONFIG/ORCA2_LIM3/EXP00/namelist_cfg (modified) * branches/2015/dev_merge_2015/NEMOGCM/CONFIG/SHARED/namelist_ref (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DIA/diacfl.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DYN/dynldf_lap_blp.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/IOM/restart.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obs_oper.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obs_prep.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/ZDF/zdftke.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/step.F90 (modified) Fixed a load of references to fse3t etc. Wed, 16 Dec 2015 16:05:18 GMT timgraham [6071] * branches/2015/dev_merge_2015/NEMOGCM (modified) * branches/2015/dev_merge_2015/NEMOGCM/ARCH/OLD/NOC/arch-ALTIX_NAUTILUS.fcm (modified) * branches/2015/dev_merge_2015/NEMOGCM/ARCH/arch-ALTIX_NAUTILUS_MPT.fcm (modified) * branches/2015/dev_merge_2015/NEMOGCM/CONFIG/AMM12/EXP00/iodef.xml (modified) * branches/2015/dev_merge_2015/NEMOGCM/CONFIG/AMM12/EXP00/namelist_cfg (modified) * branches/2015/dev_merge_2015/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist_cfg (modified) * branches/2015/dev_merge_2015/NEMOGCM/CONFIG/ORCA2_LIM3/cpp_ORCA2_LIM3.fcm (modified) * branches/2015/dev_merge_2015/NEMOGCM/CONFIG/ORCA2_LIM_CFC_C14b/EXP00/1_namelist_cfg (modified) * branches/2015/dev_merge_2015/NEMOGCM/CONFIG/SHARED/field_def.xml (modified) * branches/2015/dev_merge_2015/NEMOGCM/CONFIG/SHARED/namelist_ref (modified) * branches/2015/dev_merge_2015/NEMOGCM/CONFIG/cfg.txt (modified) * branches/2015/dev_merge_2015/NEMOGCM/CONFIG/uspcfg.txt (modified) * branches/2015/dev_merge_2015/NEMOGCM/EXTERNAL/AGRIF (modified) * branches/2015/dev_merge_2015/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-XC40_METO (modified) * branches/2015/dev_merge_2015/NEMOGCM/SETTE/input_ORCA2_LIM.cfg (modified) * branches/2015/dev_merge_2015/NEMOGCM/SETTE/prepare_job.sh (modified) * branches/2015/dev_merge_2015/NEMOGCM/SETTE/sette.sh (modified) * branches/2015/dev_merge_2015/NEMOGCM/TOOLS/OBSTOOLS/src/obs_prof_io.F90 (added) * branches/2015/dev_merge_2015/NEMOGCM/TOOLS/OBSTOOLS/src/obs_sla_io.F90 (added) * branches/2015/dev_merge_2015/NEMOGCM/TOOLS/OBSTOOLS/src/obs_sla_types.F90 (added) * branches/2015/dev_merge_2015/NEMOGCM/TOOLS/OBSTOOLS/src/obs_vel_io.F90 (added) * branches/2015/dev_merge_2015/NEMOGCM/TOOLS/OBSTOOLS/src/obsprof_io.h90 (added) * branches/2015/dev_merge_2015/NEMOGCM/TOOLS/OBSTOOLS/src/obssla_io.h90 (added) * branches/2015/dev_merge_2015/NEMOGCM/TOOLS/OBSTOOLS/src/obssla_types.h90 (added) * branches/2015/dev_merge_2015/NEMOGCM/TOOLS/REBUILD_NEMO/icb_combrest.py (copied) * branches/2015/dev_merge_2015/NEMOGCM/TOOLS/SCOORD_GEN (copied) * branches/2015/dev_merge_2015/NEMOGCM/fcm-make/inc/keys-orca2_lim.cfg (modified) * branches/2015/dev_merge_2015/NEMOGCM/fcm-make/inc/keys-orca2_lim3.cfg (modified) Commit of rest of merge with dev_MetOffice_merge_2015 Wed, 16 Dec 2015 15:56:49 GMT timgraham [6070] * branches/2015/dev_merge_2015/NEMOGCM/TOOLS/OBSTOOLS/src/obs_prof_io.F90 (deleted) * branches/2015/dev_merge_2015/NEMOGCM/TOOLS/OBSTOOLS/src/obs_seaice_io.F90 (copied) * branches/2015/dev_merge_2015/NEMOGCM/TOOLS/OBSTOOLS/src/obs_sla_io.F90 (deleted) * branches/2015/dev_merge_2015/NEMOGCM/TOOLS/OBSTOOLS/src/obs_sla_types.F90 (deleted) * branches/2015/dev_merge_2015/NEMOGCM/TOOLS/OBSTOOLS/src/obs_sst_io.F90 (copied) * branches/2015/dev_merge_2015/NEMOGCM/TOOLS/OBSTOOLS/src/obs_vel_io.F90 (deleted) * branches/2015/dev_merge_2015/NEMOGCM/TOOLS/OBSTOOLS/src/obsprof_io.h90 (deleted) * branches/2015/dev_merge_2015/NEMOGCM/TOOLS/OBSTOOLS/src/obsseaice_io.h90 (copied) * branches/2015/dev_merge_2015/NEMOGCM/TOOLS/OBSTOOLS/src/obssla_io.h90 (deleted) * branches/2015/dev_merge_2015/NEMOGCM/TOOLS/OBSTOOLS/src/obssla_types.h90 (deleted) * branches/2015/dev_merge_2015/NEMOGCM/TOOLS/OBSTOOLS/src/obssst_io.h90 (copied) * branches/2015/dev_merge_2015/NEMOGCM/TOOLS/OBSTOOLS/src/obsvel_io.h90 (deleted) * branches/2015/dev_merge_2015/NEMOGCM/TOOLS/OBSTOOLS/src/par_oce.F90 (copied) Intermediate commit to fix changes of file types in OBSTOOLS directory Wed, 16 Dec 2015 15:44:35 GMT timgraham [6069] * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OFF_SRC/dommsk.F90 (copied) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OFF_SRC/domrea.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OFF_SRC/dtadyn.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OFF_SRC/nemogcm.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OOO_SRC (deleted) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/BDY/bdytides.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/BDY/bdyvol.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DIA/dia25h.F90 (copied) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DIA/diacfl.F90 (copied) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DIA/diafwb.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DIA/diaharm.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DIA/diahsb.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DIA/diatmb.F90 (copied) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DIU (copied) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DOM/daymod.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DOM/dom_oce.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DOM/domain.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DOM/domhgr.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DOM/domngb.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DOM/iscplhsb.F90 (copied) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DOM/iscplini.F90 (copied) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DOM/iscplrst.F90 (copied) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DOM/istate.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DYN/divhor.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DYN/dynnxt.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DYN/dynzad.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/ICB/icbrst.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/IOM/in_out_manager.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/IOM/iom_def.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/IOM/iom_nf90.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/IOM/restart.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/LBC/lbclnk.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/LBC/mppini_2.h90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/LDF/ldfslp.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obs_fbm.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obs_grd_bruteforce.h90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obs_grid.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obs_inter_sup.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obs_mpp.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obs_oper.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obs_prep.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obs_prof_io.F90 (deleted) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obs_profiles_def.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_altbias.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_prof.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_seaice.F90 (deleted) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_sla.F90 (deleted) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_sst.F90 (deleted) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_surf.F90 (copied) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_vel.F90 (deleted) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obs_readmdt.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obs_rot_vel.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obs_seaice.F90 (deleted) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obs_seaice_io.F90 (deleted) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obs_sla.F90 (deleted) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obs_sla_io.F90 (deleted) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obs_sla_types.F90 (deleted) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obs_sst.F90 (deleted) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obs_sst_io.F90 (deleted) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obs_sstbias.F90 (copied) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obs_surf_def.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obs_types.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obs_vel_io.F90 (deleted) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obs_write.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obsprof_io.h90 (deleted) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obsseaice_io.h90 (deleted) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obssla_io.h90 (deleted) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obssla_types.h90 (deleted) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obssst_io.h90 (deleted) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obsvel_io.h90 (deleted) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/SBC/sbc_oce.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/SBC/sbcisf.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/SBC/sbcrnf.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/SBC/sbctide.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/TRA/traadv.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/TRA/tradmp.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_iso.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/TRA/tranxt.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/TRA/trasbc.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/TRA/zpshde.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfmxl.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/lib_fortran.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/oce.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/step.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/step_oce.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/SAO_SRC (copied) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/SAS_SRC/nemogcm.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/TOP_SRC/trcini.F90 (modified) Merge of dev_MetOffice_merge_2015 into branch (only NEMO directory for ... Wed, 16 Dec 2015 10:10:54 GMT timgraham [6062] * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DOM/dom_oce.F90 (modified) Minor bug fix Wed, 16 Dec 2015 09:25:22 GMT timgraham [6060] * branches/2015/dev_merge_2015 (modified) * branches/2015/dev_merge_2015/DOC (modified) * branches/2015/dev_merge_2015/DOC/NEMO_book.tex (modified) * branches/2015/dev_merge_2015/DOC/TexFiles/Biblio/Biblio.bib (modified) * branches/2015/dev_merge_2015/DOC/TexFiles/Chapters/Abstracts_Foreword.tex (modified) * branches/2015/dev_merge_2015/DOC/TexFiles/Chapters/Annex_C.tex (modified) * branches/2015/dev_merge_2015/DOC/TexFiles/Chapters/Chap_DOM.tex (modified) * branches/2015/dev_merge_2015/DOC/TexFiles/Chapters/Chap_DYN.tex (modified) * branches/2015/dev_merge_2015/DOC/TexFiles/Chapters/Chap_LDF.tex (modified) * branches/2015/dev_merge_2015/DOC/TexFiles/Chapters/Chap_Model_Basics.tex (modified) * branches/2015/dev_merge_2015/DOC/TexFiles/Chapters/Chap_Model_Basics_zstar.tex (modified) * branches/2015/dev_merge_2015/DOC/TexFiles/Chapters/Chap_STP.tex (modified) * branches/2015/dev_merge_2015/DOC/TexFiles/Chapters/Chap_TRA.tex (modified) * branches/2015/dev_merge_2015/DOC/TexFiles/Chapters/Introduction.tex (modified) * branches/2015/dev_merge_2015/DOC/TexFiles/Namelist/nam_tide (modified) * branches/2015/dev_merge_2015/DOC/TexFiles/Namelist/namagrif (modified) * branches/2015/dev_merge_2015/DOC/TexFiles/Namelist/nambbl (modified) * branches/2015/dev_merge_2015/DOC/TexFiles/Namelist/nambdy (modified) * branches/2015/dev_merge_2015/DOC/TexFiles/Namelist/nambdy_dta (modified) * branches/2015/dev_merge_2015/DOC/TexFiles/Namelist/nambdy_tide (modified) * branches/2015/dev_merge_2015/DOC/TexFiles/Namelist/namberg (modified) * branches/2015/dev_merge_2015/DOC/TexFiles/Namelist/nambfr (modified) * branches/2015/dev_merge_2015/DOC/TexFiles/Namelist/namdct (modified) * branches/2015/dev_merge_2015/DOC/TexFiles/Namelist/namdom (modified) * branches/2015/dev_merge_2015/DOC/TexFiles/Namelist/namdyn_adv (modified) * branches/2015/dev_merge_2015/DOC/TexFiles/Namelist/namdyn_hpg (modified) * branches/2015/dev_merge_2015/DOC/TexFiles/Namelist/namdyn_ldf (modified) * branches/2015/dev_merge_2015/DOC/TexFiles/Namelist/namdyn_spg (modified) * branches/2015/dev_merge_2015/DOC/TexFiles/Namelist/namdyn_vor (modified) * branches/2015/dev_merge_2015/DOC/TexFiles/Namelist/nameos (modified) * branches/2015/dev_merge_2015/DOC/TexFiles/Namelist/namhsb (modified) * branches/2015/dev_merge_2015/DOC/TexFiles/Namelist/namlbc (modified) * branches/2015/dev_merge_2015/DOC/TexFiles/Namelist/namobs (modified) * branches/2015/dev_merge_2015/DOC/TexFiles/Namelist/namptr (modified) * branches/2015/dev_merge_2015/DOC/TexFiles/Namelist/namrun (modified) * branches/2015/dev_merge_2015/DOC/TexFiles/Namelist/namsbc (modified) * branches/2015/dev_merge_2015/DOC/TexFiles/Namelist/namsbc_apr (modified) * branches/2015/dev_merge_2015/DOC/TexFiles/Namelist/namsbc_core (modified) * branches/2015/dev_merge_2015/DOC/TexFiles/Namelist/namsbc_cpl (modified) * branches/2015/dev_merge_2015/DOC/TexFiles/Namelist/namsbc_isf (modified) * branches/2015/dev_merge_2015/DOC/TexFiles/Namelist/namsbc_mfs (modified) * branches/2015/dev_merge_2015/DOC/TexFiles/Namelist/namsbc_rnf (modified) * branches/2015/dev_merge_2015/DOC/TexFiles/Namelist/namsbc_sas (modified) * branches/2015/dev_merge_2015/DOC/TexFiles/Namelist/namsbc_ssr (modified) * branches/2015/dev_merge_2015/DOC/TexFiles/Namelist/namsbc_wave (modified) * branches/2015/dev_merge_2015/DOC/TexFiles/Namelist/namtra_adv (modified) * branches/2015/dev_merge_2015/DOC/TexFiles/Namelist/namtra_dmp (modified) * branches/2015/dev_merge_2015/DOC/TexFiles/Namelist/namtra_ldf (modified) * branches/2015/dev_merge_2015/DOC/TexFiles/Namelist/namtra_qsr (modified) * branches/2015/dev_merge_2015/DOC/TexFiles/Namelist/namtrd (modified) * branches/2015/dev_merge_2015/DOC/TexFiles/Namelist/namtsd (modified) * branches/2015/dev_merge_2015/DOC/TexFiles/Namelist/namzdf_gls (modified) * branches/2015/dev_merge_2015/DOC/TexFiles/Namelist/namzdf_tke (modified) * branches/2015/dev_merge_2015/DOC/TexFiles/Namelist/namzgr (modified) * branches/2015/dev_merge_2015/DOC/TexFiles/Namelist/namzgr_sco (modified) * branches/2015/dev_merge_2015/NEMOGCM (modified) * branches/2015/dev_merge_2015/NEMOGCM/ARCH/arch-openmpi_NAVITI_MERCATOR.fcm (modified) * branches/2015/dev_merge_2015/NEMOGCM/CONFIG/AMM12/EXP00/namelist_cfg (modified) * branches/2015/dev_merge_2015/NEMOGCM/CONFIG/AMM12/cpp_AMM12.fcm (modified) * branches/2015/dev_merge_2015/NEMOGCM/CONFIG/C1D_PAPA/EXP00/namelist_cfg (modified) * branches/2015/dev_merge_2015/NEMOGCM/CONFIG/GYRE/EXP00/namelist_cfg (modified) * branches/2015/dev_merge_2015/NEMOGCM/CONFIG/GYRE_BFM/EXP00/namelist_cfg (modified) * branches/2015/dev_merge_2015/NEMOGCM/CONFIG/GYRE_PISCES/EXP00/namelist_cfg (modified) * branches/2015/dev_merge_2015/NEMOGCM/CONFIG/GYRE_XIOS/EXP00/namelist_cfg (modified) * branches/2015/dev_merge_2015/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/1_namelist_cfg (modified) * branches/2015/dev_merge_2015/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist_cfg (modified) * branches/2015/dev_merge_2015/NEMOGCM/CONFIG/ORCA2_LIM/cpp_ORCA2_LIM.fcm (modified) * branches/2015/dev_merge_2015/NEMOGCM/CONFIG/ORCA2_LIM3/EXP00/1_namelist_cfg (modified) * branches/2015/dev_merge_2015/NEMOGCM/CONFIG/ORCA2_LIM3/EXP00/namelist_cfg (modified) * branches/2015/dev_merge_2015/NEMOGCM/CONFIG/ORCA2_LIM3/cpp_ORCA2_LIM3.fcm (modified) * branches/2015/dev_merge_2015/NEMOGCM/CONFIG/ORCA2_LIM_CFC_C14b/EXP00/1_namelist_cfg (modified) * branches/2015/dev_merge_2015/NEMOGCM/CONFIG/ORCA2_LIM_CFC_C14b/EXP00/namelist_cfg (modified) * branches/2015/dev_merge_2015/NEMOGCM/CONFIG/ORCA2_LIM_PISCES/EXP00/namelist_cfg (modified) * branches/2015/dev_merge_2015/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist_cfg (modified) * branches/2015/dev_merge_2015/NEMOGCM/CONFIG/ORCA2_SAS_LIM/EXP00/namelist_cfg (modified) * branches/2015/dev_merge_2015/NEMOGCM/CONFIG/ORCA2_SAS_LIM/cpp_ORCA2_SAS_LIM.fcm (modified) * branches/2015/dev_merge_2015/NEMOGCM/CONFIG/SHARED/field_def.xml (modified) * branches/2015/dev_merge_2015/NEMOGCM/CONFIG/SHARED/namelist_ref (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/LIM_SRC_2/limsbc_2.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/LIM_SRC_2/limthd_2.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/LIM_SRC_3/limsbc.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/LIM_SRC_3/limthd.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/NST_SRC/agrif_opa_interp.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/NST_SRC/agrif_opa_sponge.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/NST_SRC/agrif_opa_update.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/NST_SRC/agrif_top_interp.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/NST_SRC/agrif_top_sponge.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/NST_SRC/agrif_top_update.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/NST_SRC/agrif_user.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OFF_SRC/domrea.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OFF_SRC/dtadyn.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/ASM/asmbkg.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/BDY/bdydta.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/BDY/bdydyn.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/BDY/bdydyn3d.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/BDY/bdyini.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/BDY/bdylib.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/BDY/bdytides.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/BDY/bdytra.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/BDY/bdyvol.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/C1D/c1d.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/C1D/domc1d.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/C1D/dtauvd.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/C1D/dyncor_c1d.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/C1D/dyndmp.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/C1D/step_c1d.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/CRS/crs.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/CRS/crsdom.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/CRS/crsdomwri.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/CRS/crsfld.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/CRS/crsini.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/CRS/crslbclnk.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DIA/diaar5.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DIA/diadct.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DIA/diadimg.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DIA/diafwb.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DIA/diahsb.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DIA/diahth.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DIA/diaptr.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DOM/daymod.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DOM/dom_oce.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DOM/domain.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DOM/domcfg.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DOM/domhgr.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DOM/domstp.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr_substitute.h90 (deleted) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DOM/dtatsd.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DOM/istate.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DYN/divhor.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DYN/dynadv.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DYN/dynadv_cen2.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DYN/dynadv_ubs.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DYN/dynbfr.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DYN/dynldf.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DYN/dynldf_iso.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DYN/dynldf_lap_blp.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DYN/dynnxt.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_exp.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DYN/dynvor.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DYN/dynzad.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DYN/dynzdf.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DYN/dynzdf_exp.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DYN/dynzdf_imp.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DYN/sshwzv.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/FLO/flo4rk.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/FLO/floblk.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/FLO/flodom.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/FLO/florst.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/FLO/flowri.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/ICB/icb_oce.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/IOM/in_out_manager.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/IOM/restart.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/LBC/lbclnk.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/LBC/lbcnfd.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/LBC/mppini.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/LDF/ldfc1d_c2d.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/LDF/ldfdyn.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/LDF/ldfslp.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/LDF/ldftra.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/SBC/fldread.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/SBC/geo2ocean.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/SBC/sbc_oce.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/SBC/sbcana.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/SBC/sbcapr.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_core.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_mfs.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/SBC/sbcflx.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/SBC/sbcfwb.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_cice.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_if.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim_2.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/SBC/sbcisf.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/SBC/sbcrnf.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/SBC/sbcssm.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/SBC/sbcssr.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/SBC/sbctide.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/SBC/sbcwave.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/SBC/tideini.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/TRA/eosbn2.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/TRA/traadv.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_cen.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_fct.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_mle.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_mus.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_qck.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_ubs.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/TRA/trabbc.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/TRA/trabbl.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/TRA/tradmp.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/TRA/traldf.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_blp.F90 (deleted) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_iso.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_lap.F90 (deleted) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_lap_blp.F90 (copied) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_triad.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/TRA/tranpc.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/TRA/tranxt.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/TRA/traqsr.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/TRA/trasbc.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/TRA/trazdf.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/TRA/trazdf_exp.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/TRA/trazdf_imp.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/TRA/zpshde.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/TRD/trd_oce.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/TRD/trddyn.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/TRD/trdglo.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/TRD/trdini.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/TRD/trdken.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/TRD/trdmxl.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/TRD/trdpen.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/TRD/trdtra.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/TRD/trdvor.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfbfr.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfddm.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfevd.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfgls.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfmxl.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfric.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/ZDF/zdftke.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/ZDF/zdftmx.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/lib_print.f90 (deleted) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/oce.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/step.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/stpctl.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/trc_oce.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/SAS_SRC/diawri.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/SAS_SRC/sbcssm.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/SAS_SRC/step.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/TOP_SRC/C14b/trcsms_c14b.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/TOP_SRC/CFC/trcsms_cfc.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/TOP_SRC/PISCES/P2Z/p2zbio.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/TOP_SRC/PISCES/P2Z/p2zexp.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/TOP_SRC/PISCES/P2Z/p2zopt.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/TOP_SRC/PISCES/P2Z/p2zsed.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zbio.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zche.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zfechem.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zflx.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zopt.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zprod.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zrem.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zsbc.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zsed.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zsink.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/TOP_SRC/PISCES/trcwri_pisces.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/TOP_SRC/TRP/trcadv.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/TOP_SRC/TRP/trcdmp.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/TOP_SRC/TRP/trcldf.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/TOP_SRC/TRP/trcnxt.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/TOP_SRC/TRP/trcsbc.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/TOP_SRC/TRP/trczdf.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/TOP_SRC/TRP/trdmxl_trc.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/TOP_SRC/TRP/trdmxl_trc_rst.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/TOP_SRC/trcbc.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/TOP_SRC/trcdta.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/TOP_SRC/trcini.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/TOP_SRC/trcrst.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/TOP_SRC/trcstp.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/NEMO/TOP_SRC/trcsub.F90 (modified) * branches/2015/dev_merge_2015/NEMOGCM/SETTE/sette.sh (modified) * branches/2015/dev_merge_2015/NEMOGCM/TRUST (deleted) * branches/2015/dev_merge_2015/NEMOGCM/fcm-make/inc/keys-amm12.cfg (modified) * branches/2015/dev_merge_2015/NEMOGCM/fcm-make/inc/keys-gyre.cfg (modified) * branches/2015/dev_merge_2015/NEMOGCM/fcm-make/inc/keys-gyre_pisces.cfg (modified) * branches/2015/dev_merge_2015/NEMOGCM/fcm-make/inc/keys-orca2_lim.cfg (modified) * branches/2015/dev_merge_2015/NEMOGCM/fcm-make/inc/keys-orca2_lim3.cfg (modified) * branches/2015/dev_merge_2015/NEMOGCM/fcm-make/inc/keys-orca2_lim_cfc.cfg (modified) * branches/2015/dev_merge_2015/NEMOGCM/fcm-make/inc/keys-orca2_lim_pisces.cfg (modified) * branches/2015/dev_merge_2015/NEMOGCM/fcm-make/inc/keys-orca2_sas_lim.cfg (modified) Merged dev_r5836_noc2_VVL_BY_DEFAULT into branch Wed, 16 Dec 2015 09:11:02 GMT timgraham [6059] * branches/2015/dev_merge_2015 (copied) Create branch for 2015 merge party Fri, 27 Nov 2015 11:01:02 GMT nicolasmartin [5936] * trunk/NEMOGCM/TRUST (added) * trunk/NEMOGCM/TRUST/batch (added) * trunk/NEMOGCM/TRUST/batch/X64_ADA.sh (added) * trunk/NEMOGCM/TRUST/batch/X64_CURIE.sh (added) * trunk/NEMOGCM/TRUST/config (added) * trunk/NEMOGCM/TRUST/config/X64_ADA.cfg (added) * trunk/NEMOGCM/TRUST/config/X64_CURIE.cfg (added) * trunk/NEMOGCM/TRUST/config/arch_template.cfg (added) * trunk/NEMOGCM/TRUST/config/martin.cfg (added) * trunk/NEMOGCM/TRUST/config/romr005.cfg (added) * trunk/NEMOGCM/TRUST/config/user_template.cfg (added) * trunk/NEMOGCM/TRUST/cron (added) * trunk/NEMOGCM/TRUST/cron/ada.env (added) * trunk/NEMOGCM/TRUST/cron/curie.env (added) * trunk/NEMOGCM/TRUST/inc (added) * trunk/NEMOGCM/TRUST/inc/banner.html (added) * trunk/NEMOGCM/TRUST/inc/banner.txt (added) * trunk/NEMOGCM/TRUST/inc/svn_abstract.awk (added) * trunk/NEMOGCM/TRUST/inc/trusting.env (added) * trunk/NEMOGCM/TRUST/inc/trusting_func.sh (added) * trunk/NEMOGCM/TRUST/inc/trusting_help.txt (added) * trunk/NEMOGCM/TRUST/inputs (added) * trunk/NEMOGCM/TRUST/inputs/AMM12 (added) * trunk/NEMOGCM/TRUST/inputs/AMM12/iodef.xml (added) * trunk/NEMOGCM/TRUST/inputs/AMM12/namelist_cfg (added) * trunk/NEMOGCM/TRUST/inputs/C1D_PAPA (added) * trunk/NEMOGCM/TRUST/inputs/GYRE (added) * trunk/NEMOGCM/TRUST/inputs/GYRE/iodef.xml (added) * trunk/NEMOGCM/TRUST/inputs/GYRE/namelist_cfg (added) * trunk/NEMOGCM/TRUST/inputs/GYRE_BFM (added) * trunk/NEMOGCM/TRUST/inputs/GYRE_PISCES (added) * trunk/NEMOGCM/TRUST/inputs/GYRE_XIOS (added) * trunk/NEMOGCM/TRUST/inputs/O1L3P_trust (added) * trunk/NEMOGCM/TRUST/inputs/ORCA1_LIM3_PISCES (added) * trunk/NEMOGCM/TRUST/inputs/ORCA1_LIM3_PISCES/namelist_cfg (added) * trunk/NEMOGCM/TRUST/inputs/ORCA1_LIM3_PISCES/namelist_ice_cfg (added) * trunk/NEMOGCM/TRUST/inputs/ORCA2_LIM (added) * trunk/NEMOGCM/TRUST/inputs/ORCA2_LIM/1_namelist_cfg (added) * trunk/NEMOGCM/TRUST/inputs/ORCA2_LIM/namelist_cfg (added) * trunk/NEMOGCM/TRUST/inputs/ORCA2_LIM3 (added) * trunk/NEMOGCM/TRUST/inputs/ORCA2_LIM_CFC_C14b (added) * trunk/NEMOGCM/TRUST/inputs/ORCA2_LIM_PISCES (added) * trunk/NEMOGCM/TRUST/inputs/ORCA2_LIM_PISCES/iodef.xml (added) * trunk/NEMOGCM/TRUST/inputs/ORCA2_LIM_PISCES/namelist_cfg (added) * trunk/NEMOGCM/TRUST/inputs/ORCA2_LIM_PISCES/namelist_pisces_cfg (added) * trunk/NEMOGCM/TRUST/inputs/ORCA2_LIM_PISCES/namelist_top_cfg (added) * trunk/NEMOGCM/TRUST/inputs/ORCA2_OFF_PISCES (added) * trunk/NEMOGCM/TRUST/inputs/ORCA2_SAS_LIM (added) * trunk/NEMOGCM/TRUST/install_new_branch.sh (added) * trunk/NEMOGCM/TRUST/trusting.sh (added) * trunk/NEMOGCM/TRUST/web (added) * trunk/NEMOGCM/TRUST/web/html (added) * trunk/NEMOGCM/TRUST/web/html/images (added) * trunk/NEMOGCM/TRUST/web/html/images/blank.png (added) * trunk/NEMOGCM/TRUST/web/html/images/downsimple.png (added) * trunk/NEMOGCM/TRUST/web/html/images/folder.png (added) * trunk/NEMOGCM/TRUST/web/html/images/upsimple.png (added) * trunk/NEMOGCM/TRUST/web/html/sortabletable.css (added) * trunk/NEMOGCM/TRUST/web/html/sortabletable.js (added) * trunk/NEMOGCM/TRUST/web/html/tab-view.css (added) * trunk/NEMOGCM/TRUST/web/html/tab-view.js (added) * trunk/NEMOGCM/TRUST/web/images (added) * trunk/NEMOGCM/TRUST/web/images/close.gif (added) * trunk/NEMOGCM/TRUST/web/images/close_over.gif (added) * trunk/NEMOGCM/TRUST/web/images/tab_left_active.gif (added) * trunk/NEMOGCM/TRUST/web/images/tab_left_inactive.gif (added) * trunk/NEMOGCM/TRUST/web/images/tab_left_over.gif (added) * trunk/NEMOGCM/TRUST/web/images/tab_right_active.gif (added) * trunk/NEMOGCM/TRUST/web/images/tab_right_inactive.gif (added) * trunk/NEMOGCM/TRUST/web/images/tab_right_over.gif (added) * trunk/NEMOGCM/TRUST/web/index.html (added) * trunk/NEMOGCM/TRUST/web/index.php (added) * trunk/NEMOGCM/TRUST/web/read_trusting.php (added) Merge dev_r5092_CNRS18_TRUST onto the trunk: add new tool Trusting (ie ...