# # ChangeLog for branches/UKMO # # Generated by Trac 1.0.1 # 2024-04-30T18:49:48+02:00 Wed, 08 Nov 2017 10:32:49 GMT frrh [8677] * branches/UKMO/dev_r5518_GO6_pkg_test_sst/NEMOGCM/NEMO/OPA_SRC/stpctl.F90 (modified) * branches/UKMO/dev_r5518_GO6_pkg_test_sst/NEMOGCM/NEMO/TOP_SRC/MEDUSA/air_sea.F90 (modified) * branches/UKMO/dev_r5518_GO6_pkg_test_sst/NEMOGCM/NEMO/TOP_SRC/MEDUSA/bio_medusa_init.F90 (modified) * branches/UKMO/dev_r5518_GO6_pkg_test_sst/NEMOGCM/NEMO/TOP_SRC/MEDUSA/trcbio_medusa.F90 (modified) * branches/UKMO/dev_r5518_GO6_pkg_test_sst/NEMOGCM/NEMO/TOP_SRC/TRP/trctrp.F90 (modified) * branches/UKMO/dev_r5518_GO6_pkg_test_sst/NEMOGCM/NEMO/TOP_SRC/trcrst.F90 (modified) * branches/UKMO/dev_r5518_GO6_pkg_test_sst/NEMOGCM/NEMO/TOP_SRC/trcstat.F90 (added) * branches/UKMO/dev_r5518_GO6_pkg_test_sst/NEMOGCM/NEMO/TOP_SRC/trcstp.F90 (modified) Commit JP/AXY's local changes to give us a stable platform. Wed, 08 Nov 2017 10:07:19 GMT frrh [8676] * branches/UKMO/dev_r5518_GO6_pkg_test_sst (copied) Test branch to develop tests for "microboil" instances Fri, 03 Nov 2017 15:40:54 GMT hadjt [8672] * branches/UKMO/CO6_shelfclimate_fabm/NEMOGCM/NEMO/OPA_SRC/DIA/diaregmean.F90 (modified) * branches/UKMO/CO6_shelfclimate_fabm/NEMOGCM/NEMO/OPA_SRC/DIA/diatmb.F90 (modified) * branches/UKMO/CO6_shelfclimate_fabm/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90 (modified) Updated diaregmean.F90: - outputs BGC variables - outputs depth ... Thu, 02 Nov 2017 15:02:02 GMT jamrae [8670] * branches/UKMO/dev_r5518_GO6_package_r8356_plus_form_drag/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90 (modified) * branches/UKMO/dev_r5518_GO6_package_r8356_plus_form_drag/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_cice.F90 (modified) Added capability to weight sea ice roughness length before coupling. Thu, 26 Oct 2017 09:50:32 GMT alistairsellar [8660] * branches/UKMO/dev_r5518_GO6_CarbFix_DMSMin/NEMOGCM/NEMO/TOP_SRC/MEDUSA/trcdms_medusa.F90 (modified) Reduce the Anderson DMS minimum (and the constant for log term) from ... Thu, 26 Oct 2017 09:48:04 GMT alistairsellar [8659] * branches/UKMO/dev_r5518_GO6_CarbFix_DMSMin (copied) Branch-of-branch to test Anderson DMS min=1.72 Mon, 23 Oct 2017 16:37:35 GMT dford [8654] * branches/UKMO/dev_r5518_obs_oper_update_medusa (deleted) Delete branch as merged into community branch. Mon, 23 Oct 2017 16:32:44 GMT dford [8653] * branches/UKMO/dev_r5518_obs_oper_update (modified) * branches/UKMO/dev_r5518_obs_oper_update/NEMOGCM (modified) * branches/UKMO/dev_r5518_obs_oper_update/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90 (modified) * branches/UKMO/dev_r5518_obs_oper_update/NEMOGCM/NEMO/OPA_SRC/OBS/obs_oper.F90 (modified) Updates for getting biogeochemical fields from MEDUSA. See GMED ticket ... Fri, 20 Oct 2017 13:31:59 GMT dford [8648] * 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 (modified) * branches/UKMO/dev_r5518_GO6_package_asm_surf_bgc_v2/NEMOGCM/NEMO/OPA_SRC/ASM/asmlogchlbal_medusa.F90 (modified) Change source of MLD for direct initialisation of logchl and pCO2 to ... Fri, 20 Oct 2017 09:35:37 GMT dford [8646] * branches/UKMO/dev_r5518_obs_oper_update_medusa/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90 (modified) * branches/UKMO/dev_r5518_obs_oper_update_medusa/NEMOGCM/NEMO/OPA_SRC/OBS/obs_oper.F90 (modified) Add comments in response to review. Fri, 20 Oct 2017 09:34:43 GMT dford [8645] * 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/nemogcm.F90 (modified) Add comments in response to review. Thu, 19 Oct 2017 08:20:59 GMT frrh [8638] * 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/OPA_SRC (modified) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/OPA_SRC/DIA/diaptr.F90 (modified) Applied fix from Tim Graham's branh: ... Wed, 18 Oct 2017 15:05:46 GMT timgraham [8635] * branches/UKMO/dev_r5518_GO6_package_msfeiv_fix/NEMOGCM/NEMO/OPA_SRC/DIA/diaptr.F90 (modified) Correct calculation of EIV overturning streamfunction Wed, 18 Oct 2017 15:03:15 GMT timgraham [8634] * branches/UKMO/dev_r5518_GO6_package_msfeiv_fix (copied) Temporary branch to fix bug in overturning diagnostic from GM ... Thu, 12 Oct 2017 10:57:56 GMT hadlh [8619] * branches/UKMO/GO6_package_r8356_CICEnudging/NEMOGCM/NEMO/OPA_SRC/SBC/sbcdta_ice.F90 (added) Added extra file that calculates the DA increment Thu, 12 Oct 2017 10:49:28 GMT hadlh [8618] * branches/UKMO/GO6_package_r8356_CICEnudging/NEMOGCM/NEMO/OPA_SRC/SBC/sbc_ice.F90 (modified) * branches/UKMO/GO6_package_r8356_CICEnudging/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_cice.F90 (modified) * branches/UKMO/GO6_package_r8356_CICEnudging/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90 (modified) Changes for DePreSys3 (coupled) sea-ice nudging, including code to read ... Wed, 11 Oct 2017 15:13:12 GMT frrh [8615] * 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/OPA_SRC (modified) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/OPA_SRC/TRA/trabbl.F90 (modified) Commit Tim Graham's branches/UKMO/dev_r5518_GO6_package_bblkeyfix. Met ... Tue, 10 Oct 2017 13:37:58 GMT timgraham [8609] * branches/UKMO/dev_r5518_GO6_package_diaptr_gm_fix (deleted) Deleting old branch Tue, 10 Oct 2017 13:15:28 GMT frrh [8608] * 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/OPA_SRC (modified) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/OPA_SRC/DIA/diaptr.F90 (modified) Apply bug fix in diaptr for overturning heat/salt diagnostics when using ... Tue, 10 Oct 2017 10:37:14 GMT timgraham [8606] * branches/UKMO/dev_r5518_GO6_package_diaptr_gm_fix/NEMOGCM/NEMO/OPA_SRC/DIA/diaptr.F90 (modified) Fix bug in diaptr for overturning heat/salt when using GM. See GMED 350 Tue, 10 Oct 2017 10:33:46 GMT timgraham [8605] * branches/UKMO/dev_r5518_GO6_package_diaptr_gm_fix (copied) Temporary branch for fix of overturning heat/salt transport with GM Tue, 10 Oct 2017 09:21:44 GMT timgraham [8604] * branches/UKMO/dev_r5518_GO6_package_bblkeyfix/NEMOGCM/NEMO/OPA_SRC/TRA/trabbl.F90 (modified) Added key_old_bbl_non_conserve Tue, 10 Oct 2017 09:13:36 GMT timgraham [8603] * branches/UKMO/dev_r5518_GO6_package_bblkeyfix (copied) Temporary branch to wrap previous commit in a cpp key so that results ... Thu, 28 Sep 2017 12:58:00 GMT mathiot [8574] * branches/UKMO/GO6_package_r8356_CICEnudging (copied) Branch for DePreSys nudging of sea ice Fri, 22 Sep 2017 15:45:41 GMT jgraham [8561] * branches/UKMO/AMM15_v3_6_STABLE_package/NEMOGCM/NEMO/OPA_SRC/DIA/dia25h.F90 (modified) * branches/UKMO/AMM15_v3_6_STABLE_package/NEMOGCM/NEMO/OPA_SRC/DIA/diaopfoam.F90 (added) * branches/UKMO/AMM15_v3_6_STABLE_package/NEMOGCM/NEMO/OPA_SRC/DIA/diatmb.F90 (modified) * branches/UKMO/AMM15_v3_6_STABLE_package/NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90 (modified) * branches/UKMO/AMM15_v3_6_STABLE_package/NEMOGCM/NEMO/OPA_SRC/DIU (added) * branches/UKMO/AMM15_v3_6_STABLE_package/NEMOGCM/NEMO/OPA_SRC/DIU/cool_skin.F90 (added) * branches/UKMO/AMM15_v3_6_STABLE_package/NEMOGCM/NEMO/OPA_SRC/DIU/diurnal_bulk.F90 (added) * branches/UKMO/AMM15_v3_6_STABLE_package/NEMOGCM/NEMO/OPA_SRC/DIU/solfrac_mod.F90 (added) * branches/UKMO/AMM15_v3_6_STABLE_package/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 (modified) * branches/UKMO/AMM15_v3_6_STABLE_package/NEMOGCM/NEMO/OPA_SRC/step.F90 (modified) * branches/UKMO/AMM15_v3_6_STABLE_package/NEMOGCM/NEMO/OPA_SRC/step_oce.F90 (modified) Updates for operational diagnostics: 25h mean diagnostics - bottom ... Thu, 21 Sep 2017 11:09:26 GMT jcastill [8553] * branches/UKMO/r6232_HZG_WAVE-coupling/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90 (modified) * branches/UKMO/r6232_HZG_WAVE-coupling/NEMOGCM/NEMO/OPA_SRC/SBC/sbcwave.F90 (modified) Cap the value of tauoc as recieved via coupling or via forcing Tue, 19 Sep 2017 15:41:15 GMT deazer [8544] * branches/UKMO/ROMS_WAD_7832/NEMOGCM/CONFIG/CS15mini/EXP00/namelist_cfg (modified) * branches/UKMO/ROMS_WAD_7832/NEMOGCM/CONFIG/CS15mini/MY_SRC/diawri.F90 (added) * branches/UKMO/ROMS_WAD_7832/NEMOGCM/CONFIG/CS15mini/MY_SRC/domvvl.F90 (modified) * branches/UKMO/ROMS_WAD_7832/NEMOGCM/CONFIG/CS15mini/MY_SRC/domzgr.F90 (modified) * branches/UKMO/ROMS_WAD_7832/NEMOGCM/CONFIG/CS15mini/MY_SRC/dynhpg.F90 (modified) * branches/UKMO/ROMS_WAD_7832/NEMOGCM/CONFIG/CS15mini/MY_SRC/dynspg_ts.F90 (modified) * branches/UKMO/ROMS_WAD_7832/NEMOGCM/CONFIG/CS15mini/MY_SRC/usrdef_istate.F90 (modified) * branches/UKMO/ROMS_WAD_7832/NEMOGCM/CONFIG/CS15mini/MY_SRC/wet_dry.F90 (modified) * branches/UKMO/ROMS_WAD_7832/NEMOGCM/CONFIG/TEST_CASES/cfg.txt (modified) Added reference level (above all potential wet points) to avoid negative ... Tue, 19 Sep 2017 08:01:20 GMT timgraham [8540] * branches/UKMO/dev_r5518_GO6_package_lim3/NEMOGCM/CONFIG/SHARED/field_def.xml (modified) * branches/UKMO/dev_r5518_GO6_package_lim3/NEMOGCM/CONFIG/SHARED/namelist_ice_lim3_ref (modified) * branches/UKMO/dev_r5518_GO6_package_lim3/NEMOGCM/NEMO/LIM_SRC_3/dom_ice.F90 (modified) * branches/UKMO/dev_r5518_GO6_package_lim3/NEMOGCM/NEMO/LIM_SRC_3/ice.F90 (modified) * branches/UKMO/dev_r5518_GO6_package_lim3/NEMOGCM/NEMO/LIM_SRC_3/limadv.F90 (modified) * branches/UKMO/dev_r5518_GO6_package_lim3/NEMOGCM/NEMO/LIM_SRC_3/limcons.F90 (modified) * branches/UKMO/dev_r5518_GO6_package_lim3/NEMOGCM/NEMO/LIM_SRC_3/limctl.F90 (modified) * branches/UKMO/dev_r5518_GO6_package_lim3/NEMOGCM/NEMO/LIM_SRC_3/limdiahsb.F90 (modified) * branches/UKMO/dev_r5518_GO6_package_lim3/NEMOGCM/NEMO/LIM_SRC_3/limdyn.F90 (modified) * branches/UKMO/dev_r5518_GO6_package_lim3/NEMOGCM/NEMO/LIM_SRC_3/limhdf.F90 (modified) * branches/UKMO/dev_r5518_GO6_package_lim3/NEMOGCM/NEMO/LIM_SRC_3/limistate.F90 (modified) * branches/UKMO/dev_r5518_GO6_package_lim3/NEMOGCM/NEMO/LIM_SRC_3/limitd_me.F90 (modified) * branches/UKMO/dev_r5518_GO6_package_lim3/NEMOGCM/NEMO/LIM_SRC_3/limitd_th.F90 (modified) * branches/UKMO/dev_r5518_GO6_package_lim3/NEMOGCM/NEMO/LIM_SRC_3/limmsh.F90 (modified) * branches/UKMO/dev_r5518_GO6_package_lim3/NEMOGCM/NEMO/LIM_SRC_3/limrhg.F90 (modified) * branches/UKMO/dev_r5518_GO6_package_lim3/NEMOGCM/NEMO/LIM_SRC_3/limrst.F90 (modified) * branches/UKMO/dev_r5518_GO6_package_lim3/NEMOGCM/NEMO/LIM_SRC_3/limsbc.F90 (modified) * branches/UKMO/dev_r5518_GO6_package_lim3/NEMOGCM/NEMO/LIM_SRC_3/limtab.F90 (modified) * branches/UKMO/dev_r5518_GO6_package_lim3/NEMOGCM/NEMO/LIM_SRC_3/limthd.F90 (modified) * branches/UKMO/dev_r5518_GO6_package_lim3/NEMOGCM/NEMO/LIM_SRC_3/limthd_dh.F90 (modified) * branches/UKMO/dev_r5518_GO6_package_lim3/NEMOGCM/NEMO/LIM_SRC_3/limthd_dif.F90 (modified) * branches/UKMO/dev_r5518_GO6_package_lim3/NEMOGCM/NEMO/LIM_SRC_3/limthd_ent.F90 (modified) * branches/UKMO/dev_r5518_GO6_package_lim3/NEMOGCM/NEMO/LIM_SRC_3/limthd_lac.F90 (modified) * branches/UKMO/dev_r5518_GO6_package_lim3/NEMOGCM/NEMO/LIM_SRC_3/limthd_sal.F90 (modified) * branches/UKMO/dev_r5518_GO6_package_lim3/NEMOGCM/NEMO/LIM_SRC_3/limtrp.F90 (modified) * branches/UKMO/dev_r5518_GO6_package_lim3/NEMOGCM/NEMO/LIM_SRC_3/limupdate1.F90 (modified) * branches/UKMO/dev_r5518_GO6_package_lim3/NEMOGCM/NEMO/LIM_SRC_3/limupdate2.F90 (modified) * branches/UKMO/dev_r5518_GO6_package_lim3/NEMOGCM/NEMO/LIM_SRC_3/limvar.F90 (modified) * branches/UKMO/dev_r5518_GO6_package_lim3/NEMOGCM/NEMO/LIM_SRC_3/limwri.F90 (modified) * branches/UKMO/dev_r5518_GO6_package_lim3/NEMOGCM/NEMO/LIM_SRC_3/limwri_dimg.h90 (modified) * branches/UKMO/dev_r5518_GO6_package_lim3/NEMOGCM/NEMO/LIM_SRC_3/thd_ice.F90 (modified) * branches/UKMO/dev_r5518_GO6_package_lim3/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim.F90 (modified) Changes required to get GO6 running with LIM3 (updated LIM3 and ... Tue, 19 Sep 2017 07:59:42 GMT timgraham [8539] * branches/UKMO/dev_r5518_GO6_package_lim3 (copied) Branch for LIM3 developments with GO6 Thu, 14 Sep 2017 15:42:14 GMT marc [8521] * 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/OPA_SRC (modified) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/OPA_SRC/TRA/trabbl.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_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/detritus.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/trcnam_medusa.F90 (modified) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/MEDUSA/trcsms_medusa.F90 (modified) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/trc.F90 (modified) gmed:#346 Merging branches/NERC/dev_r5518_GO6_MEDUSA_conserv Fri, 08 Sep 2017 12:29:09 GMT dford [8513] * branches/UKMO/dev_r5518_GO6_package_asm_surf_bgc_v2/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90 (modified) Protect loop with key_top. 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. 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 ... 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 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. 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: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. 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. 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. 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: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 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 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. 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 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 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 ... 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 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: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. 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 ... Tue, 01 Aug 2017 15:46:39 GMT timgraham [8401] * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/CONFIG/SHARED/namelist_ref (modified) Revert namobs in namelist_ref how it was at start of package branch to ... Tue, 01 Aug 2017 14:12:29 GMT timgraham [8400] * 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/cfg.txt (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/asmbkg.F90 (modified) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90 (modified) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/OPA_SRC/ASM/bias.F90 (copied) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/OPA_SRC/ASM/biaspar.F90 (copied) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/OPA_SRC/DIA/diainsitutem.F90 (copied) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/OPA_SRC/DIA/diawri.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/DYN/sshwzv.F90 (modified) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/OPA_SRC/SBC/sbc_ice.F90 (modified) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_cice.F90 (modified) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/OPA_SRC/TRA/trasbc.F90 (modified) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 (modified) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/OPA_SRC/step.F90 (modified) * branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/OPA_SRC/step_oce.F90 (modified) GMED ticket 335: - Merge dev_r5518_GO6_package_inc_asm into ... Fri, 28 Jul 2017 15:26:12 GMT jgraham [8393] * branches/UKMO/AMM15_v3_6_STABLE_package/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfmxl.F90 (modified) Updated to include 25hourm mldzint diagnostics. Fri, 28 Jul 2017 10:38:26 GMT frrh [8392] * branches/UKMO/dev_r5518_fix_NaNs/NEMOGCM/CONFIG/SHARED/namelist_ref (modified) * branches/UKMO/dev_r5518_fix_NaNs/NEMOGCM/CONFIG/SHARED/namelist_top_MEDUSA_et_al_cfg (deleted) * branches/UKMO/dev_r5518_fix_NaNs/NEMOGCM/CONFIG/SHARED/namelist_top_MEDUSA_et_al_ref (modified) Remove redundant MEDUSA cfg namelist namelist_top_MEDUSA_et_al_cfg - ... Thu, 27 Jul 2017 14:45:56 GMT frrh [8389] * branches/UKMO/dev_r5518_fix_NaNs/NEMOGCM/NEMO/OPA_SRC/DOM/dom_oce.F90 (modified) * branches/UKMO/dev_r5518_fix_NaNs/NEMOGCM/NEMO/TOP_SRC/trcrst.F90 (modified) Reinstate original use of fse3t_a, having ensured contents will be ... Thu, 27 Jul 2017 13:22:52 GMT frrh [8388] * branches/UKMO/dev_r5518_GO6_MEDUSA_dummyrun (deleted) Delete branch from dummy run tests of GO6 code merge. Thu, 27 Jul 2017 13:21:02 GMT frrh [8387] * branches/UKMO/dev_r5518_GO6M_StableTo6959 (deleted) Delete development branch. Thu, 27 Jul 2017 12:22:16 GMT frrh [8386] * branches/UKMO/dev_r5518_fix_NaNs/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90 (modified) * branches/UKMO/dev_r5518_fix_NaNs/NEMOGCM/NEMO/TOP_SRC/trcrst.F90 (modified) Avoid passing in the same variable twice to repcmo with conflicting ... Thu, 27 Jul 2017 10:52:27 GMT jamrae [8385] * branches/UKMO/dev_r5518_GO6_package_r8356_plus_form_drag/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90 (modified) Debugging. Thu, 27 Jul 2017 10:27:39 GMT jamrae [8384] * branches/UKMO/dev_r5518_GO6_package_r8356_plus_form_drag/NEMOGCM/NEMO/OPA_SRC/SBC/sbc_ice.F90 (modified) * branches/UKMO/dev_r5518_GO6_package_r8356_plus_form_drag/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90 (modified) * branches/UKMO/dev_r5518_GO6_package_r8356_plus_form_drag/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_cice.F90 (modified) Implemented changes to pass sea ice form drag from CICE to coupler. Thu, 27 Jul 2017 10:17:34 GMT jamrae [8383] * branches/UKMO/dev_r5518_GO6_package_r8356_plus_form_drag (copied) New branch created. Thu, 27 Jul 2017 10:17:20 GMT jamrae [8382] * branches/UKMO/dev_r8356_GO6_package_r7750_plus_form_drag (deleted) Deleted branch created in error. Thu, 27 Jul 2017 10:15:06 GMT jamrae [8381] * branches/UKMO/dev_r8356_GO6_package_r7750_plus_form_drag (copied) New branch, a copy of GO6 package branch.