# # ChangeLog for branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/USR/usrdef_hgr.F90 # # Generated by Trac 1.0.1 # 2024-05-13T21:16:00+02:00 Tue, 19 Dec 2017 08:26:25 GMT gm [9124] * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/MY_SRC/usrdef_hgr.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/OVERFLOW/MY_SRC/usrdef_hgr.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/SAS_BIPER/MY_SRC/usrdef_hgr.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/SAS_BIPER/MY_SRC/usrdef_zgr.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/VORTEX/MY_SRC/usrdef_hgr.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/VORTEX/MY_SRC/usrdef_zgr.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/WAD/MY_SRC/bdyini.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/WAD/MY_SRC/domain.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/WAD/MY_SRC/usrdef_hgr.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/WAD/MY_SRC/usrdef_zgr.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/icealb.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/icecor.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/icedia.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/icedyn.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/icedyn_adv.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/icedyn_rdgrft.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/icedyn_rhg.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/iceforcing.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/icethd.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/icethd_zdf.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/iceupdate.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/icewri.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OFF_SRC/dtadyn.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OFF_SRC/nemogcm.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/BDY/bdydta.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/BDY/bdydyn.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/BDY/bdydyn2d.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/BDY/bdydyn3d.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/BDY/bdyice.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/BDY/bdyini.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/BDY/bdylib.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/BDY/bdytides.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/BDY/bdytra.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/BDY/bdyvol.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/C1D/domc1d.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/C1D/dtauvd.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/C1D/dyndmp.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/CRS/crsdomwri.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/CRS/crsfld.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/CRS/crsini.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DIA/diaar5.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DIA/diacfl.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DIA/diadct.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DIA/diaharm.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DIA/diahsb.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DIA/diahth.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DIA/diaptr.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DIA/diatmb.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DIU/step_diu.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/daymod.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/dommsk.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/domngb.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/domwri.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/dtatsd.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/istate.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynadv_cen2.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynadv_ubs.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynbfr.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/dynldf_lap_blp.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_exp.F90 (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) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/sshwzv.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/wet_dry.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/FLO/flo_oce.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/FLO/floats.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ICB/icbstp.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/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/SBC/sbcblk.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_algo_coare.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_algo_coare3p5.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_algo_ecmwf.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_algo_ncar.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbcdcy.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbcfwb.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_cice.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbcisf.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbcssr.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_cen.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_fct.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_mle.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_mus.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_qck.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_ubs.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/trabbl.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_iso.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/TRA/traldf_triad.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/traqsr.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/trasbc.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/trazdf.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/USR/usrdef_closea.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/USR/usrdef_fmask.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/USR/usrdef_hgr.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/USR/usrdef_istate.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/USR/usrdef_nam.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/USR/usrdef_sbc.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/USR/usrdef_zgr.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfgls.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/SAS_SRC/daymod.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/SAS_SRC/diawri.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/SAS_SRC/nemogcm.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/SAS_SRC/sbcssm.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/AGE/trcsms_age.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/C14/trcatm_c14.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/C14/trcsms_c14.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/CFC/trcsms_cfc.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/MY_TRC/trcsms_my_trc.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/PISCES/P2Z/p2zbio.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/PISCES/P2Z/p2zexp.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/PISCES/P2Z/p2zopt.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/PISCES/P2Z/p2zsed.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/PISCES/P2Z/p2zsms.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zagg.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zbio.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zche.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zfechem.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zflx.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zint.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zligand.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zlim.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zlys.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zmeso.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zmicro.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zmort.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zopt.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zpoc.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zprod.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zrem.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zsbc.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zsed.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zsink.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zsms.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p5zlim.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p5zmeso.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p5zmicro.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p5zmort.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p5zprod.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/PISCES/SED/par_sed.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/PISCES/SED/sed.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/PISCES/SED/sedadv.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/PISCES/par_pisces.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/PISCES/sms_pisces.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/PISCES/trcice_pisces.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/PISCES/trcnam_pisces.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/PISCES/trcsms_pisces.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/TRP/trcbbl.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/TRP/trcdmp.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/TRP/trcldf.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/TRP/trcnxt.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/TRP/trcrad.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/TRP/trcsbc.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/TRP/trctrp.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/TRP/trczdf.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/trcbc.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/trcbdy.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/trcdta.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/trcice.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/trcini.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/trcsms.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/trcstp.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/trcsub.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/trcwri.F90 (modified) dev_merge_2017: ln_timing instead of nn_timing + restricted timing to ... Wed, 13 Dec 2017 17:08:50 GMT timgraham [9023] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/BDY/bdydyn2d.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DIA/diawri.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/dommsk.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/domwri.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/divhor.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/dynnxt.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg.F90 (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/sshwzv.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/wet_dry.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/OBS/obs_averg_h2d.F90 (copied) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/OBS/obs_mpp.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/OBS/obs_profiles_def.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_prof.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_surf.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/OBS/obs_readmdt.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/OBS/obs_sstbias.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/OBS/obs_surf_def.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/OBS/obs_write.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/OBS/obsinter_h2d.h90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/cpl_oasis3.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbc_oce.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbcrnf.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbctide.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbcwave.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/tide_mod.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/tideini.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/tranxt.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/trasbc.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/USR/usrdef_hgr.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/USR/usrdef_nam.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfgls.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/oce.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) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/stpctl.F90 (modified) Merged METO_MERCATOR branch and resolved all conflicts in OPA_SRC Wed, 13 Dec 2017 14:56:18 GMT timgraham [9018] * branches/2017/dev_merge_2017 (copied) Merge of 2017 developments Fri, 03 Mar 2017 11:46:59 GMT mocavero [7753] * trunk/NEMOGCM/NEMO/LIM_SRC_3/limadv_umx.F90 (modified) * trunk/NEMOGCM/NEMO/LIM_SRC_3/limdyn.F90 (modified) * trunk/NEMOGCM/NEMO/LIM_SRC_3/limhdf.F90 (modified) * trunk/NEMOGCM/NEMO/LIM_SRC_3/limistate.F90 (modified) * trunk/NEMOGCM/NEMO/LIM_SRC_3/limitd_me.F90 (modified) * trunk/NEMOGCM/NEMO/LIM_SRC_3/limitd_th.F90 (modified) * trunk/NEMOGCM/NEMO/LIM_SRC_3/limrhg.F90 (modified) * trunk/NEMOGCM/NEMO/LIM_SRC_3/limrst.F90 (modified) * trunk/NEMOGCM/NEMO/LIM_SRC_3/limsbc.F90 (modified) * trunk/NEMOGCM/NEMO/LIM_SRC_3/limthd.F90 (modified) * trunk/NEMOGCM/NEMO/LIM_SRC_3/limthd_da.F90 (modified) * trunk/NEMOGCM/NEMO/LIM_SRC_3/limthd_lac.F90 (modified) * trunk/NEMOGCM/NEMO/LIM_SRC_3/limtrp.F90 (modified) * trunk/NEMOGCM/NEMO/LIM_SRC_3/limupdate1.F90 (modified) * trunk/NEMOGCM/NEMO/LIM_SRC_3/limupdate2.F90 (modified) * trunk/NEMOGCM/NEMO/LIM_SRC_3/limvar.F90 (modified) * trunk/NEMOGCM/NEMO/LIM_SRC_3/limwri.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/BDY/bdy_oce.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/DIA/dia25h.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/DIA/diaar5.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/DIA/diacfl.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/DIA/diahsb.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/DIA/diaptr.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/DOM/depth_e3.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/DOM/domain.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/DOM/domhgr.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/DOM/dtatsd.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/DOM/istate.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/DYN/divhor.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynbfr.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynkeg.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynldf.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynldf_lap_blp.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynnxt.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynvor.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynzad.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynzdf.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynzdf_imp.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/DYN/sshwzv.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/ICB/icbini.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/LDF/ldfc1d_c2d.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/LDF/ldfdyn.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/LDF/ldfslp.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/LDF/ldftra.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/SBC/albedo.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/SBC/geo2ocean.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_algo_ncar.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/SBC/sbcrnf.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/SBC/sbcssm.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/SBC/sbcssr.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/TRA/eosbn2.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/TRA/traadv.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_fct.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_mle.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_mus.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/TRA/trabbc.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/TRA/trabbl.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/TRA/tradmp.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/TRA/traldf.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_iso.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/TRA/tranxt.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/TRA/traqsr.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/TRA/trasbc.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/TRA/trazdf.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/TRA/trazdf_imp.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/TRA/zpshde.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/USR/usrdef_hgr.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/USR/usrdef_istate.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/USR/usrdef_sbc.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/USR/usrdef_zgr.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfbfr.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfddm.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfevd.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfmxl.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/ZDF/zdftke.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/ZDF/zdftmx.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/step.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zagg.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zbio.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zche.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zfechem.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zflx.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zint.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zlim.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zlys.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zmeso.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zmicro.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zmort.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zopt.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zpoc.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zprod.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zrem.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zsbc.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zsed.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zsink.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zsms.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/trcini_pisces.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/TRP/trcadv.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/TRP/trcbbl.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/TRP/trcldf.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/TRP/trcnxt.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/TRP/trcrad.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/TRP/trcsbc.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/TRP/trczdf.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/trcice.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/trcini.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/trcrst.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/trcstp.F90 (modified) * trunk/NEMOGCM/SETTE/prepare_job.sh (modified) * trunk/NEMOGCM/SETTE/sette.sh (modified) Reverting trunk to remove OpenMP