# # ChangeLog for NEMO/branches/2019/dev_r11943_MERGE_2019/doc # # Generated by Trac 1.0.1 # 2024-04-19T05:42:03+02:00 Sat, 14 Dec 2019 13:57:23 GMT smasson [12252] * NEMO/branches/2019/dev_r11943_MERGE_2019 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/AGRIF_DEMO/EXPREF/1_namelist_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/AGRIF_DEMO/EXPREF/2_namelist_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/AGRIF_DEMO/EXPREF/3_namelist_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/AGRIF_DEMO/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/AMM12/EXPREF/file_def_nemo-oce.xml (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/AMM12/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/C1D_PAPA/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/GYRE_BFM/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/GYRE_PISCES/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/ORCA2_ICE_PISCES/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/ORCA2_OFF_PISCES/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/ORCA2_OFF_TRC/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/ORCA2_SAS_ICE/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/SHARED (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/SHARED/field_def_nemo-oce.xml (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/SHARED/grid_def_nemo.xml (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/SHARED/namelist_ice_ref (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/SHARED/namelist_ref (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/SPITZ12/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/doc (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/doc/latex/NEMO/subfiles/chap_DIA.tex (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/doc/namelists/nam_diatmb (deleted) * NEMO/branches/2019/dev_r11943_MERGE_2019/src (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/ICE/icedyn_adv.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/ICE/icedyn_adv_pra.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/ICE/icedyn_adv_umx.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/BDY/bdyini.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/BDY/bdyvol.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DIA/diatmb.F90 (deleted) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DIA/diawri.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/divhor.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynspg_ts.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/IOM/iom.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/LDF/ldfdyn.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/LDF/ldfslp.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/cpl_oasis3.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/sbc_oce.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/sbccpl.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/sbcrnf.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/nemogcm.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p4zmeso.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p4zmicro.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/trcini.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/trcstp.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/CANAL/EXPREF/field_def_nemo-oce.xml (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/CANAL/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/CANAL/MY_SRC/diawri.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ICE_ADV1D/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ICE_ADV1D/EXPREF/namelist_cfg_120pts (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ICE_ADV1D/EXPREF/namelist_cfg_240pts (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ICE_ADV1D/EXPREF/namelist_cfg_60pts (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ICE_ADV2D/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ICE_AGRIF/EXPREF/1_namelist_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ICE_AGRIF/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ISOMIP/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT2_flux_ubs_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/OVERFLOW/EXPREF/namelist_zps_FCT4_flux_ubs_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/VORTEX/EXPREF/1_namelist_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/VORTEX/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/WAD/EXPREF/namelist_cfg (modified) rev12240_dev_r11943_MERGE_2019: same as [12251], merge trunk ... Fri, 13 Dec 2019 09:19:48 GMT acc [12236] * NEMO/branches/2019/dev_r11943_MERGE_2019 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/SHARED (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/SHARED/namelist_ref (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/doc (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/doc/latex/NEMO/subfiles/chap_misc.tex (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/doc/namelists/namctl (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/ABL/ablmod.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/ICE/icecor.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/ICE/icectl.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/ICE/icedyn_rdgrft.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/ICE/icedyn_rhg.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/ICE/icedyn_rhg_evp.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/ICE/icethd.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/ICE/iceupdate.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/C1D/dyncor_c1d.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/C1D/dyndmp.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DOM/daymod.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynadv_cen2.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynadv_ubs.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynatf.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynhpg.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynkeg.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynldf.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynldf_iso.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynspg.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynvor.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynzad.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynzdf.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/sshwzv.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/IOM/in_out_manager.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/IOM/prtctl.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/LBC/mppini.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/LDF/ldfslp.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/cpl_oasis3.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/sbcblk.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/sbcmod.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/eosbn2.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/traadv.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/traatf.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/trabbc.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/trabbl.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/tradmp.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/traldf.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/traqsr.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/trasbc.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/trazdf.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRD/trdmxl.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/ZDF/zdfddm.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/ZDF/zdfdrg.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/ZDF/zdfgls.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/ZDF/zdfiwm.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/ZDF/zdfmxl.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/ZDF/zdfosm.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/ZDF/zdftke.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/nemogcm.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/stpctl.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OFF/dtadyn.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OFF/nemogcm.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/SAO/nemogcm.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/SAS/daymod.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/SAS/nemogcm.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/SAS/sbcssm.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/SAS/stpctl.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P2Z/p2zbio.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P2Z/p2zexp.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P2Z/p2zopt.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P2Z/p2zsed.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p4zagg.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p4zbio.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p4zfechem.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p4zflx.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p4zligand.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p4zlys.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p4zmeso.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p4zmicro.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p4zmort.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p4zpoc.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p4zprod.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p4zrem.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p4zsed.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p4zsink.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p5zmeso.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p5zmicro.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p5zmort.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p5zprod.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/SED/trcdmp_sed.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/TRP/trcadv.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/TRP/trcatf.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/TRP/trcbbl.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/TRP/trcdmp.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/TRP/trcldf.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/TRP/trcrad.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/TRP/trcsbc.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/TRP/trczdf.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/prtctl_trc.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/trcini.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/trcsms.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/trcstp.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests (modified) Branch 2019/dev_r11943_MERGE_2019. Merge in changes from ... Thu, 12 Dec 2019 10:52:50 GMT acc [12205] * NEMO/branches/2019/dev_r11943_MERGE_2019 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/AGRIF_DEMO/EXPREF/1_namelist_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/AGRIF_DEMO/EXPREF/2_namelist_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/AGRIF_DEMO/EXPREF/3_namelist_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/AGRIF_DEMO/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/AMM12/EXPREF/context_nemo.xml (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/AMM12/EXPREF/file_def_nemo-oce.xml (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/AMM12/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/C1D_PAPA/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/GYRE_BFM/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/GYRE_PISCES/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/ORCA2_ICE_PISCES/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/ORCA2_OFF_PISCES/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/ORCA2_OFF_TRC/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/ORCA2_SAS_ICE/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/SHARED (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/SHARED/field_def_nemo-oce.xml (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/SHARED/grid_def_nemo.xml (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/SHARED/namelist_ref (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/SPITZ12/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/doc (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/doc/latex/NEMO/subfiles/chap_DIA.tex (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/doc/latex/global/ametsoc.bst (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/doc/namelists/nam_diaharm (deleted) * NEMO/branches/2019/dev_r11943_MERGE_2019/src (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/BDY/bdydta.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/BDY/bdyini.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/BDY/bdytides.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DIA/diadetide.F90 (copied) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DIA/diaharm.F90 (deleted) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DIA/diamlr.F90 (copied) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynspg.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynspg_ts.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/IOM/iom.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/sbctide.F90 (deleted) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/tide.h90 (deleted) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/tide_mod.F90 (deleted) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/tideini.F90 (deleted) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/updtide.F90 (deleted) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TDE (copied) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TDE/tide_mod.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/nemogcm.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/step.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/step_oce.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/CANAL/EXPREF/field_def_nemo-oce.xml (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/CANAL/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ICE_ADV1D/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ICE_ADV1D/EXPREF/namelist_cfg_120pts (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ICE_ADV1D/EXPREF/namelist_cfg_240pts (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ICE_ADV1D/EXPREF/namelist_cfg_60pts (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ICE_ADV2D/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ICE_AGRIF/EXPREF/1_namelist_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ICE_AGRIF/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ISOMIP/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT2_flux_ubs_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/OVERFLOW/EXPREF/namelist_zps_FCT4_flux_ubs_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/VORTEX/EXPREF/1_namelist_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/VORTEX/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/WAD/EXPREF/namelist_cfg (modified) 2019/dev_r11943_MERGE_2019: Merge in dev_r11879_ENHANCE-05_SimonM- ... Wed, 11 Dec 2019 16:15:54 GMT davestorkey [12193] * NEMO/branches/2019/dev_r11943_MERGE_2019 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/AGRIF_DEMO/EXPREF/1_context_nemo.xml (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/AGRIF_DEMO/EXPREF/2_context_nemo.xml (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/AGRIF_DEMO/EXPREF/3_context_nemo.xml (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/AGRIF_DEMO/EXPREF/axis_def_nemo.xml (copied) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/AGRIF_DEMO/EXPREF/context_nemo.xml (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/AMM12/EXPREF/axis_def_nemo.xml (copied) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/AMM12/EXPREF/context_nemo.xml (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/C1D_PAPA/EXPREF/axis_def_nemo.xml (copied) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/C1D_PAPA/EXPREF/context_nemo.xml (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/GYRE_BFM/EXPREF/axis_def_nemo.xml (copied) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/GYRE_BFM/EXPREF/context_nemo.xml (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/GYRE_PISCES/EXPREF/axis_def_nemo.xml (copied) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/GYRE_PISCES/EXPREF/context_nemo.xml (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/ORCA2_ICE_PISCES/EXPREF/axis_def_nemo.xml (copied) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/ORCA2_ICE_PISCES/EXPREF/context_nemo.xml (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/ORCA2_ICE_PISCES/EXPREF/file_def_nemo-ice.xml (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/ORCA2_ICE_PISCES/EXPREF/file_def_nemo-oce.xml (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/ORCA2_ICE_PISCES/EXPREF/namelist_pisces_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/ORCA2_ICE_PISCES/EXPREF/namelist_top_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/ORCA2_OFF_PISCES/EXPREF/axis_def_nemo.xml (copied) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/ORCA2_OFF_PISCES/EXPREF/context_nemo.xml (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/ORCA2_OFF_PISCES/EXPREF/file_def_nemo-pisces.xml (copied) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/ORCA2_OFF_PISCES/EXPREF/file_def_nemo.xml (deleted) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/ORCA2_OFF_PISCES/EXPREF/namelist_pisces_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/ORCA2_OFF_PISCES/EXPREF/namelist_top_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/ORCA2_OFF_TRC/EXPREF/axis_def_nemo.xml (copied) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/ORCA2_OFF_TRC/EXPREF/context_nemo.xml (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/ORCA2_OFF_TRC/EXPREF/file_def_nemo-innerttrc.xml (copied) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/ORCA2_OFF_TRC/EXPREF/file_def_nemo.xml (deleted) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/ORCA2_SAS_ICE/EXPREF/axis_def_nemo.xml (copied) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/ORCA2_SAS_ICE/EXPREF/context_nemo.xml (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/SHARED (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/SHARED/axis_def_nemo.xml (copied) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/SHARED/domain_def_nemo.xml (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/SHARED/field_def_nemo-ice.xml (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/SHARED/field_def_nemo-oce.xml (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/SHARED/field_def_nemo-pisces.xml (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/SHARED/grid_def_nemo.xml (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/SHARED/namelist_pisces_ref (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/SHARED/namelist_ref (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/SHARED/namelist_top_ref (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/SPITZ12/EXPREF/axis_def_nemo.xml (copied) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/SPITZ12/EXPREF/context_nemo.xml (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/doc (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/ABL/sbcabl.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DIA/diaar5.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DIA/diahth.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DIA/diaptr.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/IOM/iom.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/LDF/ldftra.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/sbcblk.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/sbccpl.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/sbcmod.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/sbcrnf.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/sbcssr.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/traadv.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/traadv_cen.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/traadv_fct.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/traadv_mus.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/traadv_qck.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/traadv_ubs.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/trabbc.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/traldf_iso.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/traldf_lap_blp.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/traldf_triad.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/nemogcm.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/step.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/MY_TRC/trcsms_my_trc.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p4zbc.F90 (copied) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p4zfechem.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p4zflx.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p4zsbc.F90 (deleted) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p4zsed.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p4zsms.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/SED/oce_sed.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/par_pisces.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/sms_pisces.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/trcini_pisces.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/TRP/trctrp.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/trc.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/trcbc.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/trcdta.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/trcini.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/trcnam.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/CANAL/EXPREF/axis_def_nemo.xml (copied) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/CANAL/EXPREF/context_nemo.xml (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ICE_ADV1D/EXPREF/axis_def_nemo.xml (copied) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ICE_ADV1D/EXPREF/context_nemo.xml (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ICE_ADV2D/EXPREF/axis_def_nemo.xml (copied) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ICE_ADV2D/EXPREF/context_nemo.xml (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ICE_AGRIF/EXPREF/axis_def_nemo.xml (copied) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ICE_AGRIF/EXPREF/context_nemo.xml (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ISOMIP/EXPREF/axis_def_nemo.xml (copied) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ISOMIP/EXPREF/context_nemo.xml (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/LOCK_EXCHANGE/EXPREF/axis_def_nemo.xml (copied) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/LOCK_EXCHANGE/EXPREF/context_nemo.xml (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/OVERFLOW/EXPREF/axis_def_nemo.xml (copied) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/OVERFLOW/EXPREF/context_nemo.xml (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/VORTEX/EXPREF/axis_def_nemo.xml (copied) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/WAD/EXPREF/axis_def_nemo.xml (copied) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/WAD/EXPREF/context_nemo.xml (modified) 2019/dev_r11943_MERGE_2019: Merge in dev_r12072_TOP-01_ENHANCE- 11_cethe Wed, 11 Dec 2019 11:38:43 GMT davestorkey [12182] * NEMO/branches/2019/dev_r11943_MERGE_2019 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/AGRIF_DEMO/EXPREF/1_namelist_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/AGRIF_DEMO/EXPREF/2_namelist_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/AGRIF_DEMO/EXPREF/2_namelist_ice_ref (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/AGRIF_DEMO/EXPREF/2_namelist_ref (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/AGRIF_DEMO/EXPREF/3_namelist_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/AGRIF_DEMO/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/C1D_PAPA/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/ORCA2_ICE_ABL (copied) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/ORCA2_ICE_PISCES/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/ORCA2_SAS_ICE/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/SHARED (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/SHARED/field_def_nemo-ice.xml (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/SHARED/field_def_nemo-oce.xml (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/SHARED/grid_def_nemo.xml (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/SHARED/namelist_ice_ref (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/SHARED/namelist_ref (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/SPITZ12/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/ref_cfgs.txt (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/doc (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/doc/README.rst (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/doc/latex/.svnignore (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/doc/latex/NEMO/build (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/doc/latex/NEMO/main/NEMO_manual.ist (copied) * NEMO/branches/2019/dev_r11943_MERGE_2019/doc/latex/NEMO/main/appendices.tex (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/doc/latex/NEMO/main/bibliography.bib (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/doc/latex/NEMO/main/chapters.tex (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/doc/latex/NEMO/main/definitions.tex (copied) * NEMO/branches/2019/dev_r11943_MERGE_2019/doc/latex/NEMO/main/foreword.tex (copied) * NEMO/branches/2019/dev_r11943_MERGE_2019/doc/latex/NEMO/main/thanks.tex (copied) * NEMO/branches/2019/dev_r11943_MERGE_2019/doc/latex/NEMO/subfiles/chap_SBC.tex (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/doc/latex/NEMO/subfiles/introduction.tex (copied) * NEMO/branches/2019/dev_r11943_MERGE_2019/doc/latex/SI3/build (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/doc/latex/SI3/build/SI3_manual.ist (copied) * NEMO/branches/2019/dev_r11943_MERGE_2019/doc/latex/SI3/main/SI3_manual.ist (copied) * NEMO/branches/2019/dev_r11943_MERGE_2019/doc/latex/SI3/main/chapters.tex (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/doc/latex/SI3/main/definitions.tex (copied) * NEMO/branches/2019/dev_r11943_MERGE_2019/doc/latex/SI3/main/foreword.tex (copied) * NEMO/branches/2019/dev_r11943_MERGE_2019/doc/latex/SI3/main/routines.idx (copied) * NEMO/branches/2019/dev_r11943_MERGE_2019/doc/latex/SI3/main/thanks.tex (copied) * NEMO/branches/2019/dev_r11943_MERGE_2019/doc/latex/TOP/build (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/doc/latex/TOP/build/TOP_manual.ist (copied) * NEMO/branches/2019/dev_r11943_MERGE_2019/doc/latex/TOP/main/TOP_manual.ist (copied) * NEMO/branches/2019/dev_r11943_MERGE_2019/doc/latex/TOP/main/chapters.tex (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/doc/latex/TOP/main/definitions.tex (copied) * NEMO/branches/2019/dev_r11943_MERGE_2019/doc/latex/TOP/main/foreword.tex (copied) * NEMO/branches/2019/dev_r11943_MERGE_2019/doc/latex/TOP/main/routines.idx (copied) * NEMO/branches/2019/dev_r11943_MERGE_2019/doc/latex/TOP/main/thanks.tex (copied) * NEMO/branches/2019/dev_r11943_MERGE_2019/doc/latex/global (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/doc/latex/global/ametsoc.bst (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/doc/latex/global/annex_D.tex (deleted) * NEMO/branches/2019/dev_r11943_MERGE_2019/doc/latex/global/coding_rules.tex (deleted) * NEMO/branches/2019/dev_r11943_MERGE_2019/doc/latex/global/document.tex (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/doc/latex/global/epilogue.tex (deleted) * NEMO/branches/2019/dev_r11943_MERGE_2019/doc/latex/global/frontpage.tex (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/doc/latex/global/highlighting.tex (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/doc/latex/global/index.ist (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/doc/latex/global/index.tex (deleted) * NEMO/branches/2019/dev_r11943_MERGE_2019/doc/latex/global/indexes.tex (copied) * NEMO/branches/2019/dev_r11943_MERGE_2019/doc/latex/global/info_page.tex (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/doc/latex/global/latexmk.pl (deleted) * NEMO/branches/2019/dev_r11943_MERGE_2019/doc/latex/global/latexmkrc (copied) * NEMO/branches/2019/dev_r11943_MERGE_2019/doc/latex/global/new_cmds.tex (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/doc/latex/global/packages.tex (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/doc/latex/global/preamble.tex (copied) * NEMO/branches/2019/dev_r11943_MERGE_2019/doc/latex/global/prologue.tex (deleted) * NEMO/branches/2019/dev_r11943_MERGE_2019/doc/latex/global/styles.tex (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/doc/namelists/namsbc_blk (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/ABL (copied) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/ICE/icesbc.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/ICE/icevar.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DIA/diawri.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/IOM/in_out_manager.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/IOM/iom.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/IOM/iom_nf90.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/OBS/obs_averg_h2d.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/OBS/obs_oper.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/abl.F90 (copied) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/cpl_oasis3.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/cyclone.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/fldread.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/sbc_oce.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/sbcabl.F90 (copied) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/sbcapr.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/sbcblk.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/sbcblk_algo_coare.F90 (deleted) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/sbcblk_algo_coare3p0.F90 (copied) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/sbcblk_algo_coare3p5.F90 (deleted) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/sbcblk_algo_coare3p6.F90 (copied) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/sbcblk_algo_ecmwf.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/sbcblk_algo_ncar.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/sbcblk_phy.F90 (copied) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/sbcblk_skin_coare.F90 (copied) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/sbcblk_skin_ecmwf.F90 (copied) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/sbccpl.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/sbcdcy.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/sbcice_cice.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/sbcmod.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/sbcrnf.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/sbctide.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/tideini.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/ZDF/zdfiwm.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/SAS/diawri.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/STATION_ASF (copied) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/demo_cfgs.txt (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/test_cases.bib (modified) 2019/dev_r11943_MERGE_2019: Merge in dev_ASINTER-01-05_merge. Tue, 10 Dec 2019 14:16:33 GMT davestorkey [12150] * NEMO/branches/2019/dev_r11943_MERGE_2019 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/AGRIF_DEMO/EXPREF/file_def_nemo-ice.xml (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/ORCA2_ICE_PISCES/EXPREF/file_def_nemo-ice.xml (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/ORCA2_SAS_ICE/EXPREF/file_def_nemo-ice.xml (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/SHARED/field_def_nemo-oce.xml (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/SHARED/namelist_ref (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/WED025 (copied) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/ref_cfgs.txt (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/doc/latex/global/ametsoc.bst (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/BDY/bdyvol.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DIA/diahsb.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DIA/diawri.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DOM/closea.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DOM/dom_oce.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DOM/domain.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DOM/domvvl.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DOM/domwri.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DOM/domzgr.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DOM/iscplhsb.F90 (deleted) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DOM/iscplini.F90 (deleted) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DOM/iscplrst.F90 (deleted) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DOM/istate.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/divhor.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynatf.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynhpg.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynspg_ts.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynzdf.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/sshwzv.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/IOM/iom.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/IOM/restart.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/ISF (copied) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/ISF/isfstp.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/LDF/ldfslp.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/LDF/ldftra.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/sbc_oce.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/sbcclo.F90 (copied) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/sbccpl.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/sbcfwb.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/sbcisf.F90 (deleted) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/sbcmod.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/sbcrnf.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/sbcssm.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/eosbn2.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/traatf.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/traisf.F90 (copied) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/trasbc.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/ZDF/zdfmxl.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/nemogcm.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/par_oce.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/step.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/step_oce.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ICE_AGRIF/EXPREF/file_def_nemo-ice.xml (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ISOMIP+ (copied) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ISOMIP/EXPREF/file_def_nemo-oce.xml (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ISOMIP/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT2_flux_cen2_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT2_flux_ubs_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT2_vect_eenH_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT2_vect_een_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT2_vect_ene_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT2_vect_ens_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT4_flux_cen2_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT4_flux_ubs_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT4_vect_eenH_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT4_vect_een_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT4_vect_ene_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT4_vect_ens_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/VORTEX/MY_SRC/domvvl.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/demo_cfgs.txt (modified) 2019/dev_r11943_MERGE_2019: Merge in UKMO_MERGE_2019. Fri, 22 Nov 2019 14:29:17 GMT acc [11949] * NEMO/branches/2019/dev_r11943_MERGE_2019 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/CHANGES.rst (deleted) * NEMO/branches/2019/dev_r11943_MERGE_2019/RELEASE_NOTES.rst (copied) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/SHARED (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/SHARED/namelist_top_ref (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/doc (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/ICE/icedyn.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/ICE/icedyn_rhg.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/ICE/icedyn_rhg_evp.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/ICE/iceistate.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/ICE/icerst.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/ICE/icestp.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/ICE/iceupdate.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/NST/agrif_oce.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/NST/agrif_oce_interp.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/NST/agrif_oce_sponge.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/NST/agrif_oce_update.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/NST/agrif_top_interp.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/NST/agrif_top_sponge.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/NST/agrif_top_update.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/NST/agrif_user.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/ASM/asmbkg.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/ASM/asminc.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/BDY/bdydta.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/BDY/bdydyn.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/BDY/bdydyn3d.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/BDY/bdylib.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/BDY/bdytra.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/C1D/dtauvd.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/C1D/dyncor_c1d.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/C1D/dyndmp.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/C1D/step_c1d.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/CRS/crsfld.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/CRS/crsini.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DIA/dia25h.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DIA/diaar5.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DIA/diacfl.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DIA/diadct.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DIA/diaharm.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DIA/diahsb.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DIA/diahth.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DIA/diaptr.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DIA/diatmb.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DIA/diawri.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DIU/cool_skin.F90 (deleted) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DIU/diu_bulk.F90 (copied) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DIU/diu_coolskin.F90 (copied) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DIU/diu_layers.F90 (copied) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DIU/diurnal_bulk.F90 (deleted) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DIU/step_diu.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DOM/dom_oce.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DOM/domain.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DOM/domvvl.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DOM/iscplhsb.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DOM/iscplrst.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DOM/istate.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/divhor.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynadv.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynadv_cen2.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynadv_ubs.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynatf.F90 (copied) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynhpg.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynkeg.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynldf.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynldf_iso.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynldf_lap_blp.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynnxt.F90 (deleted) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynspg.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynspg_exp.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynspg_ts.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynvor.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynzad.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynzdf.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/sshwzv.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/wet_dry.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/FLO/flo4rk.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/FLO/floats.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/FLO/floblk.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/FLO/flodom.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/FLO/flowri.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/IOM/iom.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/IOM/restart.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/LBC/lib_mpp.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/LDF/ldfdyn.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/LDF/ldfslp.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/LDF/ldftra.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/OBS/diaobs.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/OBS/obs_prep.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/OBS/obs_read_altbias.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/OBS/obs_readmdt.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/OBS/obs_sstbias.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/fldread.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/sbccpl.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/sbcfwb.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/sbcice_cice.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/sbcice_if.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/sbcisf.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/sbcmod.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/sbcrnf.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/sbcssm.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/sbcwave.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/eosbn2.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/traadv.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/traadv_cen.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/traadv_fct.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/traadv_mus.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/traadv_qck.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/traadv_ubs.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/traatf.F90 (copied) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/trabbc.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/trabbl.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/tradmp.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/traldf.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/traldf_iso.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/traldf_lap_blp.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/traldf_triad.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/tramle.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/tranpc.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/tranxt.F90 (deleted) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/traqsr.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/trasbc.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/trazdf.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/zpshde.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRD/trddyn.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRD/trdglo.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRD/trdini.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRD/trdken.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRD/trdmxl.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRD/trdpen.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRD/trdtra.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRD/trdtrc.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRD/trdvor.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/USR/usrdef_sbc.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/ZDF/zdfddm.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/ZDF/zdfdrg.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/ZDF/zdfevd.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/ZDF/zdfgls.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/ZDF/zdfiwm.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/ZDF/zdfmxl.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/ZDF/zdfosm.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/ZDF/zdfphy.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/ZDF/zdfric.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/ZDF/zdfsh2.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/ZDF/zdfswm.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/ZDF/zdftke.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/nemogcm.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/oce.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/par_oce.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/step.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/step_oce.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/stpctl.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/trc_oce.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OFF/dtadyn.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OFF/nemogcm.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/SAO/nemogcm.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/SAS/diawri.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/SAS/nemogcm.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/SAS/sbcssm.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/SAS/step.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/AGE/trcini_age.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/AGE/trcsms_age.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/AGE/trcwri_age.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/C14/trcini_c14.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/C14/trcsms_c14.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/C14/trcwri_c14.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/CFC/trcini_cfc.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/CFC/trcsms_cfc.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/CFC/trcwri_cfc.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/MY_TRC/trcini_my_trc.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/MY_TRC/trcsms_my_trc.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/MY_TRC/trcwri_my_trc.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P2Z/p2zbio.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P2Z/p2zexp.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P2Z/p2zopt.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P2Z/p2zsed.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P2Z/p2zsms.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p4zagg.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p4zbio.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p4zche.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p4zfechem.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p4zflx.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p4zint.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p4zligand.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p4zlim.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p4zlys.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p4zmeso.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p4zmicro.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p4zmort.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p4zopt.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p4zpoc.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p4zprod.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p4zrem.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p4zsbc.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p4zsed.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p4zsink.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p4zsms.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p5zlim.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p5zmeso.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p5zmicro.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p5zmort.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p5zprod.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/SED/oce_sed.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/SED/seddta.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/SED/sedini.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/SED/sedinitrc.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/SED/sedmodel.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/SED/sedrst.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/SED/sedsfc.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/SED/sedstp.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/SED/trcdmp_sed.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/trcini_pisces.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/trcsms_pisces.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/trcwri_pisces.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/TRP/trcadv.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/TRP/trcatf.F90 (copied) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/TRP/trcbbl.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/TRP/trcdmp.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/TRP/trcldf.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/TRP/trcnxt.F90 (deleted) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/TRP/trcrad.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/TRP/trcsbc.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/TRP/trcsink.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/TRP/trctrp.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/TRP/trczdf.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/TRP/trdmxl_trc.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/TRP/trdmxl_trc_rst.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/TRP/trdtrc.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/oce_trc.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/trc.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/trcbc.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/trcbdy.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/trcdta.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/trcini.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/trcnam.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/trcrst.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/trcsms.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/trcstp.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/trcsub.F90 (deleted) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/trcwri.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/BENCH/MY_SRC/diawri.F90 (copied) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/BENCH/MY_SRC/usrdef_sbc.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/BENCH/MY_SRC/zdfiwm.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/CANAL/MY_SRC/diawri.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/CANAL/MY_SRC/domvvl.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/CANAL/MY_SRC/sbcmod.F90 (copied) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/CANAL/MY_SRC/stpctl.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/CANAL/MY_SRC/trazdf.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/CANAL/MY_SRC/usrdef_sbc.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ICE_ADV1D/MY_SRC/usrdef_sbc.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ICE_ADV2D/MY_SRC/usrdef_sbc.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ICE_AGRIF/MY_SRC/usrdef_sbc.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ISOMIP/MY_SRC/usrdef_sbc.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/LOCK_EXCHANGE/MY_SRC/usrdef_sbc.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/OVERFLOW/MY_SRC/usrdef_sbc.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/VORTEX/MY_SRC/domvvl.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/VORTEX/MY_SRC/usrdef_sbc.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/WAD/EXPREF/makebdy_tc7.py (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/WAD/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/WAD/MY_DOCS/Namelists/nam_wad_tc7 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/WAD/MY_SRC/usrdef_sbc.F90 (modified) Merge in changes from 2019/dev_r10721_KERNEL- ... Fri, 22 Nov 2019 12:23:31 GMT acc [11947] * NEMO/branches/2019/dev_r11943_MERGE_2019 (copied) Create a 2019 merge branch named 2019/dev_r11943_MERGE_2019. See ticket ... Thu, 14 Nov 2019 17:15:03 GMT nicolasmartin [11907] * NEMO/trunk/doc/rst/source/conf.py (modified) * NEMO/trunk/doc/rst/source/docutils.conf (added) * NEMO/trunk/doc/rst/source/global.rst (modified) Implementation of syntax highlighting for inline code