# # ChangeLog for branches # # Generated by Trac 1.0.1 # 2024-04-19T08:12:18+02:00 Thu, 07 Sep 2017 10:28:42 GMT clem [8506] * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/ice.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/iceist.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icerdgrft.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icethd.F90 (modified) changes in style - part5 - continue changing init routines Wed, 06 Sep 2017 17:02:43 GMT clem [8505] * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/ice.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/iceadv.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icealb.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icedia.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/iceitd.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icestp.F90 (modified) changes in style - part5 - start changing init routines Wed, 06 Sep 2017 15:47:28 GMT clem [8504] * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/iceadv.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/iceadv_prather.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/iceadv_umx.F90 (modified) changes in style - part4 - clarify ice advection routines Wed, 06 Sep 2017 13:05:03 GMT jcastill [8503] * branches/UKMO/r6232_HZG_WAVE-coupling/NEMOGCM/NEMO/OPA_SRC/SBC/sbcflx.F90 (modified) Print namsbc_flx namelist information in the output (shelf seas ... Wed, 06 Sep 2017 11:05:50 GMT jcastill [8502] * branches/UKMO/r6232_HZG_WAVE-coupling/NEMOGCM/NEMO/OPA_SRC/SBC/sbcflx.F90 (modified) Bug fix - one variable was calculated using the wrong component Wed, 06 Sep 2017 10:56:00 GMT dford [8501] * branches/UKMO/dev_r5518_GO6_package_asm_surf_bgc_v2/NEMOGCM/NEMO/TOP_SRC/MEDUSA/bio_medusa_fin.F90 (modified) * branches/UKMO/dev_r5518_GO6_package_asm_surf_bgc_v2/NEMOGCM/NEMO/TOP_SRC/MEDUSA/plankton.F90 (modified) Add omitted do loop and divide-by-zero check. Wed, 06 Sep 2017 10:01:34 GMT clem [8500] * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/ice.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/iceadv.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/iceitd.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icerdgrft.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icerhg_evp.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icestp.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icethd_dif.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icevar.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icewri.F90 (modified) changes in style - part3 - move output into proper files and correct a ... Wed, 06 Sep 2017 08:33:50 GMT jcastill [8499] * branches/dev (deleted) Remove because it was created by mistake Tue, 05 Sep 2017 17:53:41 GMT clem [8498] * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/ice.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icealb.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icecor.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icectl.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/iceforcing.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/iceist.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/iceitd.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icerdgrft.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icerhg_evp.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icestp.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icethd.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icethd_da.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icethd_dh.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icethd_sal.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/iceupdate.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icevar.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icewri.F90 (modified) changes in style - part2 - Tue, 05 Sep 2017 16:00:18 GMT dford [8497] * branches/UKMO/dev_r5518_GO6_package_asm_surf_bgc_v2/NEMOGCM/NEMO/OPA_SRC/ASM/asmlogchlbal_medusa.F90 (modified) Include conversion from moles to grams in carbon to chlorophyll ratio ... Tue, 05 Sep 2017 13:03:08 GMT clem [8496] * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icevar.F90 (modified) debug icevar Mon, 04 Sep 2017 16:50:10 GMT dford [8495] * branches/UKMO/dev_r5518_GO6_package_asm_surf_bgc_v2 (modified) * branches/UKMO/dev_r5518_GO6_package_asm_surf_bgc_v2/NEMOGCM (modified) * branches/UKMO/dev_r5518_GO6_package_asm_surf_bgc_v2/NEMOGCM/CONFIG/SHARED (modified) * branches/UKMO/dev_r5518_GO6_package_asm_surf_bgc_v2/NEMOGCM/CONFIG/SHARED/namelist_ref (modified) * branches/UKMO/dev_r5518_GO6_package_asm_surf_bgc_v2/NEMOGCM/NEMO (modified) * branches/UKMO/dev_r5518_GO6_package_asm_surf_bgc_v2/NEMOGCM/NEMO/OPA_SRC (modified) * branches/UKMO/dev_r5518_GO6_package_asm_surf_bgc_v2/NEMOGCM/NEMO/OPA_SRC/ASM/asmbal.F90 (copied) * branches/UKMO/dev_r5518_GO6_package_asm_surf_bgc_v2/NEMOGCM/NEMO/OPA_SRC/ASM/asmbkg.F90 (modified) * branches/UKMO/dev_r5518_GO6_package_asm_surf_bgc_v2/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90 (modified) * branches/UKMO/dev_r5518_GO6_package_asm_surf_bgc_v2/NEMOGCM/NEMO/OPA_SRC/ASM/asmlogchlbal_hadocc.F90 (copied) * branches/UKMO/dev_r5518_GO6_package_asm_surf_bgc_v2/NEMOGCM/NEMO/OPA_SRC/ASM/asmlogchlbal_medusa.F90 (copied) * branches/UKMO/dev_r5518_GO6_package_asm_surf_bgc_v2/NEMOGCM/NEMO/OPA_SRC/ASM/asmpar.F90 (modified) * branches/UKMO/dev_r5518_GO6_package_asm_surf_bgc_v2/NEMOGCM/NEMO/OPA_SRC/ASM/asmpco2bal.F90 (copied) * branches/UKMO/dev_r5518_GO6_package_asm_surf_bgc_v2/NEMOGCM/NEMO/OPA_SRC/ZDF/zdftmx.F90 (modified) * branches/UKMO/dev_r5518_GO6_package_asm_surf_bgc_v2/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 (modified) * branches/UKMO/dev_r5518_GO6_package_asm_surf_bgc_v2/NEMOGCM/NEMO/OPA_SRC/step.F90 (modified) * branches/UKMO/dev_r5518_GO6_package_asm_surf_bgc_v2/NEMOGCM/NEMO/TOP_SRC/MEDUSA/air_sea.F90 (modified) * branches/UKMO/dev_r5518_GO6_package_asm_surf_bgc_v2/NEMOGCM/NEMO/TOP_SRC/MEDUSA/bio_medusa_fin.F90 (modified) * branches/UKMO/dev_r5518_GO6_package_asm_surf_bgc_v2/NEMOGCM/NEMO/TOP_SRC/MEDUSA/bio_medusa_init.F90 (modified) * branches/UKMO/dev_r5518_GO6_package_asm_surf_bgc_v2/NEMOGCM/NEMO/TOP_SRC/MEDUSA/plankton.F90 (modified) * branches/UKMO/dev_r5518_GO6_package_asm_surf_bgc_v2/NEMOGCM/NEMO/TOP_SRC/MEDUSA/sms_medusa.F90 (modified) * branches/UKMO/dev_r5518_GO6_package_asm_surf_bgc_v2/NEMOGCM/NEMO/TOP_SRC/MEDUSA/trcbio_medusa.F90 (modified) * branches/UKMO/dev_r5518_GO6_package_asm_surf_bgc_v2/NEMOGCM/NEMO/TOP_SRC/MEDUSA/trcnam_medusa.F90 (modified) * branches/UKMO/dev_r5518_GO6_package_asm_surf_bgc_v2/NEMOGCM/NEMO/TOP_SRC/trcrst.F90 (modified) Merge in changes from dev_r5518_GO6_package_asm_surf_bgc, and adapt to ... Mon, 04 Sep 2017 12:25:06 GMT dford [8494] * branches/UKMO/dev_r5518_GO6_package_asm_surf_bgc_v2 (copied) New branch off head of GO6 package branch for MEDUSA assimilation ... Mon, 04 Sep 2017 07:48:12 GMT frrh [8493] * branches/UKMO/dev_r5518_MEDUSA_merge (deleted) Remove defunct development/test branch. Mon, 04 Sep 2017 07:46:39 GMT frrh [8492] * branches/UKMO/dev_r5518_GC3_couple_pkg_GO6 (deleted) Remove defunct development branch. Fri, 01 Sep 2017 16:15:45 GMT clem [8491] * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icecor.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icerhg.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icevar.F90 (modified) debug icevar.F90 Fri, 01 Sep 2017 15:28:24 GMT jpalmier [8490] * branches/NERC/dev_r5518_GO6_MEDUSA_conserv/NEMOGCM/CONFIG/SHARED/field_def_bgc.xml (modified) * branches/NERC/dev_r5518_GO6_MEDUSA_conserv/NEMOGCM/NEMO/TOP_SRC/MEDUSA/bio_medusa_fin.F90 (modified) * branches/NERC/dev_r5518_GO6_MEDUSA_conserv/NEMOGCM/NEMO/TOP_SRC/MEDUSA/trcnam_medusa.F90 (modified) * branches/NERC/dev_r5518_GO6_MEDUSA_conserv/NEMOGCM/NEMO/TOP_SRC/trc.F90 (modified) JPALM -- mld chl -- remove quick and dirty hacks Fri, 01 Sep 2017 14:55:53 GMT jpalmier [8489] * branches/NERC/dev_r5518_GO6_MEDUSA_conserv/NEMOGCM/NEMO/OPA_SRC/TRA/trabbl.F90 (modified) * branches/NERC/dev_r5518_GO6_MEDUSA_conserv/NEMOGCM/NEMO/TOP_SRC/MEDUSA/air_sea.F90 (modified) * branches/NERC/dev_r5518_GO6_MEDUSA_conserv/NEMOGCM/NEMO/TOP_SRC/MEDUSA/bio_medusa_fin.F90 (modified) * branches/NERC/dev_r5518_GO6_MEDUSA_conserv/NEMOGCM/NEMO/TOP_SRC/MEDUSA/bio_medusa_init.F90 (modified) * branches/NERC/dev_r5518_GO6_MEDUSA_conserv/NEMOGCM/NEMO/TOP_SRC/MEDUSA/bio_medusa_mod.F90 (modified) * branches/NERC/dev_r5518_GO6_MEDUSA_conserv/NEMOGCM/NEMO/TOP_SRC/MEDUSA/bio_medusa_update.F90 (modified) * branches/NERC/dev_r5518_GO6_MEDUSA_conserv/NEMOGCM/NEMO/TOP_SRC/MEDUSA/detritus.F90 (modified) * branches/NERC/dev_r5518_GO6_MEDUSA_conserv/NEMOGCM/NEMO/TOP_SRC/MEDUSA/phytoplankton.F90 (modified) * branches/NERC/dev_r5518_GO6_MEDUSA_conserv/NEMOGCM/NEMO/TOP_SRC/MEDUSA/trcsms_medusa.F90 (modified) JPALM -- gmed ticket #346 : improve MEDUSA conservation -- import BBL ... Fri, 01 Sep 2017 14:47:58 GMT clem [8488] * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icevar.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icewri.F90 (modified) compilation bugs Fri, 01 Sep 2017 14:35:06 GMT jpalmier [8487] * branches/NERC/dev_r5518_GO6_MEDUSA_conserv (copied) JPALM -- gmed ticket #346 -- branch creation Fri, 01 Sep 2017 13:49:35 GMT clem [8486] * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/ice.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/ice1D.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/iceadv.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/iceadv_prather.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/iceadv_umx.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icealb.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icecor.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icectl.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icedia.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/iceforcing.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/iceist.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/iceitd.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icerdgrft.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icerhg.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icerhg_evp.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icerst.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icestp.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icetab.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icethd.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icethd_da.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icethd_dh.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icethd_dif.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icethd_ent.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icethd_lac.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icethd_sal.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/iceupdate.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icevar.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icewri.F90 (modified) changes in style - part1 - (now the code looks better txs to Gurvan's ... Fri, 01 Sep 2017 13:12:42 GMT dford [8485] * branches/UKMO/dev_r5518_GO6_package_asm_surf_bgc/NEMOGCM/NEMO/OPA_SRC/ASM/asmlogchlbal_medusa.F90 (modified) * branches/UKMO/dev_r5518_GO6_package_asm_surf_bgc/NEMOGCM/NEMO/OPA_SRC/ZDF/zdftmx.F90 (modified) Mask logchl increments in the ITF region. Fri, 01 Sep 2017 10:17:24 GMT jamrae [8484] * branches/UKMO/dev_r5518_GO6_package_r8356_plus_form_drag/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_cice.F90 (modified) Added write statements for debugging. Fri, 01 Sep 2017 10:03:38 GMT clem [8483] * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icethd.F90 (modified) bug fix following #1937 Fri, 01 Sep 2017 10:02:50 GMT clem [8482] * branches/2017/dev_r8127_AGRIF_LIM3_GHOST/NEMOGCM/NEMO/LIM_SRC_3/limthd.F90 (modified) bug fix following #1937 Fri, 01 Sep 2017 10:02:11 GMT clem [8480] * branches/2016/dev_v3_6_STABLE_r6506_AGRIF_LIM3/NEMOGCM/NEMO/LIM_SRC_3/limthd.F90 (modified) bug fix following #1937 Thu, 31 Aug 2017 17:44:18 GMT jpalmier [8479] * branches/NERC/dev_r5518_GO6_package_trdtrc/NEMOGCM/CONFIG/SHARED/field_def_bgc.xml (modified) JPALM -- trdtrc -- polish field_def_bgc Thu, 31 Aug 2017 15:22:10 GMT jamrae [8478] * branches/UKMO/dev_r5518_GO6_package_r8356_plus_form_drag/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_cice.F90 (modified) Added call to cice2nemo for roughness length in cice_sbc_init. Thu, 31 Aug 2017 12:41:13 GMT timgraham [8477] * branches/2015/nemo_v3_6_STABLE/NEMOGCM/NEMO/OPA_SRC/step.F90 (modified) Revert accidental change to step.F90 in last commit Thu, 31 Aug 2017 12:33:15 GMT davestorkey [8476] * branches/UKMO/dev_3.6_FVPS/NEMOGCM/CONFIG/SHARED/field_def.xml (modified) * branches/UKMO/dev_3.6_FVPS/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90 (modified) * branches/UKMO/dev_3.6_FVPS/NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90 (modified) UKMO/dev_3.6_FVPS : implement FVPS HPG scheme. Thu, 31 Aug 2017 12:15:56 GMT jpalmier [8475] * branches/NERC/dev_r5518_GO6_package_trdtrc/NEMOGCM/CONFIG/SHARED/field_def_bgc.xml (modified) * branches/NERC/dev_r5518_GO6_package_trdtrc/NEMOGCM/NEMO/TOP_SRC/TRP/trczdf.F90 (modified) JPALM -- trdtrc --add vertical integrated trends Wed, 30 Aug 2017 13:08:27 GMT dford [8474] * branches/UKMO/dev_r5518_GO6_package_asm_surf_bgc/NEMOGCM/NEMO/TOP_SRC/trcrst.F90 (modified) Add fields required for logchl assimilation to restart. Wed, 30 Aug 2017 09:38:39 GMT timgraham [8473] * branches/2015/nemo_v3_6_STABLE/NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90 (modified) Corrected fix for #1935 (not using variables that don't exist in ... Tue, 29 Aug 2017 16:20:48 GMT jpalmier [8472] * branches/2017/nemo_v3_6_STABLE_trdtrc/NEMOGCM/CONFIG/SHARED/field_def.xml (modified) JPALM -- #1933 -- typo error Tue, 29 Aug 2017 16:12:42 GMT jpalmier [8471] * branches/2017/nemo_v3_6_STABLE_trdtrc/NEMOGCM/CONFIG/SHARED/field_def.xml (modified) * branches/2017/nemo_v3_6_STABLE_trdtrc/NEMOGCM/CONFIG/SHARED/namelist_top_ref (modified) * branches/2017/nemo_v3_6_STABLE_trdtrc/NEMOGCM/NEMO/OPA_SRC/TRD/trdtra.F90 (modified) * branches/2017/nemo_v3_6_STABLE_trdtrc/NEMOGCM/NEMO/TOP_SRC/TRP/trcnxt.F90 (modified) * branches/2017/nemo_v3_6_STABLE_trdtrc/NEMOGCM/NEMO/TOP_SRC/TRP/trczdf.F90 (modified) * branches/2017/nemo_v3_6_STABLE_trdtrc/NEMOGCM/NEMO/TOP_SRC/TRP/trdtrc.F90 (modified) * branches/2017/nemo_v3_6_STABLE_trdtrc/NEMOGCM/NEMO/TOP_SRC/trcnam.F90 (modified) * branches/2017/nemo_v3_6_STABLE_trdtrc/NEMOGCM/NEMO/TOP_SRC/trcstat.F90 (added) JPALM -- #1933 -- add and correct passive tracer trends - needs ... Tue, 29 Aug 2017 14:18:37 GMT jpalmier [8470] * branches/NERC/dev_r5518_GO6_package_trdtrc/NEMOGCM/NEMO/TOP_SRC/TRP/trcnxt.F90 (modified) * branches/NERC/dev_r5518_GO6_package_trdtrc/NEMOGCM/NEMO/TOP_SRC/TRP/trczdf.F90 (modified) * branches/NERC/dev_r5518_GO6_package_trdtrc/NEMOGCM/NEMO/TOP_SRC/TRP/trdtrc.F90 (modified) JPALM -- 29-08-2017 -- trends bug fix TOT, ZDF, ZDP Fri, 25 Aug 2017 16:56:36 GMT jpalmier [8467] * branches/NERC/dev_r5518_GO6_package_trdtrc/NEMOGCM/NEMO/TOP_SRC/TRP/trctrp.F90 (modified) * branches/NERC/dev_r5518_GO6_package_trdtrc/NEMOGCM/NEMO/TOP_SRC/TRP/trdtrc.F90 (modified) * branches/NERC/dev_r5518_GO6_package_trdtrc/NEMOGCM/NEMO/TOP_SRC/trcrst.F90 (modified) * branches/NERC/dev_r5518_GO6_package_trdtrc/NEMOGCM/NEMO/TOP_SRC/trcstat.F90 (added) * branches/NERC/dev_r5518_GO6_package_trdtrc/NEMOGCM/NEMO/TOP_SRC/trcstp.F90 (modified) JPALM -- 25-08-2017 -- improve trdtrc debug print statements Fri, 25 Aug 2017 14:10:15 GMT dford [8466] * branches/UKMO/dev_r5518_obs_oper_update_medusa/NEMOGCM/NEMO/OPA_SRC/OBS/obs_oper.F90 (modified) Set QC value so fill values don't get assimilated. Fri, 25 Aug 2017 08:31:40 GMT timgraham [8464] * branches/2015/nemo_v3_6_STABLE/NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90 (modified) * branches/2015/nemo_v3_6_STABLE/NEMOGCM/NEMO/OPA_SRC/step.F90 (modified) #1934 and #1935 - correct KE calculation in diawri.F90 Thu, 24 Aug 2017 17:05:09 GMT jpalmier [8463] * branches/NERC/dev_r5518_GO6_package_trdtrc/NEMOGCM/CONFIG/SHARED/field_def_bgc.xml (modified) * branches/NERC/dev_r5518_GO6_package_trdtrc/NEMOGCM/CONFIG/SHARED/namelist_top_MEDUSA_et_al_ref (modified) * branches/NERC/dev_r5518_GO6_package_trdtrc/NEMOGCM/CONFIG/SHARED/namelist_top_ref (modified) * branches/NERC/dev_r5518_GO6_package_trdtrc/NEMOGCM/NEMO/TOP_SRC/CFC/trcsms_cfc.F90 (modified) * branches/NERC/dev_r5518_GO6_package_trdtrc/NEMOGCM/NEMO/TOP_SRC/MEDUSA/bio_medusa_update.F90 (modified) * branches/NERC/dev_r5518_GO6_package_trdtrc/NEMOGCM/NEMO/TOP_SRC/MEDUSA/trcsms_medusa.F90 (modified) * branches/NERC/dev_r5518_GO6_package_trdtrc/NEMOGCM/NEMO/TOP_SRC/trcnam.F90 (modified) JPALM - trdtrc - fixes, update field_def Thu, 24 Aug 2017 11:02:20 GMT dford [8462] * branches/UKMO/dev_r5518_GO6_package_asm_surf_bgc/NEMOGCM/NEMO/TOP_SRC/trcrst.F90 (modified) Mask land if initialising pCO2/fCO2. Wed, 23 Aug 2017 16:52:54 GMT jpalmier [8461] * branches/2017/nemo_v3_6_STABLE_trdtrc (copied) correct trdtrc ticket #1933 Wed, 23 Aug 2017 16:23:13 GMT jamrae [8460] * branches/UKMO/dev_r5518_GO6_package_r8356_plus_form_drag/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90 (modified) Moved lines setting up ssnd(jps_fmdice), as they were in the wrong ... Wed, 23 Aug 2017 15:53:34 GMT jamrae [8459] * branches/UKMO/dev_r5518_GO6_package_r8356_plus_form_drag/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90 (modified) Outputs for debugging. Wed, 23 Aug 2017 15:07:41 GMT jamrae [8458] * branches/UKMO/dev_r5518_GO6_package_r8356_plus_form_drag/NEMOGCM/NEMO/OPA_SRC/SBC/cpl_oasis3.F90 (modified) Write statements for debugging. Wed, 23 Aug 2017 13:27:51 GMT dford [8457] * branches/UKMO/dev_r5518_GO6_package_asm_surf_bgc/NEMOGCM/NEMO/TOP_SRC/MEDUSA/sms_medusa.F90 (modified) * branches/UKMO/dev_r5518_GO6_package_asm_surf_bgc/NEMOGCM/NEMO/TOP_SRC/MEDUSA/trcbio_medusa.F90 (modified) * branches/UKMO/dev_r5518_GO6_package_asm_surf_bgc/NEMOGCM/NEMO/TOP_SRC/MEDUSA/trcnam_medusa.F90 (modified) Option to read in a value for atmospheric xCO2. Wed, 23 Aug 2017 12:20:41 GMT dford [8456] * branches/UKMO/dev_r5518_GO6_package_asm_surf_bgc/NEMOGCM/CONFIG/SHARED/namelist_ref (modified) * branches/UKMO/dev_r5518_GO6_package_asm_surf_bgc/NEMOGCM/NEMO/OPA_SRC/ASM/asmbal.F90 (modified) * branches/UKMO/dev_r5518_GO6_package_asm_surf_bgc/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90 (modified) * branches/UKMO/dev_r5518_GO6_package_asm_surf_bgc/NEMOGCM/NEMO/OPA_SRC/ASM/asmpco2bal.F90 (added) * branches/UKMO/dev_r5518_GO6_package_asm_surf_bgc/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 (modified) * branches/UKMO/dev_r5518_GO6_package_asm_surf_bgc/NEMOGCM/NEMO/OPA_SRC/step.F90 (modified) Add pCO2/fCO2 assimilation. Wed, 23 Aug 2017 10:57:45 GMT dford [8455] * branches/UKMO/dev_r5518_obs_oper_update_medusa/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90 (modified) Update getting chlorophyll, pCO2 and fCO2 from MEDUSA. Wed, 23 Aug 2017 10:53:01 GMT dford [8454] * branches/UKMO/dev_r5518_obs_oper_update_medusa (copied) Branch to update logchl and fco2 obs operator for use with GO6-MEDUSA. Tue, 22 Aug 2017 16:54:47 GMT jpalmier [8453] * branches/NERC/dev_r5518_GO6_package_trdtrc/NEMOGCM/CONFIG/SHARED/field_def_bgc.xml (modified) * branches/NERC/dev_r5518_GO6_package_trdtrc/NEMOGCM/NEMO/OPA_SRC/TRD/trd_oce.F90 (modified) * branches/NERC/dev_r5518_GO6_package_trdtrc/NEMOGCM/NEMO/OPA_SRC/TRD/trdtra.F90 (modified) * branches/NERC/dev_r5518_GO6_package_trdtrc/NEMOGCM/NEMO/TOP_SRC/MEDUSA/bio_medusa_update.F90 (modified) * branches/NERC/dev_r5518_GO6_package_trdtrc/NEMOGCM/NEMO/TOP_SRC/TRP/trcnxt.F90 (modified) * branches/NERC/dev_r5518_GO6_package_trdtrc/NEMOGCM/NEMO/TOP_SRC/TRP/trczdf.F90 (modified) * branches/NERC/dev_r5518_GO6_package_trdtrc/NEMOGCM/NEMO/TOP_SRC/TRP/trdtrc.F90 (modified) * branches/NERC/dev_r5518_GO6_package_trdtrc/NEMOGCM/NEMO/TOP_SRC/trcnam.F90 (modified) JPALM --22-08-2017-- repair trends for passive tracers Tue, 22 Aug 2017 12:36:39 GMT frrh [8452] * branches/UKMO/dev_r5518_GO6_lock_test/NEMOGCM/TOOLS/WEIGHTS/src/timers.f90 (modified) Lock files Tue, 22 Aug 2017 11:19:10 GMT jpalmier [8451] * branches/NERC/dev_r5518_GO6_package_trdtrc (copied) create branch to correct the passive tracer trends Tue, 22 Aug 2017 09:34:27 GMT frrh [8450] * branches/UKMO/dev_r5518_GO6_lock_test (copied) Test locking processes for prevention of rogue commits. Mon, 21 Aug 2017 14:33:57 GMT jamrae [8449] * branches/UKMO/dev_r5518_GO6_package_r8356_plus_form_drag/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90 (modified) Added some write statements for debugging. Mon, 21 Aug 2017 13:06:27 GMT jamrae [8448] * branches/UKMO/dev_r5518_GO6_package_r8356_plus_form_drag/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90 (modified) Changes to NEMO coupling for form drag field. Fri, 18 Aug 2017 16:16:42 GMT anaguiar [8447] * branches/UKMO/dev_r5518_GO6_package (modified) * branches/UKMO/dev_r5518_GO6_package/DOC (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/namelist_ref (modified) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO (modified) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/OPA_SRC (modified) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/OPA_SRC/ASM/bias.F90 (modified) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/OPA_SRC/ASM/biaspar.F90 (modified) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/OPA_SRC/C1D/dynnxt_c1d.F90 (modified) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90 (modified) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/OPA_SRC/TRA/eosbn2.F90 (modified) Merging with the dev_r5518_pcbias_ipc@8446 branch Fri, 18 Aug 2017 15:08:42 GMT anaguiar [8446] * branches/UKMO/dev_r5518_pcbias_ipc/NEMOGCM/NEMO/OPA_SRC/ASM/bias.F90 (modified) More changes to avoid conflict merge Fri, 18 Aug 2017 15:01:53 GMT anaguiar [8445] * branches/UKMO/dev_r5518_pcbias_ipc/NEMOGCM/NEMO/OPA_SRC/ASM/bias.F90 (modified) * branches/UKMO/dev_r5518_pcbias_ipc/NEMOGCM/NEMO/OPA_SRC/step.F90 (modified) Further changes to solve conflict merges with package branch Fri, 18 Aug 2017 14:35:46 GMT anaguiar [8444] * branches/UKMO/dev_r5518_pcbias_ipc/NEMOGCM/NEMO/OPA_SRC/ASM/bias.F90 (modified) * branches/UKMO/dev_r5518_pcbias_ipc/NEMOGCM/NEMO/OPA_SRC/TRA/eosbn2.F90 (modified) * branches/UKMO/dev_r5518_pcbias_ipc/NEMOGCM/NEMO/OPA_SRC/step.F90 (modified) Changes to avoid merge conflicts with package branch Thu, 17 Aug 2017 14:24:17 GMT frrh [8443] * branches/UKMO/dev_r5518_test_GO6_package_update (deleted) Delete defunct development branch Thu, 17 Aug 2017 11:39:18 GMT frrh [8442] * branches/UKMO/dev_r5518_GO6_package (modified) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM (modified) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO (modified) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/AGE/trcsms_age.F90 (modified) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/C14b/trcnam_c14b.F90 (modified) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/CFC/trcnam_cfc.F90 (modified) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/CFC/trcsms_cfc.F90 (modified) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/IDTRA/trcsms_idtra.F90 (modified) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/MEDUSA/air_sea.F90 (modified) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/MEDUSA/bio_med_diag_iomput.F90 (modified) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/MEDUSA/bio_med_diag_trc.F90 (deleted) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/MEDUSA/bio_medusa_diag.F90 (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/bio_medusa_init.F90 (modified) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/MEDUSA/bio_medusa_mod.F90 (modified) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/MEDUSA/bio_medusa_update.F90 (modified) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/MEDUSA/trcbio_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/MEDUSA/trcrst_medusa.F90 (deleted) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/MEDUSA/trcsed_medusa.F90 (modified) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/TRP/trcadv.F90 (modified) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/TRP/trctrp.F90 (modified) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/par_trc.F90 (modified) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/trcini.F90 (modified) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/trcnam.F90 (modified) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/trcsms.F90 (modified) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/trcstp.F90 (modified) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/trcwri.F90 (modified) Commit changes relating to Met Office GMED ticket 340 for the tidying of ... Thu, 17 Aug 2017 09:13:19 GMT frrh [8441] * branches/UKMO/dev_r5518_GO6_package (modified) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM (modified) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO (modified) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/MEDUSA/air_sea.F90 (copied) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/MEDUSA/bio_med_diag_iomput.F90 (copied) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/MEDUSA/bio_med_diag_trc.F90 (copied) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/MEDUSA/bio_medusa_diag.F90 (copied) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/MEDUSA/bio_medusa_diag_slice.F90 (copied) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/MEDUSA/bio_medusa_fin.F90 (copied) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/MEDUSA/bio_medusa_init.F90 (copied) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/MEDUSA/bio_medusa_mod.F90 (copied) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/MEDUSA/bio_medusa_update.F90 (copied) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/MEDUSA/carb_chem.F90 (copied) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/MEDUSA/detritus.F90 (copied) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/MEDUSA/detritus_fast_sink.F90 (copied) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/MEDUSA/iron_chem_scav.F90 (copied) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/MEDUSA/par_medusa.F90 (modified) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/MEDUSA/phytoplankton.F90 (copied) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/MEDUSA/plankton.F90 (copied) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/MEDUSA/trcbio_medusa.F90 (modified) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/MEDUSA/zooplankton.F90 (copied) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/trcini.F90 (modified) Commit changes relating to Met Office GMED ticket 339 for the ... Wed, 16 Aug 2017 12:47:00 GMT dford [8440] * branches/UKMO/dev_r5518_GO6_package_asm_surf_bgc/NEMOGCM/NEMO/OPA_SRC/ASM/asmbkg.F90 (modified) * branches/UKMO/dev_r5518_GO6_package_asm_surf_bgc/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90 (modified) * branches/UKMO/dev_r5518_GO6_package_asm_surf_bgc/NEMOGCM/NEMO/OPA_SRC/ASM/asmlogchlbal_hadocc.F90 (modified) * branches/UKMO/dev_r5518_GO6_package_asm_surf_bgc/NEMOGCM/NEMO/OPA_SRC/ASM/asmlogchlbal_medusa.F90 (modified) * branches/UKMO/dev_r5518_GO6_package_asm_surf_bgc/NEMOGCM/NEMO/TOP_SRC/trcrst.F90 (modified) Add more variables to assimilation background, so it includes all ... Tue, 15 Aug 2017 10:22:55 GMT dancopsey [8439] * branches/UKMO/dev_r5518_new_runoff_coupling/NEMOGCM/NEMO/OPA_SRC/SBC/cpl_oasis3.F90 (modified) Add n_rivers as a parameter. Tue, 15 Aug 2017 10:21:39 GMT dford [8438] * branches/UKMO/dev_r5518_v3.6_asm_nemovar_community_logchlbal/NEMOGCM/NEMO/OPA_SRC/ASM/asmlogchlbal_ersem.F90 (modified) Initial implementation of Jozef S's code to do multivariate balancing ... Mon, 14 Aug 2017 14:33:48 GMT dancopsey [8437] * branches/UKMO/dev_r5518_new_runoff_coupling/NEMOGCM/NEMO/OPA_SRC/SBC/cpl_oasis3.F90 (modified) Put number of rivers into partition definition. Only output final river ... Mon, 14 Aug 2017 13:22:09 GMT dford [8436] * branches/UKMO/dev_r5518_GO6_package_asm_surf_bgc/NEMOGCM/NEMO/OPA_SRC/ASM/asmbkg.F90 (modified) * branches/UKMO/dev_r5518_GO6_package_asm_surf_bgc/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90 (modified) * branches/UKMO/dev_r5518_GO6_package_asm_surf_bgc/NEMOGCM/NEMO/OPA_SRC/ASM/asmlogchlbal_hadocc.F90 (modified) * branches/UKMO/dev_r5518_GO6_package_asm_surf_bgc/NEMOGCM/NEMO/OPA_SRC/ASM/asmlogchlbal_medusa.F90 (copied) * branches/UKMO/dev_r5518_GO6_package_asm_surf_bgc/NEMOGCM/NEMO/TOP_SRC/MEDUSA/sms_medusa.F90 (modified) * branches/UKMO/dev_r5518_GO6_package_asm_surf_bgc/NEMOGCM/NEMO/TOP_SRC/MEDUSA/trcbio_medusa.F90 (modified) * branches/UKMO/dev_r5518_GO6_package_asm_surf_bgc/NEMOGCM/NEMO/TOP_SRC/trcrst.F90 (modified) Implement initial version of surface chlorophyll assimilation for ... Mon, 14 Aug 2017 10:19:09 GMT isabella [8435] * branches/UKMO/dev_r5518_pcbias_ipc/NEMOGCM/NEMO/LIM_SRC_2/dom_ice_2.F90 (modified) * branches/UKMO/dev_r5518_pcbias_ipc/NEMOGCM/NEMO/OPA_SRC/ASM/bias.F90 (modified) * branches/UKMO/dev_r5518_pcbias_ipc/NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90 (modified) * branches/UKMO/dev_r5518_pcbias_ipc/NEMOGCM/NEMO/OPA_SRC/step.F90 (modified) Added changes after review. Fri, 11 Aug 2017 10:47:19 GMT jpalmier [8434] * branches/NERC/dev_r5518_GO6_split_trcbiomedusa/NEMOGCM/NEMO/TOP_SRC/AGE/trcsms_age.F90 (modified) * branches/NERC/dev_r5518_GO6_split_trcbiomedusa/NEMOGCM/NEMO/TOP_SRC/C14b/trcnam_c14b.F90 (modified) * branches/NERC/dev_r5518_GO6_split_trcbiomedusa/NEMOGCM/NEMO/TOP_SRC/CFC/trcnam_cfc.F90 (modified) * branches/NERC/dev_r5518_GO6_split_trcbiomedusa/NEMOGCM/NEMO/TOP_SRC/CFC/trcsms_cfc.F90 (modified) * branches/NERC/dev_r5518_GO6_split_trcbiomedusa/NEMOGCM/NEMO/TOP_SRC/IDTRA/trcsms_idtra.F90 (modified) * branches/NERC/dev_r5518_GO6_split_trcbiomedusa/NEMOGCM/NEMO/TOP_SRC/MEDUSA/air_sea.F90 (modified) * branches/NERC/dev_r5518_GO6_split_trcbiomedusa/NEMOGCM/NEMO/TOP_SRC/MEDUSA/bio_med_diag_iomput.F90 (modified) * branches/NERC/dev_r5518_GO6_split_trcbiomedusa/NEMOGCM/NEMO/TOP_SRC/MEDUSA/bio_med_diag_trc.F90 (deleted) * branches/NERC/dev_r5518_GO6_split_trcbiomedusa/NEMOGCM/NEMO/TOP_SRC/MEDUSA/bio_medusa_diag.F90 (modified) * branches/NERC/dev_r5518_GO6_split_trcbiomedusa/NEMOGCM/NEMO/TOP_SRC/MEDUSA/bio_medusa_diag_slice.F90 (modified) * branches/NERC/dev_r5518_GO6_split_trcbiomedusa/NEMOGCM/NEMO/TOP_SRC/MEDUSA/bio_medusa_fin.F90 (modified) * branches/NERC/dev_r5518_GO6_split_trcbiomedusa/NEMOGCM/NEMO/TOP_SRC/MEDUSA/bio_medusa_init.F90 (modified) * branches/NERC/dev_r5518_GO6_split_trcbiomedusa/NEMOGCM/NEMO/TOP_SRC/MEDUSA/bio_medusa_mod.F90 (modified) * branches/NERC/dev_r5518_GO6_split_trcbiomedusa/NEMOGCM/NEMO/TOP_SRC/MEDUSA/bio_medusa_update.F90 (modified) * branches/NERC/dev_r5518_GO6_split_trcbiomedusa/NEMOGCM/NEMO/TOP_SRC/MEDUSA/trcbio_medusa.F90 (modified) * branches/NERC/dev_r5518_GO6_split_trcbiomedusa/NEMOGCM/NEMO/TOP_SRC/MEDUSA/trcnam_medusa.F90 (modified) * branches/NERC/dev_r5518_GO6_split_trcbiomedusa/NEMOGCM/NEMO/TOP_SRC/MEDUSA/trcrst_medusa.F90 (deleted) * branches/NERC/dev_r5518_GO6_split_trcbiomedusa/NEMOGCM/NEMO/TOP_SRC/MEDUSA/trcsed_medusa.F90 (modified) * branches/NERC/dev_r5518_GO6_split_trcbiomedusa/NEMOGCM/NEMO/TOP_SRC/TRP/trcadv.F90 (modified) * branches/NERC/dev_r5518_GO6_split_trcbiomedusa/NEMOGCM/NEMO/TOP_SRC/TRP/trctrp.F90 (modified) * branches/NERC/dev_r5518_GO6_split_trcbiomedusa/NEMOGCM/NEMO/TOP_SRC/par_trc.F90 (modified) * branches/NERC/dev_r5518_GO6_split_trcbiomedusa/NEMOGCM/NEMO/TOP_SRC/trcini.F90 (modified) * branches/NERC/dev_r5518_GO6_split_trcbiomedusa/NEMOGCM/NEMO/TOP_SRC/trcnam.F90 (modified) * branches/NERC/dev_r5518_GO6_split_trcbiomedusa/NEMOGCM/NEMO/TOP_SRC/trcsms.F90 (modified) * branches/NERC/dev_r5518_GO6_split_trcbiomedusa/NEMOGCM/NEMO/TOP_SRC/trcstp.F90 (modified) * branches/NERC/dev_r5518_GO6_split_trcbiomedusa/NEMOGCM/NEMO/TOP_SRC/trcwri.F90 (modified) JPALM -- 11-08-2017 -- MEDUSA cleaned and purged Thu, 10 Aug 2017 15:33:56 GMT dancopsey [8433] * branches/UKMO/dev_r5518_new_runoff_coupling/NEMOGCM/NEMO/OPA_SRC/SBC/cpl_oasis3.F90 (modified) * branches/UKMO/dev_r5518_new_runoff_coupling/NEMOGCM/NEMO/OPA_SRC/oce.F90 (modified) Added partition information for river runoff coupling. Thu, 10 Aug 2017 10:16:22 GMT dford [8432] * branches/UKMO/dev_r5518_v3.6_asm_nemovar_community_logchlbal/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modarrays.F90 (modified) * branches/UKMO/dev_r5518_v3.6_asm_nemovar_community_logchlbal/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modbc.F90 (modified) * branches/UKMO/dev_r5518_v3.6_asm_nemovar_community_logchlbal/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modbcfunction.F90 (modified) * branches/UKMO/dev_r5518_v3.6_asm_nemovar_community_logchlbal/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modcluster.F90 (modified) * branches/UKMO/dev_r5518_v3.6_asm_nemovar_community_logchlbal/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modcurgridfunctions.F90 (modified) * branches/UKMO/dev_r5518_v3.6_asm_nemovar_community_logchlbal/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modinitvars.F90 (modified) * branches/UKMO/dev_r5518_v3.6_asm_nemovar_community_logchlbal/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modinterp.F90 (modified) * branches/UKMO/dev_r5518_v3.6_asm_nemovar_community_logchlbal/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modinterpbasic.F90 (modified) * branches/UKMO/dev_r5518_v3.6_asm_nemovar_community_logchlbal/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modmask.F90 (modified) * branches/UKMO/dev_r5518_v3.6_asm_nemovar_community_logchlbal/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modmpp.F90 (modified) * branches/UKMO/dev_r5518_v3.6_asm_nemovar_community_logchlbal/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modsauv.F90 (modified) * branches/UKMO/dev_r5518_v3.6_asm_nemovar_community_logchlbal/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modupdate.F90 (modified) * branches/UKMO/dev_r5518_v3.6_asm_nemovar_community_logchlbal/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modupdatebasic.F90 (modified) * branches/UKMO/dev_r5518_v3.6_asm_nemovar_community_logchlbal/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modutil.F90 (modified) Clear svn keywords. Thu, 10 Aug 2017 10:14:14 GMT dford [8431] * branches/UKMO/dev_r5518_v3.6_asm_nemovar_community_logchlbal (copied) Branch of UKMO ASM code to include logchl balancing for ERSEM. Thu, 10 Aug 2017 09:31:49 GMT dford [8430] * branches/UKMO/dev_r4650_general_vert_coord_obsoper_pfts/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90 (modified) Add a couple of declarations which got omitted in previous merge. Wed, 09 Aug 2017 13:55:41 GMT frrh [8429] * branches/UKMO/dev_r5518_fix_NaNs (deleted) Deleting development branch now that it has been committed to GO6 ... Wed, 09 Aug 2017 12:56:31 GMT dford [8428] * branches/UKMO/dev_r5518_GO6_package_asm_surf_bgc (modified) * branches/UKMO/dev_r5518_GO6_package_asm_surf_bgc/NEMOGCM (modified) * branches/UKMO/dev_r5518_GO6_package_asm_surf_bgc/NEMOGCM/CONFIG/SHARED/namelist_ref (modified) * branches/UKMO/dev_r5518_GO6_package_asm_surf_bgc/NEMOGCM/NEMO (modified) * branches/UKMO/dev_r5518_GO6_package_asm_surf_bgc/NEMOGCM/NEMO/OPA_SRC (modified) * branches/UKMO/dev_r5518_GO6_package_asm_surf_bgc/NEMOGCM/NEMO/OPA_SRC/ASM/asmbal.F90 (copied) * branches/UKMO/dev_r5518_GO6_package_asm_surf_bgc/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90 (modified) * branches/UKMO/dev_r5518_GO6_package_asm_surf_bgc/NEMOGCM/NEMO/OPA_SRC/ASM/asmlogchlbal_hadocc.F90 (added) * branches/UKMO/dev_r5518_GO6_package_asm_surf_bgc/NEMOGCM/NEMO/OPA_SRC/ASM/asmpar.F90 (modified) * branches/UKMO/dev_r5518_GO6_package_asm_surf_bgc/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 (modified) * branches/UKMO/dev_r5518_GO6_package_asm_surf_bgc/NEMOGCM/NEMO/OPA_SRC/step.F90 (modified) Add logchl assimilation, with nitrogen balancing for HadOCC. Wed, 09 Aug 2017 10:13:16 GMT timgraham [8427] * 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/namelist_ref (modified) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/CONFIG/SHARED/namelist_top_MEDUSA_et_al_cfg (deleted) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/CONFIG/SHARED/namelist_top_MEDUSA_et_al_ref (modified) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO (modified) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/OPA_SRC (modified) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/OPA_SRC/DOM/dom_oce.F90 (modified) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90 (modified) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/OPA_SRC/TRA/eosbn2.F90 (modified) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/trcrst.F90 (modified) GMED ticket 341. Fixes found through use of preset NaNs to make the code ... Tue, 08 Aug 2017 15:53:09 GMT clem [8426] * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/ice.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/iceadv.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icealb.F90 (added) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icealbedo.F90 (deleted) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icecons.F90 (deleted) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icecor.F90 (added) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icectl.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icedia.F90 (added) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icediahsb.F90 (deleted) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/iceerr1.F90 (deleted) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/iceerr2.F90 (deleted) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/iceforcing.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/iceist.F90 (added) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/iceistate.F90 (deleted) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/iceitd.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icerdgrft.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icerhg.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icestp.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icethd.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icethd_lac.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/iceupdate.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icevar.F90 (modified) last routine names to be changed Tue, 08 Aug 2017 14:57:45 GMT jcastill [8425] * branches/UKMO/CO6_KD490/NEMOGCM/NEMO/OPA_SRC/SBC/sbcflx.F90 (modified) Calculate wind velocity relative to currents if needed for flux forcing ... Tue, 08 Aug 2017 14:18:04 GMT clem [8424] * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/ice.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/iceadv.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/iceerr1.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/iceerr2.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/iceistate.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/iceitd.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icerdgrft.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icerhg.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icestp.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icethd.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icethd_ent.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icethd_lac.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icethd_sal.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icevar.F90 (added) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icewri.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limvar.F90 (deleted) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/OPA_SRC/BDY/bdydta.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/OPA_SRC/BDY/bdyice.F90 (modified) continue naming Tue, 08 Aug 2017 14:14:00 GMT jpalmier [8423] * branches/NERC/dev_r5518_GO6_split_trcbiomedusa/NEMOGCM/NEMO/TOP_SRC/MEDUSA/bio_medusa_fin.F90 (modified) * branches/NERC/dev_r5518_GO6_split_trcbiomedusa/NEMOGCM/NEMO/TOP_SRC/MEDUSA/bio_medusa_update.F90 (modified) JPALM -- 08-08-2017 -- add conservation test - correct MEDUSA jn loop Tue, 08 Aug 2017 13:58:05 GMT clem [8422] * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/ice.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/iceerr1.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/iceerr2.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/iceistate.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/iceitd.F90 (added) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icestp.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icethd.F90 (added) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icethd_da.F90 (added) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icethd_dh.F90 (added) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icethd_dif.F90 (added) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icethd_ent.F90 (added) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icethd_lac.F90 (added) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icethd_sal.F90 (added) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limitd_th.F90 (deleted) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limthd.F90 (deleted) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limthd_da.F90 (deleted) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limthd_dh.F90 (deleted) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limthd_dif.F90 (deleted) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limthd_ent.F90 (deleted) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limthd_lac.F90 (deleted) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limthd_sal.F90 (deleted) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limvar.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/OPA_SRC/BDY/bdyice.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90 (modified) continue naming Tue, 08 Aug 2017 13:50:02 GMT flavoni [8421] * branches/2015/nemo_v3_6_STABLE/NEMOGCM/CONFIG/SHARED/namelist_ref (modified) fix ticket #1931 for 3_6_STABLE Tue, 08 Aug 2017 12:18:46 GMT clem [8420] * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/ice1D.F90 (added) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icectl.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/iceerr1.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/iceerr2.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icerdgrft.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icestp.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icetab.F90 (added) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limitd_th.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limtab.F90 (deleted) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limthd.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limthd_da.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limthd_dh.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limthd_dif.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limthd_ent.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limthd_lac.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limthd_sal.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limvar.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/thd_ice.F90 (deleted) changing names Tue, 08 Aug 2017 12:11:22 GMT jpalmier [8419] * branches/NERC/dev_r5518_GO6_split_trcbiomedusa/NEMOGCM/NEMO/TOP_SRC/MEDUSA/bio_medusa_fin.F90 (modified) * branches/NERC/dev_r5518_GO6_split_trcbiomedusa/NEMOGCM/NEMO/TOP_SRC/MEDUSA/bio_medusa_update.F90 (modified) * branches/NERC/dev_r5518_GO6_split_trcbiomedusa/NEMOGCM/NEMO/TOP_SRC/trcini.F90 (modified) JPALM -- 08-08-2017 -- clean trcbio_medusa split only - running this ... Tue, 08 Aug 2017 11:19:48 GMT mattmartin [8418] * branches/UKMO/dev_r5518_GO6_package_avgback/NEMOGCM/NEMO/OPA_SRC/ASM/asmbkg.F90 (modified) * branches/UKMO/dev_r5518_GO6_package_avgback/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90 (modified) * branches/UKMO/dev_r5518_GO6_package_avgback/NEMOGCM/NEMO/OPA_SRC/ASM/asmpar.F90 (modified) Updated branch of GO6 package branch to enable averaging the ... Tue, 08 Aug 2017 11:14:54 GMT mattmartin [8417] * branches/UKMO/dev_r5518_GO6_package_avgback (copied) Create a branch for averaging the assimilation background used for ... Tue, 08 Aug 2017 11:10:09 GMT jcastill [8416] * branches/UKMO/AMM15_v3_6_STABLE_package/NEMOGCM/NEMO/OPA_SRC/SBC/sbcflx.F90 (modified) Add the possibility of using wind velocity relative to currents when ... Tue, 08 Aug 2017 10:54:49 GMT jcastill [8415] * branches/UKMO/r6232_HZG_WAVE-coupling/NEMOGCM/CONFIG/SHARED/namelist_ref (modified) * branches/UKMO/r6232_HZG_WAVE-coupling/NEMOGCM/NEMO/OPA_SRC/SBC/sbcflx.F90 (modified) Calculate wind velocity relative to currents if needed for flux forcing ... Tue, 08 Aug 2017 10:48:02 GMT clem [8414] * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/albedoice.F90 (deleted) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icealbedo.F90 (added) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icediahsb.F90 (added) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/iceforcing.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icestp.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/iceupdate.F90 (added) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limdiahsb.F90 (deleted) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limsbc.F90 (deleted) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limthd.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limthd_dh.F90 (modified) changing names Mon, 07 Aug 2017 17:05:39 GMT clem [8413] * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/ice.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/iceistate.F90 (added) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icerst.F90 (added) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icestp.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icewri.F90 (added) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limdiahsb.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limistate.F90 (deleted) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limrst.F90 (deleted) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limvar.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limwri.F90 (deleted) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90 (modified) continue changing names (again) Mon, 07 Aug 2017 16:11:04 GMT jcastill [8412] * branches/UKMO/r6232_CO6_CO5_zenv_pomsdwl/NEMOGCM/NEMO/OPA_SRC/SBC/sbcflx.F90 (modified) Minor modification to avoid merging problems Mon, 07 Aug 2017 16:09:12 GMT clem [8411] * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/iceadv.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icecons.F90 (added) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icectl.F90 (added) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/iceerr1.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/iceerr2.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icerdgrft.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icerhg.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icestp.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limcons.F90 (deleted) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limctl.F90 (deleted) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limitd_th.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limmp.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limrst.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limsbc.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limthd.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limthd_lac.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/OPA_SRC/BDY/bdyice.F90 (modified) continue changing names Mon, 07 Aug 2017 15:43:51 GMT clem [8410] * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icecor1.F90 (deleted) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icecor2.F90 (deleted) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/iceerr1.F90 (added) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/iceerr2.F90 (added) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icestp.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limitd_th.F90 (modified) correction on the last commit Mon, 07 Aug 2017 15:29:21 GMT clem [8409] * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/ice.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/iceadv.F90 (added) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/iceadv_prather.F90 (added) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/iceadv_umx.F90 (added) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icecor1.F90 (added) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icecor2.F90 (added) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icerdgrft.F90 (added) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icerhg.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icerhg_evp.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icestp.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limadv_prather.F90 (deleted) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limadv_umx.F90 (deleted) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limcons.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limitd_me.F90 (deleted) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limitd_th.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limtrp.F90 (deleted) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limupdate1.F90 (deleted) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limupdate2.F90 (deleted) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limwri.F90 (modified) change calls in icestp.F90 for advection Mon, 07 Aug 2017 14:52:13 GMT jcastill [8408] * branches/UKMO/r6232_CO6_CO5_zenv_pomsdwl/NEMOGCM/NEMO/OPA_SRC/SBC/sbcflx.F90 (modified) * branches/UKMO/r6232_CO6_CO5_zenv_pomsdwl/NEMOGCM/NEMO/OPA_SRC/SBC/sbcssr.F90 (modified) * branches/UKMO/r6232_CO6_CO5_zenv_pomsdwl/NEMOGCM/NEMO/OPA_SRC/TRA/trasbc.F90 (modified) * branches/UKMO/r6232_CO6_CO5_zenv_pomsdwl/NEMOGCM/NEMO/OPA_SRC/step_oce.F90 (modified) * branches/UKMO/r6232_CO6_CO5_zenv_pomsdwl/NEMOGCM/NEMO/OPA_SRC/trc_oce.F90 (modified) Remove the code that does not belong to this branch, and that is already ... Mon, 07 Aug 2017 14:45:49 GMT clem [8407] * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/ice.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icerhg.F90 (added) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icerhg_evp.F90 (added) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icestp.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limdyn.F90 (deleted) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limrhg.F90 (deleted) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/OPA_SRC/BDY/bdyice.F90 (added) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/OPA_SRC/BDY/bdyice_lim.F90 (deleted) change calls in icestp.F90 for rheology Mon, 07 Aug 2017 14:38:55 GMT dford [8406] * branches/UKMO/dev_r5518_GO6_package_asm_surf_bgc (copied) Branch to add assimilation of surface ocean colour and fCO2 to ... Mon, 07 Aug 2017 13:26:30 GMT dford [8405] * branches/UKMO/dev_r5518_passive_tracers_foam/NEMOGCM/CONFIG/SHARED/field_def_ptracer.xml (modified) Update trend diagnostics in field_def_ptracer.xml. Mon, 07 Aug 2017 13:05:37 GMT clem [8404] * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/iceforcing.F90 (added) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icestp.F90 (modified) * branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limsbc.F90 (modified) start changing calls in icestp.F90 Thu, 03 Aug 2017 08:05:37 GMT deazer [8403] * branches/UKMO/ROMS_WAD_7832/NEMOGCM/CONFIG/CS15mini (added) * branches/UKMO/ROMS_WAD_7832/NEMOGCM/CONFIG/CS15mini/EXP00 (added) * branches/UKMO/ROMS_WAD_7832/NEMOGCM/CONFIG/CS15mini/EXP00/context_nemo.xml (added) * branches/UKMO/ROMS_WAD_7832/NEMOGCM/CONFIG/CS15mini/EXP00/file_def_nemo-opa.xml (added) * branches/UKMO/ROMS_WAD_7832/NEMOGCM/CONFIG/CS15mini/EXP00/iodef.xml (added) * branches/UKMO/ROMS_WAD_7832/NEMOGCM/CONFIG/CS15mini/EXP00/namelist_cfg (added) * branches/UKMO/ROMS_WAD_7832/NEMOGCM/CONFIG/CS15mini/MY_SRC (added) * branches/UKMO/ROMS_WAD_7832/NEMOGCM/CONFIG/CS15mini/MY_SRC/bdyini.F90 (added) * branches/UKMO/ROMS_WAD_7832/NEMOGCM/CONFIG/CS15mini/MY_SRC/domain.F90 (added) * branches/UKMO/ROMS_WAD_7832/NEMOGCM/CONFIG/CS15mini/MY_SRC/domvvl.F90 (added) * branches/UKMO/ROMS_WAD_7832/NEMOGCM/CONFIG/CS15mini/MY_SRC/domwri.F90 (added) * branches/UKMO/ROMS_WAD_7832/NEMOGCM/CONFIG/CS15mini/MY_SRC/domzgr.F90 (added) * branches/UKMO/ROMS_WAD_7832/NEMOGCM/CONFIG/CS15mini/MY_SRC/dynhpg.F90 (added) * branches/UKMO/ROMS_WAD_7832/NEMOGCM/CONFIG/CS15mini/MY_SRC/dynspg_ts.F90 (added) * branches/UKMO/ROMS_WAD_7832/NEMOGCM/CONFIG/CS15mini/MY_SRC/usrdef_hgr.F90 (added) * branches/UKMO/ROMS_WAD_7832/NEMOGCM/CONFIG/CS15mini/MY_SRC/usrdef_istate.F90 (added) * branches/UKMO/ROMS_WAD_7832/NEMOGCM/CONFIG/CS15mini/MY_SRC/usrdef_nam.F90 (added) * branches/UKMO/ROMS_WAD_7832/NEMOGCM/CONFIG/CS15mini/MY_SRC/usrdef_sbc.F90 (added) * branches/UKMO/ROMS_WAD_7832/NEMOGCM/CONFIG/CS15mini/MY_SRC/usrdef_zgr.F90 (added) * branches/UKMO/ROMS_WAD_7832/NEMOGCM/CONFIG/CS15mini/MY_SRC/wet_dry.F90 (added) * branches/UKMO/ROMS_WAD_7832/NEMOGCM/CONFIG/CS15mini/cpp_CS15mini.fcm (added) * branches/UKMO/ROMS_WAD_7832/NEMOGCM/CONFIG/TEST_CASES/WAD/EXP00/namelist_cfg (modified) * branches/UKMO/ROMS_WAD_7832/NEMOGCM/CONFIG/TEST_CASES/WAD/MY_SRC/diawri.F90 (added) * branches/UKMO/ROMS_WAD_7832/NEMOGCM/CONFIG/TEST_CASES/WAD/MY_SRC/domain.F90 (modified) * branches/UKMO/ROMS_WAD_7832/NEMOGCM/CONFIG/TEST_CASES/WAD/MY_SRC/domvvl.F90 (added) * branches/UKMO/ROMS_WAD_7832/NEMOGCM/CONFIG/TEST_CASES/WAD/MY_SRC/domwri.F90 (added) * branches/UKMO/ROMS_WAD_7832/NEMOGCM/CONFIG/TEST_CASES/WAD/MY_SRC/domzgr.F90 (added) * branches/UKMO/ROMS_WAD_7832/NEMOGCM/CONFIG/TEST_CASES/WAD/MY_SRC/dynhpg.F90 (added) * branches/UKMO/ROMS_WAD_7832/NEMOGCM/CONFIG/TEST_CASES/WAD/MY_SRC/dynspg_ts.F90 (added) * branches/UKMO/ROMS_WAD_7832/NEMOGCM/CONFIG/TEST_CASES/WAD/MY_SRC/usrdef_istate.F90 (modified) * branches/UKMO/ROMS_WAD_7832/NEMOGCM/CONFIG/TEST_CASES/WAD/MY_SRC/usrdef_zgr.F90 (modified) * branches/UKMO/ROMS_WAD_7832/NEMOGCM/CONFIG/TEST_CASES/WAD/MY_SRC/wet_dry.F90 (added) * branches/UKMO/ROMS_WAD_7832/NEMOGCM/CONFIG/cfg.txt (modified) Add in ROMS WAD option ln_rwd+changes for implicit Bed Friction for ...