# # ChangeLog for NEMO # # Generated by Trac 1.0.1 # 2024-04-27T15:32:51+02:00 Thu, 26 Dec 2019 15:22:36 GMT smasson [12288] * NEMO/trunk/cfgs/SHARED/field_def_nemo-oce.xml (modified) * NEMO/trunk/cfgs/SHARED/grid_def_nemo.xml (modified) * NEMO/trunk/cfgs/SHARED/namelist_ref (modified) * NEMO/trunk/src/OCE/SBC/sbccpl.F90 (modified) trunk : minor bugfix/cleaning Mon, 23 Dec 2019 11:05:58 GMT cetlod [12284] * NEMO/trunk/src/OCE/SBC/sbccpl.F90 (modified) trunk:give the right unit to ocean carbon flux Mon, 23 Dec 2019 10:40:48 GMT cetlod [12283] * NEMO/trunk/src/OCE/IOM/iom.F90 (modified) * NEMO/trunk/src/OCE/SBC/sbccpl.F90 (modified) trunk:revert some changes done in sbccpl.F90 Sat, 21 Dec 2019 10:48:18 GMT cetlod [12282] * 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/p5zprod.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/trcwri.F90 (modified) bugfix in dev_r12072_MERGE_OPTION2_2019 : initialise local array in ... Sat, 21 Dec 2019 10:47:12 GMT cetlod [12281] * 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/p5zprod.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/trcwri.F90 (modified) bugfix in dev_r11943_MERGE_2019 : initialise local array in PISCES, see ... Sat, 21 Dec 2019 10:42:44 GMT cetlod [12280] * NEMO/trunk/src/TOP/PISCES/P4Z/p4zprod.F90 (modified) * NEMO/trunk/src/TOP/PISCES/P4Z/p5zprod.F90 (modified) * NEMO/trunk/src/TOP/trcwri.F90 (modified) bugfix in trunk : initialise local array in PISCES, see ticket #2357 Fri, 20 Dec 2019 13:36:15 GMT jchanut [12279] * NEMO/trunk/src/OCE/DYN/dynnxt.F90 (modified) * NEMO/trunk/src/OCE/TRA/tranxt.F90 (modified) #2317, changes for LFRA freshwater correction Fri, 20 Dec 2019 12:41:08 GMT cetlod [12278] * NEMO/trunk/src/OCE/LDF/ldftra.F90 (modified) trunk : minor correction in use of diaptr Fri, 20 Dec 2019 11:54:47 GMT cetlod [12277] * NEMO/trunk/src/OCE/LDF/ldftra.F90 (modified) * NEMO/trunk/src/OCE/SBC/sbcrnf.F90 (modified) * NEMO/trunk/src/TOP/PISCES/P4Z/p4zflx.F90 (modified) * NEMO/trunk/src/TOP/PISCES/P4Z/p5zlim.F90 (modified) * NEMO/trunk/src/TOP/PISCES/P4Z/p5zprod.F90 (modified) trunk : Minor corrections Fri, 20 Dec 2019 11:14:26 GMT cetlod [12276] * NEMO/trunk/cfgs/AGRIF_DEMO/EXPREF/1_context_nemo.xml (modified) * NEMO/trunk/cfgs/AGRIF_DEMO/EXPREF/2_context_nemo.xml (modified) * NEMO/trunk/cfgs/AGRIF_DEMO/EXPREF/3_context_nemo.xml (modified) * NEMO/trunk/cfgs/AGRIF_DEMO/EXPREF/axis_def_nemo.xml (added) * NEMO/trunk/cfgs/AGRIF_DEMO/EXPREF/context_nemo.xml (modified) * NEMO/trunk/cfgs/AMM12/EXPREF/axis_def_nemo.xml (added) * NEMO/trunk/cfgs/AMM12/EXPREF/context_nemo.xml (modified) * NEMO/trunk/cfgs/C1D_PAPA/EXPREF/axis_def_nemo.xml (added) * NEMO/trunk/cfgs/C1D_PAPA/EXPREF/context_nemo.xml (modified) * NEMO/trunk/cfgs/GYRE_BFM/EXPREF/axis_def_nemo.xml (added) * NEMO/trunk/cfgs/GYRE_BFM/EXPREF/context_nemo.xml (modified) * NEMO/trunk/cfgs/GYRE_PISCES/EXPREF/axis_def_nemo.xml (added) * NEMO/trunk/cfgs/GYRE_PISCES/EXPREF/context_nemo.xml (modified) * NEMO/trunk/cfgs/ORCA2_ICE_PISCES/EXPREF/axis_def_nemo.xml (added) * NEMO/trunk/cfgs/ORCA2_ICE_PISCES/EXPREF/context_nemo.xml (modified) * NEMO/trunk/cfgs/ORCA2_ICE_PISCES/EXPREF/file_def_nemo-ice.xml (modified) * NEMO/trunk/cfgs/ORCA2_ICE_PISCES/EXPREF/file_def_nemo-oce.xml (modified) * NEMO/trunk/cfgs/ORCA2_OFF_PISCES/EXPREF/axis_def_nemo.xml (added) * NEMO/trunk/cfgs/ORCA2_OFF_PISCES/EXPREF/context_nemo.xml (modified) * NEMO/trunk/cfgs/ORCA2_OFF_PISCES/EXPREF/file_def_nemo-pisces.xml (added) * NEMO/trunk/cfgs/ORCA2_OFF_PISCES/EXPREF/file_def_nemo.xml (deleted) * NEMO/trunk/cfgs/ORCA2_OFF_TRC/EXPREF/axis_def_nemo.xml (added) * NEMO/trunk/cfgs/ORCA2_OFF_TRC/EXPREF/context_nemo.xml (modified) * NEMO/trunk/cfgs/ORCA2_OFF_TRC/EXPREF/file_def_nemo-innerttrc.xml (added) * NEMO/trunk/cfgs/ORCA2_OFF_TRC/EXPREF/file_def_nemo.xml (deleted) * NEMO/trunk/cfgs/ORCA2_SAS_ICE/EXPREF/axis_def_nemo.xml (added) * NEMO/trunk/cfgs/ORCA2_SAS_ICE/EXPREF/context_nemo.xml (modified) * NEMO/trunk/cfgs/SHARED/axis_def_nemo.xml (added) * NEMO/trunk/cfgs/SHARED/domain_def_nemo.xml (modified) * NEMO/trunk/cfgs/SHARED/field_def_nemo-ice.xml (modified) * NEMO/trunk/cfgs/SHARED/field_def_nemo-oce.xml (modified) * NEMO/trunk/cfgs/SHARED/field_def_nemo-pisces.xml (modified) * NEMO/trunk/cfgs/SHARED/grid_def_nemo.xml (modified) * NEMO/trunk/cfgs/SHARED/namelist_ref (modified) * NEMO/trunk/cfgs/SPITZ12/EXPREF/axis_def_nemo.xml (added) * NEMO/trunk/cfgs/SPITZ12/EXPREF/context_nemo.xml (modified) * NEMO/trunk/src/OCE/DIA/diaar5.F90 (modified) * NEMO/trunk/src/OCE/DIA/diahth.F90 (modified) * NEMO/trunk/src/OCE/DIA/diaptr.F90 (modified) * NEMO/trunk/src/OCE/IOM/iom.F90 (modified) * NEMO/trunk/src/OCE/LDF/ldfdyn.F90 (modified) * NEMO/trunk/src/OCE/LDF/ldftra.F90 (modified) * NEMO/trunk/src/OCE/SBC/sbcblk.F90 (modified) * NEMO/trunk/src/OCE/SBC/sbccpl.F90 (modified) * NEMO/trunk/src/OCE/SBC/sbcmod.F90 (modified) * NEMO/trunk/src/OCE/SBC/sbcrnf.F90 (modified) * NEMO/trunk/src/OCE/SBC/sbcssr.F90 (modified) * NEMO/trunk/src/OCE/TRA/trabbc.F90 (modified) * NEMO/trunk/src/OCE/step.F90 (modified) * NEMO/trunk/src/TOP/PISCES/P4Z/p4zfechem.F90 (modified) * NEMO/trunk/src/TOP/PISCES/P4Z/p4zflx.F90 (modified) * NEMO/trunk/src/TOP/PISCES/P4Z/p4zligand.F90 (modified) * NEMO/trunk/src/TOP/PISCES/P4Z/p4zlim.F90 (modified) * NEMO/trunk/src/TOP/PISCES/P4Z/p4zlys.F90 (modified) * NEMO/trunk/src/TOP/PISCES/P4Z/p4zmeso.F90 (modified) * NEMO/trunk/src/TOP/PISCES/P4Z/p4zmicro.F90 (modified) * NEMO/trunk/src/TOP/PISCES/P4Z/p4zopt.F90 (modified) * NEMO/trunk/src/TOP/PISCES/P4Z/p4zprod.F90 (modified) * NEMO/trunk/src/TOP/PISCES/P4Z/p4zrem.F90 (modified) * NEMO/trunk/src/TOP/PISCES/P4Z/p4zsed.F90 (modified) * NEMO/trunk/src/TOP/PISCES/P4Z/p4zsink.F90 (modified) * NEMO/trunk/src/TOP/PISCES/P4Z/p4zsms.F90 (modified) * NEMO/trunk/src/TOP/PISCES/P4Z/p5zlim.F90 (modified) * NEMO/trunk/src/TOP/PISCES/P4Z/p5zmeso.F90 (modified) * NEMO/trunk/src/TOP/PISCES/P4Z/p5zmicro.F90 (modified) * NEMO/trunk/src/TOP/PISCES/P4Z/p5zprod.F90 (modified) * NEMO/trunk/tests/CANAL/EXPREF/axis_def_nemo.xml (added) * NEMO/trunk/tests/CANAL/EXPREF/context_nemo.xml (modified) * NEMO/trunk/tests/ICE_ADV1D/EXPREF/axis_def_nemo.xml (added) * NEMO/trunk/tests/ICE_ADV1D/EXPREF/context_nemo.xml (modified) * NEMO/trunk/tests/ICE_ADV2D/EXPREF/axis_def_nemo.xml (added) * NEMO/trunk/tests/ICE_ADV2D/EXPREF/context_nemo.xml (modified) * NEMO/trunk/tests/ICE_AGRIF/EXPREF/axis_def_nemo.xml (added) * NEMO/trunk/tests/ISOMIP/EXPREF/axis_def_nemo.xml (added) * NEMO/trunk/tests/ISOMIP/EXPREF/context_nemo.xml (modified) * NEMO/trunk/tests/LOCK_EXCHANGE/EXPREF/axis_def_nemo.xml (added) * NEMO/trunk/tests/LOCK_EXCHANGE/EXPREF/context_nemo.xml (modified) * NEMO/trunk/tests/OVERFLOW/EXPREF/axis_def_nemo.xml (added) * NEMO/trunk/tests/OVERFLOW/EXPREF/context_nemo.xml (modified) * NEMO/trunk/tests/VORTEX/EXPREF/1_context_nemo.xml (modified) * NEMO/trunk/tests/VORTEX/EXPREF/axis_def_nemo.xml (added) * NEMO/trunk/tests/VORTEX/EXPREF/context_nemo.xml (modified) * NEMO/trunk/tests/WAD/EXPREF/axis_def_nemo.xml (added) * NEMO/trunk/tests/WAD/EXPREF/context_nemo.xml (modified) trunk : merge in some cmip6 diagnostics into the trunk before copying it ... Wed, 18 Dec 2019 15:42:19 GMT mathiot [12275] * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/ICB/icbthm.F90 (modified) fix icb reproducibility (ticket #2238) Wed, 18 Dec 2019 15:42:04 GMT mathiot [12274] * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/ICB/icbthm.F90 (modified) fix icb reproducibility (ticket #2238) Wed, 18 Dec 2019 12:44:42 GMT mathiot [12271] * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/ISF/isfutils.F90 (modified) fix bugs in isfutils debug subroutines found during icb reproducibility ... Wed, 18 Dec 2019 12:41:43 GMT mathiot [12270] * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/ISF/isfutils.F90 (modified) fix bugs in isfutils debug subroutines found during icb reproducibility ... Wed, 18 Dec 2019 10:34:35 GMT mathiot [12269] * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/eosbn2.F90 (modified) remove useless lbc_lnk in eosbn2 (rab2d and insitu2d) as suggested in ... Wed, 18 Dec 2019 10:28:06 GMT mathiot [12268] * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/TRA/eosbn2.F90 (modified) remove useless lbc_lnk in eosbn2 (rab2d and insitu2d) as suggested in ... Wed, 18 Dec 2019 09:47:31 GMT cguiavarch [12266] * NEMO/branches/UKMO/NEMO_4.0_FKOSM/src/OCE/ZDF/zdfosm.F90 (modified) Debug Tue, 17 Dec 2019 16:34:29 GMT stefryn [12263] * NEMO/branches/2019/dev_r11842_SI3-10_EAP/tests/ICE_RHEO (added) * NEMO/branches/2019/dev_r11842_SI3-10_EAP/tests/ICE_RHEO/EXPREF (added) * NEMO/branches/2019/dev_r11842_SI3-10_EAP/tests/ICE_RHEO/EXPREF/README (added) * NEMO/branches/2019/dev_r11842_SI3-10_EAP/tests/ICE_RHEO/EXPREF/context_nemo.xml (added) * NEMO/branches/2019/dev_r11842_SI3-10_EAP/tests/ICE_RHEO/EXPREF/domain_def_nemo.xml (added) * NEMO/branches/2019/dev_r11842_SI3-10_EAP/tests/ICE_RHEO/EXPREF/field_def_nemo-ice.xml (added) * NEMO/branches/2019/dev_r11842_SI3-10_EAP/tests/ICE_RHEO/EXPREF/field_def_nemo-oce.xml (added) * NEMO/branches/2019/dev_r11842_SI3-10_EAP/tests/ICE_RHEO/EXPREF/file_def_nemo-ice.xml (added) * NEMO/branches/2019/dev_r11842_SI3-10_EAP/tests/ICE_RHEO/EXPREF/file_def_nemo-oce.xml (added) * NEMO/branches/2019/dev_r11842_SI3-10_EAP/tests/ICE_RHEO/EXPREF/grid_def_nemo.xml (added) * NEMO/branches/2019/dev_r11842_SI3-10_EAP/tests/ICE_RHEO/EXPREF/iodef.xml (added) * NEMO/branches/2019/dev_r11842_SI3-10_EAP/tests/ICE_RHEO/EXPREF/layout.dat (added) * NEMO/branches/2019/dev_r11842_SI3-10_EAP/tests/ICE_RHEO/EXPREF/make_INITICE.py (added) * NEMO/branches/2019/dev_r11842_SI3-10_EAP/tests/ICE_RHEO/EXPREF/namelist_cfg (added) * NEMO/branches/2019/dev_r11842_SI3-10_EAP/tests/ICE_RHEO/EXPREF/namelist_ice_cfg (added) * NEMO/branches/2019/dev_r11842_SI3-10_EAP/tests/ICE_RHEO/EXPREF/namelist_ice_ref (added) * NEMO/branches/2019/dev_r11842_SI3-10_EAP/tests/ICE_RHEO/EXPREF/namelist_ref (added) * NEMO/branches/2019/dev_r11842_SI3-10_EAP/tests/ICE_RHEO/EXPREF/nemo (added) * NEMO/branches/2019/dev_r11842_SI3-10_EAP/tests/ICE_RHEO/MY_SRC (added) * NEMO/branches/2019/dev_r11842_SI3-10_EAP/tests/ICE_RHEO/MY_SRC/icedyn_rhg_eap.F90 (added) * NEMO/branches/2019/dev_r11842_SI3-10_EAP/tests/ICE_RHEO/MY_SRC/icedyn_rhg_evp.F90 (added) * NEMO/branches/2019/dev_r11842_SI3-10_EAP/tests/ICE_RHEO/MY_SRC/usrdef_hgr.F90 (added) * NEMO/branches/2019/dev_r11842_SI3-10_EAP/tests/ICE_RHEO/MY_SRC/usrdef_nam.F90 (added) * NEMO/branches/2019/dev_r11842_SI3-10_EAP/tests/ICE_RHEO/MY_SRC/usrdef_sbc.F90 (added) * NEMO/branches/2019/dev_r11842_SI3-10_EAP/tests/ICE_RHEO/MY_SRC/usrdef_zgr.F90 (added) * NEMO/branches/2019/dev_r11842_SI3-10_EAP/tests/ICE_RHEO/cpp_ICE_RHEO.fcm (added) add test case for rheology, will change lateral bounday conditions later Tue, 17 Dec 2019 15:19:06 GMT smasson [12262] * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/SHARED/namelist_ice_ref (modified) rev12240_dev_r11943_MERGE_2019: correct namelist_ice_ref to match the ... Tue, 17 Dec 2019 13:43:09 GMT stefryn [12261] * NEMO/branches/2019/dev_r11842_SI3-10_EAP/cfgs/SHARED/field_def_nemo-ice.xml (modified) * NEMO/branches/2019/dev_r11842_SI3-10_EAP/src/ICE/ice.F90 (modified) * NEMO/branches/2019/dev_r11842_SI3-10_EAP/src/ICE/icedyn_rdgrft.F90 (modified) * NEMO/branches/2019/dev_r11842_SI3-10_EAP/src/ICE/icedyn_rhg.F90 (modified) * NEMO/branches/2019/dev_r11842_SI3-10_EAP/src/ICE/icedyn_rhg_eap.F90 (modified) * NEMO/branches/2019/dev_r11842_SI3-10_EAP/tests/ICE_ADV2D/EXPREF/file_def_nemo-ice.xml (modified) * NEMO/branches/2019/dev_r11842_SI3-10_EAP/tests/ICE_ADV2D/EXPREF/namelist_ice_cfg (modified) * NEMO/branches/2019/dev_r11842_SI3-10_EAP/tests/ICE_ADV2D/MY_SRC/usrdef_nam.F90 (modified) add yield surface output and include effect on ridging Tue, 17 Dec 2019 10:33:49 GMT acc [12260] * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p5zmeso.F90 (modified) dev_r11943_MERGE_2019 : Fix compilation issue in ... Mon, 16 Dec 2019 13:38:32 GMT cetlod [12258] * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/ORCA2_ICE_PISCES/EXPREF/namelist_ice_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/SHARED/field_def_nemo-pisces.xml (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p4zbc.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/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/p4zopt.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/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/p5zprod.F90 (modified) dev_r11943_MERGE_2019 : : Cleaning PISCES diagnostics output ; fully ... Mon, 16 Dec 2019 13:36:58 GMT cetlod [12257] * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/ORCA2_ICE_PISCES/EXPREF/namelist_ice_cfg (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/SHARED/field_def_nemo-pisces.xml (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/p4zopt.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/p4zsink.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/p5zprod.F90 (modified) dev_r12072_MERGE_OPTION2_2019: Cleaning PISCES diagnostics output ; ... Mon, 16 Dec 2019 12:52:49 GMT smasson [12256] * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/BDY/bdydta.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/step.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/SAS/step.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/trcbc.F90 (modified) rev12232_dev_r12072_MERGE_OPTION2_2019: bugfix in fldread offset in bdy, ... Mon, 16 Dec 2019 12:52:25 GMT smasson [12255] * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/BDY/bdydta.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/fldread.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/step.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/SAS/step.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/trcbc.F90 (modified) rev12240_dev_r11943_MERGE_2019: bugfix in fldread offset in bdy, see ... Mon, 16 Dec 2019 11:24:46 GMT acc [12254] * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/STATION_ASF/MY_SRC/nemogcm.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/STATION_ASF/MY_SRC/stpctl.F90 (modified) Branch dev_r11943_MERGE_2019. Minor changes to MY_SRC files in ... 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 ... 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 ... Sat, 14 Dec 2019 08:41:16 GMT smasson [12250] * 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/bdytides.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DOM/daymod.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/DYN/dynspg_ts.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/fldread.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/step.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OFF/dtadyn.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/SAS/daymod.F90 (deleted) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/SAS/step.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/trcbc.F90 (modified) rev12240_dev_r11943_MERGE_2019: same as [12246], add modifications from ... Fri, 13 Dec 2019 18:48:00 GMT laurent [12249] * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/STATION_ASF/EXPREF/namelist_coare3p6-noskin_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/STATION_ASF/EXPREF/namelist_coare3p6_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/STATION_ASF/EXPREF/namelist_ecmwf-noskin_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/STATION_ASF/EXPREF/namelist_ecmwf_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/STATION_ASF/EXPREF/namelist_ncar_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/STATION_ASF/MY_SRC/diawri.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/STATION_ASF/MY_SRC/nemogcm.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/STATION_ASF/MY_SRC/sbcssm.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/STATION_ASF/MY_SRC/step_c1d.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/STATION_ASF/MY_SRC/stpctl.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/STATION_ASF/MY_SRC/usrdef_nam.F90 (modified) Made STATION_ASF testcase fully compliant with new timestepping scheme. Fri, 13 Dec 2019 16:33:53 GMT smasson [12248] * NEMO/trunk/src/OCE/SBC/fldread.F90 (modified) trunk : clean useless warnings in fldread Fri, 13 Dec 2019 15:45:41 GMT gsamson [12247] * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/SHARED/namelist_ice_ref (modified) turn off adaptive EVP (turned on in r12166) to avoid sea-ice stability ... Fri, 13 Dec 2019 15:11:51 GMT smasson [12246] * 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/bdytides.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DOM/daymod.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DOM/dom_oce.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/SBC/fldread.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/step.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OFF/dtadyn.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/SAS/daymod.F90 (deleted) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/SAS/step.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/trcbc.F90 (modified) rev12232_dev_r12072_MERGE_OPTION2_2019: add modifications from ... Fri, 13 Dec 2019 13:31:46 GMT cguiavarch [12245] * NEMO/branches/UKMO/NEMO_4.0_FKOSM (modified) * NEMO/branches/UKMO/NEMO_4.0_FKOSM/cfgs/C1D_PAPA/cpp_C1D_PAPA.fcm (modified) * NEMO/branches/UKMO/NEMO_4.0_FKOSM/cfgs/SHARED (modified) * NEMO/branches/UKMO/NEMO_4.0_FKOSM/cfgs/SHARED/domain_def_nemo.xml (modified) * NEMO/branches/UKMO/NEMO_4.0_FKOSM/cfgs/SHARED/field_def_nemo-oce.xml (modified) * NEMO/branches/UKMO/NEMO_4.0_FKOSM/cfgs/SHARED/field_def_nemo-waves.xml (copied) * NEMO/branches/UKMO/NEMO_4.0_FKOSM/cfgs/SHARED/grid_def_nemo.xml (modified) * NEMO/branches/UKMO/NEMO_4.0_FKOSM/cfgs/SHARED/namelist_ref (modified) * NEMO/branches/UKMO/NEMO_4.0_FKOSM/cfgs/eORCA1 (copied) * NEMO/branches/UKMO/NEMO_4.0_FKOSM/cfgs/ref_cfgs.txt (modified) * NEMO/branches/UKMO/NEMO_4.0_FKOSM/src (modified) * NEMO/branches/UKMO/NEMO_4.0_FKOSM/src/OCE/TRA/tramle.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0_FKOSM/src/OCE/TRD/trd_oce.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0_FKOSM/src/OCE/TRD/trdtra.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0_FKOSM/src/OCE/ZDF/zdfosm.F90 (modified) Merge changes from ... Fri, 13 Dec 2019 13:25:01 GMT cguiavarch [12244] * NEMO/branches/UKMO/NEMO_4.0_FKOSM (copied) Create a branch for FKOSM (Fox-Kemper OSMOSIS) Fri, 13 Dec 2019 10:31:34 GMT mathiot [12242] * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/ISF/isfstp.F90 (modified) change in comments in a ctl_stop Fri, 13 Dec 2019 10:29:33 GMT mathiot [12241] * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/ISF/isfstp.F90 (modified) change in comments in a ctl_stop 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 ... Fri, 13 Dec 2019 08:25:14 GMT cetlod [12232] * NEMO/trunk/src/TOP/PISCES/P4Z/p4zmeso.F90 (modified) * NEMO/trunk/src/TOP/PISCES/P4Z/p4zmicro.F90 (modified) trunk : bugfixes on grazing diagnostics, see ticket #2260 Thu, 12 Dec 2019 17:15:21 GMT smasson [12230] * NEMO/trunk/cfgs/AMM12/EXPREF/file_def_nemo-oce.xml (modified) * NEMO/trunk/tests/CANAL/EXPREF/field_def_nemo-oce.xml (modified) * utils/tools/DOMAINcfg/field_def.xml (modified) trunk: missing part in supressing diatmb, see #1759 Thu, 12 Dec 2019 16:41:04 GMT acc [12229] * 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/axis_def_nemo.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/src (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/NST/agrif_all_update.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/NST/agrif_ice_update.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/NST/vremap.F90 (copied) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DIA/diamlr.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynspg_ts.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/VORTEX/EXPREF/1_context_nemo.xml (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/VORTEX/EXPREF/context_nemo.xml (modified) 2019/dev_r11943_MERGE_2019: Merge in dev_AGRIF-01-05_merged. Fully SETTE ... Thu, 12 Dec 2019 16:14:20 GMT smasson [12227] * NEMO/releases/release-3.6/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90 (modified) v3.6: minor bugfix in sbccpl, see #2132 Thu, 12 Dec 2019 16:08:22 GMT agn [12226] * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/C1D_PAPA/cpp_C1D_PAPA.fcm (modified) remove key_mpp from cpp_C1D_PAPA.fcm Thu, 12 Dec 2019 16:02:10 GMT agn [12225] * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/SHARED/domain_def_nemo.xml (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/SHARED/grid_def_nemo.xml (modified) added xml code in SHARED to allow small area output with danger_grid Thu, 12 Dec 2019 16:02:02 GMT agn [12224] * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/eORCA1 (added) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/eORCA1/EXPREF (added) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/eORCA1/EXPREF/context_nemo.xml (added) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/eORCA1/EXPREF/context_nemo_1d.xml (added) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/eORCA1/EXPREF/context_nemo_1m.xml (added) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/eORCA1/EXPREF/context_nemo_1ts.xml (added) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/eORCA1/EXPREF/context_nemo_danger_1ts.xml (added) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/eORCA1/EXPREF/file_def_1d.xml (added) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/eORCA1/EXPREF/file_def_1m.xml (added) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/eORCA1/EXPREF/file_def_1ts.xml (added) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/eORCA1/EXPREF/file_def_danger_1ts.xml (added) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/eORCA1/EXPREF/file_def_nemo-ice_1d.xml (added) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/eORCA1/EXPREF/file_def_nemo-ice_1m.xml (added) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/eORCA1/EXPREF/file_def_nemo-ice_1ts.xml (added) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/eORCA1/EXPREF/file_def_osmosis_1d.xml (added) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/eORCA1/EXPREF/file_def_osmosis_1m.xml (added) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/eORCA1/EXPREF/file_def_osmosis_1ts.xml (added) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/eORCA1/EXPREF/file_def_osmosis_danger_1ts.xml (added) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/eORCA1/EXPREF/file_def_osmosis_danger_1ts_noFK.xml (added) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/eORCA1/EXPREF/file_def_osmosis_short_1ts.xml (added) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/eORCA1/EXPREF/file_def_short_1ts.xml (added) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/eORCA1/EXPREF/file_def_waves_1d.xml (added) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/eORCA1/EXPREF/file_def_waves_1m.xml (added) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/eORCA1/EXPREF/file_def_waves_1ts.xml (added) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/eORCA1/EXPREF/iodef.xml (added) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/eORCA1/EXPREF/namelist_cfg (added) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/eORCA1/EXPREF/namelist_cfg_start_N (added) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/eORCA1/EXPREF/namelist_ice_cfg (added) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/eORCA1/cpp_eORCA1.fcm (added) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/ref_cfgs.txt (modified) add eORCA1 configuration with EXPREF holding OSMOSIS xml & namelists Thu, 12 Dec 2019 16:01:57 GMT agn [12223] * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/SHARED/field_def_nemo-waves.xml (added) Reintroduce field-def_nemo-waves.xml Thu, 12 Dec 2019 16:01:51 GMT agn [12222] * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/SHARED/namelist_ref (modified) added FK/OSM namelist vars in namelist_ref Thu, 12 Dec 2019 16:01:46 GMT agn [12221] * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/ZDF/zdfosm.F90 (modified) relax hmle to hbl Thu, 12 Dec 2019 16:01:41 GMT agn [12220] * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/SHARED/field_def_nemo-oce.xml (modified) add extra FK fields to field_def_nemo-oce.xml add ML lateral T, S & b ... Thu, 12 Dec 2019 16:01:36 GMT agn [12219] * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/TRD/trd_oce.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/TRD/trdtra.F90 (modified) Add Gurvan's corrections to trend diagnostics Thu, 12 Dec 2019 16:01:31 GMT agn [12218] * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/ZDF/zdfosm.F90 (modified) FKOSM mods for zdfosm.F90 Thu, 12 Dec 2019 16:01:26 GMT agn [12217] * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/TRA/tramle.F90 (modified) make FKOSM changes to tramle.F90 Thu, 12 Dec 2019 16:01:18 GMT agn [12216] * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/ZDF/zdfosm.F90 (modified) Alan's changes Thu, 12 Dec 2019 15:46:06 GMT smasson [12214] * NEMO/trunk/src/OCE/nemogcm.F90 (modified) trunk: put back 1 line accidentally deleted by [12206] Thu, 12 Dec 2019 15:32:02 GMT smasson [12213] * NEMO/trunk/cfgs/AGRIF_DEMO/EXPREF/context_nemo.xml (modified) * NEMO/trunk/cfgs/AMM12/EXPREF/context_nemo.xml (modified) * NEMO/trunk/cfgs/C1D_PAPA/EXPREF/context_nemo.xml (modified) * NEMO/trunk/cfgs/GYRE_BFM/EXPREF/context_nemo.xml (modified) * NEMO/trunk/cfgs/GYRE_PISCES/EXPREF/context_nemo.xml (modified) * NEMO/trunk/cfgs/ORCA2_ICE_PISCES/EXPREF/context_nemo.xml (modified) * NEMO/trunk/cfgs/ORCA2_OFF_PISCES/EXPREF/context_nemo.xml (modified) * NEMO/trunk/cfgs/ORCA2_OFF_TRC/EXPREF/context_nemo.xml (modified) * NEMO/trunk/cfgs/ORCA2_SAS_ICE/EXPREF/context_nemo.xml (modified) * NEMO/trunk/cfgs/SHARED/grid_def_nemo.xml (modified) * NEMO/trunk/cfgs/SPITZ12/EXPREF/context_nemo.xml (modified) * NEMO/trunk/tests/CANAL/EXPREF/context_nemo.xml (modified) * NEMO/trunk/tests/ICE_ADV1D/EXPREF/context_nemo.xml (modified) * NEMO/trunk/tests/ICE_ADV2D/EXPREF/context_nemo.xml (modified) * NEMO/trunk/tests/ICE_AGRIF/EXPREF/context_nemo.xml (modified) * NEMO/trunk/tests/ISOMIP/EXPREF/context_nemo.xml (modified) * NEMO/trunk/tests/LOCK_EXCHANGE/EXPREF/context_nemo.xml (modified) * NEMO/trunk/tests/OVERFLOW/EXPREF/context_nemo.xml (modified) * NEMO/trunk/tests/VORTEX/EXPREF/context_nemo.xml (modified) * NEMO/trunk/tests/WAD/EXPREF/context_nemo.xml (modified) trunk: update xml files to define missing grids, see #2255 Thu, 12 Dec 2019 15:00:01 GMT dancopsey [12212] * NEMO/branches/UKMO/NEMO_4.0.1_remove_leads_botm/src/ICE/icethd.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.1_remove_leads_botm/src/ICE/icethd_dh.F90 (modified) Reinstate fhld_1d into icethd_dh.F90 but set it to zero in icethd.F90. ... Thu, 12 Dec 2019 12:15:13 GMT cetlod [12210] * 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/SHARED (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/SHARED/namelist_ref (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/doc (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/doc/latex/NEMO/subfiles/chap_misc.tex (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/doc/namelists/namctl (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/ABL/ablmod.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/ICE/icecor.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/ICE/icectl.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/icedyn_rhg_evp.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/iceupdate.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/C1D/dyncor_c1d.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/DOM/daymod.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DYN/dynadv_cen2.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DYN/dynadv_ubs.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/dynkeg.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DYN/dynldf.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DYN/dynldf_iso.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DYN/dynnxt.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/dynzad.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DYN/dynzdf.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DYN/sshwzv.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/IOM/prtctl.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/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/sbcblk.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/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/traldf.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/TRA/tranxt.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/TRA/trasbc.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/TRA/trazdf.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/ZDF/zdfddm.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/zdfmxl.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/zdftke.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/nemogcm.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/stpctl.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/SAS/daymod.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/SAS/stpctl.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/p2zexp.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/p4zagg.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/PISCES/P4Z/p4zbio.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/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/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/p4zsink.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/trcdmp_sed.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/trcbbl.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/trcnxt.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/trcsbc.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/TRP/trczdf.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/prtctl_trc.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/trcsms.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/BENCH/MY_SRC/zdfiwm.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/CANAL/MY_SRC/stpctl.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/CANAL/MY_SRC/trazdf.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/STATION_ASF/EXPREF/namelist_coare3p6-noskin_cfg (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/STATION_ASF/EXPREF/namelist_coare3p6_cfg (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/STATION_ASF/EXPREF/namelist_ecmwf-noskin_cfg (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/STATION_ASF/EXPREF/namelist_ecmwf_cfg (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/STATION_ASF/EXPREF/namelist_ncar_cfg (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/stpctl.F90 (modified) dev_merge_option2 : merge in fix_sn_cfctl_ticket2328 branch Thu, 12 Dec 2019 11:29:12 GMT cetlod [12209] * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/TOP/trcbc.F90 (modified) Minor bugfix in trcbc.F90 Thu, 12 Dec 2019 11:20:21 GMT smasson [12208] * NEMO/trunk/cfgs/AGRIF_DEMO/cpp_AGRIF_DEMO.fcm (modified) * NEMO/trunk/tests/VORTEX/cpp_VORTEX.fcm (modified) trunk: move back cpp_AGRIF_DEMO and cpp_VORTEX mofified by [12206] Thu, 12 Dec 2019 11:14:55 GMT smasson [12206] * NEMO/trunk/cfgs/AGRIF_DEMO/EXPREF/1_namelist_cfg (modified) * NEMO/trunk/cfgs/AGRIF_DEMO/EXPREF/2_namelist_cfg (modified) * NEMO/trunk/cfgs/AGRIF_DEMO/EXPREF/3_namelist_cfg (modified) * NEMO/trunk/cfgs/AGRIF_DEMO/EXPREF/namelist_cfg (modified) * NEMO/trunk/cfgs/AGRIF_DEMO/cpp_AGRIF_DEMO.fcm (modified) * NEMO/trunk/cfgs/AMM12/EXPREF/namelist_cfg (modified) * NEMO/trunk/cfgs/C1D_PAPA/EXPREF/namelist_cfg (modified) * NEMO/trunk/cfgs/GYRE_BFM/EXPREF/namelist_cfg (modified) * NEMO/trunk/cfgs/GYRE_PISCES/EXPREF/namelist_cfg (modified) * NEMO/trunk/cfgs/ORCA2_ICE_PISCES/EXPREF/namelist_cfg (modified) * NEMO/trunk/cfgs/ORCA2_OFF_PISCES/EXPREF/namelist_cfg (modified) * NEMO/trunk/cfgs/ORCA2_OFF_TRC/EXPREF/namelist_cfg (modified) * NEMO/trunk/cfgs/ORCA2_SAS_ICE/EXPREF/namelist_cfg (modified) * NEMO/trunk/cfgs/SHARED/field_def_nemo-oce.xml (modified) * NEMO/trunk/cfgs/SHARED/namelist_ref (modified) * NEMO/trunk/cfgs/SPITZ12/EXPREF/namelist_cfg (modified) * NEMO/trunk/doc/latex/NEMO/subfiles/chap_DIA.tex (modified) * NEMO/trunk/doc/namelists/nam_diatmb (deleted) * NEMO/trunk/src/OCE/DIA/diatmb.F90 (deleted) * NEMO/trunk/src/OCE/DIA/diawri.F90 (modified) * NEMO/trunk/src/OCE/DYN/dynspg_ts.F90 (modified) * NEMO/trunk/src/OCE/nemogcm.F90 (modified) * NEMO/trunk/tests/CANAL/EXPREF/namelist_cfg (modified) * NEMO/trunk/tests/CANAL/MY_SRC/diawri.F90 (modified) * NEMO/trunk/tests/ICE_ADV1D/EXPREF/namelist_cfg (modified) * NEMO/trunk/tests/ICE_ADV1D/EXPREF/namelist_cfg_120pts (modified) * NEMO/trunk/tests/ICE_ADV1D/EXPREF/namelist_cfg_240pts (modified) * NEMO/trunk/tests/ICE_ADV1D/EXPREF/namelist_cfg_60pts (modified) * NEMO/trunk/tests/ICE_ADV2D/EXPREF/namelist_cfg (modified) * NEMO/trunk/tests/ICE_AGRIF/EXPREF/1_namelist_cfg (modified) * NEMO/trunk/tests/ICE_AGRIF/EXPREF/namelist_cfg (modified) * NEMO/trunk/tests/ISOMIP/EXPREF/namelist_cfg (modified) * NEMO/trunk/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT2_flux_ubs_cfg (modified) * NEMO/trunk/tests/OVERFLOW/EXPREF/namelist_zps_FCT4_flux_ubs_cfg (modified) * NEMO/trunk/tests/VORTEX/EXPREF/1_namelist_cfg (modified) * NEMO/trunk/tests/VORTEX/EXPREF/namelist_cfg (modified) * NEMO/trunk/tests/VORTEX/cpp_VORTEX.fcm (modified) * NEMO/trunk/tests/WAD/EXPREF/namelist_cfg (modified) trunk: supress diatmb as it was bugged and already coded in diawri, see ... 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- ... Thu, 12 Dec 2019 10:41:48 GMT cetlod [12204] * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019 (modified) minor updates Thu, 12 Dec 2019 09:10:28 GMT cetlod [12203] * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DIA/diaptr.F90 (modified) den_merge_option2 : minor bug correction 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- ... Thu, 12 Dec 2019 08:51:33 GMT smasson [12201] * NEMO/trunk/src/OCE/LDF/ldfdyn.F90 (modified) trunk: correct [12194], see #2265 Thu, 12 Dec 2019 08:49:28 GMT laurent [12200] * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/sbcblk.F90 (modified) Catches up with SBCBLK bugfixes of branch ... Thu, 12 Dec 2019 08:30:08 GMT laurent [12199] * NEMO/branches/2019/dev_r11943_MERGE_2019/src/ABL/sbcabl.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/abl.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/sbcblk.F90 (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/STATION_ASF/EXPREF/context_nemo.xml (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/STATION_ASF/EXPREF/namelist_coare3p6-noskin_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/STATION_ASF/EXPREF/namelist_coare3p6_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/STATION_ASF/EXPREF/namelist_ecmwf-noskin_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/STATION_ASF/EXPREF/namelist_ecmwf_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/STATION_ASF/EXPREF/namelist_ncar_cfg (modified) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/STATION_ASF/MY_SRC/iom.F90 (deleted) * NEMO/branches/2019/dev_r11943_MERGE_2019/tests/STATION_ASF/MY_SRC/usrdef_nam.F90 (modified) Catches up with SBCBLK bugfixes of branch ... Thu, 12 Dec 2019 08:16:14 GMT smasson [12198] * NEMO/trunk/src/OCE/LDF/ldfslp.F90 (modified) trunk: bugfix in ldf_slp_triad, see #1928 Wed, 11 Dec 2019 23:46:12 GMT clem [12197] * NEMO/trunk/src/ICE/icedyn_adv.F90 (modified) * NEMO/trunk/src/ICE/icedyn_adv_pra.F90 (modified) * NEMO/trunk/src/ICE/icedyn_adv_umx.F90 (modified) correct ticket #2349 Wed, 11 Dec 2019 17:13:20 GMT smasson [12196] * NEMO/trunk/src/OCE/LDF/ldfslp.F90 (modified) trunk: limit bottom slope to 1/2*e3/e1 in ldf_slp, see #1180 Wed, 11 Dec 2019 16:23:52 GMT cetlod [12195] * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/VORTEX/EXPREF/1_context_nemo.xml (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/VORTEX/EXPREF/context_nemo.xml (modified) dev_merge_option2 : update context file Wed, 11 Dec 2019 16:21:56 GMT smasson [12194] * NEMO/trunk/src/OCE/LDF/ldfdyn.F90 (modified) trunk: minor bugfix in ldfdyn, see #2265 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 16:00:27 GMT laurent [12192] * 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/sbcblk.F90 (modified) Skin temperature is back to Celsius (formerly Kelvin)! Wed, 11 Dec 2019 15:56:06 GMT jchanut [12191] * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/CHANGES.rst (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/CONTRIBUTING.rst (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/INSTALL.rst (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/LICENSE (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/README.rst (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/REFERENCES.bib (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs (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/namelist_ref (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/ref_cfgs.txt (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/doc (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/doc/latex/global/ametsoc.bst (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/ext (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/NST/agrif_all_update.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/NST/agrif_ice_update.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/NST/agrif_oce.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/NST/agrif_oce_interp.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/NST/agrif_oce_sponge.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/NST/agrif_oce_update.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/NST/agrif_top_interp.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/NST/agrif_top_sponge.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/NST/agrif_top_update.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/NST/vremap.F90 (copied) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DYN/dynspg_ts.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests (modified) * utils/build/makenemo (modified) Add dev_AGRIF-01-05_merged branch, e.g. 2019 AGRIF dev Wed, 11 Dec 2019 15:40:16 GMT smueller [12190] * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019 (modified) Modification of the location of the external tools directory to ... Wed, 11 Dec 2019 15:23:51 GMT dancopsey [12189] * NEMO/branches/UKMO/NEMO_4.0.1_fix_cpl/src/ICE/icethd_zdf_bl99.F90 (modified) Revert zbeta to original SI3 value (do not use CICE value). Wed, 11 Dec 2019 15:20:57 GMT dancopsey [12188] * NEMO/branches/UKMO/NEMO_4.0.1_remove_leads_botm/src/ICE/icethd_dh.F90 (modified) Remove the leads term from the calculation of the net heat flux at the ... Wed, 11 Dec 2019 15:15:15 GMT dancopsey [12187] * NEMO/branches/UKMO/NEMO_4.0.1_remove_leads_botm (copied) Branch to remove the effect of the leads on the bottom melt Wed, 11 Dec 2019 14:18:59 GMT jchanut [12186] * NEMO/branches/2019/dev_AGRIF-01-05_merged/src/NST/agrif_oce_sponge.F90 (modified) #2222, remove sponge masking Wed, 11 Dec 2019 14:06:19 GMT gsamson [12185] * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/SHARED/grid_def_nemo.xml (modified) put back ABL grid in grid_def_nemo.xml 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 ... Wed, 11 Dec 2019 13:00:24 GMT mathiot [12183] * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbcblk.F90 (modified) minor changes on sbcblk to compile with Cray 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. Wed, 11 Dec 2019 11:32:37 GMT laurent [12181] * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/STATION_ASF/EXPREF/namelist_coare3p6-noskin_cfg (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/STATION_ASF/EXPREF/namelist_coare3p6_cfg (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/STATION_ASF/EXPREF/namelist_ecmwf-noskin_cfg (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/STATION_ASF/EXPREF/namelist_ecmwf_cfg (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/STATION_ASF/EXPREF/namelist_ncar_cfg (modified) Remove useless "ln_iscpl" from "namrun" in namelist_*_cfg of STATION_ASF ... Wed, 11 Dec 2019 11:16:36 GMT smasson [12180] * NEMO/branches/2019/dev_r12114_ticket_2263/src/OCE/DOM/daymod.F90 (modified) dev_r12114_ticket_2263: minor bugfix in daymod to follow [12158], see ... Wed, 11 Dec 2019 11:09:17 GMT laurent [12179] * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/ABL/sbcabl.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/sbcblk.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/STATION_ASF/EXPREF/context_nemo.xml (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/STATION_ASF/MY_SRC/iom.F90 (deleted) Bug fix in skin temperature! use of "tsk_m" array! Wed, 11 Dec 2019 11:02:38 GMT agn [12178] * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/AGRIF_DEMO/EXPREF/1_namelist_cfg (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/AGRIF_DEMO/EXPREF/2_namelist_cfg (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/AGRIF_DEMO/EXPREF/3_namelist_cfg (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/AGRIF_DEMO/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/AMM12/EXPREF/context_nemo.xml (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/AMM12/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/C1D_PAPA/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/C1D_PAPA/MY_SRC/usrdef_nam.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/GYRE_BFM/EXPREF/context_nemo.xml (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/GYRE_BFM/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/GYRE_PISCES/EXPREF/context_nemo.xml (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/GYRE_PISCES/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/ORCA2_ICE_PISCES/EXPREF/context_nemo.xml (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/ORCA2_ICE_PISCES/EXPREF/file_def_nemo-ice.xml (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/ORCA2_ICE_PISCES/EXPREF/file_def_nemo-oce.xml (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/ORCA2_ICE_PISCES/EXPREF/file_def_nemo-pisces.xml (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/ORCA2_ICE_PISCES/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/ORCA2_ICE_PISCES/EXPREF/namelist_top_cfg (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/ORCA2_OFF_PISCES/EXPREF/context_nemo.xml (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/ORCA2_OFF_PISCES/EXPREF/file_def_nemo.xml (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/ORCA2_OFF_PISCES/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/ORCA2_OFF_PISCES/EXPREF/namelist_top_cfg (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/ORCA2_OFF_TRC/EXPREF/context_nemo.xml (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/ORCA2_OFF_TRC/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/ORCA2_SAS_ICE/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/SHARED (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/SHARED/domain_def_nemo.xml (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/SHARED/field_def_nemo-ice.xml (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/SHARED/field_def_nemo-oce.xml (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/SHARED/field_def_nemo-pisces.xml (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/SHARED/field_def_nemo-waves.xml (deleted) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/SHARED/grid_def_nemo.xml (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/SHARED/namelist_ice_ref (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/SHARED/namelist_pisces_ref (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/SHARED/namelist_ref (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/SHARED/namelist_top_ref (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/SPITZ12/EXPREF/file_def_nemo-ice.xml (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/SPITZ12/EXPREF/file_def_nemo-oce.xml (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/SPITZ12/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/SPITZ12/EXPREF/namelist_ice_cfg (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/.svnignore (deleted) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/README.rst (copied) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/.svnignore (copied) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/DEPS (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/HTML_latex2html.sh (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/NEMO (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/NEMO/build (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/NEMO/main (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/NEMO/main/NEMO_coding_conv.tex (deleted) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/NEMO/main/NEMO_manual.bib (deleted) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/NEMO/main/NEMO_manual.ist (deleted) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/NEMO/main/NEMO_manual.tex (copied) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/NEMO/main/abstract.tex (copied) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/NEMO/main/appendices.tex (copied) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/NEMO/main/authors.tex (copied) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/NEMO/main/bibliography.bib (copied) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/NEMO/main/blocks.idx (copied) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/NEMO/main/chapters.tex (copied) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/NEMO/main/introduction.tex (copied) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/NEMO/main/keys.idx (copied) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/NEMO/main/modules.idx (copied) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/NEMO/main/parameters.idx (copied) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/NEMO/main/settings.tex (copied) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/NEMO/main/subroutines.idx (copied) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/NEMO/subfiles (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/NEMO/subfiles/annex_A.tex (deleted) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/NEMO/subfiles/annex_B.tex (deleted) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/NEMO/subfiles/annex_C.tex (deleted) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/NEMO/subfiles/annex_D.tex (deleted) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/NEMO/subfiles/annex_E.tex (deleted) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/NEMO/subfiles/annex_iso.tex (deleted) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/NEMO/subfiles/apdx_DOMAINcfg.tex (copied) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/NEMO/subfiles/apdx_algos.tex (copied) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/NEMO/subfiles/apdx_diff_opers.tex (copied) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/NEMO/subfiles/apdx_invariants.tex (copied) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/NEMO/subfiles/apdx_s_coord.tex (copied) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/NEMO/subfiles/apdx_triads.tex (copied) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/NEMO/subfiles/blocks.idx (copied) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/NEMO/subfiles/chap_ASM.tex (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/NEMO/subfiles/chap_CONFIG.tex (deleted) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/NEMO/subfiles/chap_DIA.tex (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/NEMO/subfiles/chap_DIU.tex (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/NEMO/subfiles/chap_DOM.tex (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/NEMO/subfiles/chap_DYN.tex (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/NEMO/subfiles/chap_LBC.tex (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/NEMO/subfiles/chap_LDF.tex (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/NEMO/subfiles/chap_OBS.tex (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/NEMO/subfiles/chap_SBC.tex (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/NEMO/subfiles/chap_STO.tex (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/NEMO/subfiles/chap_TRA.tex (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/NEMO/subfiles/chap_ZDF.tex (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/NEMO/subfiles/chap_cfgs.tex (copied) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/NEMO/subfiles/chap_conservation.tex (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/NEMO/subfiles/chap_misc.tex (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/NEMO/subfiles/chap_model_basics.tex (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/NEMO/subfiles/chap_model_basics_zstar.tex (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/NEMO/subfiles/chap_time_domain.tex (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/NEMO/subfiles/foreword.tex (deleted) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/NEMO/subfiles/introduction.tex (deleted) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/NEMO/subfiles/keys.idx (copied) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/NEMO/subfiles/modules.idx (copied) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/NEMO/subfiles/parameters.idx (copied) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/NEMO/subfiles/subroutines.idx (copied) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/SI3 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/SI3/build (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/SI3/build/SI3_manual.ist (copied) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/SI3/main (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/SI3/main/SI3_manual.bib (deleted) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/SI3/main/SI3_manual.tex (copied) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/SI3/main/abstract.tex (copied) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/SI3/main/appendices.tex (copied) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/SI3/main/authors.tex (copied) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/SI3/main/bibliography.bib (copied) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/SI3/main/blocks.idx (copied) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/SI3/main/chapters.tex (copied) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/SI3/main/introduction.tex (copied) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/SI3/main/keys.idx (copied) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/SI3/main/modules.idx (copied) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/SI3/main/parameters.idx (copied) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/SI3/main/settings.tex (copied) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/SI3/main/subroutines.idx (copied) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/SI3/namelists (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/SI3/subfiles (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/SI3/subfiles/blocks.idx (copied) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/SI3/subfiles/chap_bdy_agrif.tex (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/SI3/subfiles/chap_domain.tex (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/SI3/subfiles/chap_dynamics.tex (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/SI3/subfiles/chap_interfaces.tex (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/SI3/subfiles/chap_miscellaneous.tex (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/SI3/subfiles/chap_model_basics.tex (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/SI3/subfiles/chap_output_diagnostics.tex (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/SI3/subfiles/chap_radiative_transfer.tex (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/SI3/subfiles/chap_ridging_rafting.tex (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/SI3/subfiles/chap_single_category_use.tex (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/SI3/subfiles/chap_thermo.tex (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/SI3/subfiles/chap_transport.tex (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/SI3/subfiles/introduction.tex (deleted) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/SI3/subfiles/keys.idx (copied) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/SI3/subfiles/modules.idx (copied) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/SI3/subfiles/parameters.idx (copied) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/SI3/subfiles/subroutines.idx (copied) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/TOP (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/TOP/build (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/TOP/build/TOP_manual.ist (copied) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/TOP/main (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/TOP/main/TOP_manual.bib (deleted) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/TOP/main/TOP_manual.tex (copied) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/TOP/main/abstract.tex (copied) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/TOP/main/appendices.tex (copied) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/TOP/main/authors.tex (copied) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/TOP/main/bibliography.bib (copied) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/TOP/main/blocks.idx (copied) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/TOP/main/byrd-co2-2008.txt (deleted) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/TOP/main/chapters.tex (copied) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/TOP/main/edc-co2.txt (deleted) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/TOP/main/introduction.tex (copied) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/TOP/main/keys.idx (copied) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/TOP/main/modules.idx (copied) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/TOP/main/parameters.idx (copied) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/TOP/main/settings.tex (copied) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/TOP/main/subroutines.idx (copied) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/TOP/subfiles (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/TOP/subfiles/blocks.idx (copied) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/TOP/subfiles/byrd-co2-2008.txt (copied) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/TOP/subfiles/edc-co2.txt (copied) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/TOP/subfiles/introduction.tex (deleted) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/TOP/subfiles/keys.idx (copied) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/TOP/subfiles/miscellaneous.tex (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/TOP/subfiles/model_description.tex (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/TOP/subfiles/model_setup.tex (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/TOP/subfiles/modules.idx (copied) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/TOP/subfiles/parameters.idx (copied) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/TOP/subfiles/subroutines.idx (copied) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/global (copied) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/global/ametsoc.bst (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/styles (deleted) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/manual_build.sh (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/namelists/nam_diadct (copied) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/namelists/nam_diaharm (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/namelists/nambdy (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/namelists/nambdy_dta (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/namelists/namdct (deleted) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/namelists/namdia (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/namelists/namdom_domcfg (copied) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/namelists/namflo (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/namelists/namhsb (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/namelists/namini (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/namelists/nammpp (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/namelists/namobs (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/namelists/namthd_pnd (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/namelists/namzgr_domcfg (copied) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/namelists/namzgr_sco_domcfg (copied) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/tools/shr_func.sh (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/ICE/ice.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/ICE/icealb.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/ICE/icecor.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/ICE/icectl.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/ICE/icedia.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/ICE/icedyn.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/ICE/icedyn_adv.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/ICE/icedyn_adv_pra.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/ICE/icedyn_adv_umx.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/ICE/icedyn_rdgrft.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/ICE/icedyn_rhg.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/ICE/icedyn_rhg_evp.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/ICE/iceistate.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/ICE/iceitd.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/ICE/icerst.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/ICE/icesbc.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/ICE/icestp.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/ICE/icethd.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/ICE/icethd_da.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/ICE/icethd_do.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/ICE/icethd_pnd.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/ICE/icethd_sal.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/ICE/icethd_zdf.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/ICE/iceupdate.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/ICE/icevar.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/ICE/icewri.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/NST/agrif_user.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/ASM/asminc.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/BDY/bdy_oce.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/BDY/bdydta.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/BDY/bdydyn2d.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/BDY/bdydyn3d.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/BDY/bdyice.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/BDY/bdyini.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/BDY/bdylib.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/BDY/bdytides.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/BDY/bdytra.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/BDY/bdyvol.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/C1D/c1d.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/C1D/dtauvd.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/C1D/dyndmp.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/C1D/step_c1d.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/CRS/crsdom.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/CRS/crsini.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/CRS/crslbclnk.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/DIA/dia25h.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/DIA/diacfl.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/DIA/diadct.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/DIA/diaharm.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/DIA/diahsb.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/DIA/diahth.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/DIA/diaptr.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/DIA/diatmb.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/DIA/diawri.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/DIU/diurnal_bulk.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/DOM/domain.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/DOM/dommsk.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/DOM/domvvl.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/DOM/domwri.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/DOM/dtatsd.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/DOM/iscplhsb.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/DOM/iscplini.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/DYN/dynadv.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/DYN/dynhpg.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/DYN/dynkeg.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/DYN/dynspg.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/DYN/dynspg_ts.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/DYN/dynvor.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/DYN/dynzdf.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/DYN/sshwzv.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/DYN/wet_dry.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/FLO/flo4rk.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/FLO/flo_oce.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/FLO/floats.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/FLO/floblk.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/FLO/flodom.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/FLO/florst.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/FLO/flowri.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/ICB/icbini.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/ICB/icblbc.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/ICB/icbrst.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/ICB/icbstp.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/IOM/in_out_manager.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/IOM/iom.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/IOM/iom_nf90.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/IOM/restart.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/LBC/lbc_lnk_generic.h90 (deleted) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/LBC/lbc_lnk_multi_generic.h90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/LBC/lbc_nfd_nogather_generic.h90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/LBC/lbclnk.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/LBC/lbcnfd.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/LBC/lib_mpp.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/LBC/mpp_bdy_generic.h90 (deleted) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/LBC/mpp_lnk_generic.h90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/LBC/mpp_nfd_generic.h90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/LBC/mppini.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/LDF/ldfdyn.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/LDF/ldftra.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/OBS/diaobs.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/SBC/fldread.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/SBC/sbcapr.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/SBC/sbcblk.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/SBC/sbccpl.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/SBC/sbcflx.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/SBC/sbcice_cice.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/SBC/sbcice_if.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/SBC/sbcisf.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/SBC/sbcmod.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/SBC/sbcrnf.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/SBC/sbcssr.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/SBC/sbcwave.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/SBC/tideini.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/SBC/updtide.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/STO/stopar.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/TRA/eosbn2.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/TRA/traadv.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/TRA/traadv_fct.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/TRA/trabbc.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/TRA/trabbl.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/TRA/tradmp.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/TRA/traldf_iso.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/TRA/tramle.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/TRA/traqsr.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/TRD/trd_oce.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/TRD/trdini.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/TRD/trdmxl.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/TRD/trdmxl_rst.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/TRD/trdtra.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/TRD/trdvor.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/USR/usrdef_nam.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/ZDF/zdfdrg.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/ZDF/zdfgls.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/ZDF/zdfiwm.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/ZDF/zdfosm.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/ZDF/zdfphy.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/ZDF/zdfric.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/ZDF/zdftke.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/module_example (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/nemogcm.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/step.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/stpctl.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/timing.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OFF/dtadyn.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OFF/nemogcm.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/SAO/nemogcm.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/SAO/sao_data.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/SAS/diawri.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/SAS/nemogcm.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/SAS/sbcssm.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/SAS/step.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/TOP/AGE/trcnam_age.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/TOP/C14/trcnam_c14.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/TOP/CFC/trcnam_cfc.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/TOP/PISCES/P2Z/p2zbio.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/TOP/PISCES/P2Z/p2zopt.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/TOP/PISCES/P2Z/p2zsed.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/TOP/PISCES/P4Z/p4zfechem.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/TOP/PISCES/P4Z/p4zflx.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/TOP/PISCES/P4Z/p4zligand.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/TOP/PISCES/P4Z/p4zlim.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/TOP/PISCES/P4Z/p4zlys.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/TOP/PISCES/P4Z/p4zmeso.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/TOP/PISCES/P4Z/p4zmicro.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/TOP/PISCES/P4Z/p4zmort.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/TOP/PISCES/P4Z/p4zopt.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/TOP/PISCES/P4Z/p4zpoc.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/TOP/PISCES/P4Z/p4zprod.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/TOP/PISCES/P4Z/p4zrem.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/TOP/PISCES/P4Z/p4zsbc.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/TOP/PISCES/P4Z/p4zsms.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/TOP/PISCES/P4Z/p5zlim.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/TOP/PISCES/P4Z/p5zmeso.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/TOP/PISCES/P4Z/p5zmicro.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/TOP/PISCES/P4Z/p5zmort.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/TOP/PISCES/P4Z/p5zprod.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/TOP/PISCES/SED/sedini.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/TOP/PISCES/SED/sedrst.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/TOP/PISCES/trcnam_pisces.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/TOP/TRP/trcadv.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/TOP/TRP/trcdmp.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/TOP/TRP/trcldf.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/TOP/TRP/trcrad.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/TOP/TRP/trcsink.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/TOP/TRP/trdmxl_trc.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/TOP/trcbc.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/TOP/trcbdy.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/TOP/trcdta.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/TOP/trcice.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/TOP/trcnam.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/TOP/trcrst.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/tests (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/tests/BENCH/EXPREF/best_jpni_jpnj_eorca025 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/tests/BENCH/EXPREF/best_jpni_jpnj_eorca12 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/tests/BENCH/EXPREF/namelist_cfg_orca025_like (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/tests/BENCH/EXPREF/namelist_cfg_orca12_like (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/tests/BENCH/EXPREF/namelist_cfg_orca1_like (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/tests/BENCH/EXPREF/namelist_ice_cfg (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/tests/BENCH/EXPREF/namelist_top_cfg (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/tests/BENCH/EXPREF/sh_bench (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/tests/BENCH/EXPREF/submit_bench (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/tests/BENCH/MY_SRC/diawri.F90 (deleted) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/tests/BENCH/MY_SRC/usrdef_istate.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/tests/BENCH/MY_SRC/usrdef_nam.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/tests/BENCH/MY_SRC/usrdef_zgr.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/tests/BENCH/MY_SRC/zdfiwm.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/tests/CANAL/EXPREF/context_nemo.xml (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/tests/CANAL/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/tests/CANAL/MY_SRC/diawri.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/tests/CANAL/MY_SRC/domvvl.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/tests/CANAL/MY_SRC/usrdef_nam.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/tests/ICE_ADV1D/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/tests/ICE_ADV1D/EXPREF/namelist_cfg_120pts (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/tests/ICE_ADV1D/EXPREF/namelist_cfg_240pts (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/tests/ICE_ADV1D/EXPREF/namelist_cfg_60pts (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/tests/ICE_ADV1D/MY_SRC/usrdef_nam.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/tests/ICE_ADV2D/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/tests/ICE_ADV2D/MY_SRC/usrdef_nam.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/tests/ICE_AGRIF/EXPREF/1_namelist_cfg (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/tests/ICE_AGRIF/EXPREF/file_def_nemo-ice.xml (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/tests/ICE_AGRIF/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/tests/ICE_AGRIF/MY_SRC/usrdef_nam.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/tests/ISOMIP/EXPREF/context_nemo.xml (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/tests/ISOMIP/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/tests/ISOMIP/MY_SRC/usrdef_nam.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/tests/LOCK_EXCHANGE/EXPREF/context_nemo.xml (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT2_flux_ubs_cfg (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/tests/LOCK_EXCHANGE/MY_SRC/usrdef_nam.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/tests/OVERFLOW/EXPREF/context_nemo.xml (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/tests/OVERFLOW/EXPREF/namelist_zps_FCT4_flux_ubs_cfg (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/tests/OVERFLOW/MY_SRC/usrdef_nam.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/tests/VORTEX/EXPREF/1_namelist_cfg (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/tests/VORTEX/EXPREF/context_nemo.xml (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/tests/VORTEX/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/tests/VORTEX/MY_SRC/domvvl.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/tests/VORTEX/MY_SRC/usrdef_nam.F90 (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/tests/WAD/EXPREF/context_nemo.xml (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/tests/WAD/EXPREF/namelist_cfg (modified) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/tests/WAD/MY_SRC/bdyini.F90 (deleted) * NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/tests/WAD/MY_SRC/usrdef_nam.F90 (modified) updated trunk to v 11653 Wed, 11 Dec 2019 10:09:28 GMT cetlod [12173] * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DOM/closea.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbcclo.F90 (modified) Minor bugfixes Wed, 11 Dec 2019 09:55:06 GMT cetlod [12172] * 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/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/namelist_ref (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/doc (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/doc/latex/global/ametsoc.bst (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src (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/domzgr.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbcclo.F90 (copied) * 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/par_oce.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests (modified) dev_merge_option2 : merge in ENHANCE-03_closea branch Wed, 11 Dec 2019 09:36:23 GMT smasson [12171] * NEMO/trunk/src/OCE/SBC/sbccpl.F90 (modified) trunk: minor cleaning in sbccpl, see #2313 Wed, 11 Dec 2019 09:34:40 GMT mathiot [12170] * NEMO/branches/2019/ENHANCE-03_closea/cfgs/SHARED/namelist_ref (modified) fix after update to 12072 Wed, 11 Dec 2019 09:18:26 GMT cetlod [12169] * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/ISF/isfcpl.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/ISF/isfutils.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/TRA/tranxt.F90 (modified) Bugfixes Wed, 11 Dec 2019 09:16:47 GMT smasson [12168] * NEMO/trunk/src/OCE/SBC/sbcrnf.F90 (modified) trunk: minor bugfix in sbcrfn, see #2340 Wed, 11 Dec 2019 09:10:28 GMT mathiot [12167] * NEMO/branches/2019/ENHANCE-02_ISF_nemo/src/OCE/TRA/tranxt.F90 (modified) change restore old location of rnf block for bit reproducibility Wed, 11 Dec 2019 08:53:24 GMT cetlod [12166] * 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/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/namelist_ice_ref (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/SHARED/namelist_ref (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/WED025 (copied) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/ref_cfgs.txt (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/doc (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/doc/latex/global/ametsoc.bst (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src (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/diahsb.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DIA/diawri.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DOM/dom_oce.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/domvvl.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DOM/domwri.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DOM/domzgr.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DOM/iscplhsb.F90 (deleted) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DOM/iscplini.F90 (deleted) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DOM/iscplrst.F90 (deleted) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DOM/istate.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/dynhpg.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DYN/dynnxt.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/DYN/dynzdf.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DYN/sshwzv.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/IOM/restart.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/ISF (copied) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/LDF/ldfslp.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/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/sbcfwb.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbcisf.F90 (deleted) * 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/sbcssm.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/TRA/traisf.F90 (copied) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/TRA/tranxt.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/TRA/trasbc.F90 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/ZDF/zdfmxl.F90 (modified) * 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/ISOMIP+ (copied) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/ISOMIP/EXPREF/file_def_nemo-oce.xml (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_cen2_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/LOCK_EXCHANGE/EXPREF/namelist_FCT2_vect_eenH_cfg (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT2_vect_een_cfg (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT2_vect_ene_cfg (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT2_vect_ens_cfg (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT4_flux_cen2_cfg (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT4_flux_ubs_cfg (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT4_vect_eenH_cfg (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT4_vect_een_cfg (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT4_vect_ene_cfg (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT4_vect_ens_cfg (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/demo_cfgs.txt (modified) dev_merge_option2 : merge in ENHANCE-02_ISF_nemo branch Wed, 11 Dec 2019 08:27:27 GMT davestorkey [12165] * NEMO/branches/2019/dev_ASINTER-01-05_merged (modified) * NEMO/branches/2019/dev_ASINTER-01-05_merged/CHANGES.rst (copied) * NEMO/branches/2019/dev_ASINTER-01-05_merged/CONTRIBUTING.rst (modified) * NEMO/branches/2019/dev_ASINTER-01-05_merged/INSTALL.rst (modified) * NEMO/branches/2019/dev_ASINTER-01-05_merged/README.rst (modified) * NEMO/branches/2019/dev_ASINTER-01-05_merged/REFERENCES.bib (modified) * NEMO/branches/2019/dev_ASINTER-01-05_merged/RELEASE_NOTES.rst (deleted) * NEMO/branches/2019/dev_ASINTER-01-05_merged/cfgs (modified) * NEMO/branches/2019/dev_ASINTER-01-05_merged/cfgs/AGRIF_DEMO/EXPREF/namelist_ice_cfg (modified) * NEMO/branches/2019/dev_ASINTER-01-05_merged/cfgs/AGRIF_DEMO/MY_SRC (deleted) * NEMO/branches/2019/dev_ASINTER-01-05_merged/cfgs/AGRIF_DEMO/README.rst (modified) * NEMO/branches/2019/dev_ASINTER-01-05_merged/cfgs/ORCA2_ICE_PISCES/EXPREF/namelist_ice_cfg (modified) * NEMO/branches/2019/dev_ASINTER-01-05_merged/cfgs/ORCA2_ICE_PISCES/MY_SRC (deleted) * NEMO/branches/2019/dev_ASINTER-01-05_merged/cfgs/ORCA2_SAS_ICE/MY_SRC (deleted) * NEMO/branches/2019/dev_ASINTER-01-05_merged/cfgs/README.rst (modified) * NEMO/branches/2019/dev_ASINTER-01-05_merged/cfgs/SHARED (modified) * NEMO/branches/2019/dev_ASINTER-01-05_merged/cfgs/SHARED/README.rst (modified) * NEMO/branches/2019/dev_ASINTER-01-05_merged/cfgs/SHARED/namelist_ice_ref (modified) * NEMO/branches/2019/dev_ASINTER-01-05_merged/cfgs/SPITZ12/EXPREF/namelist_ice_cfg (modified) * NEMO/branches/2019/dev_ASINTER-01-05_merged/cfgs/SPITZ12/MY_SRC (deleted) * NEMO/branches/2019/dev_ASINTER-01-05_merged/doc (modified) * NEMO/branches/2019/dev_ASINTER-01-05_merged/doc/latex/global/ametsoc.bst (modified) * NEMO/branches/2019/dev_ASINTER-01-05_merged/doc/rst/source/conf.py (modified) * NEMO/branches/2019/dev_ASINTER-01-05_merged/doc/rst/source/docutils.conf (copied) * NEMO/branches/2019/dev_ASINTER-01-05_merged/doc/rst/source/global.rst (modified) * NEMO/branches/2019/dev_ASINTER-01-05_merged/src (modified) * NEMO/branches/2019/dev_ASINTER-01-05_merged/src/ICE/ice.F90 (modified) * NEMO/branches/2019/dev_ASINTER-01-05_merged/src/ICE/icectl.F90 (modified) * NEMO/branches/2019/dev_ASINTER-01-05_merged/src/ICE/icedyn_adv_pra.F90 (modified) * NEMO/branches/2019/dev_ASINTER-01-05_merged/src/ICE/icedyn_adv_umx.F90 (modified) * NEMO/branches/2019/dev_ASINTER-01-05_merged/src/ICE/icedyn_rdgrft.F90 (modified) * NEMO/branches/2019/dev_ASINTER-01-05_merged/src/ICE/iceitd.F90 (modified) * NEMO/branches/2019/dev_ASINTER-01-05_merged/src/OCE/CRS/README.rst (modified) * NEMO/branches/2019/dev_ASINTER-01-05_merged/src/OCE/DYN/dynnxt.F90 (modified) * NEMO/branches/2019/dev_ASINTER-01-05_merged/src/OCE/FLO/flodom.F90 (modified) * NEMO/branches/2019/dev_ASINTER-01-05_merged/src/OCE/FLO/flowri.F90 (modified) * NEMO/branches/2019/dev_ASINTER-01-05_merged/src/OCE/LBC/mppini.F90 (modified) * NEMO/branches/2019/dev_ASINTER-01-05_merged/src/OCE/LDF/ldfdyn.F90 (modified) * NEMO/branches/2019/dev_ASINTER-01-05_merged/src/OCE/USR/README-setup-configs (deleted) * NEMO/branches/2019/dev_ASINTER-01-05_merged/src/OCE/USR/README.rst (copied) * NEMO/branches/2019/dev_ASINTER-01-05_merged/src/OFF/nemogcm.F90 (modified) * NEMO/branches/2019/dev_ASINTER-01-05_merged/src/README.rst (copied) * NEMO/branches/2019/dev_ASINTER-01-05_merged/src/TOP/README.rst (modified) * NEMO/branches/2019/dev_ASINTER-01-05_merged/src/TOP/TRP/trcnxt.F90 (modified) * NEMO/branches/2019/dev_ASINTER-01-05_merged/src/TOP/trcbdy.F90 (modified) * NEMO/branches/2019/dev_ASINTER-01-05_merged/tests (modified) * NEMO/branches/2019/dev_ASINTER-01-05_merged/tests/CANAL/MY_SRC/usrdef_nam.F90 (modified) 2019/dev_ASINTER-01-05_merged: Update to r12072 of trunk. Tue, 10 Dec 2019 17:01:35 GMT cetlod [12164] * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/ORCA2_ICE_ABL/EXPREF/axis_def_nemo.xml (added) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/ORCA2_ICE_ABL/EXPREF/context_nemo.xml (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/SHARED/axis_def_nemo.xml (modified) Update ORCA2_ICE_ABL configuration Tue, 10 Dec 2019 16:57:47 GMT cetlod [12163] * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019 (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/CHANGES.rst (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/CONTRIBUTING.rst (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/INSTALL.rst (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/LICENSE (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/README.rst (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/REFERENCES.bib (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/doc (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/doc/latex/NEMO/main/bibliography.bib (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/doc/latex/NEMO/subfiles/chap_SBC.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/namsbc_blk (modified) * NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/ext (modified) * utils/build/makenemo (modified) Commit changes in DOC Tue, 10 Dec 2019 16:11:51 GMT laurent [12162] * NEMO/branches/2019/dev_r11085_ASINTER-05_Brodeau_Advanced_Bulk/doc/latex/NEMO/main/bibliography.bib (modified) * NEMO/branches/2019/dev_r11085_ASINTER-05_Brodeau_Advanced_Bulk/doc/latex/NEMO/subfiles/chap_SBC.tex (modified) * NEMO/branches/2019/dev_r11085_ASINTER-05_Brodeau_Advanced_Bulk/src/OCE/SBC/sbcblk.F90 (modified) * NEMO/branches/2019/dev_r11085_ASINTER-05_Brodeau_Advanced_Bulk/src/OCE/SBC/sbcblk_algo_ncar.F90 (modified) * NEMO/branches/2019/dev_r11085_ASINTER-05_Brodeau_Advanced_Bulk/src/OCE/SBC/sbcblk_phy.F90 (modified) Catching up with "dev_r12072_MERGE_OPTION2_2019"