# # ChangeLog for / # # Generated by Trac 1.0.1 # 2024-04-27T19:40:17+02:00 Mon, 30 Apr 2018 14:38:28 GMT jchanut [9529] * branches/2018/dev_r8864_nemo_v3_6_ZTILDE/NEMOGCM/CONFIG/SHARED/field_def.xml (modified) * branches/2018/dev_r8864_nemo_v3_6_ZTILDE/NEMOGCM/CONFIG/cfg.txt (modified) * branches/2018/dev_r8864_nemo_v3_6_ZTILDE/NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90 (modified) * branches/2018/dev_r8864_nemo_v3_6_ZTILDE/NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90 (modified) * branches/2018/dev_r8864_nemo_v3_6_ZTILDE/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90 (modified) * branches/2018/dev_r8864_nemo_v3_6_ZTILDE/NEMOGCM/NEMO/OPA_SRC/DYN/sshwzv.F90 (modified) * branches/2018/dev_r8864_nemo_v3_6_ZTILDE/NEMOGCM/NEMO/OPA_SRC/step.F90 (modified) ztilde stability update Mon, 30 Apr 2018 13:39:18 GMT gm [9528] * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/GYRE_BFM/EXP00/namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/GYRE_PISCES/EXP00/namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/SHARED/namelist_ref (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynvor.F90 (modified) dev_merge_2017: add to new vorticity scheme (EET= EEN using e3t instead ... Mon, 30 Apr 2018 11:10:53 GMT gm [9527] * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AGRIF_NORDIC/EXP00/1_namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AGRIF_NORDIC/EXP00/2_namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AGRIF_NORDIC/EXP00/namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AMM12/EXP00/namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/C1D_PAPA/EXP00/namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/GYRE_BFM/EXP00/namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/GYRE_PISCES/EXP00/namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_LIM3_PISCES/EXP00/namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_OFF_TRC/EXP00/namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_SAS_LIM3/EXP00/namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/SHARED/namelist_ref (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/CANAL/EXP00/namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/ISOMIP/EXP00/namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT2_flux_cen2_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT2_flux_ubs_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT2_vect_eenH_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT2_vect_een_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT2_vect_ene_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT2_vect_ens_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT4_flux_cen2_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT4_flux_ubs_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT4_vect_eenH_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT4_vect_een_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT4_vect_ene_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT4_vect_ens_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/OVERFLOW/EXP00/namelist_sco_FCT2_flux_cen-ahm1000_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/OVERFLOW/EXP00/namelist_sco_FCT2_flux_ubs_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/OVERFLOW/EXP00/namelist_sco_FCT4_flux_cen-ahm1000_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/OVERFLOW/EXP00/namelist_sco_FCT4_flux_ubs_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/OVERFLOW/EXP00/namelist_zps_FCT2_flux_ubs_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/OVERFLOW/EXP00/namelist_zps_FCT4_flux_ubs_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/OVERFLOW/EXP00/namelist_zps_FCT4_vect_een_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/SAS_BIPER/EXP00/1_namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/SAS_BIPER/EXP00/namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/VORTEX/EXP00/1_namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/VORTEX/EXP00/namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/WAD/EXP00/namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90 (modified) dev_merge_2017: NO selection for lateral momentum boundary condition Mon, 30 Apr 2018 10:22:35 GMT gm [9526] * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AGRIF_NORDIC/EXP00/1_namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AGRIF_NORDIC/EXP00/2_namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AGRIF_NORDIC/EXP00/namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AMM12/EXP00/namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/C1D_PAPA/EXP00/domain_def.xml (deleted) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/C1D_PAPA/EXP00/domain_def_nemo.xml (added) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/C1D_PAPA/EXP00/field_def.xml (deleted) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/C1D_PAPA/EXP00/field_def_nemo-opa.xml (added) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/C1D_PAPA/EXP00/namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/GYRE_BFM/EXP00/namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/GYRE_PISCES/EXP00/namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_LIM3_PISCES/EXP00/1_context_nemo.xml (deleted) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_LIM3_PISCES/EXP00/1_namelist_cfg (deleted) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_LIM3_PISCES/EXP00/1_namelist_ice_cfg (deleted) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_LIM3_PISCES/EXP00/1_namelist_ice_ref (deleted) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_LIM3_PISCES/EXP00/1_namelist_ref (deleted) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_LIM3_PISCES/EXP00/AGRIF_FixedGrids.in (deleted) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_LIM3_PISCES/EXP00/iodef.xml (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_LIM3_PISCES/EXP00/namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_OFF_TRC/EXP00/namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_SAS_LIM3/EXP00/namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/SHARED/field_def_nemo-opa.xml (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/SHARED/namelist_ref (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/SHARED/namelist_top_ref (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/CANAL/EXP00/field_def_nemo-opa.xml (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/CANAL/EXP00/namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/ISOMIP/EXP00/namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT2_flux_cen2_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT2_flux_ubs_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT2_vect_eenH_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT2_vect_een_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT2_vect_ene_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT2_vect_ens_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT4_flux_cen2_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT4_flux_ubs_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT4_vect_eenH_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT4_vect_een_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT4_vect_ene_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT4_vect_ens_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/OVERFLOW/EXP00/namelist_sco_FCT2_flux_cen-ahm1000_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/OVERFLOW/EXP00/namelist_sco_FCT2_flux_ubs_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/OVERFLOW/EXP00/namelist_sco_FCT4_flux_cen-ahm1000_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/OVERFLOW/EXP00/namelist_sco_FCT4_flux_ubs_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/OVERFLOW/EXP00/namelist_zps_FCT2_flux_ubs_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/OVERFLOW/EXP00/namelist_zps_FCT4_flux_ubs_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/OVERFLOW/EXP00/namelist_zps_FCT4_vect_een_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/SAS_BIPER/EXP00/1_namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/SAS_BIPER/EXP00/namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/VORTEX/EXP00/1_namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/VORTEX/EXP00/namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/WAD/EXP00/namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/cfg.txt (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynadv.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/LDF/ldfdyn.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/LDF/ldftra.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/traadv.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfdrg.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/TRP/trcadv.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/TRP/trcldf.F90 (modified) dev_merge_2017: rename ln_...NONE as ln_...OFF (CONFIG, OPA_SRC, ... Sun, 29 Apr 2018 21:05:24 GMT clem [9525] * branches/2017/dev_merge_2017/NEMOGCM/SETTE/sette.sh (modified) * branches/2017/dev_merge_2017/NEMOGCM/SETTE/sette_rpt.sh (modified) change sette so that GYRE configuration runs and report is readable Fri, 27 Apr 2018 17:41:24 GMT clem [9524] * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/SAS_BIPER/EXP00/1_namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/SAS_BIPER/EXP00/namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/SETTE/sette_test-cases.sh (modified) correct sas_biper namelists Fri, 27 Apr 2018 17:39:31 GMT mathiot [9523] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/OBS/mpp_map.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/OBS/obs_grid.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/OBS/obs_inter_sup.F90 (modified) fix to OBS to deal with a change in the halo at the wrap points (Dan ... Fri, 27 Apr 2018 16:52:28 GMT clem [9522] * branches/2017/dev_merge_2017/NEMOGCM/SETTE/input_EMPTY.cfg (added) * branches/2017/dev_merge_2017/NEMOGCM/SETTE/sette_test-cases.sh (modified) debug test cases Fri, 27 Apr 2018 16:46:25 GMT clem [9521] * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT2_flux_cen2_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT2_flux_ubs_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT2_vect_eenH_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT2_vect_een_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT2_vect_ene_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT2_vect_ens_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT4_flux_cen2_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT4_flux_ubs_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT4_vect_eenH_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT4_vect_een_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT4_vect_ene_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT4_vect_ens_cfg (modified) correct lock_exchange namelists Fri, 27 Apr 2018 16:43:57 GMT clem [9520] * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/OVERFLOW/EXP00/namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/OVERFLOW/EXP00/namelist_sco_FCT2_flux_cen-ahm1000_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/OVERFLOW/EXP00/namelist_sco_FCT2_flux_ubs_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/OVERFLOW/EXP00/namelist_zps_FCT2_flux_ubs_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/OVERFLOW/EXP00/namelist_zps_FCT4_flux_ubs_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/OVERFLOW/EXP00/namelist_zps_FCT4_vect_een_cfg (modified) correct overflow namelists Fri, 27 Apr 2018 16:41:08 GMT clem [9519] * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/VORTEX/EXP00/1_namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/VORTEX/EXP00/namelist_cfg (modified) correct vortex namelists Fri, 27 Apr 2018 15:59:40 GMT clem [9518] * branches/2017/dev_merge_2017/NEMOGCM/SETTE/sette.sh (modified) * branches/2017/dev_merge_2017/NEMOGCM/SETTE/sette_rpt.sh (modified) * branches/2017/dev_merge_2017/NEMOGCM/SETTE/sette_test-cases.sh (modified) update sette tests so that all configurations are tested and the report ... Fri, 27 Apr 2018 15:11:03 GMT clem [9517] * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AMM12/EXP00/namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/SAS_BIPER/MY_SRC/usrdef_sbc.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/VORTEX/EXP00/iodef.xml (modified) small corrections to make SETTE work Fri, 27 Apr 2018 14:46:20 GMT gm [9516] * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AGRIF_NORDIC/EXP00/namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AMM12/EXP00/namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/GYRE_BFM/EXP00/namelist_top_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/GYRE_PISCES/EXP00/namelist_top_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_LIM3_PISCES/EXP00/namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_LIM3_PISCES/EXP00/namelist_top_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist_top_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_OFF_TRC/EXP00/namelist_top_cfg (modified) #2075 - dev_merge_2017: CONFIG:correct the namelist_top_cfg + activate ... Fri, 27 Apr 2018 12:56:20 GMT dancopsey [9515] * branches/UKMO/dev_r5518_new_runoff_coupling/NEMOGCM/NEMO/OPA_SRC/SBC/cpl_rnf_1d.F90 (modified) Do not use halos in area calculations. Fri, 27 Apr 2018 12:49:26 GMT clem [9514] * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AGRIF_NORDIC/EXP00/1_namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AGRIF_NORDIC/EXP00/2_namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AGRIF_NORDIC/EXP00/namelist_cfg (modified) fix namelists one more time for agrif Fri, 27 Apr 2018 12:30:02 GMT mathiot [9513] * branches/UKMO/dev_isf_remapping_UKESM_GO6package_r9314/NEMOGCM/CONFIG/SHARED/namelist_ref (modified) * branches/UKMO/dev_isf_remapping_UKESM_GO6package_r9314/NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90 (modified) * branches/UKMO/dev_isf_remapping_UKESM_GO6package_r9314/NEMOGCM/NEMO/OPA_SRC/DOM/domngb.F90 (modified) * branches/UKMO/dev_isf_remapping_UKESM_GO6package_r9314/NEMOGCM/NEMO/OPA_SRC/DOM/domutl.F90 (added) * branches/UKMO/dev_isf_remapping_UKESM_GO6package_r9314/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90 (modified) Add option to detect and remove subglacial lake (do not affect closed ... Fri, 27 Apr 2018 11:06:25 GMT frrh [9512] * branches/UKMO/dev_r5518_fix_diag_bitcomp/NEMOGCM/NEMO/OPA_SRC/DIA/diaptr.F90 (modified) * branches/UKMO/dev_r5518_fix_diag_bitcomp/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_eiv.F90 (modified) Correct lbc_lnk call and fix initialisation bugs in diaptr. Fri, 27 Apr 2018 10:04:46 GMT clem [9511] * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AGRIF_NORDIC/EXP00/1_namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AGRIF_NORDIC/EXP00/2_namelist_cfg (modified) fix namelists of agrif_nordic Fri, 27 Apr 2018 09:55:57 GMT clem [9510] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/SAS_SRC/step.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/SAS_SRC/stpctl.F90 (modified) fix restartability with SAS module ==> SAS_BIPER is now restartable Fri, 27 Apr 2018 09:21:19 GMT clem [9509] * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/SAS_BIPER/EXP00/iodef.xml (modified) * branches/2017/dev_merge_2017/NEMOGCM/SETTE/input_SASBIPER.cfg (added) * branches/2017/dev_merge_2017/NEMOGCM/SETTE/sette_test-cases.sh (modified) SASBIPER test case formally introduced in sette tests (for now ... Fri, 27 Apr 2018 09:08:25 GMT clem [9508] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/LBC/mppini.F90 (modified) add forgotten key_agrif Fri, 27 Apr 2018 08:11:28 GMT clem [9507] * branches/2017/dev_merge_2017/NEMOGCM/SETTE/sette.sh (modified) add comments in SETTE for running AGRIF_NORDIC Thu, 26 Apr 2018 14:54:23 GMT clem [9506] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 (modified) for some mpp decomposition (typically 8x4) agrif failed at running ... Thu, 26 Apr 2018 10:24:30 GMT clem [9505] * branches/2017/dev_merge_2017/NEMOGCM/SETTE/prepare_exe_dir.sh (modified) make sure to use the right iodef.xml and not the one defined in agrif Wed, 25 Apr 2018 15:41:23 GMT acc [9504] * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_LIM3_PISCES/EXP00/namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/SHARED/namelist_ref (modified) Branch 2017/dev_merge_2017. Cosmetic changes to namelists to restore ... Wed, 25 Apr 2018 14:27:03 GMT davestorkey [9503] * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/SBC/sbc_ice.F90 (modified) Add in missing updates to sbc_ice.F90. Wed, 25 Apr 2018 08:24:20 GMT frrh [9502] * branches/UKMO/dev_r5518_fix_diag_bitcomp/NEMOGCM/NEMO/OPA_SRC/DIA/diaprod.F90 (modified) * branches/UKMO/dev_r5518_fix_diag_bitcomp/NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90 (modified) * branches/UKMO/dev_r5518_fix_diag_bitcomp/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_eiv.F90 (modified) * branches/UKMO/dev_r5518_fix_diag_bitcomp/NEMOGCM/NEMO/TOP_SRC/IDTRA/trcsms_idtra.F90 (modified) * branches/UKMO/dev_r5518_fix_diag_bitcomp/NEMOGCM/NEMO/TOP_SRC/MEDUSA/bio_medusa_diag_slice.F90 (modified) * branches/UKMO/dev_r5518_fix_diag_bitcomp/NEMOGCM/NEMO/TOP_SRC/MEDUSA/bio_medusa_fin.F90 (modified) * branches/UKMO/dev_r5518_fix_diag_bitcomp/NEMOGCM/NEMO/TOP_SRC/TRP/trdtrc.F90 (modified) Ensure numerous diagnostics are bit comparable ond different PE ... Wed, 25 Apr 2018 08:18:44 GMT frrh [9501] * branches/UKMO/dev_r5518_fix_diag_bitcomp (copied) Ensure ALL diagnostics are bit comparable on different PE ... Mon, 23 Apr 2018 14:40:35 GMT davestorkey [9500] * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/LBC/mppini.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/SBC/sbc_ice.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_cice.F90 (modified) branches/UKMO/dev_merge_2017_CICE_interface : recommit science changes. Mon, 23 Apr 2018 14:39:54 GMT davestorkey [9499] * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/ARCH/OLD/CNRS/arch-BG_BABEL.fcm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/ARCH/OLD/CNRS/arch-IA64_PLATINE.fcm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/ARCH/OLD/CNRS/arch-PW6MONO_VARGAS.fcm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/ARCH/OLD/CNRS/arch-PW6_VARGAS.fcm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/ARCH/OLD/CNRS/arch-SX8_BRODIE.fcm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/ARCH/OLD/CNRS/arch-SX8_MERCURE.fcm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/ARCH/OLD/CNRS/arch-SX9_MERCURE.fcm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/ARCH/OLD/CNRS/arch-TX7_ULAM.fcm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/ARCH/OLD/CNRS/arch-X64_TITANE.fcm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/ARCH/OLD/CNRS/arch-X86_CESIUM.fcm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/ARCH/OLD/NOC/arch-ALTIX_NAUTILUS.fcm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/ARCH/OLD/arch-g95_linux.fcm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/ARCH/OLD/arch-g95_osx.fcm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/ARCH/OLD/arch-gfortran_linux.fcm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/ARCH/OLD/arch-gfortran_osx.fcm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/ARCH/OLD/arch-ifort_linux.fcm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/ARCH/OLD/arch-ifort_linux_omp.fcm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/ARCH/OLD/arch-ifort_osx.fcm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/ARCH/OLD/arch-lahey_linux.fcm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/ARCH/OLD/arch-mpxlf_aix.fcm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/ARCH/OLD/arch-nag_linux.fcm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/ARCH/OLD/arch-pathscale_linux.fcm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/ARCH/OLD/arch-pgf90_linux.fcm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/ARCH/OLD/arch-xlf_osx.fcm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/ARCH/arch-ALTIX_NAUTILUS_MPT.fcm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/AA_job (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/iodef.xml (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/cpp_ORCA2_OFF_PISCES.fcm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/CONFIG/SHARED/namelist_ref (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/CONFIG/TEST_CASES/CANAL/MY_SRC/diawri.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/CONFIG/TEST_CASES/CANAL/MY_SRC/domvvl.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/CONFIG/TEST_CASES/CANAL/MY_SRC/stpctl.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/CONFIG/TEST_CASES/CANAL/MY_SRC/trazdf.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/CONFIG/TEST_CASES/CANAL/MY_SRC/usrdef_hgr.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/CONFIG/TEST_CASES/CANAL/MY_SRC/usrdef_istate.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/CONFIG/TEST_CASES/CANAL/MY_SRC/usrdef_nam.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/CONFIG/TEST_CASES/ISOMIP/MY_SRC/usrdef_hgr.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/CONFIG/TEST_CASES/ISOMIP/MY_SRC/usrdef_istate.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/CONFIG/TEST_CASES/ISOMIP/MY_SRC/usrdef_nam.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/MY_SRC/usrdef_hgr.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/MY_SRC/usrdef_istate.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/MY_SRC/usrdef_nam.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/CONFIG/TEST_CASES/OVERFLOW/MY_SRC/usrdef_hgr.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/CONFIG/TEST_CASES/OVERFLOW/MY_SRC/usrdef_istate.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/CONFIG/TEST_CASES/OVERFLOW/MY_SRC/usrdef_nam.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/CONFIG/TEST_CASES/SAS_BIPER/MY_SRC/par_oce.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/CONFIG/TEST_CASES/SAS_BIPER/MY_SRC/usrdef_hgr.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/CONFIG/TEST_CASES/SAS_BIPER/MY_SRC/usrdef_nam.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/CONFIG/TEST_CASES/VORTEX/MY_SRC/domvvl.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/CONFIG/TEST_CASES/VORTEX/MY_SRC/usrdef_hgr.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/CONFIG/TEST_CASES/VORTEX/MY_SRC/usrdef_istate.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/CONFIG/TEST_CASES/VORTEX/MY_SRC/usrdef_nam.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/CONFIG/TEST_CASES/WAD/MY_SRC/bdyini.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/CONFIG/TEST_CASES/WAD/MY_SRC/domain.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/CONFIG/TEST_CASES/WAD/MY_SRC/usrdef_hgr.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/CONFIG/TEST_CASES/WAD/MY_SRC/usrdef_istate.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/CONFIG/TEST_CASES/WAD/MY_SRC/usrdef_nam.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/CONFIG/cfg.txt (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/CONFIG/makenemo (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modarrays.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modbc.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modbcfunction.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modcluster.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modcurgridfunctions.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modgrids.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modinit.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modinitvars.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modinterp.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modinterpbasic.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modlinktomodel.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modmask.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modmpp.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modprocs.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modsauv.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modseq.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modtypes.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modupdate.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modupdatebasic.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modutil.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modvariables.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/AGRIF/LIB/DiversListe.c (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/AGRIF/LIB/Makefile (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/AGRIF/LIB/SubLoopCreation.c (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/AGRIF/LIB/UtilAgrif.c (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/AGRIF/LIB/UtilCharacter.c (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/AGRIF/LIB/UtilFile.c (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/AGRIF/LIB/UtilFortran.c (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/AGRIF/LIB/UtilListe.c (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/AGRIF/LIB/UtilNotGridDep.c (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/AGRIF/LIB/WorkWithAllocatelist.c (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/AGRIF/LIB/WorkWithParameterlist.c (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/AGRIF/LIB/WorkWithglobliste.c (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/AGRIF/LIB/WorkWithlistdatavariable.c (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/AGRIF/LIB/WorkWithlistmoduleinfile.c (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/AGRIF/LIB/WorkWithlistofcoupled.c (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/AGRIF/LIB/WorkWithlistofmodulebysubroutine.c (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/AGRIF/LIB/WorkWithlistvarindoloop.c (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/AGRIF/LIB/WorkWithvarofsubroutineliste.c (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/AGRIF/LIB/WriteInFile.c (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/AGRIF/LIB/Writedeclarations.c (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/AGRIF/LIB/decl.h (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/AGRIF/LIB/dependfile.c (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/AGRIF/LIB/fortran.c (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/AGRIF/LIB/main.c (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/AGRIF/LIB/run (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/AGRIF/LIB/toamr.c (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/AGRIF/agrif_opa.in (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/IOIPSL/IOIPSL_License_CeCILL.txt (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/IOIPSL/src/calendar.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/IOIPSL/src/defprec.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/IOIPSL/src/errioipsl.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/IOIPSL/src/flincom.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/IOIPSL/src/fliocom.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/IOIPSL/src/getincom.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/IOIPSL/src/histcom.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/IOIPSL/src/ioipsl.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/IOIPSL/src/mathelp.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/IOIPSL/src/restcom.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/IOIPSL/src/stringop.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/IOIPSL/tools/Fparser.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/IOIPSL/tools/flio_rbld.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/IOIPSL/tools/ncregular.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/IOIPSL/tools/ncunderflow.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/IOIPSL/tools/rebuild (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/IOIPSL/tools/tkcond.c (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/IOIPSL/tools/tkgen.c (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/IOIPSL/tools/tkparse.c (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/IOIPSL/tools/tkparse.h (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/COPYRIGHT.txt (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/LICENSE.html (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/README (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/bin/fcm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/bin/fcm_graphic_diff (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/bin/fcm_graphic_merge (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/bin/fcm_gui (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/bin/fcm_internal (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/bin/fcm_setup_konqueror (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/bin/fcm_update_version_dir.pl (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/etc/fcm.cfg.eg (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/etc/fcm_gui.desktop (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/lib/Fcm/Base.pm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/lib/Fcm/Build.pm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/lib/Fcm/Build/Fortran.pm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/lib/Fcm/BuildSrc.pm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/lib/Fcm/BuildTask.pm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/lib/Fcm/CLI.pm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/lib/Fcm/CLI/Config.pm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/lib/Fcm/CLI/Config/Default.pm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/lib/Fcm/CLI/Exception.pm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/lib/Fcm/CLI/Invoker.pm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/lib/Fcm/CLI/Invoker/Browser.pm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/lib/Fcm/CLI/Invoker/CM.pm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/lib/Fcm/CLI/Invoker/CfgPrinter.pm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/lib/Fcm/CLI/Invoker/ConfigSystem.pm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/lib/Fcm/CLI/Invoker/ExtractConfigComparator.pm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/lib/Fcm/CLI/Invoker/GUI.pm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/lib/Fcm/CLI/Invoker/Help.pm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/lib/Fcm/CLI/Invoker/KeywordPrinter.pm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/lib/Fcm/CLI/Option.pm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/lib/Fcm/CLI/Subcommand.pm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/lib/Fcm/CLI/fcm-add.pod (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/lib/Fcm/CLI/fcm-branch.pod (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/lib/Fcm/CLI/fcm-commit.pod (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/lib/Fcm/CLI/fcm-conflicts.pod (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/lib/Fcm/CLI/fcm-delete.pod (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/lib/Fcm/CLI/fcm-diff.pod (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/lib/Fcm/CLI/fcm-merge.pod (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/lib/Fcm/CLI/fcm-mkpatch.pod (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/lib/Fcm/CLI/fcm-switch.pod (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/lib/Fcm/CLI/fcm-update.pod (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/lib/Fcm/CfgFile.pm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/lib/Fcm/CfgLine.pm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/lib/Fcm/Cm.pm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/lib/Fcm/CmBranch.pm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/lib/Fcm/CmCommitMessage.pm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/lib/Fcm/CmUrl.pm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/lib/Fcm/Config.pm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/lib/Fcm/ConfigSystem.pm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/lib/Fcm/Dest.pm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/lib/Fcm/Exception.pm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/lib/Fcm/Extract.pm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/lib/Fcm/ExtractConfigComparator.pm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/lib/Fcm/ExtractFile.pm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/lib/Fcm/ExtractSrc.pm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/lib/Fcm/Interactive.pm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/lib/Fcm/Interactive/InputGetter.pm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/lib/Fcm/Interactive/InputGetter/CLI.pm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/lib/Fcm/Interactive/InputGetter/GUI.pm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/lib/Fcm/Keyword.pm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/lib/Fcm/Keyword/Config.pm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/lib/Fcm/Keyword/Entries.pm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/lib/Fcm/Keyword/Entry.pm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/lib/Fcm/Keyword/Entry/Location.pm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/lib/Fcm/Keyword/Exception.pm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/lib/Fcm/Keyword/Formatter/Entries.pm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/lib/Fcm/Keyword/Formatter/Entry.pm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/lib/Fcm/Keyword/Formatter/Entry/Location.pm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/lib/Fcm/Keyword/Loader.pod (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/lib/Fcm/Keyword/Loader/Config/Location.pm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/lib/Fcm/Keyword/Loader/Config/Revision.pm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/lib/Fcm/Keyword/Loader/VC/Revision.pm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/lib/Fcm/ReposBranch.pm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/lib/Fcm/SrcDirLayer.pm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/lib/Fcm/Timer.pm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/lib/Fcm/Util.pm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/lib/Fcm/Util/ClassLoader.pm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/man/man1/fcm.1 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/t/Fcm/Build/Fortran-extract-interface-result.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/t/Fcm/Build/Fortran-extract-interface-source.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/t/Fcm/Build/Fortran.t (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/t/Fcm/CLI.t (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/t/Fcm/CLI/Config.t (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/t/Fcm/CLI/Config/Default.t (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/t/Fcm/CLI/Exception.t (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/t/Fcm/CLI/Invoker.t (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/t/Fcm/CLI/Invoker/Browser.t (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/t/Fcm/CLI/Invoker/CM.t (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/t/Fcm/CLI/Invoker/CfgPrinter.t (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/t/Fcm/CLI/Invoker/ConfigSystem.t (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/t/Fcm/CLI/Invoker/ExtractConfigComparator.t (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/t/Fcm/CLI/Invoker/GUI.t (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/t/Fcm/CLI/Invoker/Help.t (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/t/Fcm/CLI/Invoker/KeywordPrinter.t (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/t/Fcm/CLI/Option.t (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/t/Fcm/CLI/Subcommand.t (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/t/Fcm/ConfigSystem.t (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/t/Fcm/Exception.t (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/t/Fcm/ExtractConfigComparator.t (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/t/Fcm/Interactive.t (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/t/Fcm/Interactive/InputGetter.t (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/t/Fcm/Interactive/InputGetter/CLI.pm (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/t/Fcm/Interactive/InputGetter/GUI.t (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/t/Fcm/Keyword.t (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/t/Fcm/Keyword/Config.t (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/t/Fcm/Keyword/Entries.t (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/t/Fcm/Keyword/Entry.t (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/t/Fcm/Keyword/Entry/Location.t (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/t/Fcm/Keyword/Exception.t (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/t/Fcm/Keyword/Formatter/Entries.t (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/t/Fcm/Keyword/Formatter/Entry.t (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/t/Fcm/Keyword/Formatter/Entry/Location.t (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/t/Fcm/Keyword/Loader/Config/Location.t (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/t/Fcm/Keyword/Loader/Config/Revision.t (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/t/Fcm/Keyword/Loader/VC/Revision.dump (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/t/Fcm/Keyword/Loader/VC/Revision.t (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/t/Fcm/Util.t (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/fcm/t/Fcm/Util/ClassLoader.t (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/svn_tools/svn_load_dirs.pl (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/EXTERNAL/svn_tools/update_vendor.sh (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/License_CeCILL.txt (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/LIM_SRC_3/ice.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/LIM_SRC_3/ice1d.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/LIM_SRC_3/icealb.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/LIM_SRC_3/icecor.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/LIM_SRC_3/icectl.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/LIM_SRC_3/icedia.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/LIM_SRC_3/icedyn.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/LIM_SRC_3/icedyn_adv.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/LIM_SRC_3/icedyn_adv_pra.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/LIM_SRC_3/icedyn_adv_umx.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/LIM_SRC_3/icedyn_rdgrft.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/LIM_SRC_3/icedyn_rhg.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/LIM_SRC_3/icedyn_rhg_evp.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/LIM_SRC_3/iceforcing.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/LIM_SRC_3/iceistate.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/LIM_SRC_3/iceitd.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/LIM_SRC_3/icerst.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/LIM_SRC_3/icestp.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/LIM_SRC_3/icetab.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/LIM_SRC_3/icethd.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/LIM_SRC_3/icethd_da.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/LIM_SRC_3/icethd_dh.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/LIM_SRC_3/icethd_do.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/LIM_SRC_3/icethd_ent.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/LIM_SRC_3/icethd_pnd.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/LIM_SRC_3/icethd_sal.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/LIM_SRC_3/icethd_zdf.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/LIM_SRC_3/icethd_zdf_bl99.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/LIM_SRC_3/iceupdate.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/LIM_SRC_3/icevar.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/LIM_SRC_3/icewri.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/NST_SRC/agrif2model.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/NST_SRC/agrif_ice.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/NST_SRC/agrif_lim3_interp.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/NST_SRC/agrif_lim3_update.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/NST_SRC/agrif_oce.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/NST_SRC/agrif_opa_interp.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/NST_SRC/agrif_opa_sponge.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/NST_SRC/agrif_opa_update.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/NST_SRC/agrif_top_interp.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/NST_SRC/agrif_top_sponge.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/NST_SRC/agrif_top_update.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/NST_SRC/agrif_user.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OFF_SRC/dtadyn.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OFF_SRC/nemogcm.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/ASM/asmbkg.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/ASM/asmpar.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/BDY/bdy_oce.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/BDY/bdydta.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/BDY/bdydyn.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/BDY/bdydyn2d.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/BDY/bdydyn3d.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/BDY/bdyice.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/BDY/bdyini.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/BDY/bdylib.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/BDY/bdytides.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/BDY/bdytra.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/BDY/bdyvol.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/C1D/c1d.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/C1D/domc1d.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/C1D/dtauvd.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/C1D/dyncor_c1d.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/C1D/dyndmp.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/C1D/step_c1d.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/CRS/crs.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/CRS/crsdom.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/CRS/crsdomwri.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/CRS/crsfld.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/CRS/crsini.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/CRS/crslbclnk.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/DIA/dia25h.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/DIA/diaar5.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/DIA/diacfl.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/DIA/diadct.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/DIA/diaharm.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/DIA/diahsb.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/DIA/diahth.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/DIA/dianam.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/DIA/diaptr.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/DIA/diatmb.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/DIU/cool_skin.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/DIU/step_diu.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/DOM/closea.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/DOM/daymod.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/DOM/dom_oce.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/DOM/domain.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/DOM/domhgr.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/DOM/domngb.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/DOM/domwri.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/DOM/dtatsd.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/DOM/iscplhsb.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/DOM/iscplini.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/DOM/iscplrst.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/DOM/istate.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/DOM/phycst.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/DYN/divhor.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/DYN/dynadv.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/DYN/dynadv_cen2.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/DYN/dynadv_ubs.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/DYN/dynkeg.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/DYN/dynldf.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/DYN/dynldf_iso.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/DYN/dynldf_lap_blp.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/DYN/dynnxt.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_exp.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/DYN/dynvor.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/DYN/dynzad.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/DYN/dynzdf.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/DYN/sshwzv.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/FLO/flo4rk.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/FLO/flo_oce.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/FLO/floats.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/FLO/floblk.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/FLO/flodom.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/FLO/florst.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/FLO/flowri.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/ICB/icb_oce.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/ICB/icbclv.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/ICB/icbdia.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/ICB/icbdyn.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/ICB/icbini.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/ICB/icblbc.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/ICB/icbrst.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/ICB/icbstp.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/ICB/icbthm.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/ICB/icbtrj.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/ICB/icbutl.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/IOM/in_out_manager.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/IOM/iom_def.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/IOM/iom_nf90.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/IOM/prtctl.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/IOM/restart.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/LBC/lbclnk.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/LBC/lbcnfd.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/LBC/mppini.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/LDF/ldfc1d_c2d.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/LDF/ldfdyn.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/LDF/ldfslp.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/LDF/ldftra.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/OBS/ddatetoymdhms.h90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/OBS/find_obs_proc.h90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/OBS/greg2jul.h90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/OBS/grt_cir_dis.h90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/OBS/grt_cir_dis_saa.h90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/OBS/jul2greg.h90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/OBS/julian.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/OBS/linquad.h90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/OBS/maxdist.h90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/OBS/mpp_map.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/OBS/obs_averg_h2d.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/OBS/obs_const.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/OBS/obs_conv.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/OBS/obs_conv_functions.h90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/OBS/obs_fbm.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/OBS/obs_grid.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/OBS/obs_inter_h2d.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/OBS/obs_inter_sup.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/OBS/obs_inter_z1d.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/OBS/obs_level_search.h90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/OBS/obs_mpp.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/OBS/obs_oper.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/OBS/obs_prep.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/OBS/obs_profiles.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/OBS/obs_profiles_def.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_altbias.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_prof.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_surf.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/OBS/obs_readmdt.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/OBS/obs_rot_vel.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/OBS/obs_sort.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/OBS/obs_sstbias.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/OBS/obs_surf_def.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/OBS/obs_types.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/OBS/obs_utils.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/OBS/obs_write.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/OBS/obsinter_h2d.h90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/OBS/obsinter_z1d.h90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/OBS/str_c_to_for.h90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/SBC/cpl_oasis3.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/SBC/cyclone.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/SBC/fldread.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/SBC/geo2ocean.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/SBC/ocealb.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/SBC/sbc_ice.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/SBC/sbc_oce.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/SBC/sbcapr.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/SBC/sbcdcy.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/SBC/sbcflx.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/SBC/sbcfwb.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_cice.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_if.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/SBC/sbcisf.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/SBC/sbcrnf.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/SBC/sbcssm.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/SBC/sbcssr.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/SBC/sbctide.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/SBC/sbcwave.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/SBC/tide_mod.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/SBC/tideini.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/SBC/updtide.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/STO/stopar.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/STO/stopts.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/STO/storng.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/TRA/eosbn2.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/TRA/traadv.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_cen.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_fct.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_mle.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_mus.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_qck.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_ubs.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/TRA/trabbc.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/TRA/trabbl.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/TRA/tradmp.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/TRA/traldf.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_iso.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_lap_blp.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_triad.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/TRA/tranpc.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/TRA/tranxt.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/TRA/traqsr.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/TRA/trasbc.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/TRA/trazdf.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/TRA/zpshde.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/TRD/trd_oce.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/TRD/trddyn.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/TRD/trdglo.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/TRD/trdini.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/TRD/trdken.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/TRD/trdmxl.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/TRD/trdmxl_oce.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/TRD/trdmxl_rst.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/TRD/trdpen.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/TRD/trdtra.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/TRD/trdtrc.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/TRD/trdvor.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/TRD/trdvor_oce.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/USR/usrdef_fmask.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/USR/usrdef_hgr.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/USR/usrdef_istate.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/USR/usrdef_nam.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/USR/usrdef_sbc.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/USR/usrdef_zgr.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/ZDF/zdf_oce.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfddm.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfdrg.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfevd.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfgls.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfiwm.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfmxl.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfphy.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfric.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfsh2.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfswm.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/ZDF/zdftke.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/lib_cray.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/lib_fortran.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/module_example (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/nemo.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/oce.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/par_kind.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/par_oce.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/step.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/step_oce.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/stpctl.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/timing.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/trc_oce.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/vectopt_loop_substitute.h90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/SAO_SRC/nemogcm.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/SAO_SRC/sao_data.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/SAO_SRC/sao_intp.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/SAO_SRC/sao_read.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/SAS_SRC/daymod.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/SAS_SRC/diawri.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/SAS_SRC/nemogcm.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/SAS_SRC/sbcssm.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/SAS_SRC/step.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/SAS_SRC/stpctl.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/AGE/par_age.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/AGE/trcice_age.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/AGE/trcini_age.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/AGE/trcwri_age.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/C14/trcatm_c14.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/C14/trcice_c14.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/C14/trcini_c14.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/C14/trcnam_c14.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/C14/trcsms_c14.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/C14/trcwri_c14.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/CFC/par_cfc.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/CFC/trcice_cfc.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/CFC/trcini_cfc.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/CFC/trcnam_cfc.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/CFC/trcsms_cfc.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/CFC/trcwri_cfc.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/MY_TRC/par_my_trc.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/MY_TRC/trcini_my_trc.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/MY_TRC/trcnam_my_trc.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/MY_TRC/trcsms_my_trc.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/PISCES/P2Z/p2zbio.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/PISCES/P2Z/p2zexp.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/PISCES/P2Z/p2zopt.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/PISCES/P2Z/p2zsed.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/PISCES/P2Z/p2zsms.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zagg.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zbio.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zche.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zfechem.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zflx.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zint.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zligand.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zlim.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zlys.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zmeso.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zmicro.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zmort.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zopt.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zpoc.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zprod.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zrem.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zsbc.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zsed.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zsink.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zsms.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p5zlim.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p5zmeso.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p5zmicro.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p5zmort.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p5zprod.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/PISCES/SED/par_sed.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/PISCES/SED/sed.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/PISCES/SED/sedadv.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/PISCES/SED/sedarr.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/PISCES/SED/sedbtb.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/PISCES/SED/sedchem.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/PISCES/SED/sedco3.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/PISCES/SED/seddsr.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/PISCES/SED/seddta.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/PISCES/SED/sedini.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/PISCES/SED/sedmat.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/PISCES/SED/sedmbc.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/PISCES/SED/sedmodel.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/PISCES/SED/sedrst.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/PISCES/SED/sedsfc.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/PISCES/SED/sedstp.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/PISCES/SED/sedwri.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/PISCES/par_pisces.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/PISCES/sms_pisces.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/PISCES/trcice_pisces.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/PISCES/trcini_pisces.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/PISCES/trcnam_pisces.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/PISCES/trcsms_pisces.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/PISCES/trcwri_pisces.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/TRP/trcadv.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/TRP/trcbbl.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/TRP/trcdmp.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/TRP/trcldf.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/TRP/trcnxt.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/TRP/trcrad.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/TRP/trcsbc.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/TRP/trctrp.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/TRP/trczdf.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/TRP/trdmxl_trc.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/TRP/trdmxl_trc_rst.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/TRP/trdtrc.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/TRP/trdtrc_oce.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/oce_trc.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/par_trc.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/prtctl_trc.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/trc.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/trcbc.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/trcbdy.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/trcdta.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/trcice.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/trcini.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/trcnam.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/trcrst.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/trcsms.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/trcstp.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/trcsub.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/TOP_SRC/trcwri.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/SETTE/all_functions.sh (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/COMPILE/Fcheck_archfile.sh (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/COMPILE/Fcheck_config.sh (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/COMPILE/Fcheck_script.sh (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/COMPILE/Fclean_var.sh (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/COMPILE/Fcopy_dir.sh (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/COMPILE/Fgo_to_TOOLS.sh (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/COMPILE/Flist_archfile.sh (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/COMPILE/Fmake_WORK.sh (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/COMPILE/Fmake_bld.sh (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/COMPILE/Fmake_config.sh (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/COMPILE/Fprep_agrif.sh (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/COMPILE/Fread_dir.sh (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/COMPILE/README (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/COMPILE/bld.cfg (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/COMPILE/bld_preproagr.cfg (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/COMPILE/bld_tools.cfg (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/COMPILE/bldxag.cfg (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/COMPILE/conv.cfg (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/COMPILE/template.sh (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/COMPILE/tools.txt (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/DOMAINcfg/src/calendar.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/DOMAINcfg/src/closea.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/DOMAINcfg/src/daymod.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/DOMAINcfg/src/defprec.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/DOMAINcfg/src/dom_oce.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/DOMAINcfg/src/domain.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/DOMAINcfg/src/domcfg.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/DOMAINcfg/src/domhgr.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/DOMAINcfg/src/dommsk.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/DOMAINcfg/src/domngb.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/DOMAINcfg/src/domstp.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/DOMAINcfg/src/domvvl.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/DOMAINcfg/src/domwri.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/DOMAINcfg/src/domzgr.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/DOMAINcfg/src/dtatsd.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/DOMAINcfg/src/eosbn2.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/DOMAINcfg/src/errioipsl.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/DOMAINcfg/src/flincom.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/DOMAINcfg/src/fliocom.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/DOMAINcfg/src/getincom.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/DOMAINcfg/src/histcom.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/DOMAINcfg/src/in_out_manager.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/DOMAINcfg/src/ioipsl.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/DOMAINcfg/src/iom.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/DOMAINcfg/src/iom_def.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/DOMAINcfg/src/iom_nf90.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/DOMAINcfg/src/iscplhsb.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/DOMAINcfg/src/iscplini.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/DOMAINcfg/src/iscplrst.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/DOMAINcfg/src/istate.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/DOMAINcfg/src/lbclnk.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/DOMAINcfg/src/lbcnfd.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/DOMAINcfg/src/lib_cray.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/DOMAINcfg/src/lib_fortran.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/DOMAINcfg/src/lib_mpp.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/DOMAINcfg/src/make_domain_cfg.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/DOMAINcfg/src/mathelp.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/DOMAINcfg/src/mppini.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/DOMAINcfg/src/mppini_2.h90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/DOMAINcfg/src/nemogcm.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/DOMAINcfg/src/oce.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/DOMAINcfg/src/par_kind.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/DOMAINcfg/src/par_oce.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/DOMAINcfg/src/phycst.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/DOMAINcfg/src/prtctl.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/DOMAINcfg/src/restart.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/DOMAINcfg/src/restcom.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/DOMAINcfg/src/step_oce.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/DOMAINcfg/src/stpctl.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/DOMAINcfg/src/stringop.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/DOMAINcfg/src/timing.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/DOMAINcfg/src/trc_oce.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/DOMAINcfg/src/wrk_nemo.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/GRIDGEN/doc_cfg_tools.pdf (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/GRIDGEN/namelist_R05 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/GRIDGEN/namelist_R2 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/GRIDGEN/src/cfg_tools.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/GRIDGEN/src/create_coordinates.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/GRIDGEN/src/domain.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/GRIDGEN/src/io_netcdf.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/GRIDGEN/src/mixed_grid.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/GRIDGEN/src/projection.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/GRIDGEN/src/readwrite.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/GRIDGEN/src/types.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/MISCELLANEOUS/chk_iomput.sh (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/MPP_PREP/mpp_nc.pdf (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/MPP_PREP/namelist (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/MPP_PREP/src/mpp_optimiz_zoom_nc.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/MPP_PREP/src/mppopt_showproc_nc.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/NESTING/agulhas (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/NESTING/doc_nesting_tools.pdf (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/NESTING/src/agrif_connect_topo.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/NESTING/src/agrif_create_bathy.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/NESTING/src/agrif_create_coordinates.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/NESTING/src/agrif_create_data.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/NESTING/src/agrif_create_restart.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/NESTING/src/agrif_create_restart_trc.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/NESTING/src/agrif_extrapolation.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/NESTING/src/agrif_gridsearch.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/NESTING/src/agrif_interpolation.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/NESTING/src/agrif_modutil.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/NESTING/src/agrif_partial_steps.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/NESTING/src/agrif_readwrite.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/NESTING/src/agrif_types.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/NESTING/src/bicubic_interp.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/NESTING/src/bilinear_interp.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/NESTING/src/io_netcdf.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/OBSTOOLS/src/in_out_manager.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/OBSTOOLS/src/obs_prof_io.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/OBSTOOLS/src/obs_seaice_io.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/OBSTOOLS/src/obs_sla_io.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/OBSTOOLS/src/obs_sla_types.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/OBSTOOLS/src/obs_sst_io.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/OBSTOOLS/src/obs_vel_io.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/OBSTOOLS/src/obsprof_io.h90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/OBSTOOLS/src/obsseaice_io.h90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/OBSTOOLS/src/obssla_io.h90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/OBSTOOLS/src/obssla_types.h90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/OBSTOOLS/src/obssst_io.h90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/OBSTOOLS/src/par_oce.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/REBUILD/src/calendar.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/REBUILD/src/defprec.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/REBUILD/src/errioipsl.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/REBUILD/src/flincom.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/REBUILD/src/flio_rbld.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/REBUILD/src/fliocom.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/REBUILD/src/getincom.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/REBUILD/src/histcom.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/REBUILD/src/ioipsl.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/REBUILD/src/mathelp.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/REBUILD/src/ncunderflow.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/REBUILD/src/restcom.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/REBUILD/src/stringop.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/REBUILD_NEMO/icb_combrest.py (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/SIREN/src/grid_hgr.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/WEIGHTS/nocsutil/scrip.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/WEIGHTS/src/constants.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/WEIGHTS/src/grids.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/WEIGHTS/src/iounits.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/WEIGHTS/src/kinds_mod.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/WEIGHTS/src/netcdf_mod.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/WEIGHTS/src/remap.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/WEIGHTS/src/remap_bicubic.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/WEIGHTS/src/remap_bilinear.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/WEIGHTS/src/remap_conserv.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/WEIGHTS/src/remap_distwgt.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/WEIGHTS/src/remap_read.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/WEIGHTS/src/remap_vars.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/WEIGHTS/src/remap_write.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/WEIGHTS/src/scrip.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/WEIGHTS/src/timers.f90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/TOOLS/maketools (modified) branches/UKMO/dev_merge_2017_CICE_interface : clear SVN keywords. Mon, 23 Apr 2018 14:38:50 GMT davestorkey [9498] * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/LBC/mppini.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/SBC/sbc_ice.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_cice.F90 (modified) branches/UKMO/dev_merge_2017_CICE_interface : revert changes so that I ... Mon, 23 Apr 2018 14:37:47 GMT davestorkey [9497] * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/CONFIG/SHARED/field_def_nemo-opa.xml (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/LIM_SRC_3/icerst.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/DOM/domain.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/ICB/icbrst.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/IOM/in_out_manager.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/IOM/restart.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfmxl.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/ZDF/zdftke.F90 (modified) branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing : recommit ... Mon, 23 Apr 2018 14:36:53 GMT davestorkey [9496] * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/ARCH/OLD/CNRS/arch-BG_BABEL.fcm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/ARCH/OLD/CNRS/arch-IA64_PLATINE.fcm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/ARCH/OLD/CNRS/arch-PW6MONO_VARGAS.fcm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/ARCH/OLD/CNRS/arch-PW6_VARGAS.fcm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/ARCH/OLD/CNRS/arch-SX8_BRODIE.fcm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/ARCH/OLD/CNRS/arch-SX8_MERCURE.fcm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/ARCH/OLD/CNRS/arch-SX9_MERCURE.fcm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/ARCH/OLD/CNRS/arch-TX7_ULAM.fcm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/ARCH/OLD/CNRS/arch-X64_TITANE.fcm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/ARCH/OLD/CNRS/arch-X86_CESIUM.fcm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/ARCH/OLD/NOC/arch-ALTIX_NAUTILUS.fcm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/ARCH/OLD/arch-g95_linux.fcm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/ARCH/OLD/arch-g95_osx.fcm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/ARCH/OLD/arch-gfortran_linux.fcm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/ARCH/OLD/arch-gfortran_osx.fcm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/ARCH/OLD/arch-ifort_linux.fcm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/ARCH/OLD/arch-ifort_linux_omp.fcm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/ARCH/OLD/arch-ifort_osx.fcm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/ARCH/OLD/arch-lahey_linux.fcm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/ARCH/OLD/arch-mpxlf_aix.fcm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/ARCH/OLD/arch-nag_linux.fcm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/ARCH/OLD/arch-pathscale_linux.fcm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/ARCH/OLD/arch-pgf90_linux.fcm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/ARCH/OLD/arch-xlf_osx.fcm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/ARCH/arch-ALTIX_NAUTILUS_MPT.fcm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/AA_job (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/iodef.xml (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/cpp_ORCA2_OFF_PISCES.fcm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/CONFIG/SHARED/namelist_ref (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/CONFIG/TEST_CASES/CANAL/MY_SRC/diawri.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/CONFIG/TEST_CASES/CANAL/MY_SRC/domvvl.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/CONFIG/TEST_CASES/CANAL/MY_SRC/stpctl.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/CONFIG/TEST_CASES/CANAL/MY_SRC/trazdf.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/CONFIG/TEST_CASES/CANAL/MY_SRC/usrdef_hgr.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/CONFIG/TEST_CASES/CANAL/MY_SRC/usrdef_istate.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/CONFIG/TEST_CASES/CANAL/MY_SRC/usrdef_nam.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/CONFIG/TEST_CASES/ISOMIP/MY_SRC/usrdef_hgr.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/CONFIG/TEST_CASES/ISOMIP/MY_SRC/usrdef_istate.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/CONFIG/TEST_CASES/ISOMIP/MY_SRC/usrdef_nam.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/MY_SRC/usrdef_hgr.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/MY_SRC/usrdef_istate.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/MY_SRC/usrdef_nam.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/CONFIG/TEST_CASES/OVERFLOW/MY_SRC/usrdef_hgr.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/CONFIG/TEST_CASES/OVERFLOW/MY_SRC/usrdef_istate.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/CONFIG/TEST_CASES/OVERFLOW/MY_SRC/usrdef_nam.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/CONFIG/TEST_CASES/SAS_BIPER/MY_SRC/par_oce.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/CONFIG/TEST_CASES/SAS_BIPER/MY_SRC/usrdef_hgr.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/CONFIG/TEST_CASES/SAS_BIPER/MY_SRC/usrdef_nam.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/CONFIG/TEST_CASES/VORTEX/MY_SRC/domvvl.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/CONFIG/TEST_CASES/VORTEX/MY_SRC/usrdef_hgr.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/CONFIG/TEST_CASES/VORTEX/MY_SRC/usrdef_istate.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/CONFIG/TEST_CASES/VORTEX/MY_SRC/usrdef_nam.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/CONFIG/TEST_CASES/WAD/MY_SRC/bdyini.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/CONFIG/TEST_CASES/WAD/MY_SRC/domain.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/CONFIG/TEST_CASES/WAD/MY_SRC/usrdef_hgr.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/CONFIG/TEST_CASES/WAD/MY_SRC/usrdef_istate.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/CONFIG/TEST_CASES/WAD/MY_SRC/usrdef_nam.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/CONFIG/cfg.txt (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/CONFIG/makenemo (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modarrays.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modbc.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modbcfunction.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modcluster.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modcurgridfunctions.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modgrids.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modinit.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modinitvars.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modinterp.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modinterpbasic.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modlinktomodel.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modmask.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modmpp.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modprocs.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modsauv.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modseq.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modtypes.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modupdate.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modupdatebasic.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modutil.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modvariables.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/AGRIF/LIB/DiversListe.c (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/AGRIF/LIB/Makefile (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/AGRIF/LIB/SubLoopCreation.c (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/AGRIF/LIB/UtilAgrif.c (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/AGRIF/LIB/UtilCharacter.c (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/AGRIF/LIB/UtilFile.c (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/AGRIF/LIB/UtilFortran.c (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/AGRIF/LIB/UtilListe.c (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/AGRIF/LIB/UtilNotGridDep.c (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/AGRIF/LIB/WorkWithAllocatelist.c (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/AGRIF/LIB/WorkWithParameterlist.c (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/AGRIF/LIB/WorkWithglobliste.c (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/AGRIF/LIB/WorkWithlistdatavariable.c (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/AGRIF/LIB/WorkWithlistmoduleinfile.c (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/AGRIF/LIB/WorkWithlistofcoupled.c (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/AGRIF/LIB/WorkWithlistofmodulebysubroutine.c (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/AGRIF/LIB/WorkWithlistvarindoloop.c (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/AGRIF/LIB/WorkWithvarofsubroutineliste.c (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/AGRIF/LIB/WriteInFile.c (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/AGRIF/LIB/Writedeclarations.c (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/AGRIF/LIB/decl.h (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/AGRIF/LIB/dependfile.c (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/AGRIF/LIB/fortran.c (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/AGRIF/LIB/main.c (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/AGRIF/LIB/run (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/AGRIF/LIB/toamr.c (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/AGRIF/agrif_opa.in (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/IOIPSL/IOIPSL_License_CeCILL.txt (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/IOIPSL/src/calendar.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/IOIPSL/src/defprec.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/IOIPSL/src/errioipsl.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/IOIPSL/src/flincom.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/IOIPSL/src/fliocom.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/IOIPSL/src/getincom.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/IOIPSL/src/histcom.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/IOIPSL/src/ioipsl.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/IOIPSL/src/mathelp.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/IOIPSL/src/restcom.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/IOIPSL/src/stringop.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/IOIPSL/tools/Fparser.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/IOIPSL/tools/flio_rbld.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/IOIPSL/tools/ncregular.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/IOIPSL/tools/ncunderflow.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/IOIPSL/tools/rebuild (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/IOIPSL/tools/tkcond.c (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/IOIPSL/tools/tkgen.c (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/IOIPSL/tools/tkparse.c (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/IOIPSL/tools/tkparse.h (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/COPYRIGHT.txt (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/LICENSE.html (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/README (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/bin/fcm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/bin/fcm_graphic_diff (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/bin/fcm_graphic_merge (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/bin/fcm_gui (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/bin/fcm_internal (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/bin/fcm_setup_konqueror (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/bin/fcm_update_version_dir.pl (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/etc/fcm.cfg.eg (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/etc/fcm_gui.desktop (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/lib/Fcm/Base.pm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/lib/Fcm/Build.pm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/lib/Fcm/Build/Fortran.pm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/lib/Fcm/BuildSrc.pm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/lib/Fcm/BuildTask.pm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/lib/Fcm/CLI.pm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/lib/Fcm/CLI/Config.pm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/lib/Fcm/CLI/Config/Default.pm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/lib/Fcm/CLI/Exception.pm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/lib/Fcm/CLI/Invoker.pm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/lib/Fcm/CLI/Invoker/Browser.pm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/lib/Fcm/CLI/Invoker/CM.pm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/lib/Fcm/CLI/Invoker/CfgPrinter.pm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/lib/Fcm/CLI/Invoker/ConfigSystem.pm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/lib/Fcm/CLI/Invoker/ExtractConfigComparator.pm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/lib/Fcm/CLI/Invoker/GUI.pm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/lib/Fcm/CLI/Invoker/Help.pm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/lib/Fcm/CLI/Invoker/KeywordPrinter.pm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/lib/Fcm/CLI/Option.pm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/lib/Fcm/CLI/Subcommand.pm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/lib/Fcm/CLI/fcm-add.pod (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/lib/Fcm/CLI/fcm-branch.pod (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/lib/Fcm/CLI/fcm-commit.pod (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/lib/Fcm/CLI/fcm-conflicts.pod (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/lib/Fcm/CLI/fcm-delete.pod (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/lib/Fcm/CLI/fcm-diff.pod (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/lib/Fcm/CLI/fcm-merge.pod (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/lib/Fcm/CLI/fcm-mkpatch.pod (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/lib/Fcm/CLI/fcm-switch.pod (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/lib/Fcm/CLI/fcm-update.pod (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/lib/Fcm/CfgFile.pm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/lib/Fcm/CfgLine.pm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/lib/Fcm/Cm.pm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/lib/Fcm/CmBranch.pm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/lib/Fcm/CmCommitMessage.pm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/lib/Fcm/CmUrl.pm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/lib/Fcm/Config.pm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/lib/Fcm/ConfigSystem.pm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/lib/Fcm/Dest.pm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/lib/Fcm/Exception.pm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/lib/Fcm/Extract.pm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/lib/Fcm/ExtractConfigComparator.pm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/lib/Fcm/ExtractFile.pm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/lib/Fcm/ExtractSrc.pm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/lib/Fcm/Interactive.pm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/lib/Fcm/Interactive/InputGetter.pm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/lib/Fcm/Interactive/InputGetter/CLI.pm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/lib/Fcm/Interactive/InputGetter/GUI.pm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/lib/Fcm/Keyword.pm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/lib/Fcm/Keyword/Config.pm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/lib/Fcm/Keyword/Entries.pm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/lib/Fcm/Keyword/Entry.pm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/lib/Fcm/Keyword/Entry/Location.pm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/lib/Fcm/Keyword/Exception.pm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/lib/Fcm/Keyword/Formatter/Entries.pm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/lib/Fcm/Keyword/Formatter/Entry.pm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/lib/Fcm/Keyword/Formatter/Entry/Location.pm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/lib/Fcm/Keyword/Loader.pod (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/lib/Fcm/Keyword/Loader/Config/Location.pm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/lib/Fcm/Keyword/Loader/Config/Revision.pm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/lib/Fcm/Keyword/Loader/VC/Revision.pm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/lib/Fcm/ReposBranch.pm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/lib/Fcm/SrcDirLayer.pm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/lib/Fcm/Timer.pm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/lib/Fcm/Util.pm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/lib/Fcm/Util/ClassLoader.pm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/man/man1/fcm.1 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/t/Fcm/Build/Fortran-extract-interface-result.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/t/Fcm/Build/Fortran-extract-interface-source.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/t/Fcm/Build/Fortran.t (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/t/Fcm/CLI.t (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/t/Fcm/CLI/Config.t (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/t/Fcm/CLI/Config/Default.t (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/t/Fcm/CLI/Exception.t (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/t/Fcm/CLI/Invoker.t (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/t/Fcm/CLI/Invoker/Browser.t (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/t/Fcm/CLI/Invoker/CM.t (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/t/Fcm/CLI/Invoker/CfgPrinter.t (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/t/Fcm/CLI/Invoker/ConfigSystem.t (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/t/Fcm/CLI/Invoker/ExtractConfigComparator.t (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/t/Fcm/CLI/Invoker/GUI.t (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/t/Fcm/CLI/Invoker/Help.t (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/t/Fcm/CLI/Invoker/KeywordPrinter.t (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/t/Fcm/CLI/Option.t (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/t/Fcm/CLI/Subcommand.t (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/t/Fcm/ConfigSystem.t (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/t/Fcm/Exception.t (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/t/Fcm/ExtractConfigComparator.t (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/t/Fcm/Interactive.t (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/t/Fcm/Interactive/InputGetter.t (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/t/Fcm/Interactive/InputGetter/CLI.pm (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/t/Fcm/Interactive/InputGetter/GUI.t (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/t/Fcm/Keyword.t (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/t/Fcm/Keyword/Config.t (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/t/Fcm/Keyword/Entries.t (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/t/Fcm/Keyword/Entry.t (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/t/Fcm/Keyword/Entry/Location.t (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/t/Fcm/Keyword/Exception.t (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/t/Fcm/Keyword/Formatter/Entries.t (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/t/Fcm/Keyword/Formatter/Entry.t (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/t/Fcm/Keyword/Formatter/Entry/Location.t (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/t/Fcm/Keyword/Loader/Config/Location.t (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/t/Fcm/Keyword/Loader/Config/Revision.t (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/t/Fcm/Keyword/Loader/VC/Revision.dump (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/t/Fcm/Keyword/Loader/VC/Revision.t (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/t/Fcm/Util.t (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/fcm/t/Fcm/Util/ClassLoader.t (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/svn_tools/svn_load_dirs.pl (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/EXTERNAL/svn_tools/update_vendor.sh (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/License_CeCILL.txt (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/LIM_SRC_3/ice.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/LIM_SRC_3/ice1d.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/LIM_SRC_3/icealb.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/LIM_SRC_3/icecor.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/LIM_SRC_3/icectl.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/LIM_SRC_3/icedia.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/LIM_SRC_3/icedyn.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/LIM_SRC_3/icedyn_adv.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/LIM_SRC_3/icedyn_adv_pra.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/LIM_SRC_3/icedyn_adv_umx.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/LIM_SRC_3/icedyn_rdgrft.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/LIM_SRC_3/icedyn_rhg.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/LIM_SRC_3/icedyn_rhg_evp.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/LIM_SRC_3/iceforcing.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/LIM_SRC_3/iceistate.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/LIM_SRC_3/iceitd.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/LIM_SRC_3/icerst.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/LIM_SRC_3/icestp.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/LIM_SRC_3/icetab.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/LIM_SRC_3/icethd.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/LIM_SRC_3/icethd_da.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/LIM_SRC_3/icethd_dh.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/LIM_SRC_3/icethd_do.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/LIM_SRC_3/icethd_ent.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/LIM_SRC_3/icethd_pnd.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/LIM_SRC_3/icethd_sal.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/LIM_SRC_3/icethd_zdf.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/LIM_SRC_3/icethd_zdf_bl99.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/LIM_SRC_3/iceupdate.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/LIM_SRC_3/icevar.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/LIM_SRC_3/icewri.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/NST_SRC/agrif2model.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/NST_SRC/agrif_ice.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/NST_SRC/agrif_lim3_interp.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/NST_SRC/agrif_lim3_update.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/NST_SRC/agrif_oce.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/NST_SRC/agrif_opa_interp.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/NST_SRC/agrif_opa_sponge.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/NST_SRC/agrif_opa_update.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/NST_SRC/agrif_top_interp.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/NST_SRC/agrif_top_sponge.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/NST_SRC/agrif_top_update.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/NST_SRC/agrif_user.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OFF_SRC/dtadyn.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OFF_SRC/nemogcm.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/ASM/asmbkg.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/ASM/asmpar.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/BDY/bdy_oce.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/BDY/bdydta.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/BDY/bdydyn.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/BDY/bdydyn2d.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/BDY/bdydyn3d.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/BDY/bdyice.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/BDY/bdyini.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/BDY/bdylib.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/BDY/bdytides.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/BDY/bdytra.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/BDY/bdyvol.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/C1D/c1d.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/C1D/domc1d.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/C1D/dtauvd.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/C1D/dyncor_c1d.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/C1D/dyndmp.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/C1D/step_c1d.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/CRS/crs.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/CRS/crsdom.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/CRS/crsdomwri.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/CRS/crsfld.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/CRS/crsini.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/CRS/crslbclnk.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/DIA/dia25h.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/DIA/diaar5.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/DIA/diacfl.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/DIA/diadct.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/DIA/diaharm.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/DIA/diahsb.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/DIA/diahth.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/DIA/dianam.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/DIA/diaptr.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/DIA/diatmb.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/DIU/cool_skin.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/DIU/step_diu.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/DOM/closea.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/DOM/daymod.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/DOM/dom_oce.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/DOM/domain.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/DOM/domhgr.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/DOM/domngb.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/DOM/domwri.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/DOM/dtatsd.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/DOM/iscplhsb.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/DOM/iscplini.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/DOM/iscplrst.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/DOM/istate.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/DOM/phycst.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/DYN/divhor.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/DYN/dynadv.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/DYN/dynadv_cen2.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/DYN/dynadv_ubs.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/DYN/dynkeg.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/DYN/dynldf.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/DYN/dynldf_iso.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/DYN/dynldf_lap_blp.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/DYN/dynnxt.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_exp.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/DYN/dynvor.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/DYN/dynzad.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/DYN/dynzdf.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/DYN/sshwzv.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/FLO/flo4rk.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/FLO/flo_oce.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/FLO/floats.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/FLO/floblk.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/FLO/flodom.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/FLO/florst.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/FLO/flowri.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/ICB/icb_oce.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/ICB/icbclv.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/ICB/icbdia.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/ICB/icbdyn.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/ICB/icbini.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/ICB/icblbc.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/ICB/icbrst.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/ICB/icbstp.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/ICB/icbthm.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/ICB/icbtrj.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/ICB/icbutl.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/IOM/in_out_manager.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/IOM/iom_def.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/IOM/iom_nf90.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/IOM/prtctl.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/IOM/restart.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/LBC/lbclnk.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/LBC/lbcnfd.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/LBC/mppini.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/LDF/ldfc1d_c2d.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/LDF/ldfdyn.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/LDF/ldfslp.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/LDF/ldftra.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/OBS/ddatetoymdhms.h90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/OBS/find_obs_proc.h90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/OBS/greg2jul.h90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/OBS/grt_cir_dis.h90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/OBS/grt_cir_dis_saa.h90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/OBS/jul2greg.h90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/OBS/julian.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/OBS/linquad.h90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/OBS/maxdist.h90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/OBS/mpp_map.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/OBS/obs_averg_h2d.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/OBS/obs_const.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/OBS/obs_conv.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/OBS/obs_conv_functions.h90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/OBS/obs_fbm.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/OBS/obs_grid.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/OBS/obs_inter_h2d.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/OBS/obs_inter_sup.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/OBS/obs_inter_z1d.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/OBS/obs_level_search.h90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/OBS/obs_mpp.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/OBS/obs_oper.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/OBS/obs_prep.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/OBS/obs_profiles.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/OBS/obs_profiles_def.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_altbias.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_prof.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_surf.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/OBS/obs_readmdt.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/OBS/obs_rot_vel.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/OBS/obs_sort.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/OBS/obs_sstbias.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/OBS/obs_surf_def.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/OBS/obs_types.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/OBS/obs_utils.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/OBS/obs_write.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/OBS/obsinter_h2d.h90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/OBS/obsinter_z1d.h90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/OBS/str_c_to_for.h90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/SBC/cpl_oasis3.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/SBC/cyclone.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/SBC/fldread.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/SBC/geo2ocean.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/SBC/ocealb.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/SBC/sbc_ice.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/SBC/sbc_oce.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/SBC/sbcapr.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/SBC/sbcdcy.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/SBC/sbcflx.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/SBC/sbcfwb.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_cice.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_if.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/SBC/sbcisf.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/SBC/sbcrnf.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/SBC/sbcssm.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/SBC/sbcssr.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/SBC/sbctide.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/SBC/sbcwave.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/SBC/tide_mod.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/SBC/tideini.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/SBC/updtide.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/STO/stopar.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/STO/stopts.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/STO/storng.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/TRA/eosbn2.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/TRA/traadv.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_cen.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_fct.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_mle.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_mus.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_qck.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_ubs.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/TRA/trabbc.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/TRA/trabbl.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/TRA/tradmp.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/TRA/traldf.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_iso.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_lap_blp.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_triad.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/TRA/tranpc.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/TRA/tranxt.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/TRA/traqsr.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/TRA/trasbc.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/TRA/trazdf.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/TRA/zpshde.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/TRD/trd_oce.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/TRD/trddyn.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/TRD/trdglo.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/TRD/trdini.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/TRD/trdken.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/TRD/trdmxl.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/TRD/trdmxl_oce.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/TRD/trdmxl_rst.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/TRD/trdpen.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/TRD/trdtra.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/TRD/trdtrc.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/TRD/trdvor.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/TRD/trdvor_oce.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/USR/usrdef_fmask.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/USR/usrdef_hgr.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/USR/usrdef_istate.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/USR/usrdef_nam.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/USR/usrdef_sbc.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/USR/usrdef_zgr.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/ZDF/zdf_oce.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfddm.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfdrg.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfevd.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfgls.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfiwm.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfmxl.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfphy.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfric.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfsh2.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfswm.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/ZDF/zdftke.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/lib_cray.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/lib_fortran.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/module_example (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/nemo.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/oce.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/par_kind.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/par_oce.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/step.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/step_oce.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/stpctl.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/timing.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/trc_oce.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/vectopt_loop_substitute.h90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/SAO_SRC/nemogcm.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/SAO_SRC/sao_data.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/SAO_SRC/sao_intp.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/SAO_SRC/sao_read.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/SAS_SRC/daymod.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/SAS_SRC/diawri.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/SAS_SRC/nemogcm.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/SAS_SRC/sbcssm.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/SAS_SRC/step.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/SAS_SRC/stpctl.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/AGE/par_age.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/AGE/trcice_age.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/AGE/trcini_age.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/AGE/trcwri_age.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/C14/trcatm_c14.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/C14/trcice_c14.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/C14/trcini_c14.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/C14/trcnam_c14.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/C14/trcsms_c14.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/C14/trcwri_c14.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/CFC/par_cfc.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/CFC/trcice_cfc.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/CFC/trcini_cfc.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/CFC/trcnam_cfc.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/CFC/trcsms_cfc.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/CFC/trcwri_cfc.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/MY_TRC/par_my_trc.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/MY_TRC/trcini_my_trc.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/MY_TRC/trcnam_my_trc.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/MY_TRC/trcsms_my_trc.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/PISCES/P2Z/p2zbio.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/PISCES/P2Z/p2zexp.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/PISCES/P2Z/p2zopt.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/PISCES/P2Z/p2zsed.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/PISCES/P2Z/p2zsms.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zagg.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zbio.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zche.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zfechem.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zflx.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zint.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zligand.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zlim.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zlys.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zmeso.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zmicro.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zmort.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zopt.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zpoc.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zprod.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zrem.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zsbc.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zsed.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zsink.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zsms.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p5zlim.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p5zmeso.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p5zmicro.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p5zmort.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p5zprod.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/PISCES/SED/par_sed.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/PISCES/SED/sed.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/PISCES/SED/sedadv.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/PISCES/SED/sedarr.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/PISCES/SED/sedbtb.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/PISCES/SED/sedchem.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/PISCES/SED/sedco3.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/PISCES/SED/seddsr.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/PISCES/SED/seddta.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/PISCES/SED/sedini.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/PISCES/SED/sedmat.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/PISCES/SED/sedmbc.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/PISCES/SED/sedmodel.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/PISCES/SED/sedrst.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/PISCES/SED/sedsfc.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/PISCES/SED/sedstp.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/PISCES/SED/sedwri.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/PISCES/par_pisces.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/PISCES/sms_pisces.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/PISCES/trcice_pisces.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/PISCES/trcini_pisces.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/PISCES/trcnam_pisces.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/PISCES/trcsms_pisces.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/PISCES/trcwri_pisces.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/TRP/trcadv.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/TRP/trcbbl.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/TRP/trcdmp.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/TRP/trcldf.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/TRP/trcnxt.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/TRP/trcrad.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/TRP/trcsbc.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/TRP/trctrp.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/TRP/trczdf.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/TRP/trdmxl_trc.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/TRP/trdmxl_trc_rst.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/TRP/trdtrc.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/TRP/trdtrc_oce.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/oce_trc.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/par_trc.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/prtctl_trc.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/trc.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/trcbc.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/trcbdy.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/trcdta.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/trcice.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/trcini.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/trcnam.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/trcrst.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/trcsms.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/trcstp.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/trcsub.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/TOP_SRC/trcwri.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/SETTE/all_functions.sh (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/COMPILE/Fcheck_archfile.sh (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/COMPILE/Fcheck_config.sh (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/COMPILE/Fcheck_script.sh (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/COMPILE/Fclean_var.sh (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/COMPILE/Fcopy_dir.sh (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/COMPILE/Fgo_to_TOOLS.sh (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/COMPILE/Flist_archfile.sh (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/COMPILE/Fmake_WORK.sh (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/COMPILE/Fmake_bld.sh (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/COMPILE/Fmake_config.sh (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/COMPILE/Fprep_agrif.sh (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/COMPILE/Fread_dir.sh (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/COMPILE/README (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/COMPILE/bld.cfg (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/COMPILE/bld_preproagr.cfg (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/COMPILE/bld_tools.cfg (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/COMPILE/bldxag.cfg (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/COMPILE/conv.cfg (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/COMPILE/template.sh (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/COMPILE/tools.txt (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/DOMAINcfg/src/calendar.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/DOMAINcfg/src/closea.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/DOMAINcfg/src/daymod.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/DOMAINcfg/src/defprec.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/DOMAINcfg/src/dom_oce.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/DOMAINcfg/src/domain.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/DOMAINcfg/src/domcfg.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/DOMAINcfg/src/domhgr.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/DOMAINcfg/src/dommsk.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/DOMAINcfg/src/domngb.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/DOMAINcfg/src/domstp.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/DOMAINcfg/src/domvvl.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/DOMAINcfg/src/domwri.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/DOMAINcfg/src/domzgr.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/DOMAINcfg/src/dtatsd.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/DOMAINcfg/src/eosbn2.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/DOMAINcfg/src/errioipsl.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/DOMAINcfg/src/flincom.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/DOMAINcfg/src/fliocom.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/DOMAINcfg/src/getincom.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/DOMAINcfg/src/histcom.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/DOMAINcfg/src/in_out_manager.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/DOMAINcfg/src/ioipsl.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/DOMAINcfg/src/iom.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/DOMAINcfg/src/iom_def.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/DOMAINcfg/src/iom_nf90.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/DOMAINcfg/src/iscplhsb.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/DOMAINcfg/src/iscplini.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/DOMAINcfg/src/iscplrst.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/DOMAINcfg/src/istate.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/DOMAINcfg/src/lbclnk.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/DOMAINcfg/src/lbcnfd.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/DOMAINcfg/src/lib_cray.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/DOMAINcfg/src/lib_fortran.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/DOMAINcfg/src/lib_mpp.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/DOMAINcfg/src/make_domain_cfg.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/DOMAINcfg/src/mathelp.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/DOMAINcfg/src/mppini.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/DOMAINcfg/src/mppini_2.h90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/DOMAINcfg/src/nemogcm.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/DOMAINcfg/src/oce.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/DOMAINcfg/src/par_kind.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/DOMAINcfg/src/par_oce.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/DOMAINcfg/src/phycst.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/DOMAINcfg/src/prtctl.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/DOMAINcfg/src/restart.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/DOMAINcfg/src/restcom.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/DOMAINcfg/src/step_oce.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/DOMAINcfg/src/stpctl.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/DOMAINcfg/src/stringop.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/DOMAINcfg/src/timing.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/DOMAINcfg/src/trc_oce.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/DOMAINcfg/src/wrk_nemo.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/GRIDGEN/doc_cfg_tools.pdf (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/GRIDGEN/namelist_R05 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/GRIDGEN/namelist_R2 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/GRIDGEN/src/cfg_tools.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/GRIDGEN/src/create_coordinates.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/GRIDGEN/src/domain.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/GRIDGEN/src/io_netcdf.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/GRIDGEN/src/mixed_grid.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/GRIDGEN/src/projection.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/GRIDGEN/src/readwrite.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/GRIDGEN/src/types.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/MISCELLANEOUS/chk_iomput.sh (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/MPP_PREP/mpp_nc.pdf (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/MPP_PREP/namelist (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/MPP_PREP/src/mpp_optimiz_zoom_nc.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/MPP_PREP/src/mppopt_showproc_nc.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/NESTING/agulhas (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/NESTING/doc_nesting_tools.pdf (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/NESTING/src/agrif_connect_topo.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/NESTING/src/agrif_create_bathy.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/NESTING/src/agrif_create_coordinates.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/NESTING/src/agrif_create_data.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/NESTING/src/agrif_create_restart.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/NESTING/src/agrif_create_restart_trc.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/NESTING/src/agrif_extrapolation.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/NESTING/src/agrif_gridsearch.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/NESTING/src/agrif_interpolation.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/NESTING/src/agrif_modutil.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/NESTING/src/agrif_partial_steps.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/NESTING/src/agrif_readwrite.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/NESTING/src/agrif_types.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/NESTING/src/bicubic_interp.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/NESTING/src/bilinear_interp.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/NESTING/src/io_netcdf.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/OBSTOOLS/src/in_out_manager.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/OBSTOOLS/src/obs_prof_io.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/OBSTOOLS/src/obs_seaice_io.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/OBSTOOLS/src/obs_sla_io.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/OBSTOOLS/src/obs_sla_types.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/OBSTOOLS/src/obs_sst_io.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/OBSTOOLS/src/obs_vel_io.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/OBSTOOLS/src/obsprof_io.h90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/OBSTOOLS/src/obsseaice_io.h90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/OBSTOOLS/src/obssla_io.h90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/OBSTOOLS/src/obssla_types.h90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/OBSTOOLS/src/obssst_io.h90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/OBSTOOLS/src/par_oce.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/REBUILD/src/calendar.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/REBUILD/src/defprec.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/REBUILD/src/errioipsl.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/REBUILD/src/flincom.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/REBUILD/src/flio_rbld.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/REBUILD/src/fliocom.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/REBUILD/src/getincom.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/REBUILD/src/histcom.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/REBUILD/src/ioipsl.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/REBUILD/src/mathelp.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/REBUILD/src/ncunderflow.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/REBUILD/src/restcom.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/REBUILD/src/stringop.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/REBUILD_NEMO/icb_combrest.py (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/SIREN/src/grid_hgr.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/WEIGHTS/nocsutil/scrip.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/WEIGHTS/src/constants.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/WEIGHTS/src/grids.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/WEIGHTS/src/iounits.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/WEIGHTS/src/kinds_mod.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/WEIGHTS/src/netcdf_mod.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/WEIGHTS/src/remap.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/WEIGHTS/src/remap_bicubic.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/WEIGHTS/src/remap_bilinear.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/WEIGHTS/src/remap_conserv.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/WEIGHTS/src/remap_distwgt.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/WEIGHTS/src/remap_read.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/WEIGHTS/src/remap_vars.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/WEIGHTS/src/remap_write.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/WEIGHTS/src/scrip.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/WEIGHTS/src/timers.f90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/TOOLS/maketools (modified) UKMO/branches/dev_merge_2017_restart_datestamp_GO6_mixing : clear SVN ... Mon, 23 Apr 2018 14:34:55 GMT davestorkey [9495] * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/CONFIG/SHARED/field_def_nemo-opa.xml (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/LIM_SRC_3/icerst.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/DOM/domain.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/ICB/icbrst.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/IOM/in_out_manager.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/IOM/restart.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfmxl.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/ZDF/zdftke.F90 (modified) branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing : revert ... Mon, 23 Apr 2018 14:10:58 GMT davestorkey [9494] * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/LBC/mppini.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/SBC/sbc_ice.F90 (modified) * branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_cice.F90 (modified) Local changes to CICE interface code. Mon, 23 Apr 2018 14:09:25 GMT davestorkey [9493] * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/CONFIG/SHARED/field_def_nemo-opa.xml (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/LIM_SRC_3/icerst.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/DOM/domain.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/ICB/icbrst.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/IOM/in_out_manager.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/IOM/restart.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfmxl.F90 (modified) * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/NEMO/OPA_SRC/ZDF/zdftke.F90 (modified) 1. Datestamp restart files. 2. Add extra mixing options. 3. Add ... Mon, 23 Apr 2018 13:52:27 GMT davestorkey [9492] * branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing (copied) Temporary UKMO branch of dev_merge_2017 to implement datestamping of ... Mon, 23 Apr 2018 09:46:31 GMT davestorkey [9491] * branches/UKMO/dev_merge_2017_CICE_interface (copied) Temporary branch of dev_merge_2017 to implement updates to CICE ... Mon, 23 Apr 2018 08:44:07 GMT gm [9490] * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AGRIF_NORDIC/EXP00/1_namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AGRIF_NORDIC/EXP00/2_namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AGRIF_NORDIC/EXP00/namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AMM12/EXP00/namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/C1D_PAPA/EXP00/iodef.xml (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/C1D_PAPA/EXP00/namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/GYRE_BFM/EXP00/namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/GYRE_BFM/EXP00/namelist_top_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/GYRE_PISCES/EXP00/file_def_nemo.xml (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/GYRE_PISCES/EXP00/namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/GYRE_PISCES/EXP00/namelist_top_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_LIM3_PISCES/EXP00/1_namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_LIM3_PISCES/EXP00/namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_OFF_TRC/EXP00/namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_OFF_TRC/EXP00/namelist_top_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_SAS_LIM3/EXP00/namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/SHARED/field_def_nemo-opa.xml (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/SHARED/namelist_ref (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/SHARED/namelist_top_ref (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/CANAL/EXP00/field_def_nemo-opa.xml (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/CANAL/EXP00/namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/ISOMIP/EXP00/namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT2_flux_cen2_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT2_flux_ubs_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT2_vect_eenH_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT2_vect_een_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT2_vect_ene_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT2_vect_ens_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT4_flux_cen2_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT4_flux_ubs_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT4_vect_eenH_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT4_vect_een_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT4_vect_ene_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT4_vect_ens_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/OVERFLOW/EXP00/namelist_sco_FCT2_flux_cen-ahm1000_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/OVERFLOW/EXP00/namelist_sco_FCT2_flux_ubs_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/OVERFLOW/EXP00/namelist_sco_FCT4_flux_cen-ahm1000_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/OVERFLOW/EXP00/namelist_sco_FCT4_flux_ubs_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/OVERFLOW/EXP00/namelist_zps_FCT2_flux_ubs_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/OVERFLOW/EXP00/namelist_zps_FCT4_flux_ubs_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/OVERFLOW/EXP00/namelist_zps_FCT4_vect_een_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/SAS_BIPER/EXP00/1_namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/SAS_BIPER/EXP00/namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/VORTEX/EXP00/1_namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/VORTEX/EXP00/namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/WAD/EXP00/file_def_nemo-opa.xml (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/WAD/EXP00/namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/cfg.txt (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/cfg.txt (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DIA/diatmb.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/dom_oce.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/domain.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/dtatsd.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynadv.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynldf.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynldf_iso.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynzdf.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/IOM/in_out_manager.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/LDF/ldfc1d_c2d.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/LDF/ldfdyn.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/LDF/ldfslp.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/LDF/ldftra.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/OBS/obs_oper.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/OBS/obs_prep.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/tradmp.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/traldf.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_lap_blp.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/step.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/TRP/trcldf.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/oce_trc.F90 (modified) #2075 - dev_merge_2017: scale-aware setting of lateral viscous and ... Fri, 20 Apr 2018 15:24:29 GMT andmirek [9489] * branches/2017/dev_r8600_xios_read/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90 (modified) Fix restart reading with XIOS when land points are suppressed Thu, 19 Apr 2018 16:19:59 GMT jpalmier [9488] * branches/NERC/dev_r5518_GO6_under_ice_relax/NEMOGCM/NEMO/OPA_SRC/SBC/sbcssr.F90 (modified) start with hard coded under-ice relax value Thu, 19 Apr 2018 15:34:13 GMT jpalmier [9487] * branches/NERC/dev_r5518_GO6_under_ice_relax (copied) create branch Tue, 17 Apr 2018 14:46:42 GMT kingr [9486] * branches/UKMO/dev_r5518_obs_oper_update/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90 (modified) Minor bugfix to allow code to build w/o key_asminc. Sat, 14 Apr 2018 11:18:45 GMT clem [9485] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/icestp.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/step.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/step_oce.F90 (modified) make sure that the double zoom configuration agrif_nordic is ... Fri, 13 Apr 2018 20:06:09 GMT clem [9484] * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AGRIF_NORDIC/EXP00/1_namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AGRIF_NORDIC/EXP00/1_namelist_ice_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AGRIF_NORDIC/EXP00/2_namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AGRIF_NORDIC/EXP00/2_namelist_ice_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AGRIF_NORDIC/EXP00/namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AGRIF_NORDIC/EXP00/namelist_ice_cfg (modified) simplify namelists Fri, 13 Apr 2018 18:19:19 GMT clem [9483] * branches/2017/dev_merge_2017/NEMOGCM/SETTE/input_AGRIF.cfg (added) * branches/2017/dev_merge_2017/NEMOGCM/SETTE/sette.sh (modified) add agrif nordic configuration to sette tests. I just noticed that one ... Fri, 13 Apr 2018 17:03:31 GMT clem [9482] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/icedyn_rhg_evp.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/icestp.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC/agrif_lim3_interp.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC/agrif_lim3_update.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC/agrif_user.F90 (modified) The configuration Agrif_Nordic is now restartable for any ... Fri, 13 Apr 2018 14:53:13 GMT nicolasmartin [9481] * trunk/LICENSE (added) Insert full text copy of CECILL V2 license (2006-09-05) as stated in ... Fri, 13 Apr 2018 14:40:11 GMT cbricaud [9480] * branches/2017/dev_merge_2017/NEMOGCM/ARCH/arch-openmpi_KARA_MERCATOR_XIOS.fcm (added) * branches/2017/dev_merge_2017/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-openmpi_KARA_MERCATOR_XIOS (added) * branches/2017/dev_merge_2017/NEMOGCM/SETTE/prepare_job.sh (modified) modify SETTE for new MERCATOR cluster ( KARA ) Fri, 13 Apr 2018 14:30:52 GMT nicolasmartin [9479] * trunk/README.rst (modified) Finally found a better solution by combining with CSS rule Fri, 13 Apr 2018 13:41:17 GMT nicolasmartin [9478] * trunk/README.rst (modified) Should have found the right directive for ASCII code block Fri, 13 Apr 2018 13:12:31 GMT nicolasmartin [9477] * trunk/README.rst (modified) After modifying Trac configuration, README should be rendered as rst ... Fri, 13 Apr 2018 11:51:42 GMT nicolasmartin [9476] * trunk/README.rst (modified) Integrate ASCII image as literal block for rendering Fri, 13 Apr 2018 11:47:14 GMT nicolasmartin [9475] * trunk/README.rst (modified) Add ASCII art image to README Thu, 12 Apr 2018 16:14:41 GMT deazer [9474] * branches/UKMO/AMM15_v3_6_STABLE_package_withNOOS/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfmxl.F90 (modified) 25h mean bugfix needed for midnight crossover Thu, 12 Apr 2018 16:12:29 GMT deazer [9473] * branches/UKMO/AMM15_v3_6_STABLE_package/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfmxl.F90 (modified) Bug fix for 25h mean, needs reinitialzation of the mean variable at ... Thu, 12 Apr 2018 15:29:18 GMT deazer [9472] * branches/UKMO/AMM15_v3_6_STABLE_package_withNOOS/NEMOGCM/NEMO/OPA_SRC/DIA/diadct.F90 (modified) Speed up NOOS transects Wed, 11 Apr 2018 16:04:11 GMT acc [9471] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/geo2ocean.F90 (modified) Branch 2017/dev_merge_2017. Add protection around compiler directive in ... Wed, 11 Apr 2018 14:16:52 GMT nicolasmartin [9470] * trunk/README.rst (modified) Fix docutils typo Wed, 11 Apr 2018 14:11:06 GMT nicolasmartin [9469] * trunk/README.rst (modified) Set MIME type property of README.rst to be processed automatically under ... Wed, 11 Apr 2018 14:02:28 GMT nicolasmartin [9468] * trunk/README.rst (added) Upload ReStructured Text file (.rst) to test the build of a wiki page by ... Wed, 11 Apr 2018 11:22:29 GMT acc [9467] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/LBC/lbc_nfd_ext_generic.h90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/geo2ocean.F90 (modified) Branch 2017/dev_merge_2017. Fix for out of bounds error with the ... Mon, 09 Apr 2018 13:45:36 GMT jcastill [9466] * branches/UKMO/r6232_HZG_WAVE-coupling/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 (modified) Move again some lines to allow merging with operational branches Fri, 06 Apr 2018 17:57:53 GMT mathiot [9465] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90 (modified) ssh_bkginc deallocated twice Fri, 06 Apr 2018 16:30:20 GMT clem [9464] * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AGRIF_NORDIC (added) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AGRIF_NORDIC/EXP00 (added) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AGRIF_NORDIC/EXP00/1_context_nemo.xml (added) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AGRIF_NORDIC/EXP00/1_namelist_cfg (added) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AGRIF_NORDIC/EXP00/1_namelist_ice_cfg (added) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AGRIF_NORDIC/EXP00/1_namelist_ice_ref (added) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AGRIF_NORDIC/EXP00/1_namelist_ref (added) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AGRIF_NORDIC/EXP00/2_context_nemo.xml (added) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AGRIF_NORDIC/EXP00/2_namelist_cfg (added) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AGRIF_NORDIC/EXP00/2_namelist_ice_cfg (added) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AGRIF_NORDIC/EXP00/2_namelist_ice_ref (added) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AGRIF_NORDIC/EXP00/2_namelist_ref (added) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AGRIF_NORDIC/EXP00/AGRIF_FixedGrids.in (added) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AGRIF_NORDIC/EXP00/context_nemo.xml (added) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AGRIF_NORDIC/EXP00/domain_def_nemo.xml (added) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AGRIF_NORDIC/EXP00/field_def_nemo-lim.xml (added) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AGRIF_NORDIC/EXP00/field_def_nemo-opa.xml (added) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AGRIF_NORDIC/EXP00/file_def_nemo-lim.xml (added) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AGRIF_NORDIC/EXP00/file_def_nemo-opa.xml (added) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AGRIF_NORDIC/EXP00/iodef.xml (added) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AGRIF_NORDIC/EXP00/namelist_cfg (added) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AGRIF_NORDIC/EXP00/namelist_ice_cfg (added) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AGRIF_NORDIC/EXP00/namelist_ice_ref (added) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AGRIF_NORDIC/EXP00/namelist_ref (added) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AGRIF_NORDIC/MY_SRC (added) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AGRIF_NORDIC/cpp_AGRIF_NORDIC.fcm (added) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/cfg.txt (modified) New configuration. This is a double agrif zoom in the Nordic Seas from ... Fri, 06 Apr 2018 15:50:29 GMT jcastill [9463] * branches/UKMO/dev_r5518_obs_oper_update/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfgls.F90 (modified) Modify a couple of lines to allow merging with the coupling branch - no ... Fri, 06 Apr 2018 15:48:30 GMT jcastill [9462] * branches/UKMO/r6232_HZG_WAVE-coupling/NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90 (modified) * branches/UKMO/r6232_HZG_WAVE-coupling/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 (modified) * branches/UKMO/r6232_HZG_WAVE-coupling/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfgls.F90 (modified) Rearrange some lines so that it merges with operational branches Fri, 06 Apr 2018 14:14:34 GMT aumont [9461] * branches/CNRS/dev_r8832_PISCO/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zfechem.F90 (modified) * branches/CNRS/dev_r8832_PISCO/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zligand.F90 (modified) * branches/CNRS/dev_r8832_PISCO/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zrem.F90 (modified) * branches/CNRS/dev_r8832_PISCO/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p5zprod.F90 (modified) * branches/CNRS/dev_r8832_PISCO/NEMOGCM/NEMO/TOP_SRC/PISCES/sms_pisces.F90 (modified) bug fixes in iron cycle Fri, 06 Apr 2018 12:54:30 GMT clem [9460] * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/SAS_BIPER/MY_SRC/usrdef_nam.F90 (modified) correct the periodicity in the agrif zoom for sas biper test case Wed, 04 Apr 2018 15:27:32 GMT clem [9459] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/geo2ocean.F90 (modified) remove unecessary -O1 optimization in geo2ocean for agrif. I tested with ... Wed, 04 Apr 2018 14:05:10 GMT clem [9458] * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/SAS_BIPER/EXP00/namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/SAS_BIPER/MY_SRC/usrdef_nam.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/SETTE/sette_test-cases.sh (modified) debug sas biper test case after the last commits Wed, 04 Apr 2018 13:05:51 GMT clem [9457] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/IOM/iom_nf90.F90 (modified) repair broken restart for sea-ice (from I do not know when) Wed, 04 Apr 2018 07:24:34 GMT cetlod [9456] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/CFC/trcsms_cfc.F90 (modified) dev_merge : Bugfix to avoid out-of-bounds in CFC model, see ticket #2073 Wed, 04 Apr 2018 07:21:45 GMT cetlod [9455] * branches/2015/nemo_v3_6_STABLE/NEMOGCM/NEMO/TOP_SRC/CFC/trcsms_cfc.F90 (modified) Bugfix to avoid out-of-bounds in CFC model, see ticket #2073 Tue, 03 Apr 2018 15:33:37 GMT clem [9454] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC/agrif_lim3_interp.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC/agrif_lim3_update.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/geo2ocean.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk.F90 (modified) make sure that agrif is working with sea ice in any conditions Tue, 03 Apr 2018 12:57:44 GMT clem [9453] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/istate.F90 (modified) ensure that agrif works in debug mode. Agrif actually needs ua and va to ... Fri, 30 Mar 2018 16:12:48 GMT clem [9452] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/icedyn_rdgrft.F90 (modified) ensure perfect conservation in ridging/rafting routine which failed ... Fri, 30 Mar 2018 16:12:38 GMT aumont [9451] * branches/CNRS/dev_r8832_PISCO/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p5zlim.F90 (deleted) delete useless p5zlim.F90 Fri, 30 Mar 2018 16:08:29 GMT aumont [9450] * branches/CNRS/dev_r8832_PISCO/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zbio.F90 (modified) * branches/CNRS/dev_r8832_PISCO/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zfechem.F90 (modified) * branches/CNRS/dev_r8832_PISCO/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zligand.F90 (modified) * branches/CNRS/dev_r8832_PISCO/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zlim.F90 (modified) * branches/CNRS/dev_r8832_PISCO/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zlys.F90 (modified) * branches/CNRS/dev_r8832_PISCO/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zmeso.F90 (modified) * branches/CNRS/dev_r8832_PISCO/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zmicro.F90 (modified) * branches/CNRS/dev_r8832_PISCO/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zpoc.F90 (modified) * branches/CNRS/dev_r8832_PISCO/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zprod.F90 (modified) * branches/CNRS/dev_r8832_PISCO/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zrem.F90 (modified) * branches/CNRS/dev_r8832_PISCO/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zsbc.F90 (modified) * branches/CNRS/dev_r8832_PISCO/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p5zmeso.F90 (modified) * branches/CNRS/dev_r8832_PISCO/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p5zmicro.F90 (modified) * branches/CNRS/dev_r8832_PISCO/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p5zmort.F90 (modified) * branches/CNRS/dev_r8832_PISCO/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p5zprod.F90 (modified) * branches/CNRS/dev_r8832_PISCO/NEMOGCM/NEMO/TOP_SRC/PISCES/sms_pisces.F90 (modified) * branches/CNRS/dev_r8832_PISCO/NEMOGCM/NEMO/TOP_SRC/PISCES/trcini_pisces.F90 (modified) debug PISCES code Fri, 30 Mar 2018 15:37:02 GMT smasson [9449] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC/agrif_user.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/BDY/bdyini.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/LBC/mppini.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/par_oce.F90 (modified) dev_merge_2017: agrif bugfix for non-constant jpi/jpj + some cleaning... Wed, 28 Mar 2018 16:42:49 GMT clem [9448] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/iceistate.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/icestp.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/icevar.F90 (modified) correct minor bugs mostly for outputs Wed, 28 Mar 2018 15:51:06 GMT clem [9447] * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_LIM3_PISCES/EXP00/file_def_nemo-lim.xml (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_LIM3_PISCES/EXP00/file_def_nemo-opa.xml (modified) debug the scalar outputs Wed, 28 Mar 2018 15:17:03 GMT smasson [9446] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/LBC/mppini.F90 (modified) dev_merge_2017: bugfix of a very nice typo error following the ... Wed, 28 Mar 2018 13:17:56 GMT nicolasmartin [9445] * branches/2015/nemo_v3_6_STABLE/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modlinktomodel.F90 (modified) * branches/2015/nemo_v3_6_STABLE/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modutil.F90 (modified) Fix for PGI compilation of AGRIF on 3.6, ref #2072 Wed, 28 Mar 2018 12:25:17 GMT smasson [9444] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/LBC/mppini.F90 (modified) dev_merge_2017: minor bugfix following the reorganisation of nemogcm.F90 ... Tue, 27 Mar 2018 14:45:12 GMT andmirek [9443] * branches/UKMO/test_moci_test_suite_namelist_read/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 (modified) #2050 move sbc_init to original place Tue, 27 Mar 2018 13:58:49 GMT acc [9442] * branches/2017/dev_merge_2017/NEMOGCM/ARCH/arch-X64_MOBILIS.fcm (modified) * branches/2017/dev_merge_2017/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-X64_MOBILIS (modified) Branch 2017/dev_merge_2017. Local architecture and batch file update for ... Tue, 27 Mar 2018 13:57:02 GMT acc [9441] * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/CANAL/MY_SRC/stpctl.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/stpctl.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/SAS_SRC/stpctl.F90 (modified) Branch 2017/dev_merge_2017. Reorganisation of nemogcm.F90 and ... Tue, 27 Mar 2018 13:52:54 GMT acc [9440] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OFF_SRC/dtadyn.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/sshwzv.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/IOM/prtctl.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/eosbn2.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRD/trdmxl.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfddm.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfgls.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfiwm.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfmxl.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdftke.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/SAS_SRC/sbcssm.F90 (modified) Branch 2017/dev_merge_2017. Reorganisation of nemogcm.F90 and ... Tue, 27 Mar 2018 13:39:22 GMT acc [9439] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90 (modified) Branch 2017/dev_merge_2017. Reorganisation of nemogcm.F90 and ... Tue, 27 Mar 2018 13:37:21 GMT acc [9438] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90 (modified) Branch 2017/dev_merge_2017. Reorganisation of nemogcm.F90 and ... Tue, 27 Mar 2018 13:35:53 GMT acc [9437] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90 (modified) Branch 2017/dev_merge_2017. Reorganisation of nemogcm.F90 and ... Tue, 27 Mar 2018 13:30:51 GMT acc [9436] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OFF_SRC/nemogcm.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/dom_oce.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/LBC/mppini.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/SAO_SRC/nemogcm.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/SAS_SRC/nemogcm.F90 (modified) Branch 2017/dev_merge_2017. Reorganisation of nemogcm.F90 and mppini.F90 ... Tue, 27 Mar 2018 13:20:18 GMT dford [9435] * branches/UKMO/dev_r5518_GO6_package_asm_3d_bgc/NEMOGCM/NEMO/OPA_SRC/ASM/asmbgc.F90 (modified) * branches/UKMO/dev_r5518_GO6_package_asm_3d_bgc/NEMOGCM/NEMO/OPA_SRC/ASM/asmphyto2dbal_hadocc.F90 (modified) * branches/UKMO/dev_r5518_GO6_package_asm_3d_bgc/NEMOGCM/NEMO/OPA_SRC/ASM/asmphyto2dbal_medusa.F90 (modified) Allow assimilation of PFT chlorophyll. Tue, 27 Mar 2018 08:32:34 GMT andmirek [9434] * branches/UKMO/dev_r5518_GO6_namelist_read/NEMOGCM/NEMO/OPA_SRC/DIA/diadct.F90 (modified) * branches/UKMO/dev_r5518_GO6_namelist_read/NEMOGCM/NEMO/OPA_SRC/DIA/diadimg.F90 (modified) * branches/UKMO/dev_r5518_GO6_namelist_read/NEMOGCM/NEMO/OPA_SRC/DIA/diafwb.F90 (modified) * branches/UKMO/dev_r5518_GO6_namelist_read/NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90 (modified) * branches/UKMO/dev_r5518_GO6_namelist_read/NEMOGCM/NEMO/OPA_SRC/FLO/flodom.F90 (modified) * branches/UKMO/dev_r5518_GO6_namelist_read/NEMOGCM/NEMO/OPA_SRC/FLO/florst.F90 (modified) * branches/UKMO/dev_r5518_GO6_namelist_read/NEMOGCM/NEMO/OPA_SRC/FLO/flowri.F90 (modified) * branches/UKMO/dev_r5518_GO6_namelist_read/NEMOGCM/NEMO/OPA_SRC/ICB/icbini.F90 (modified) * branches/UKMO/dev_r5518_GO6_namelist_read/NEMOGCM/NEMO/OPA_SRC/IOM/prtctl.F90 (modified) * branches/UKMO/dev_r5518_GO6_namelist_read/NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90 (modified) * branches/UKMO/dev_r5518_GO6_namelist_read/NEMOGCM/NEMO/OPA_SRC/LBC/mppini.F90 (modified) * branches/UKMO/dev_r5518_GO6_namelist_read/NEMOGCM/NEMO/OPA_SRC/LBC/mppini_2.h90 (modified) * branches/UKMO/dev_r5518_GO6_namelist_read/NEMOGCM/NEMO/OPA_SRC/SBC/sbcfwb.F90 (modified) * branches/UKMO/dev_r5518_GO6_namelist_read/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim.F90 (modified) * branches/UKMO/dev_r5518_GO6_namelist_read/NEMOGCM/NEMO/OPA_SRC/SOL/solver.F90 (modified) * branches/UKMO/dev_r5518_GO6_namelist_read/NEMOGCM/NEMO/OPA_SRC/TRD/trdmxl.F90 (modified) * branches/UKMO/dev_r5518_GO6_namelist_read/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 (modified) * branches/UKMO/dev_r5518_GO6_namelist_read/NEMOGCM/NEMO/OPA_SRC/stpctl.F90 (modified) * branches/UKMO/dev_r5518_GO6_namelist_read/NEMOGCM/NEMO/OPA_SRC/timing.F90 (modified) * branches/UKMO/dev_r5518_GO6_namelist_read/NEMOGCM/NEMO/OPA_SRC/trc_oce.F90 (modified) #2067 add atribute for file opening Mon, 26 Mar 2018 15:38:31 GMT clem [9433] * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_LIM3_PISCES/EXP00/file_def_nemo-lim.xml (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/SHARED/field_def_nemo-lim.xml (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/ice.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/icevar.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/icewri.F90 (modified) add two outputs: mean snow temperature and ice surface temperature per ... Mon, 26 Mar 2018 15:34:16 GMT dford [9432] * branches/UKMO/dev_r5518_GO6_package_asm_3d_bgc/NEMOGCM/NEMO/OPA_SRC/ASM/asmbgc.F90 (modified) * branches/UKMO/dev_r5518_GO6_package_asm_3d_bgc/NEMOGCM/NEMO/OPA_SRC/ASM/asmphyto2dbal_hadocc.F90 (moved) * branches/UKMO/dev_r5518_GO6_package_asm_3d_bgc/NEMOGCM/NEMO/OPA_SRC/ASM/asmphyto2dbal_medusa.F90 (moved) Rename logchlbal to phyto2dbal. Mon, 26 Mar 2018 14:49:51 GMT dford [9431] * branches/UKMO/dev_r5518_GO6_package_asm_3d_bgc/NEMOGCM/NEMO/OPA_SRC/ASM/asmbgc.F90 (modified) * branches/UKMO/dev_r5518_GO6_package_asm_3d_bgc/NEMOGCM/NEMO/OPA_SRC/ASM/asmlogchlbal_hadocc.F90 (modified) * branches/UKMO/dev_r5518_GO6_package_asm_3d_bgc/NEMOGCM/NEMO/OPA_SRC/ASM/asmlogchlbal_medusa.F90 (modified) Allow assimilation of non-log chlorophyll, and prepare for assimilation ... Mon, 26 Mar 2018 14:47:20 GMT nicolasmartin [9430] * trunk/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/AGE/trcnam_age.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/trcbc.F90 (modified) Bugfix on trunk for key_floats compilation fix #2069