# # ChangeLog for NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/ICE_AGRIF # # Generated by Trac 1.0.1 # 2024-05-23T17:09:40+02:00 Sat, 14 Dec 2019 12:46:52 GMT smasson [12251] * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/AGRIF_DEMO/EXPREF/1_namelist_cfg (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/AGRIF_DEMO/EXPREF/2_namelist_cfg (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/AGRIF_DEMO/EXPREF/3_namelist_cfg (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/AGRIF_DEMO/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/AMM12/EXPREF/context_nemo.xml (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/AMM12/EXPREF/file_def_nemo-oce.xml (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/AMM12/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/C1D_PAPA/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/GYRE_BFM/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/GYRE_PISCES/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/ORCA2_ICE_PISCES/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/ORCA2_OFF_PISCES/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/ORCA2_OFF_TRC/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/ORCA2_SAS_ICE/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/SHARED (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/SHARED/field_def_nemo-oce.xml (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/SHARED/grid_def_nemo.xml (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/SHARED/namelist_ref (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/SPITZ12/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/doc (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/doc/latex/NEMO/subfiles/chap_DIA.tex (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/doc/namelists/nam_diatmb (deleted) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/ICE/icedyn_adv.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/ICE/icedyn_adv_pra.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/ICE/icedyn_adv_umx.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/BDY/bdyini.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/BDY/bdyvol.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DIA/diatmb.F90 (deleted) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DIA/diawri.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DYN/divhor.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DYN/dynspg_ts.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/IOM/iom.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/LDF/ldfdyn.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/LDF/ldfslp.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/cpl_oasis3.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/fldread.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbc_oce.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbccpl.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbcrnf.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/nemogcm.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p4zmeso.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p4zmicro.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/trcini.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/trcstp.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/CANAL/EXPREF/field_def_nemo-oce.xml (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/CANAL/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/CANAL/MY_SRC/diawri.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/ICE_ADV1D/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/ICE_ADV1D/EXPREF/namelist_cfg_120pts (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/ICE_ADV1D/EXPREF/namelist_cfg_240pts (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/ICE_ADV1D/EXPREF/namelist_cfg_60pts (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/ICE_ADV2D/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/ICE_AGRIF/EXPREF/1_namelist_cfg (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/ICE_AGRIF/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/ISOMIP/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT2_flux_ubs_cfg (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/OVERFLOW/EXPREF/namelist_zps_FCT4_flux_ubs_cfg (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/VORTEX/EXPREF/1_namelist_cfg (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/VORTEX/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/WAD/EXPREF/namelist_cfg (modified) rev12232_dev_r12072_MERGE_OPTION2_2019: merge trunk 12072:12248, all ... Thu, 12 Dec 2019 08:59:50 GMT cetlod [12202] * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/C1D_PAPA/MY_SRC/usrdef_nam.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/SHARED (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/doc (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/ABL/sbcabl.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/ICE/icealb.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/ICE/icedia.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/ICE/icedyn.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/ICE/icedyn_adv.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/ICE/icedyn_rdgrft.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/ICE/icedyn_rhg.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/ICE/iceistate.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/ICE/iceitd.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/ICE/icesbc.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/ICE/icestp.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/ICE/icethd.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/ICE/icethd_da.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/ICE/icethd_do.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/ICE/icethd_pnd.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/ICE/icethd_sal.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/ICE/icethd_zdf.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/NST/agrif_user.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/ASM/asminc.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/BDY/bdydta.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/BDY/bdyini.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/BDY/bdytides.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/C1D/c1d.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/C1D/dtauvd.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/C1D/dyndmp.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/CRS/crsini.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DIA/dia25h.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DIA/diadct.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DIA/diahsb.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DIA/diaptr.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DIA/diatmb.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DIU/diurnal_bulk.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DOM/closea.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DOM/domain.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DOM/dommsk.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DOM/domvvl.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DOM/dtatsd.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DYN/dynadv.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DYN/dynhpg.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DYN/dynspg.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DYN/dynvor.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DYN/wet_dry.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/FLO/floats.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/ICB/icbini.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/IOM/in_out_manager.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/ISF/isfstp.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/LBC/lib_mpp.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/LBC/mppini.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/LDF/ldfdyn.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/LDF/ldftra.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/OBS/diaobs.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbcapr.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbcblk.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbccpl.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbcflx.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbcice_cice.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbcice_if.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbcmod.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbcrnf.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbcssr.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbcwave.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/STO/stopar.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/TDE/tide_mod.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/TRA/eosbn2.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/TRA/traadv.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/TRA/trabbc.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/TRA/trabbl.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/TRA/tradmp.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/TRA/tramle.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/TRA/traqsr.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/TRD/trdini.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/TRD/trdmxl.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/USR/usrdef_nam.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/ZDF/zdfdrg.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/ZDF/zdfgls.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/ZDF/zdfiwm.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/ZDF/zdfosm.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/ZDF/zdfphy.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/ZDF/zdfric.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/ZDF/zdftke.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/module_example (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/nemogcm.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OFF/dtadyn.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OFF/nemogcm.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/SAO/nemogcm.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/SAO/sao_data.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/SAS/nemogcm.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/SAS/sbcssm.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/AGE/trcnam_age.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/C14/trcnam_c14.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/CFC/trcnam_cfc.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P2Z/p2zbio.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P2Z/p2zopt.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P2Z/p2zsed.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p4zbc.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p4zfechem.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p4zflx.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p4zligand.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p4zlim.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p4zlys.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p4zmeso.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p4zmicro.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p4zmort.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p4zopt.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p4zpoc.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p4zprod.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p4zrem.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p4zsed.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p4zsms.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p5zlim.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p5zmeso.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p5zmicro.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p5zmort.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p5zprod.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/SED/sedini.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/sms_pisces.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/trcnam_pisces.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/TRP/trcadv.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/TRP/trcdmp.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/TRP/trcldf.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/TRP/trcrad.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/TRP/trcsink.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/trc.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/trcbc.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/trcdta.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/trcice.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/trcnam.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/BENCH/MY_SRC/usrdef_nam.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/BENCH/MY_SRC/zdfiwm.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/CANAL/MY_SRC/domvvl.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/CANAL/MY_SRC/usrdef_nam.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/ICE_ADV1D/MY_SRC/usrdef_nam.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/ICE_ADV2D/MY_SRC/usrdef_nam.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/ICE_AGRIF/MY_SRC/usrdef_nam.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/ISOMIP+/MY_SRC/dtatsd.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/ISOMIP+/MY_SRC/eosbn2.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/ISOMIP+/MY_SRC/isfstp.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/ISOMIP+/MY_SRC/tradmp.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/ISOMIP/MY_SRC/usrdef_nam.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/LOCK_EXCHANGE/MY_SRC/usrdef_nam.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/OVERFLOW/MY_SRC/usrdef_nam.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/STATION_ASF/MY_SRC/nemogcm.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/STATION_ASF/MY_SRC/sbcssm.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/STATION_ASF/MY_SRC/usrdef_nam.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/VORTEX/MY_SRC/domvvl.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/VORTEX/MY_SRC/usrdef_nam.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/WAD/MY_SRC/usrdef_nam.F90 (modified) dev_merge_option2 : merge in dev_r11613_ENHANCE- ... Wed, 11 Dec 2019 13:35:26 GMT smueller [12184] * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/AGRIF_DEMO/EXPREF/1_namelist_cfg (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/AGRIF_DEMO/EXPREF/2_namelist_cfg (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/AGRIF_DEMO/EXPREF/3_namelist_cfg (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/AGRIF_DEMO/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/AMM12/EXPREF/context_nemo.xml (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/AMM12/EXPREF/file_def_nemo-oce.xml (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/AMM12/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/C1D_PAPA/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/GYRE_BFM/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/GYRE_PISCES/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/ORCA2_ICE_PISCES/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/ORCA2_OFF_PISCES/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/ORCA2_OFF_TRC/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/ORCA2_SAS_ICE/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/SHARED (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/SHARED/field_def_nemo-oce.xml (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/SHARED/grid_def_nemo.xml (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/SHARED/namelist_ref (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/SPITZ12/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/doc (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/doc/latex/NEMO/subfiles/chap_DIA.tex (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/doc/latex/global/ametsoc.bst (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/doc/namelists/nam_diaharm (deleted) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/BDY/bdydta.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/BDY/bdyini.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/BDY/bdytides.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DIA/diadetide.F90 (copied) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DIA/diaharm.F90 (deleted) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DIA/diamlr.F90 (copied) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DYN/dynspg.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DYN/dynspg_ts.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/IOM/iom.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbctide.F90 (deleted) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/tide.h90 (deleted) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/tide_mod.F90 (deleted) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/tideini.F90 (deleted) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/updtide.F90 (deleted) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/TDE (copied) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/nemogcm.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/step.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/step_oce.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/CANAL/EXPREF/field_def_nemo-oce.xml (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/CANAL/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/ICE_ADV1D/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/ICE_ADV1D/EXPREF/namelist_cfg_120pts (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/ICE_ADV1D/EXPREF/namelist_cfg_240pts (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/ICE_ADV1D/EXPREF/namelist_cfg_60pts (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/ICE_ADV2D/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/ICE_AGRIF/EXPREF/1_namelist_cfg (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/ICE_AGRIF/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/ISOMIP/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT2_flux_ubs_cfg (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/OVERFLOW/EXPREF/namelist_zps_FCT4_flux_ubs_cfg (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/VORTEX/EXPREF/1_namelist_cfg (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/VORTEX/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/WAD/EXPREF/namelist_cfg (modified) Merging of the developments in ^/NEMO/branches/2019 ... Tue, 10 Dec 2019 13:41:18 GMT cetlod [12146] * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019 (copied) Created option2 merge branch, from dev_r12072_TOP-01_ENHANCE-11_CEthe Sat, 07 Dec 2019 11:40:06 GMT cetlod [12109] * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe (modified) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/cfgs/AGRIF_DEMO/EXPREF/1_context_nemo.xml (modified) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/cfgs/AGRIF_DEMO/EXPREF/2_context_nemo.xml (modified) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/cfgs/AGRIF_DEMO/EXPREF/3_context_nemo.xml (modified) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/cfgs/AGRIF_DEMO/EXPREF/axis_def_nemo.xml (copied) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/cfgs/AGRIF_DEMO/EXPREF/context_nemo.xml (modified) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/cfgs/AMM12/EXPREF/axis_def_nemo.xml (copied) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/cfgs/AMM12/EXPREF/context_nemo.xml (modified) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/cfgs/C1D_PAPA/EXPREF/axis_def_nemo.xml (copied) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/cfgs/C1D_PAPA/EXPREF/context_nemo.xml (modified) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/cfgs/GYRE_BFM/EXPREF/axis_def_nemo.xml (copied) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/cfgs/GYRE_BFM/EXPREF/context_nemo.xml (modified) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/cfgs/GYRE_PISCES/EXPREF/axis_def_nemo.xml (copied) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/cfgs/GYRE_PISCES/EXPREF/context_nemo.xml (modified) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/cfgs/ORCA2_ICE_PISCES/EXPREF/axis_def_nemo.xml (copied) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/cfgs/ORCA2_ICE_PISCES/EXPREF/context_nemo.xml (modified) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/cfgs/ORCA2_ICE_PISCES/EXPREF/file_def_nemo-ice.xml (modified) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/cfgs/ORCA2_ICE_PISCES/EXPREF/file_def_nemo-oce.xml (modified) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/cfgs/ORCA2_OFF_PISCES/EXPREF/axis_def_nemo.xml (copied) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/cfgs/ORCA2_OFF_PISCES/EXPREF/context_nemo.xml (modified) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/cfgs/ORCA2_OFF_PISCES/EXPREF/file_def_nemo-pisces.xml (copied) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/cfgs/ORCA2_OFF_PISCES/EXPREF/file_def_nemo.xml (deleted) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/cfgs/ORCA2_OFF_TRC/EXPREF/axis_def_nemo.xml (copied) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/cfgs/ORCA2_OFF_TRC/EXPREF/context_nemo.xml (modified) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/cfgs/ORCA2_OFF_TRC/EXPREF/file_def_nemo-innerttrc.xml (copied) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/cfgs/ORCA2_OFF_TRC/EXPREF/file_def_nemo.xml (deleted) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/cfgs/ORCA2_SAS_ICE/EXPREF/axis_def_nemo.xml (copied) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/cfgs/ORCA2_SAS_ICE/EXPREF/context_nemo.xml (modified) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/cfgs/SHARED (modified) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/cfgs/SHARED/axis_def_nemo.xml (copied) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/cfgs/SHARED/domain_def_nemo.xml (modified) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/cfgs/SHARED/field_def_nemo-ice.xml (modified) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/cfgs/SHARED/field_def_nemo-oce.xml (modified) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/cfgs/SHARED/field_def_nemo-pisces.xml (modified) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/cfgs/SHARED/grid_def_nemo.xml (modified) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/cfgs/SHARED/namelist_ice_ref (modified) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/cfgs/SHARED/namelist_ref (modified) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/cfgs/SPITZ12/EXPREF/axis_def_nemo.xml (copied) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/cfgs/SPITZ12/EXPREF/context_nemo.xml (modified) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/doc (modified) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/src (modified) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/src/OCE/DIA/diaar5.F90 (modified) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/src/OCE/DIA/diahth.F90 (modified) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/src/OCE/DIA/diaptr.F90 (modified) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/src/OCE/IOM/iom.F90 (modified) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/src/OCE/LDF/ldftra.F90 (modified) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/src/OCE/SBC/sbcblk.F90 (modified) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/src/OCE/SBC/sbccpl.F90 (modified) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/src/OCE/SBC/sbcmod.F90 (modified) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/src/OCE/SBC/sbcrnf.F90 (modified) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/src/OCE/SBC/sbcssr.F90 (modified) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/src/OCE/TRA/traadv.F90 (modified) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/src/OCE/TRA/traadv_cen.F90 (modified) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/src/OCE/TRA/traadv_fct.F90 (modified) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/src/OCE/TRA/traadv_mus.F90 (modified) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/src/OCE/TRA/traadv_qck.F90 (modified) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/src/OCE/TRA/traadv_ubs.F90 (modified) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/src/OCE/TRA/trabbc.F90 (modified) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/src/OCE/TRA/traldf_iso.F90 (modified) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/src/OCE/TRA/traldf_lap_blp.F90 (modified) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/src/OCE/TRA/traldf_triad.F90 (modified) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/src/OCE/nemogcm.F90 (modified) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/src/OCE/step.F90 (modified) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/src/TOP/PISCES/P4Z/p4zflx.F90 (modified) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/src/TOP/PISCES/P4Z/p4zsms.F90 (modified) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/tests (modified) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/tests/CANAL/EXPREF/axis_def_nemo.xml (copied) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/tests/CANAL/EXPREF/context_nemo.xml (modified) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/tests/ICE_ADV1D/EXPREF/axis_def_nemo.xml (copied) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/tests/ICE_ADV1D/EXPREF/context_nemo.xml (modified) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/tests/ICE_ADV2D/EXPREF/axis_def_nemo.xml (copied) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/tests/ICE_ADV2D/EXPREF/context_nemo.xml (modified) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/tests/ICE_AGRIF/EXPREF/axis_def_nemo.xml (copied) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/tests/ICE_AGRIF/EXPREF/context_nemo.xml (modified) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/tests/ISOMIP/EXPREF/axis_def_nemo.xml (copied) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/tests/ISOMIP/EXPREF/context_nemo.xml (modified) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/tests/LOCK_EXCHANGE/EXPREF/axis_def_nemo.xml (copied) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/tests/LOCK_EXCHANGE/EXPREF/context_nemo.xml (modified) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/tests/OVERFLOW/EXPREF/axis_def_nemo.xml (copied) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/tests/OVERFLOW/EXPREF/context_nemo.xml (modified) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/tests/VORTEX/EXPREF/axis_def_nemo.xml (copied) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/tests/WAD/EXPREF/axis_def_nemo.xml (copied) * NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/tests/WAD/EXPREF/context_nemo.xml (modified) check out & merge dev_r11643_ENHANCE-11_CEthe_Shaconemo_diags branch ...