# # ChangeLog for / # # Generated by Trac 1.0.1 # 2024-04-24T06:10:17+02:00 Mon, 18 Dec 2017 16:33:07 GMT nicolasmartin [9119] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/icethd_zdf.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/icevar.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynnxt.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/trasbc.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRD/trddyn.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfosm.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/AGE/trcnam_age.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/trcbc.F90 (modified) Fix longer lines so should be harmless (passed SETTE compilations) Mon, 18 Dec 2017 15:17:44 GMT clem [9118] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/icestp.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/icevar.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/icewri.F90 (modified) debug ice test cases with thermo or dynamics only Mon, 18 Dec 2017 15:17:39 GMT acc [9117] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbcwave.F90 (modified) Branch 2017/dev_merge_2017. Fix uninitialised variables in sbcwave.F90 + ... Mon, 18 Dec 2017 14:24:31 GMT jchanut [9116] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC/agrif_oce.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC/agrif_opa_interp.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC/agrif_opa_update.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC/agrif_user.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/divhor.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 (modified) Finalize AGRIF ghost cells implementation: ensure compatibility with bdy ... Mon, 18 Dec 2017 14:06:42 GMT acc [9115] * branches/2017/dev_merge_2017/DOC/TexFiles/Bibliography/Biblio.bib (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/LBC/lbc_lnk_multi_generic.h90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbc_oce.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbcwave.F90 (modified) Branch 2017/dev_merge_2017. Tidier version of sbcwave.F90 with ... Mon, 18 Dec 2017 12:16:44 GMT frrh [9114] * branches/UKMO/dev_r5518_GO6_package (modified) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM (modified) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/CONFIG/SHARED (modified) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/CONFIG/SHARED/field_def_bgc.xml (modified) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO (modified) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/MEDUSA/bio_medusa_diag_slice.F90 (modified) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/MEDUSA/bio_medusa_fin.F90 (modified) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/MEDUSA/phytoplankton.F90 (modified) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/MEDUSA/sms_medusa.F90 (modified) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/MEDUSA/trcini_medusa.F90 (modified) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/MEDUSA/trcnam_medusa.F90 (modified) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/trc.F90 (modified) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/trcrst.F90 (modified) Apply changes developed under Met Office GMED ticket number 351 in ... Mon, 18 Dec 2017 10:54:13 GMT jchanut [9113] * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/VORTEX/MY_SRC/usrdef_hgr.F90 (modified) Properly take into account ghostcells in VORTEX domain definition Mon, 18 Dec 2017 09:43:17 GMT jchanut [9112] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 (modified) bugs with top & bottom friction Sat, 16 Dec 2017 08:40:24 GMT gm [9111] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynadv_cen2.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90 (modified) dev_merge_2017: bug ji,jj indices in sbccpl.F90 & dynadv_cen2.F90 Fri, 15 Dec 2017 18:57:15 GMT mathiot [9110] * branches/2017/dev_merge_2017/NEMOGCM/SETTE/sette.sh (modified) restore reading config from userdef instead domcfg + restore non linear ... Fri, 15 Dec 2017 18:26:36 GMT jchanut [9109] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 (modified) Correct advective velocities for wetting and drying Fri, 15 Dec 2017 18:05:36 GMT cetlod [9108] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfphy.F90 (modified) Bugfix on ZDF Fri, 15 Dec 2017 18:03:37 GMT cetlod [9107] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfphy.F90 (modified) Bugfix on ZDF Fri, 15 Dec 2017 18:02:00 GMT cetlod [9106] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfosm.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfphy.F90 (modified) Bugfix on ZDF Fri, 15 Dec 2017 17:59:18 GMT flavoni [9105] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/BDY/bdyini.F90 (modified) fix Fri, 15 Dec 2017 17:56:13 GMT gm [9104] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfddm.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfevd.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfgls.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfiwm.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfmxl.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfosm.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfphy.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfric.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfsh2.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdftke.F90 (modified) dev_merge_2017: ZDF: timing + lnk_multi + namelist cfg ctl Fri, 15 Dec 2017 17:53:43 GMT clem [9103] * branches/2017/dev_CNRS_2017/NEMOGCM/NEMO/LIM_SRC_3/icedyn.F90 (modified) * branches/2017/dev_CNRS_2017/NEMOGCM/NEMO/LIM_SRC_3/icedyn_adv_umx.F90 (modified) * branches/2017/dev_CNRS_2017/NEMOGCM/NEMO/LIM_SRC_3/icedyn_rhg_evp.F90 (modified) cosmetics Fri, 15 Dec 2017 17:52:43 GMT flavoni [9102] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/BDY/bdyini.F90 (modified) fix Fri, 15 Dec 2017 17:49:30 GMT cetlod [9101] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRD/trdmxl.F90 (modified) Bugfix in trdmxl Fri, 15 Dec 2017 17:43:46 GMT cetlod [9100] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRD/trdmxl.F90 (modified) Bugfix in trdmxl Fri, 15 Dec 2017 17:40:06 GMT cetlod [9099] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/trabbl.F90 (modified) Bugfix in trabbl Fri, 15 Dec 2017 17:38:45 GMT flavoni [9098] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/geo2ocean.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_cice.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbcisf.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbcwave.F90 (modified) change lbc_lnk in lbc_lnk_multi Fri, 15 Dec 2017 17:36:32 GMT cetlod [9097] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRD/trddyn.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRD/trdken.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRD/trdmxl.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRD/trdvor.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/USR/usrdef_sbc.F90 (modified) Use of lbclnk_multi in subdir USR & TRD Fri, 15 Dec 2017 17:35:44 GMT jchanut [9096] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC/agrif_user.F90 (modified) Agrif debug: remove higher order update Fri, 15 Dec 2017 17:31:15 GMT jchanut [9095] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC/agrif_opa_update.F90 (modified) Agrif debug: remove interface shift Fri, 15 Dec 2017 17:26:58 GMT cetlod [9094] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/LDF/ldfc1d_c2d.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/LDF/ldfdyn.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/LDF/ldfslp.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/LDF/ldftra.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/eosbn2.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_cen.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_fct.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_mle.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_mus.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_qck.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/trabbl.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_lap_blp.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/tranpc.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/tranxt.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/trazdf.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/zpshde.F90 (modified) Use of lbclnk_multi in subdir LDF & TRA Fri, 15 Dec 2017 17:20:47 GMT flavoni [9093] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/LBC/lbc_lnk_multi_generic.h90 (modified) fix Fri, 15 Dec 2017 17:20:09 GMT flavoni [9092] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/wet_dry.F90 (modified) change lbc_lnk in lbc_lnk_multi Fri, 15 Dec 2017 17:14:31 GMT clem [9091] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfosm.F90 (modified) debug timing Fri, 15 Dec 2017 17:12:43 GMT flavoni [9090] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/BDY/bdydyn3d.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/BDY/bdyini.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/iscplrst.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynadv_ubs.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynldf_iso.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynldf_lap_blp.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynnxt.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/wet_dry.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/LBC/lbc_lnk_multi_generic.h90 (modified) change lbc_lnk in lbc_lnk_multi Fri, 15 Dec 2017 17:00:09 GMT gm [9089] * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/ISOMIP/EXP00/namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/ISOMIP/MY_SRC/usrdef_hgr.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/ISOMIP/MY_SRC/usrdef_nam.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/ISOMIP/MY_SRC/usrdef_zgr.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfdrg.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfgls.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfosm.F90 (modified) dev_merge_2017: bug correction in zdfdrg + ISOMIP cfg Fri, 15 Dec 2017 16:48:19 GMT timgraham [9088] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC/agrif_user.F90 (modified) Added a call to update ssh that seemed to get lost in merge Fri, 15 Dec 2017 16:44:37 GMT alistairsellar [9087] * branches/UKMO/dev_r5518_GO6_CarbFix_DMSMin/NEMOGCM/NEMO/TOP_SRC/MEDUSA/trcdms_medusa.F90 (modified) Constants for min=1.0 Fri, 15 Dec 2017 16:44:09 GMT alistairsellar [9086] * branches/UKMO/dev_r5518_GO6_CarbFix_DMSMin/NEMOGCM/NEMO/TOP_SRC/MEDUSA/trcdms_medusa.F90 (modified) Constants for min=1.25 Fri, 15 Dec 2017 16:43:52 GMT cetlod [9085] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/PISCES/P2Z/p2zbio.F90 (modified) dev_merge_2017 : use of lbclnk_multi Fri, 15 Dec 2017 16:43:42 GMT alistairsellar [9084] * branches/UKMO/dev_r5518_GO6_CarbFix_DMSMin/NEMOGCM/NEMO/TOP_SRC/MEDUSA/trcdms_medusa.F90 (modified) Constants for min=1.5 Fri, 15 Dec 2017 16:39:55 GMT alistairsellar [9083] * branches/UKMO/dev_r5518_GO6_CarbFix_DMSMin/NEMOGCM/NEMO/TOP_SRC/MEDUSA/trcdms_medusa.F90 (modified) Replace magic numbers with named constants Fri, 15 Dec 2017 16:39:03 GMT clem [9082] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC/agrif_opa_interp.F90 (modified) debug agrif Fri, 15 Dec 2017 16:33:49 GMT cetlod [9081] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zsms.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/TRP/trcnxt.F90 (modified) dev_merge_2017 : use of lbclnk_4d for TOP arrays Fri, 15 Dec 2017 16:09:41 GMT davestorkey [9080] * branches/UKMO/dev_r8600_closea_rewrite/NEMOGCM/NEMO/OPA_SRC/DOM/closea.F90 (modified) * branches/UKMO/dev_r8600_closea_rewrite/NEMOGCM/TOOLS/DOMAINcfg/make_closea_masks.py (modified) UKMO/dev_r8600_closea_rewrite branch: 1. Correct eORCA025 lakes ... Fri, 15 Dec 2017 14:43:43 GMT flavoni [9079] * branches/2017/dev_merge_2017/NEMOGCM/TOOLS/DOMAINcfg/README (modified) * branches/2017/dev_merge_2017/NEMOGCM/TOOLS/DOMAINcfg/src/domwri.f90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/TOOLS/DOMAINcfg/src/in_out_manager.f90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/TOOLS/DOMAINcfg/src/iom.f90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/TOOLS/DOMAINcfg/src/nemogcm.f90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/TOOLS/DOMAINcfg/src/step_oce.f90 (modified) update DOMAINcfg TOOLS, do not need xios anymore Fri, 15 Dec 2017 14:31:35 GMT davestorkey [9078] * branches/UKMO/dev_r8600_closea_rewrite/NEMOGCM/CONFIG/SHARED/namelist_ref (modified) * branches/UKMO/dev_r8600_closea_rewrite/NEMOGCM/NEMO/OPA_SRC/DOM/closea.F90 (modified) * branches/UKMO/dev_r8600_closea_rewrite/NEMOGCM/NEMO/OPA_SRC/DOM/dom_oce.F90 (modified) * branches/UKMO/dev_r8600_closea_rewrite/NEMOGCM/NEMO/OPA_SRC/DOM/domain.F90 (modified) * branches/UKMO/dev_r8600_closea_rewrite/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90 (modified) * branches/UKMO/dev_r8600_closea_rewrite/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90 (modified) * branches/UKMO/dev_r8600_closea_rewrite/NEMOGCM/NEMO/OPA_SRC/SBC/sbcrnf.F90 (modified) * branches/UKMO/dev_r8600_closea_rewrite/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 (modified) * branches/UKMO/dev_r8600_closea_rewrite/NEMOGCM/TOOLS/DOMAINcfg/README (modified) * branches/UKMO/dev_r8600_closea_rewrite/NEMOGCM/TOOLS/DOMAINcfg/make_closea_masks.py (modified) UKMO/dev_r8600_closea_rewrite branch : slight redesign after discussion ... Fri, 15 Dec 2017 13:59:17 GMT vancop [9077] * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/SHARED/namelist_ice_lim3_ref (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/cfg.txt (modified) monocat to virtual_itd Fri, 15 Dec 2017 13:59:08 GMT vancop [9076] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/ice.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/icedyn.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/iceforcing.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/icestp.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/icethd.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/icethd_zdf_bl99.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk.F90 (modified) monocat to virtual_itd Fri, 15 Dec 2017 13:50:00 GMT timgraham [9075] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 (modified) Fix for uninitialised variable Fri, 15 Dec 2017 12:04:34 GMT cetlod [9074] * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_LIM3_PISCES/EXP00/file_def_nemo-opa.xml (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/SHARED/field_def_nemo-opa.xml (modified) Remove scalar diagnostic by default in the file_def Fri, 15 Dec 2017 11:48:47 GMT jpalmier [9073] * branches/NERC/dev_r5518_GO6_Carb_Fail_from_GO6_8356/NEMOGCM/NEMO/OPA_SRC/stpctl.F90 (modified) * branches/NERC/dev_r5518_GO6_Carb_Fail_from_GO6_8356/NEMOGCM/NEMO/TOP_SRC/MEDUSA/air_sea.F90 (modified) * branches/NERC/dev_r5518_GO6_Carb_Fail_from_GO6_8356/NEMOGCM/NEMO/TOP_SRC/MEDUSA/bio_medusa_init.F90 (modified) * branches/NERC/dev_r5518_GO6_Carb_Fail_from_GO6_8356/NEMOGCM/NEMO/TOP_SRC/MEDUSA/trcbio_medusa.F90 (modified) * branches/NERC/dev_r5518_GO6_Carb_Fail_from_GO6_8356/NEMOGCM/NEMO/TOP_SRC/trcrst.F90 (modified) * branches/NERC/dev_r5518_GO6_Carb_Fail_from_GO6_8356/NEMOGCM/NEMO/TOP_SRC/trcstat.F90 (added) * branches/NERC/dev_r5518_GO6_Carb_Fail_from_GO6_8356/NEMOGCM/NEMO/TOP_SRC/trcstp.F90 (modified) add all micro boil checks and securities Fri, 15 Dec 2017 11:33:26 GMT clem [9072] * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_LIM3_PISCES/EXP00/file_def_nemo-lim.xml (modified) make a complete set of sea-ice output Fri, 15 Dec 2017 10:51:41 GMT clem [9071] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/iceupdate.F90 (modified) mask some outputs Fri, 15 Dec 2017 10:35:07 GMT jpalmier [9070] * branches/NERC/dev_r5518_GO6_Carb_Fail_from_GO6_8356 (modified) * branches/NERC/dev_r5518_GO6_Carb_Fail_from_GO6_8356/DOC (modified) * branches/NERC/dev_r5518_GO6_Carb_Fail_from_GO6_8356/NEMOGCM (modified) * branches/NERC/dev_r5518_GO6_Carb_Fail_from_GO6_8356/NEMOGCM/CONFIG/SHARED (modified) * branches/NERC/dev_r5518_GO6_Carb_Fail_from_GO6_8356/NEMOGCM/CONFIG/SHARED/namelist_ref (modified) * branches/NERC/dev_r5518_GO6_Carb_Fail_from_GO6_8356/NEMOGCM/CONFIG/SHARED/namelist_top_MEDUSA_et_al_cfg (deleted) * branches/NERC/dev_r5518_GO6_Carb_Fail_from_GO6_8356/NEMOGCM/CONFIG/SHARED/namelist_top_MEDUSA_et_al_ref (modified) * branches/NERC/dev_r5518_GO6_Carb_Fail_from_GO6_8356/NEMOGCM/CONFIG/cfg.txt (modified) * branches/NERC/dev_r5518_GO6_Carb_Fail_from_GO6_8356/NEMOGCM/NEMO (modified) * branches/NERC/dev_r5518_GO6_Carb_Fail_from_GO6_8356/NEMOGCM/NEMO/OPA_SRC (modified) * branches/NERC/dev_r5518_GO6_Carb_Fail_from_GO6_8356/NEMOGCM/NEMO/OPA_SRC/ASM/asmbkg.F90 (modified) * branches/NERC/dev_r5518_GO6_Carb_Fail_from_GO6_8356/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90 (modified) * branches/NERC/dev_r5518_GO6_Carb_Fail_from_GO6_8356/NEMOGCM/NEMO/OPA_SRC/ASM/bias.F90 (copied) * branches/NERC/dev_r5518_GO6_Carb_Fail_from_GO6_8356/NEMOGCM/NEMO/OPA_SRC/ASM/biaspar.F90 (copied) * branches/NERC/dev_r5518_GO6_Carb_Fail_from_GO6_8356/NEMOGCM/NEMO/OPA_SRC/C1D/dynnxt_c1d.F90 (modified) * branches/NERC/dev_r5518_GO6_Carb_Fail_from_GO6_8356/NEMOGCM/NEMO/OPA_SRC/DIA/diainsitutem.F90 (copied) * branches/NERC/dev_r5518_GO6_Carb_Fail_from_GO6_8356/NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90 (modified) * branches/NERC/dev_r5518_GO6_Carb_Fail_from_GO6_8356/NEMOGCM/NEMO/OPA_SRC/DOM/dom_oce.F90 (modified) * branches/NERC/dev_r5518_GO6_Carb_Fail_from_GO6_8356/NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90 (modified) * branches/NERC/dev_r5518_GO6_Carb_Fail_from_GO6_8356/NEMOGCM/NEMO/OPA_SRC/DYN/sshwzv.F90 (modified) * branches/NERC/dev_r5518_GO6_Carb_Fail_from_GO6_8356/NEMOGCM/NEMO/OPA_SRC/SBC/sbc_ice.F90 (modified) * branches/NERC/dev_r5518_GO6_Carb_Fail_from_GO6_8356/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90 (modified) * branches/NERC/dev_r5518_GO6_Carb_Fail_from_GO6_8356/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_cice.F90 (modified) * branches/NERC/dev_r5518_GO6_Carb_Fail_from_GO6_8356/NEMOGCM/NEMO/OPA_SRC/TRA/eosbn2.F90 (modified) * branches/NERC/dev_r5518_GO6_Carb_Fail_from_GO6_8356/NEMOGCM/NEMO/OPA_SRC/TRA/trasbc.F90 (modified) * branches/NERC/dev_r5518_GO6_Carb_Fail_from_GO6_8356/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 (modified) * branches/NERC/dev_r5518_GO6_Carb_Fail_from_GO6_8356/NEMOGCM/NEMO/OPA_SRC/step.F90 (modified) * branches/NERC/dev_r5518_GO6_Carb_Fail_from_GO6_8356/NEMOGCM/NEMO/OPA_SRC/step_oce.F90 (modified) * branches/NERC/dev_r5518_GO6_Carb_Fail_from_GO6_8356/NEMOGCM/NEMO/TOP_SRC/AGE/trcsms_age.F90 (modified) * branches/NERC/dev_r5518_GO6_Carb_Fail_from_GO6_8356/NEMOGCM/NEMO/TOP_SRC/C14b/trcnam_c14b.F90 (modified) * branches/NERC/dev_r5518_GO6_Carb_Fail_from_GO6_8356/NEMOGCM/NEMO/TOP_SRC/CFC/trcnam_cfc.F90 (modified) * branches/NERC/dev_r5518_GO6_Carb_Fail_from_GO6_8356/NEMOGCM/NEMO/TOP_SRC/CFC/trcsms_cfc.F90 (modified) * branches/NERC/dev_r5518_GO6_Carb_Fail_from_GO6_8356/NEMOGCM/NEMO/TOP_SRC/IDTRA/trcsms_idtra.F90 (modified) * branches/NERC/dev_r5518_GO6_Carb_Fail_from_GO6_8356/NEMOGCM/NEMO/TOP_SRC/MEDUSA/air_sea.F90 (copied) * branches/NERC/dev_r5518_GO6_Carb_Fail_from_GO6_8356/NEMOGCM/NEMO/TOP_SRC/MEDUSA/bio_med_diag_iomput.F90 (copied) * branches/NERC/dev_r5518_GO6_Carb_Fail_from_GO6_8356/NEMOGCM/NEMO/TOP_SRC/MEDUSA/bio_medusa_diag.F90 (copied) * branches/NERC/dev_r5518_GO6_Carb_Fail_from_GO6_8356/NEMOGCM/NEMO/TOP_SRC/MEDUSA/bio_medusa_diag_slice.F90 (copied) * branches/NERC/dev_r5518_GO6_Carb_Fail_from_GO6_8356/NEMOGCM/NEMO/TOP_SRC/MEDUSA/bio_medusa_fin.F90 (copied) * branches/NERC/dev_r5518_GO6_Carb_Fail_from_GO6_8356/NEMOGCM/NEMO/TOP_SRC/MEDUSA/bio_medusa_init.F90 (copied) * branches/NERC/dev_r5518_GO6_Carb_Fail_from_GO6_8356/NEMOGCM/NEMO/TOP_SRC/MEDUSA/bio_medusa_mod.F90 (copied) * branches/NERC/dev_r5518_GO6_Carb_Fail_from_GO6_8356/NEMOGCM/NEMO/TOP_SRC/MEDUSA/bio_medusa_update.F90 (copied) * branches/NERC/dev_r5518_GO6_Carb_Fail_from_GO6_8356/NEMOGCM/NEMO/TOP_SRC/MEDUSA/carb_chem.F90 (copied) * branches/NERC/dev_r5518_GO6_Carb_Fail_from_GO6_8356/NEMOGCM/NEMO/TOP_SRC/MEDUSA/detritus.F90 (copied) * branches/NERC/dev_r5518_GO6_Carb_Fail_from_GO6_8356/NEMOGCM/NEMO/TOP_SRC/MEDUSA/detritus_fast_sink.F90 (copied) * branches/NERC/dev_r5518_GO6_Carb_Fail_from_GO6_8356/NEMOGCM/NEMO/TOP_SRC/MEDUSA/iron_chem_scav.F90 (copied) * branches/NERC/dev_r5518_GO6_Carb_Fail_from_GO6_8356/NEMOGCM/NEMO/TOP_SRC/MEDUSA/par_medusa.F90 (modified) * branches/NERC/dev_r5518_GO6_Carb_Fail_from_GO6_8356/NEMOGCM/NEMO/TOP_SRC/MEDUSA/phytoplankton.F90 (copied) * branches/NERC/dev_r5518_GO6_Carb_Fail_from_GO6_8356/NEMOGCM/NEMO/TOP_SRC/MEDUSA/plankton.F90 (copied) * branches/NERC/dev_r5518_GO6_Carb_Fail_from_GO6_8356/NEMOGCM/NEMO/TOP_SRC/MEDUSA/trcbio_medusa.F90 (modified) * branches/NERC/dev_r5518_GO6_Carb_Fail_from_GO6_8356/NEMOGCM/NEMO/TOP_SRC/MEDUSA/trcnam_medusa.F90 (modified) * branches/NERC/dev_r5518_GO6_Carb_Fail_from_GO6_8356/NEMOGCM/NEMO/TOP_SRC/MEDUSA/trcrst_medusa.F90 (deleted) * branches/NERC/dev_r5518_GO6_Carb_Fail_from_GO6_8356/NEMOGCM/NEMO/TOP_SRC/MEDUSA/trcsed_medusa.F90 (modified) * branches/NERC/dev_r5518_GO6_Carb_Fail_from_GO6_8356/NEMOGCM/NEMO/TOP_SRC/MEDUSA/zooplankton.F90 (copied) * branches/NERC/dev_r5518_GO6_Carb_Fail_from_GO6_8356/NEMOGCM/NEMO/TOP_SRC/TRP/trcadv.F90 (modified) * branches/NERC/dev_r5518_GO6_Carb_Fail_from_GO6_8356/NEMOGCM/NEMO/TOP_SRC/TRP/trctrp.F90 (modified) * branches/NERC/dev_r5518_GO6_Carb_Fail_from_GO6_8356/NEMOGCM/NEMO/TOP_SRC/par_trc.F90 (modified) * branches/NERC/dev_r5518_GO6_Carb_Fail_from_GO6_8356/NEMOGCM/NEMO/TOP_SRC/trcini.F90 (modified) * branches/NERC/dev_r5518_GO6_Carb_Fail_from_GO6_8356/NEMOGCM/NEMO/TOP_SRC/trcnam.F90 (modified) * branches/NERC/dev_r5518_GO6_Carb_Fail_from_GO6_8356/NEMOGCM/NEMO/TOP_SRC/trcrst.F90 (modified) * branches/NERC/dev_r5518_GO6_Carb_Fail_from_GO6_8356/NEMOGCM/NEMO/TOP_SRC/trcsms.F90 (modified) * branches/NERC/dev_r5518_GO6_Carb_Fail_from_GO6_8356/NEMOGCM/NEMO/TOP_SRC/trcstp.F90 (modified) * branches/NERC/dev_r5518_GO6_Carb_Fail_from_GO6_8356/NEMOGCM/NEMO/TOP_SRC/trcwri.F90 (modified) merge with GO6 8356:8447 Fri, 15 Dec 2017 09:35:02 GMT acc [9069] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/LBC/mppini.F90 (modified) Branch 2017/dev_merge_2017. mpp minor changes to reinstate missing ... Fri, 15 Dec 2017 09:33:52 GMT clem [9068] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/icethd_zdf_bl99.F90 (modified) correct heat diffusion equation for nlayi=1 Thu, 14 Dec 2017 22:49:18 GMT jchanut [9067] * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/VORTEX/EXP00/1_namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/VORTEX/EXP00/namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/VORTEX/MY_SRC/domvvl.F90 (added) Adapt VORTEX namelists and restore ssh initialization in domvvl Thu, 14 Dec 2017 17:13:51 GMT jpalmier [9066] * branches/NERC/dev_r5518_GO6_Carb_Fail_from_GO6_8356 (copied) create branch Thu, 14 Dec 2017 17:00:50 GMT jchanut [9065] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90 (modified) Revert to previous version Thu, 14 Dec 2017 16:54:14 GMT jchanut [9064] * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/VORTEX/MY_SRC/domvvl.F90 (deleted) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/VORTEX/MY_SRC/zdfini.F90 (deleted) Remove useless routines in VORTEX testcase Thu, 14 Dec 2017 16:23:39 GMT jchanut [9063] * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_LIM3_PISCES/EXP00/1_namelist_cfg (modified) Remove AGRIF update frequency parameter again Thu, 14 Dec 2017 16:19:27 GMT flavoni [9062] * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/SHARED/namelist_ref (modified) fix namelist Thu, 14 Dec 2017 16:08:47 GMT jchanut [9061] * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_LIM3_PISCES/EXP00/namelist_cfg (modified) remove AGRIF update frequency in namelist Thu, 14 Dec 2017 16:03:33 GMT clem [9060] * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/SAS_BIPER/EXP00/1_namelist_cfg (modified) debug SAS_BIPER Thu, 14 Dec 2017 15:55:30 GMT jchanut [9059] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90 (modified) Add SSH initialization in domvvl routine for any user defined test case ... Thu, 14 Dec 2017 15:52:57 GMT jchanut [9058] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC/agrif_oce.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC/agrif_user.F90 (modified) Correct TKE/GLS key removal with AGRIF Thu, 14 Dec 2017 15:34:32 GMT jchanut [9057] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC/agrif_opa_interp.F90 (modified) Clean merge with extra-ghost capability for AGRIF Thu, 14 Dec 2017 15:33:33 GMT jchanut [9056] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC/agrif_opa_sponge.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC/agrif_top_sponge.F90 (modified) duplicated definitions Thu, 14 Dec 2017 15:32:35 GMT jchanut [9055] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC/agrif_opa_update.F90 (modified) Missing public definition of vvl and ssh update Thu, 14 Dec 2017 15:17:59 GMT dford [9054] * branches/UKMO/dev_r4650_general_vert_coord_obsoper_pfts (modified) * branches/UKMO/dev_r4650_general_vert_coord_obsoper_pfts/NEMOGCM (modified) * branches/UKMO/dev_r4650_general_vert_coord_obsoper_pfts/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90 (modified) * branches/UKMO/dev_r4650_general_vert_coord_obsoper_pfts/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_logchl.F90 (modified) * branches/UKMO/dev_r4650_general_vert_coord_obsoper_pfts/NEMOGCM/NEMO/OPA_SRC/OBS/obs_write.F90 (modified) Merge in fix for reading/write logchl STD values. Thu, 14 Dec 2017 14:58:09 GMT frrh [9053] * branches/NERC/dev_r5518_GO6_ScalingCoupledChl/NEMOGCM/NEMO/TOP_SRC/MEDUSA/bio_medusa_fin.F90 (modified) * branches/NERC/dev_r5518_GO6_ScalingCoupledChl/NEMOGCM/NEMO/TOP_SRC/trcrst.F90 (modified) Protect instances of chloro_out_cpl from being referenced by non-coupled ... Thu, 14 Dec 2017 14:48:12 GMT timgraham [9052] * branches/2017/dev_merge_2017 (modified) * branches/2017/dev_merge_2017/DOC (modified) * branches/2017/dev_merge_2017/DOC/Figures/Fig_OBS_avg_rad.eps (copied) * branches/2017/dev_merge_2017/DOC/Figures/Fig_OBS_avg_rad.pdf (copied) * branches/2017/dev_merge_2017/DOC/Figures/Fig_OBS_avg_rec.eps (copied) * branches/2017/dev_merge_2017/DOC/Figures/Fig_OBS_avg_rec.pdf (copied) * branches/2017/dev_merge_2017/DOC/TexFiles/Bibliography/Biblio.bib (modified) * branches/2017/dev_merge_2017/DOC/TexFiles/Chapters/Chap_OBS.tex (modified) * branches/2017/dev_merge_2017/DOC/TexFiles/Chapters/Chap_SBC.tex (modified) Commit doc changes Thu, 14 Dec 2017 14:47:12 GMT flavoni [9051] * branches/2017/dev_merge_2017/NEMOGCM/TOOLS/DOMAINcfg/field_def.xml (modified) * branches/2017/dev_merge_2017/NEMOGCM/TOOLS/DOMAINcfg/namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/TOOLS/DOMAINcfg/namelist_ref (modified) * branches/2017/dev_merge_2017/NEMOGCM/TOOLS/DOMAINcfg/src/dom_oce.f90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/TOOLS/DOMAINcfg/src/domain.f90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/TOOLS/DOMAINcfg/src/domzgr.f90 (modified) put back correct routines for TOOLS/DOMAINcfg, do not change these ... Thu, 14 Dec 2017 14:26:01 GMT cetlod [9050] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/PISCES/P2Z/p2zbio.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/TRP/trcnxt.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/TRP/trdmxl_trc.F90 (modified) First use of lbc_lnk_multi in TOP routines Thu, 14 Dec 2017 13:55:17 GMT clem [9049] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/icedyn_rhg_evp.F90 (modified) group one communcation in diags Thu, 14 Dec 2017 13:40:24 GMT timgraham [9048] * branches/2017/dev_merge_2017/NEMOGCM/TOOLS/REBUILD_NEMO (modified) * branches/2017/dev_merge_2017/NEMOGCM/TOOLS/REBUILD_NEMO/BATCH_TEMPLATES (copied) * branches/2017/dev_merge_2017/NEMOGCM/TOOLS/REBUILD_NEMO/rebuild_nemo (modified) * branches/2017/dev_merge_2017/NEMOGCM/TOOLS/REBUILD_NEMO/src/rebuild_nemo.F90 (copied) * branches/2017/dev_merge_2017/NEMOGCM/TOOLS/REBUILD_NEMO/src/rebuild_nemo.f90 (deleted) New version of rebuild_nemo Thu, 14 Dec 2017 13:26:50 GMT timgraham [9047] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC/agrif_opa_sponge.F90 (modified) Another ">>>>right" Thu, 14 Dec 2017 13:25:04 GMT timgraham [9046] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC/agrif_opa_sponge.F90 (modified) Remove missed ">>>>right" line from merge Thu, 14 Dec 2017 12:03:31 GMT timgraham [9045] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 (modified) Add exlicit loops Thu, 14 Dec 2017 11:53:41 GMT timgraham [9044] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90 (modified) Remove wrk_alloc in asminc.F90 Thu, 14 Dec 2017 11:49:18 GMT acc [9043] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 (modified) Branch 2017/dev_merge_2017. revert renamed constants in dynspg_ts.F90 Thu, 14 Dec 2017 11:31:51 GMT acc [9042] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/wet_dry.F90 (modified) Branch 2017/dev_merge_2017. Stop wet_dry verbosity Thu, 14 Dec 2017 11:28:07 GMT timgraham [9041] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90 (modified) Fix in diaobs Thu, 14 Dec 2017 11:22:46 GMT timgraham [9040] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90 (modified) Fix in diaobs Thu, 14 Dec 2017 11:16:33 GMT timgraham [9039] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/wet_dry.F90 (modified) Bug fixes Thu, 14 Dec 2017 11:14:52 GMT flavoni [9038] * branches/2017/dev_merge_2017/DOC/NEMO_book.pdf (modified) * branches/2017/dev_merge_2017/DOC/Namelists/nam_tide (modified) * branches/2017/dev_merge_2017/DOC/Namelists/namagrif (modified) * branches/2017/dev_merge_2017/DOC/Namelists/namcfg (modified) * branches/2017/dev_merge_2017/DOC/Namelists/namdyn_spg (modified) * branches/2017/dev_merge_2017/DOC/Namelists/namobs (modified) * branches/2017/dev_merge_2017/DOC/Namelists/namsbc (modified) * branches/2017/dev_merge_2017/DOC/Namelists/namsbc_cpl (modified) * branches/2017/dev_merge_2017/DOC/Namelists/namsbc_wave (modified) * branches/2017/dev_merge_2017/DOC/Namelists/namwad (modified) * branches/2017/dev_merge_2017/DOC/Namelists/namzdf_osm (modified) * branches/2017/dev_merge_2017/DOC/TexFiles/Chapters/Chap_CFG.tex (modified) * branches/2017/dev_merge_2017/DOC/namelist_split.sh (modified) update DOC & Namelists Thu, 14 Dec 2017 11:12:17 GMT acc [9037] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 (modified) Branch 2017/dev_merge_2017. Fix next compilation issue in dynspg_ts.F90 Thu, 14 Dec 2017 11:07:21 GMT acc [9036] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 (modified) Branch 2017/dev_merge_2017. Fix next compilation issue in dynspg_ts.F90 Thu, 14 Dec 2017 10:41:52 GMT acc [9035] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 (modified) Branch 2017/dev_merge_2017. Fix compilation issue in dynspg_ts.F90 Thu, 14 Dec 2017 10:34:11 GMT acc [9034] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90 (modified) Branch 2017/dev_merge_2017. Fix compilation issue in sbccpl.F90 Thu, 14 Dec 2017 10:29:10 GMT timgraham [9033] * branches/2017/dev_merge_2017/NEMOGCM (modified) * branches/2017/dev_merge_2017/NEMOGCM/ARCH/OLD/NOC/arch-ALTIX_NAUTILUS.fcm (modified) * branches/2017/dev_merge_2017/NEMOGCM/ARCH/arch-ALTIX_NAUTILUS_MPT.fcm (modified) * branches/2017/dev_merge_2017/NEMOGCM/ARCH/arch-openmpi_NAVITI_MERCATOR.fcm (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/SHARED/namelist_ref (modified) * branches/2017/dev_merge_2017/NEMOGCM/EXTERNAL/AGRIF (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbc_oce.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbcwave.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/TRP/trctrp.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/TOOLS/DOMAINcfg/namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/TOOLS/DOMAINcfg/namelist_ref (modified) * branches/2017/dev_merge_2017/NEMOGCM/TOOLS/DOMAINcfg/src/dom_oce.f90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/TOOLS/DOMAINcfg/src/domain.f90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/TOOLS/DOMAINcfg/src/domzgr.f90 (modified) Commit final files from merge of NEMOGCM and some fixes for waves (taooc ... Thu, 14 Dec 2017 10:26:54 GMT jpalmier [9032] * branches/NERC/dev_r5518_GO6_ScalingCoupledChl/NEMOGCM/NEMO/TOP_SRC/MEDUSA/bio_medusa_fin.F90 (modified) * branches/NERC/dev_r5518_GO6_ScalingCoupledChl/NEMOGCM/NEMO/TOP_SRC/MEDUSA/trcini_medusa.F90 (modified) * branches/NERC/dev_r5518_GO6_ScalingCoupledChl/NEMOGCM/NEMO/TOP_SRC/trcrst.F90 (modified) JPALM -- only the coupled Chl sent to OASIS is scaled - avoid all kind ... Thu, 14 Dec 2017 10:10:02 GMT timgraham [9031] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC/agrif_lim3_update.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC/agrif_oce.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC/agrif_opa_interp.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC/agrif_opa_sponge.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC/agrif_opa_update.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC/agrif_top_interp.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC/agrif_top_sponge.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC/agrif_top_update.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC/agrif_user.F90 (modified) Resolved AGRIF conflicts Thu, 14 Dec 2017 10:03:50 GMT acc [9030] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90 (modified) Branch 2017/dev_merge_2017. Fix compilation issue in dynhpg.F90 Thu, 14 Dec 2017 09:54:39 GMT acc [9029] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbcwave.F90 (modified) Branch 2017/dev_merge_2017. Fix compilation issue in sbcwave.F90. ... Thu, 14 Dec 2017 09:20:02 GMT timgraham [9028] * branches/2017/dev_merge_2017/NEMOGCM/SETTE/sette.sh (modified) Fix incorrect merge in SETTE Thu, 14 Dec 2017 09:15:58 GMT acc [9027] * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/SAS_BIPER/MY_SRC/par_oce.F90 (modified) Branch 2017/dev_merge_2017. Update par_oce.F90 in ... Wed, 13 Dec 2017 20:54:36 GMT acc [9026] * branches/2017/dev_CNRS_2017/NEMOGCM/CONFIG/TEST_CASES/SAS_BIPER/MY_SRC/par_oce.F90 (modified) Branch 2017/dev_CNRS_2017. Fix out of date par_oce.F90 in ... Wed, 13 Dec 2017 18:08:59 GMT timgraham [9025] * branches/2017/dev_merge_2017/NEMOGCM/SETTE (modified) * branches/2017/dev_merge_2017/NEMOGCM/SETTE/new_sette.sh (modified) * branches/2017/dev_merge_2017/NEMOGCM/SETTE/sette.sh (modified) Resolved conflicts in SETTE (hopefully) Wed, 13 Dec 2017 18:01:03 GMT timgraham [9024] * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_LIM3_PISCES/EXP00/1_namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/SHARED (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/SHARED/namelist_ref (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/VORTEX (copied) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/WAD/EXP00/namelist_cfg (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/WAD/MY_DOCS/Namelists/nam_wad (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/WAD/MY_DOCS/WAD_doc.pdf (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/WAD/MY_DOCS/WAD_doc.tex (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/WAD/MY_DOCS/references.bib (copied) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/WAD/MY_SRC/domain.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/WAD/MY_SRC/usrdef_istate.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/WAD/MY_SRC/usrdef_zgr.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/cfg.txt (modified) * branches/2017/dev_merge_2017/NEMOGCM/CONFIG/cfg.txt (modified) Resolved conflicts in namelists Wed, 13 Dec 2017 17:08:50 GMT timgraham [9023] * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/BDY/bdydyn2d.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/dom_oce.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/domain.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/domwri.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/divhor.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynnxt.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/sshwzv.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/wet_dry.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/OBS/obs_averg_h2d.F90 (copied) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/OBS/obs_mpp.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/OBS/obs_oper.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/OBS/obs_prep.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/OBS/obs_profiles_def.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_prof.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_surf.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/OBS/obs_readmdt.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/OBS/obs_sstbias.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/OBS/obs_surf_def.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/OBS/obs_write.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/OBS/obsinter_h2d.h90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/cpl_oasis3.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbc_oce.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbcrnf.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbctide.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbcwave.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/tide_mod.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/tideini.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/tranxt.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/trasbc.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/USR/usrdef_hgr.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/USR/usrdef_nam.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfgls.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/oce.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/step.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/step_oce.F90 (modified) * branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/stpctl.F90 (modified) Merged METO_MERCATOR branch and resolved all conflicts in OPA_SRC Wed, 13 Dec 2017 16:38:29 GMT glong [9022] * branches/UKMO/GO6_dyn_vrt_diag/NEMOGCM/CONFIG/SHARED/field_def.xml (modified) * branches/UKMO/GO6_dyn_vrt_diag/NEMOGCM/NEMO/OPA_SRC/DYN/divcur.F90 (modified) * branches/UKMO/GO6_dyn_vrt_diag/NEMOGCM/NEMO/OPA_SRC/DYN/dynbfr.F90 (modified) * branches/UKMO/GO6_dyn_vrt_diag/NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90 (modified) * branches/UKMO/GO6_dyn_vrt_diag/NEMOGCM/NEMO/OPA_SRC/DYN/dynkeg.F90 (modified) * branches/UKMO/GO6_dyn_vrt_diag/NEMOGCM/NEMO/OPA_SRC/DYN/dynldf.F90 (modified) * branches/UKMO/GO6_dyn_vrt_diag/NEMOGCM/NEMO/OPA_SRC/DYN/dynnxt.F90 (modified) * branches/UKMO/GO6_dyn_vrt_diag/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg.F90 (modified) * branches/UKMO/GO6_dyn_vrt_diag/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_flt.F90 (modified) * branches/UKMO/GO6_dyn_vrt_diag/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 (modified) * branches/UKMO/GO6_dyn_vrt_diag/NEMOGCM/NEMO/OPA_SRC/DYN/dynvor.F90 (modified) * branches/UKMO/GO6_dyn_vrt_diag/NEMOGCM/NEMO/OPA_SRC/DYN/dynzad.F90 (modified) * branches/UKMO/GO6_dyn_vrt_diag/NEMOGCM/NEMO/OPA_SRC/DYN/dynzdf.F90 (modified) * branches/UKMO/GO6_dyn_vrt_diag/NEMOGCM/NEMO/OPA_SRC/TRD/trdini.F90 (modified) * branches/UKMO/GO6_dyn_vrt_diag/NEMOGCM/NEMO/OPA_SRC/TRD/trdvor.F90 (modified) * branches/UKMO/GO6_dyn_vrt_diag/NEMOGCM/NEMO/OPA_SRC/TRD/trdvor_oce.F90 (modified) Removed old dyn_vrt_dia subrouting and associated code. Updated trdvor ... Wed, 13 Dec 2017 16:13:00 GMT davestorkey [9021] * branches/UKMO/dev_r8600_closea_rewrite/NEMOGCM/NEMO/OPA_SRC/DOM/closea.F90 (modified) UKMO/dev_r8600_closea_rewrite branch: bug fix for signs of additional ... Wed, 13 Dec 2017 16:10:55 GMT jpalmier [9020] * branches/NERC/dev_r5518_GO6_package_trdtrc/NEMOGCM/CONFIG/SHARED/field_def_bgc.xml (modified) update trend groups in field_def_bgc