# # ChangeLog for branches/2015/dev_MetOffice_merge_2015/DOC # # Generated by Trac 1.0.1 # 2024-05-14T11:38:10+02:00 Fri, 11 Dec 2015 11:13:32 GMT timgraham [6035] * branches/2015/dev_MetOffice_merge_2015 (modified) * branches/2015/dev_MetOffice_merge_2015/DOC (modified) * branches/2015/dev_MetOffice_merge_2015/DOC/NEMO_book.pdf (modified) * branches/2015/dev_MetOffice_merge_2015/DOC/TexFiles/Chapters/Chap_DIA.tex (modified) * branches/2015/dev_MetOffice_merge_2015/DOC/TexFiles/Namelist/nam_dia25h (copied) * branches/2015/dev_MetOffice_merge_2015/DOC/TexFiles/Namelist/nam_diatmb (copied) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/ARCH/OLD/NOC/arch-ALTIX_NAUTILUS.fcm (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/ARCH/arch-ALTIX_NAUTILUS_MPT.fcm (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/CONFIG/AMM12/EXP00/iodef.xml (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/CONFIG/AMM12/EXP00/namelist_cfg (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/CONFIG/SHARED/field_def.xml (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/CONFIG/SHARED/namelist_ref (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/CONFIG/cfg.txt (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/EXTERNAL/AGRIF (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/DIA/dia25h.F90 (copied) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/DIA/diatmb.F90 (copied) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 (modified) Merged branches/2014/dev_r4650_UKMO10_Tidally_Meaned_Diagnostics into ... Tue, 08 Dec 2015 11:49:56 GMT timgraham [6021] * branches/2015/dev_MetOffice_merge_2015 (modified) * branches/2015/dev_MetOffice_merge_2015/DOC (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/ARCH/OLD/NOC/arch-ALTIX_NAUTILUS.fcm (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/ARCH/arch-ALTIX_NAUTILUS_MPT.fcm (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/CONFIG/cfg.txt (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/EXTERNAL/AGRIF (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/ICB/icbrst.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/IOM/iom_def.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/IOM/iom_nf90.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/TOOLS/REBUILD_NEMO/icb_combrest.py (copied) Merged UKMO/icebergs_restart_single_file into branch Mon, 07 Dec 2015 16:16:30 GMT timgraham [6015] * branches/2015/dev_MetOffice_merge_2015 (modified) * branches/2015/dev_MetOffice_merge_2015/DOC (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/ARCH/OLD/NOC/arch-ALTIX_NAUTILUS.fcm (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/ARCH/arch-ALTIX_NAUTILUS_MPT.fcm (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/CONFIG/cfg.txt (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/EXTERNAL/AGRIF (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/TOOLS/SCOORD_GEN (copied) Merged /branches/2015/dev_r5187_UKMO13_simplification (Scoord_gen) into ... Mon, 07 Dec 2015 15:11:45 GMT mathiot [6012] * branches/2015/dev_MetOffice_merge_2015 (modified) * branches/2015/dev_MetOffice_merge_2015/DOC (modified) * branches/2015/dev_MetOffice_merge_2015/DOC/TexFiles/Biblio/Biblio.bib (modified) * branches/2015/dev_MetOffice_merge_2015/DOC/TexFiles/Chapters/Chap_SBC.tex (modified) * branches/2015/dev_MetOffice_merge_2015/DOC/TexFiles/Namelist/namsbc (modified) * branches/2015/dev_MetOffice_merge_2015/DOC/TexFiles/Namelist/namsbc_isf (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/ARCH/OLD/NOC/arch-ALTIX_NAUTILUS.fcm (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/ARCH/arch-ALTIX_NAUTILUS_MPT.fcm (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/CONFIG/SHARED/namelist_ref (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/CONFIG/cfg.txt (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/CONFIG/uspcfg.txt (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/EXTERNAL/AGRIF (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OFF_SRC/dommsk.F90 (copied) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OFF_SRC/dtadyn.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/BDY/bdyvol.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/DIA/diaharm.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/DIA/diahsb.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/DOM/dom_oce.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/DOM/domhgr.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/DYN/divhor.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/DYN/dynnxt.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/DYN/dynzad.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/LDF/ldfslp.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/SBC/sbc_oce.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/SBC/sbcisf.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/SBC/sbcrnf.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/TRA/traadv.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_iso.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/TRA/tranxt.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/TRA/trasbc.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/TRA/zpshde.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfmxl.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/oce.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/step.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/TOP_SRC/trcini.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/SETTE/input_ORCA2_LIM.cfg (modified) merge MetO branch with dev_r5151_UKMO_ISF Fri, 04 Dec 2015 16:56:07 GMT mathiot [6006] * branches/2015/dev_MetOffice_merge_2015 (modified) * branches/2015/dev_MetOffice_merge_2015/DOC (modified) * branches/2015/dev_MetOffice_merge_2015/DOC/TexFiles/Chapters/Chap_DOM.tex (modified) * branches/2015/dev_MetOffice_merge_2015/DOC/TexFiles/Chapters/Chap_SBC.tex (modified) * branches/2015/dev_MetOffice_merge_2015/DOC/TexFiles/Namelist/namdom (modified) * branches/2015/dev_MetOffice_merge_2015/DOC/TexFiles/Namelist/namrun (modified) * branches/2015/dev_MetOffice_merge_2015/DOC/TexFiles/Namelist/namsbc_iscpl (copied) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/ARCH/OLD/NOC/arch-ALTIX_NAUTILUS.fcm (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/ARCH/arch-ALTIX_NAUTILUS_MPT.fcm (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/CONFIG/SHARED/field_def.xml (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/CONFIG/SHARED/namelist_ref (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/CONFIG/cfg.txt (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/EXTERNAL/AGRIF (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OFF_SRC/domrea.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/DIA/diafwb.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/DIA/diaharm.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/DIA/diahsb.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/DOM/dom_oce.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/DOM/domain.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/DOM/domngb.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/DOM/iscplhsb.F90 (copied) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/DOM/iscplini.F90 (copied) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/DOM/iscplrst.F90 (copied) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/DOM/istate.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/DYN/divhor.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/DYN/dynnxt.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/IOM/restart.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/LBC/lbclnk.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/LBC/mppini_2.h90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/SBC/sbcisf.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/TRA/tradmp.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/TRA/trasbc.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/lib_fortran.F90 (modified) Merged ice sheet coupling branch Fri, 04 Dec 2015 16:22:59 GMT timgraham [6005] * branches/2015/dev_MetOffice_merge_2015 (modified) * branches/2015/dev_MetOffice_merge_2015/DOC (modified) * branches/2015/dev_MetOffice_merge_2015/DOC/NEMO_book.tex (modified) * branches/2015/dev_MetOffice_merge_2015/DOC/TexFiles/Biblio/Biblio.bib (modified) * branches/2015/dev_MetOffice_merge_2015/DOC/TexFiles/Chapters/Chap_DIU.tex (copied) * branches/2015/dev_MetOffice_merge_2015/DOC/TexFiles/Namelist/namdiu (copied) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/CONFIG/SHARED/field_def.xml (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/CONFIG/SHARED/namelist_ref (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/DIU (copied) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/IOM/restart.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/step.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/step_oce.F90 (modified) Merged diurnal sst branch Fri, 04 Dec 2015 10:56:46 GMT timgraham [5998] * branches/2015/dev_MetOffice_merge_2015 (modified) * branches/2015/dev_MetOffice_merge_2015/DOC (modified) * branches/2015/dev_MetOffice_merge_2015/DOC/NEMO_book.pdf (modified) * branches/2015/dev_MetOffice_merge_2015/DOC/TexFiles/Chapters/Chap_OBS.tex (modified) * branches/2015/dev_MetOffice_merge_2015/DOC/TexFiles/Namelist/namobs (modified) * branches/2015/dev_MetOffice_merge_2015/DOC/TexFiles/Namelist/namobs_example (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/ARCH/OLD/NOC/arch-ALTIX_NAUTILUS.fcm (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/ARCH/arch-ALTIX_NAUTILUS_MPT.fcm (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist_cfg (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/CONFIG/ORCA2_LIM3/cpp_ORCA2_LIM3.fcm (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/CONFIG/SHARED/namelist_ref (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/CONFIG/cfg.txt (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/EXTERNAL/AGRIF (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obs_grid.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obs_inter_sup.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obs_mpp.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obs_oper.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obs_prep.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obs_prof_io.F90 (deleted) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obs_profiles_def.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_altbias.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_prof.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_seaice.F90 (deleted) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_sla.F90 (deleted) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_sst.F90 (deleted) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_surf.F90 (copied) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_vel.F90 (deleted) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obs_readmdt.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obs_rot_vel.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obs_seaice.F90 (deleted) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obs_seaice_io.F90 (deleted) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obs_sla.F90 (deleted) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obs_sla_io.F90 (deleted) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obs_sla_types.F90 (deleted) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obs_sst.F90 (deleted) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obs_sst_io.F90 (deleted) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obs_surf_def.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obs_types.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obs_vel_io.F90 (deleted) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obs_write.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obsprof_io.h90 (deleted) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obsseaice_io.h90 (deleted) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obssla_io.h90 (deleted) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obssla_types.h90 (deleted) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obssst_io.h90 (deleted) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obsvel_io.h90 (deleted) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/step.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/SETTE/sette.sh (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/TOOLS/OBSTOOLS/src/obs_seaice_io.F90 (added) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/TOOLS/OBSTOOLS/src/obs_sst_io.F90 (added) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/TOOLS/OBSTOOLS/src/obsseaice_io.h90 (added) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/TOOLS/OBSTOOLS/src/obssst_io.h90 (added) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/fcm-make/inc/keys-orca2_lim.cfg (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/fcm-make/inc/keys-orca2_lim3.cfg (modified) Merge in changes from OBS simplification branch ... Thu, 03 Dec 2015 16:04:43 GMT timgraham [5997] * branches/2015/dev_MetOffice_merge_2015 (modified) * branches/2015/dev_MetOffice_merge_2015/DOC (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/CONFIG/SHARED/namelist_ref (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/CONFIG/cfg.txt (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/EXTERNAL/AGRIF (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/BDY/bdytides.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/DOM/daymod.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/DOM/dom_oce.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/DOM/domain.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/IOM/in_out_manager.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obs_prep.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/SBC/sbctide.F90 (modified) Merged branches/2014/dev_r4650_UKMO7_STARTHOUR into branch Thu, 03 Dec 2015 11:16:20 GMT timgraham [5992] * branches/2015/dev_MetOffice_merge_2015 (modified) * branches/2015/dev_MetOffice_merge_2015/DOC (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/CONFIG/SHARED/namelist_ref (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/CONFIG/cfg.txt (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/EXTERNAL/AGRIF (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obs_sstbias.F90 (copied) Merged branches/2014/dev_r4650_UKMO14.5_SST_BIAS_CORRECTION into branch Tue, 01 Dec 2015 15:06:40 GMT timgraham [5963] * branches/2015/dev_MetOffice_merge_2015 (modified) * branches/2015/dev_MetOffice_merge_2015/DOC (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/CONFIG/cfg.txt (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/EXTERNAL/AGRIF (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obs_oper.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obs_prep.F90 (modified) Merged branches/2014/dev_r4650_UKMO14.4_OBS_GENERAL_VINTERP into branch Tue, 01 Dec 2015 10:31:27 GMT timgraham [5960] * branches/2015/dev_MetOffice_merge_2015 (modified) * branches/2015/dev_MetOffice_merge_2015/DOC (modified) * branches/2015/dev_MetOffice_merge_2015/DOC/TexFiles/Chapters/Chap_DIA.tex (modified) * branches/2015/dev_MetOffice_merge_2015/DOC/TexFiles/Namelist/namctl (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/CONFIG/SHARED/namelist_ref (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/CONFIG/cfg.txt (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/EXTERNAL/AGRIF (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OFF_SRC/nemogcm.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OOO_SRC/nemogcm.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/DIA/diacfl.F90 (copied) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/IOM/in_out_manager.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/step.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/step_oce.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/SAS_SRC/nemogcm.F90 (modified) Merged in changes from /branches/2014/dev_r4650_UKMO12_CFL_diags_take2 Mon, 30 Nov 2015 09:14:54 GMT timgraham [5946] * branches/2015/dev_MetOffice_merge_2015 (copied) Branch for merge of Met Office developments Fri, 31 Jul 2015 08:55:56 GMT timgraham [5656] * trunk (modified) * trunk/DOC (modified) * trunk/NEMOGCM (modified) * trunk/NEMOGCM/ARCH/CMCC/arch-PW6_calypso.fcm (modified) * trunk/NEMOGCM/ARCH/CMCC/arch-PW6_calypso_debug.fcm (modified) * trunk/NEMOGCM/ARCH/CMCC/arch-PW6_calypso_tools.fcm (modified) * trunk/NEMOGCM/ARCH/CMCC/arch-gfortran_athena_xios.fcm (modified) * trunk/NEMOGCM/ARCH/CMCC/arch-ifort_athena.fcm (modified) * trunk/NEMOGCM/ARCH/CMCC/arch-ifort_athena_debug.fcm (modified) * trunk/NEMOGCM/ARCH/CMCC/arch-ifort_athena_tools.fcm (modified) * trunk/NEMOGCM/ARCH/CMCC/arch-ifort_athena_xios.fcm (modified) * trunk/NEMOGCM/ARCH/INGV/arch-IBM_EKMAN_INGV.fcm (modified) * trunk/NEMOGCM/ARCH/OLD/NOC/arch-ALTIX_NAUTILUS.fcm (modified) * trunk/NEMOGCM/ARCH/arch-ALTIX_NAUTILUS_MPT.fcm (modified) * trunk/NEMOGCM/ARCH/arch-PW7_C2A_XIO.fcm (modified) * trunk/NEMOGCM/ARCH/arch-PW7_METO.fcm (modified) * trunk/NEMOGCM/ARCH/arch-PW7_MONSOON.fcm (modified) * trunk/NEMOGCM/ARCH/arch-X64_ADA.fcm (modified) * trunk/NEMOGCM/ARCH/arch-X64_ADA_O0.fcm (modified) * trunk/NEMOGCM/ARCH/arch-X64_CURIE.fcm (modified) * trunk/NEMOGCM/ARCH/arch-X64_MOBILIS.fcm (modified) * trunk/NEMOGCM/ARCH/arch-X64_VAYU.fcm (modified) * trunk/NEMOGCM/ARCH/arch-X64_YELLOWSTONE.fcm (modified) * trunk/NEMOGCM/ARCH/arch-XC40_METO.fcm (modified) * trunk/NEMOGCM/ARCH/arch-XC_ARCHER.fcm (modified) * trunk/NEMOGCM/ARCH/arch-XC_ARCHER_INTEL.fcm (modified) * trunk/NEMOGCM/ARCH/arch-macport_osx.fcm (modified) * trunk/NEMOGCM/ARCH/arch-openmpi_NAVITI_MERCATOR.fcm (modified) * trunk/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/1_namelist_cfg (modified) * trunk/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/iodef.xml (modified) * trunk/NEMOGCM/CONFIG/SHARED/1_namelist_ref (copied) * trunk/NEMOGCM/CONFIG/SHARED/namelist_ref (modified) * trunk/NEMOGCM/CONFIG/cfg.txt (modified) * trunk/NEMOGCM/EXTERNAL/AGRIF (modified) * trunk/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modarrays.F (deleted) * trunk/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modarrays.F90 (copied) * trunk/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modbc.F (deleted) * trunk/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modbc.F90 (copied) * trunk/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modbcfunction.F (deleted) * trunk/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modbcfunction.F90 (copied) * trunk/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modcluster.F (deleted) * trunk/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modcluster.F90 (copied) * trunk/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modcurgridfunctions.F (deleted) * trunk/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modcurgridfunctions.F90 (copied) * trunk/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modflux.F (deleted) * trunk/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modgrids.F90 (copied) * trunk/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modinit.F (deleted) * trunk/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modinit.F90 (copied) * trunk/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modinitvars.F (deleted) * trunk/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modinitvars.F90 (copied) * trunk/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modinterp.F (deleted) * trunk/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modinterp.F90 (copied) * trunk/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modinterpbasic.F (deleted) * trunk/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modinterpbasic.F90 (copied) * trunk/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modlinktomodel.F (deleted) * trunk/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modlinktomodel.F90 (copied) * trunk/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modmask.F (deleted) * trunk/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modmask.F90 (copied) * trunk/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modmpp.F (deleted) * trunk/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modmpp.F90 (copied) * trunk/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modprocs.F90 (copied) * trunk/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modsauv.F (deleted) * trunk/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modsauv.F90 (copied) * trunk/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modseq.F90 (copied) * trunk/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modtypes.F (deleted) * trunk/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modtypes.F90 (copied) * trunk/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modupdate.F (deleted) * trunk/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modupdate.F90 (copied) * trunk/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modupdatebasic.F (deleted) * trunk/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modupdatebasic.F90 (copied) * trunk/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modutil.F (deleted) * trunk/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modutil.F90 (copied) * trunk/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modvariables.F (deleted) * trunk/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modvariables.F90 (copied) * trunk/NEMOGCM/EXTERNAL/AGRIF/LEX (copied) * trunk/NEMOGCM/EXTERNAL/AGRIF/LIB/DiversListe.c (modified) * trunk/NEMOGCM/EXTERNAL/AGRIF/LIB/Makefile (modified) * trunk/NEMOGCM/EXTERNAL/AGRIF/LIB/Makefile.lex (deleted) * trunk/NEMOGCM/EXTERNAL/AGRIF/LIB/Makefile.lex.byacc (deleted) * trunk/NEMOGCM/EXTERNAL/AGRIF/LIB/SubLoopCreation.c (modified) * trunk/NEMOGCM/EXTERNAL/AGRIF/LIB/UtilAgrif.c (modified) * trunk/NEMOGCM/EXTERNAL/AGRIF/LIB/UtilCharacter.c (modified) * trunk/NEMOGCM/EXTERNAL/AGRIF/LIB/UtilFile.c (modified) * trunk/NEMOGCM/EXTERNAL/AGRIF/LIB/UtilFortran.c (modified) * trunk/NEMOGCM/EXTERNAL/AGRIF/LIB/UtilListe.c (modified) * trunk/NEMOGCM/EXTERNAL/AGRIF/LIB/UtilNotGridDep.c (modified) * trunk/NEMOGCM/EXTERNAL/AGRIF/LIB/WorkWithAllocatelist.c (modified) * trunk/NEMOGCM/EXTERNAL/AGRIF/LIB/WorkWithParameterlist.c (modified) * trunk/NEMOGCM/EXTERNAL/AGRIF/LIB/WorkWithglobliste.c (modified) * trunk/NEMOGCM/EXTERNAL/AGRIF/LIB/WorkWithlistdatavariable.c (modified) * trunk/NEMOGCM/EXTERNAL/AGRIF/LIB/WorkWithlistmoduleinfile.c (modified) * trunk/NEMOGCM/EXTERNAL/AGRIF/LIB/WorkWithlistofcoupled.c (modified) * trunk/NEMOGCM/EXTERNAL/AGRIF/LIB/WorkWithlistofmodulebysubroutine.c (modified) * trunk/NEMOGCM/EXTERNAL/AGRIF/LIB/WorkWithlistvarindoloop.c (modified) * trunk/NEMOGCM/EXTERNAL/AGRIF/LIB/WorkWithvarofsubroutineliste.c (modified) * trunk/NEMOGCM/EXTERNAL/AGRIF/LIB/WriteInFile.c (modified) * trunk/NEMOGCM/EXTERNAL/AGRIF/LIB/Writedeclarations.c (modified) * trunk/NEMOGCM/EXTERNAL/AGRIF/LIB/convert.lex (deleted) * trunk/NEMOGCM/EXTERNAL/AGRIF/LIB/convert.y (deleted) * trunk/NEMOGCM/EXTERNAL/AGRIF/LIB/decl.h (modified) * trunk/NEMOGCM/EXTERNAL/AGRIF/LIB/dependfile.c (modified) * trunk/NEMOGCM/EXTERNAL/AGRIF/LIB/fortran.c (modified) * trunk/NEMOGCM/EXTERNAL/AGRIF/LIB/fortran.lex (deleted) * trunk/NEMOGCM/EXTERNAL/AGRIF/LIB/fortran.tab.c (deleted) * trunk/NEMOGCM/EXTERNAL/AGRIF/LIB/fortran.y (deleted) * trunk/NEMOGCM/EXTERNAL/AGRIF/LIB/fortran.yy.c (deleted) * trunk/NEMOGCM/EXTERNAL/AGRIF/LIB/main.c (modified) * trunk/NEMOGCM/EXTERNAL/AGRIF/LIB/run (modified) * trunk/NEMOGCM/EXTERNAL/AGRIF/LIB/toamr.c (modified) * trunk/NEMOGCM/NEMO/NST_SRC/agrif2model.F90 (modified) * trunk/NEMOGCM/NEMO/NST_SRC/agrif_lim2_interp.F90 (modified) * trunk/NEMOGCM/NEMO/NST_SRC/agrif_lim2_update.F90 (modified) * trunk/NEMOGCM/NEMO/NST_SRC/agrif_oce.F90 (modified) * trunk/NEMOGCM/NEMO/NST_SRC/agrif_opa_interp.F90 (modified) * trunk/NEMOGCM/NEMO/NST_SRC/agrif_opa_sponge.F90 (modified) * trunk/NEMOGCM/NEMO/NST_SRC/agrif_opa_update.F90 (modified) * trunk/NEMOGCM/NEMO/NST_SRC/agrif_top_interp.F90 (modified) * trunk/NEMOGCM/NEMO/NST_SRC/agrif_top_sponge.F90 (modified) * trunk/NEMOGCM/NEMO/NST_SRC/agrif_top_update.F90 (modified) * trunk/NEMOGCM/NEMO/NST_SRC/agrif_user.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/BDY/bdyice_lim.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/BDY/bdyini.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/DOM/domhgr.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/DYN/sshwzv.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/SBC/sbcisf.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_eiv.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/TRA/tranxt.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/TRD/trdken.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/TRD/trdmxl.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/TRD/trdpen.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/ZDF/zdf_oce.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfgls.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/ZDF/zdftke.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/step.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/step_oce.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P2Z/p2zbio.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P2Z/p2zsms.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zbio.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zche.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zflx.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zint.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zlim.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zlys.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zmeso.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zmicro.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zmort.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zopt.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zprod.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zsbc.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zsed.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zsink.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/TRP/trcnxt.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/trcnam.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/trcsms.F90 (modified) * trunk/NEMOGCM/SETTE/prepare_exe_dir.sh (modified) * trunk/NEMOGCM/TOOLS/COMPILE/Fprep_agrif.sh (modified) * trunk/NEMOGCM/TOOLS/COMPILE/bld.cfg (modified) * trunk/NEMOGCM/TOOLS/COMPILE/bld_preproagr.cfg (modified) * trunk/NEMOGCM/TOOLS/COMPILE/conv.cfg (modified) * trunk/NEMOGCM/TOOLS/NESTING/agulhas (modified) * trunk/NEMOGCM/TOOLS/NESTING/src/agrif_connect_topo.f90 (modified) * trunk/NEMOGCM/TOOLS/NESTING/src/agrif_partial_steps.f90 (modified) * trunk/NEMOGCM/TOOLS/NESTING/src/agrif_types.f90 (modified) Merge of AGRIF branch (branches/2014/dev_r4765_CNRS_agrif) onto the ...