# # ChangeLog for branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO # # Generated by Trac 1.0.1 # 2024-06-01T13:18:04+02:00 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 Mon, 07 Dec 2015 14:47:55 GMT timgraham [6011] * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/DIU/step_diu.F90 (modified) bug fix for sette testing Mon, 07 Dec 2015 13:32:39 GMT timgraham [6010] * 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/cool_skin.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/DIU/diurnal_bulk.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/DIU/step_diu.F90 (added) * 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) Tidying of DIU code Mon, 07 Dec 2015 09:59:13 GMT timgraham [6009] * 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 (modified) Fix for sstbias correction and OBS simplification merge to work together ... Sun, 06 Dec 2015 17:40:08 GMT mathiot [6008] * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/CONFIG/SHARED/namelist_ref (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OFF_SRC/domrea.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/nemogcm.F90 (modified) * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/step.F90 (modified) MetO_merge_branch: minor change to run SETTE tests 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 16:03:23 GMT timgraham [6003] * 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_sstbias.F90 (modified) Fixes from last merge 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 Thu, 03 Dec 2015 10:24:12 GMT timgraham [5990] * branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obs_oper.F90 (modified) Another bugfix Wed, 02 Dec 2015 13:59:21 GMT timgraham [5979] * 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) Bug fixes following last merge 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 Thu, 26 Nov 2015 16:07:10 GMT jchanut [5930] * trunk/NEMOGCM/ARCH/arch-openmpi_NAVITI_MERCATOR.fcm (modified) * trunk/NEMOGCM/CONFIG/AMM12/EXP00/namelist_cfg (modified) * trunk/NEMOGCM/CONFIG/AMM12/cpp_AMM12.fcm (modified) * trunk/NEMOGCM/CONFIG/C1D_PAPA/EXP00/namelist_cfg (modified) * trunk/NEMOGCM/CONFIG/GYRE/EXP00/namelist_cfg (modified) * trunk/NEMOGCM/CONFIG/GYRE/cpp_GYRE.fcm (modified) * trunk/NEMOGCM/CONFIG/GYRE_BFM/EXP00/namelist_cfg (modified) * trunk/NEMOGCM/CONFIG/GYRE_BFM/cpp_GYRE_BFM.fcm (modified) * trunk/NEMOGCM/CONFIG/GYRE_PISCES/EXP00/namelist_cfg (modified) * trunk/NEMOGCM/CONFIG/GYRE_PISCES/cpp_GYRE_PISCES.fcm (modified) * trunk/NEMOGCM/CONFIG/GYRE_XIOS/EXP00/namelist_cfg (modified) * trunk/NEMOGCM/CONFIG/GYRE_XIOS/cpp_GYRE_XIOS.fcm (modified) * trunk/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/1_namelist_cfg (modified) * trunk/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist_cfg (modified) * trunk/NEMOGCM/CONFIG/ORCA2_LIM/cpp_ORCA2_LIM.fcm (modified) * trunk/NEMOGCM/CONFIG/ORCA2_LIM3/EXP00/1_namelist_cfg (modified) * trunk/NEMOGCM/CONFIG/ORCA2_LIM3/EXP00/namelist_cfg (modified) * trunk/NEMOGCM/CONFIG/ORCA2_LIM3/cpp_ORCA2_LIM3.fcm (modified) * trunk/NEMOGCM/CONFIG/ORCA2_LIM_CFC_C14b/EXP00/1_namelist_cfg (modified) * trunk/NEMOGCM/CONFIG/ORCA2_LIM_CFC_C14b/EXP00/namelist_cfg (modified) * trunk/NEMOGCM/CONFIG/ORCA2_LIM_CFC_C14b/cpp_ORCA2_LIM_CFC_C14b.fcm (modified) * trunk/NEMOGCM/CONFIG/ORCA2_LIM_PISCES/EXP00/namelist_cfg (modified) * trunk/NEMOGCM/CONFIG/ORCA2_LIM_PISCES/cpp_ORCA2_LIM_PISCES.fcm (modified) * trunk/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist_cfg (modified) * trunk/NEMOGCM/CONFIG/ORCA2_SAS_LIM/EXP00/namelist_cfg (modified) * trunk/NEMOGCM/CONFIG/ORCA2_SAS_LIM/cpp_ORCA2_SAS_LIM.fcm (modified) * trunk/NEMOGCM/CONFIG/SHARED/field_def.xml (modified) * trunk/NEMOGCM/CONFIG/SHARED/namelist_ref (modified) * trunk/NEMOGCM/NEMO/NST_SRC/agrif_opa_interp.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_user.F90 (modified) * trunk/NEMOGCM/NEMO/OFF_SRC/dtadyn.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/ASM/asmbkg.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/BDY/bdydta.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/BDY/bdydyn.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/BDY/bdydyn2d.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/BDY/bdytides.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/BDY/bdyvol.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/C1D/dynnxt_c1d.F90 (deleted) * trunk/NEMOGCM/NEMO/OPA_SRC/C1D/step_c1d.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/DIA/diaharm.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/DOM/dom_oce.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/DOM/istate.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynnxt.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_exp.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_flt.F90 (deleted) * trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_oce.F90 (deleted) * trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynvor.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynzdf_exp.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynzdf_imp.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/DYN/sshwzv.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/SBC/sbcapr.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/SBC/sbctide.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/SBC/tideini.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/SOL (deleted) * trunk/NEMOGCM/NEMO/OPA_SRC/TRA/traadv.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_fct.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_mus.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_qck.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_ubs.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/TRA/tranxt.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/TRA/trazdf.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/TRD/trd_oce.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/TRD/trddyn.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/TRD/trdken.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/oce.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/step.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/step_oce.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/stpctl.F90 (modified) * trunk/NEMOGCM/NEMO/SAS_SRC/diawri.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/trcsub.F90 (modified) * trunk/NEMOGCM/SETTE/sette.sh (modified) * trunk/NEMOGCM/fcm-make/inc/keys-amm12.cfg (modified) * trunk/NEMOGCM/fcm-make/inc/keys-gyre.cfg (modified) * trunk/NEMOGCM/fcm-make/inc/keys-gyre_pisces.cfg (modified) * trunk/NEMOGCM/fcm-make/inc/keys-orca2_lim.cfg (modified) * trunk/NEMOGCM/fcm-make/inc/keys-orca2_lim3.cfg (modified) * trunk/NEMOGCM/fcm-make/inc/keys-orca2_lim_cfc.cfg (modified) * trunk/NEMOGCM/fcm-make/inc/keys-orca2_lim_pisces.cfg (modified) * trunk/NEMOGCM/fcm-make/inc/keys-orca2_sas_lim.cfg (modified) #1620 Merge free surface simplification into trunk