# # ChangeLog for NEMO/branches/UKMO # # Generated by Trac 1.0.1 # 2024-07-10T19:36:19+02:00 Tue, 06 Jul 2021 14:11:33 GMT dford [15089] * NEMO/branches/UKMO/NEMO_4.0.4_generic_obs (modified) * NEMO/branches/UKMO/NEMO_4.0.4_generic_obs/cfgs/SHARED (modified) * NEMO/branches/UKMO/NEMO_4.0.4_generic_obs/cfgs/SHARED/namelist_ref (modified) * NEMO/branches/UKMO/NEMO_4.0.4_generic_obs/cfgs/ref_cfgs.txt (modified) * NEMO/branches/UKMO/NEMO_4.0.4_generic_obs/doc (modified) * NEMO/branches/UKMO/NEMO_4.0.4_generic_obs/doc/namelists/namobs (modified) * NEMO/branches/UKMO/NEMO_4.0.4_generic_obs/src (modified) * NEMO/branches/UKMO/NEMO_4.0.4_generic_obs/src/OCE/OBS/diaobs.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_generic_obs/src/OCE/OBS/obs_oper.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_generic_obs/src/OCE/OBS/obs_prep.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_generic_obs/src/OCE/OBS/obs_read_prof.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_generic_obs/src/OCE/OBS/obs_read_surf.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_generic_obs/src/OCE/OBS/obs_write.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_generic_obs/tests (modified) Merge in changes from 4.2 to make internal handling of profile ... Mon, 05 Jul 2021 14:19:12 GMT ayoung [15080] * NEMO/branches/UKMO/NEMO_r4.2RC_GO8_package/cfgs/METO_GO (added) * NEMO/branches/UKMO/NEMO_r4.2RC_GO8_package/cfgs/METO_GO/EXPREF (added) * NEMO/branches/UKMO/NEMO_r4.2RC_GO8_package/cfgs/METO_GO/EXPREF/context_nemo-BASIC.xml (added) * NEMO/branches/UKMO/NEMO_r4.2RC_GO8_package/cfgs/METO_GO/EXPREF/context_nemo-CMIP6.xml (added) * NEMO/branches/UKMO/NEMO_r4.2RC_GO8_package/cfgs/METO_GO/EXPREF/context_nemo-CUSTOM.xml (added) * NEMO/branches/UKMO/NEMO_r4.2RC_GO8_package/cfgs/METO_GO/EXPREF/file_def_nemo-ice-BASIC-10D.xml (added) * NEMO/branches/UKMO/NEMO_r4.2RC_GO8_package/cfgs/METO_GO/EXPREF/file_def_nemo-ice-BASIC-1M.xml (added) * NEMO/branches/UKMO/NEMO_r4.2RC_GO8_package/cfgs/METO_GO/EXPREF/file_def_nemo-ice-BASIC-INVALID_PERIOD.xml (added) * NEMO/branches/UKMO/NEMO_r4.2RC_GO8_package/cfgs/METO_GO/EXPREF/file_def_nemo-ice-CMIP6-10D.xml (added) * NEMO/branches/UKMO/NEMO_r4.2RC_GO8_package/cfgs/METO_GO/EXPREF/file_def_nemo-ice-CMIP6-1M.xml (added) * NEMO/branches/UKMO/NEMO_r4.2RC_GO8_package/cfgs/METO_GO/EXPREF/file_def_nemo-ice-CMIP6-INVALID_PERIOD.xml (added) * NEMO/branches/UKMO/NEMO_r4.2RC_GO8_package/cfgs/METO_GO/EXPREF/file_def_nemo-oce-BASIC-10D.xml (added) * NEMO/branches/UKMO/NEMO_r4.2RC_GO8_package/cfgs/METO_GO/EXPREF/file_def_nemo-oce-BASIC-1M.xml (added) * NEMO/branches/UKMO/NEMO_r4.2RC_GO8_package/cfgs/METO_GO/EXPREF/file_def_nemo-oce-BASIC-INVALID_PERIOD.xml (added) * NEMO/branches/UKMO/NEMO_r4.2RC_GO8_package/cfgs/METO_GO/EXPREF/file_def_nemo-oce-CMIP6-10D.xml (added) * NEMO/branches/UKMO/NEMO_r4.2RC_GO8_package/cfgs/METO_GO/EXPREF/file_def_nemo-oce-CMIP6-1M.xml (added) * NEMO/branches/UKMO/NEMO_r4.2RC_GO8_package/cfgs/METO_GO/EXPREF/file_def_nemo-oce-CMIP6-INVALID_PERIOD.xml (added) * NEMO/branches/UKMO/NEMO_r4.2RC_GO8_package/cfgs/METO_GO/EXPREF/iodef.xml (added) * NEMO/branches/UKMO/NEMO_r4.2RC_GO8_package/cfgs/METO_GO/EXPREF/iodef_coupled.xml (added) * NEMO/branches/UKMO/NEMO_r4.2RC_GO8_package/src/ICE/icerst.F90 (modified) * NEMO/branches/UKMO/NEMO_r4.2RC_GO8_package/src/ICE/icethd_pnd.F90 (modified) * NEMO/branches/UKMO/NEMO_r4.2RC_GO8_package/src/OCE/DIA/diawri.F90 (modified) * NEMO/branches/UKMO/NEMO_r4.2RC_GO8_package/src/OCE/DOM/domain.F90 (modified) * NEMO/branches/UKMO/NEMO_r4.2RC_GO8_package/src/OCE/DOM/dommsk.F90 (modified) * NEMO/branches/UKMO/NEMO_r4.2RC_GO8_package/src/OCE/ICB/icbrst.F90 (modified) * NEMO/branches/UKMO/NEMO_r4.2RC_GO8_package/src/OCE/IOM/in_out_manager.F90 (modified) * NEMO/branches/UKMO/NEMO_r4.2RC_GO8_package/src/OCE/IOM/restart.F90 (modified) * NEMO/branches/UKMO/NEMO_r4.2RC_GO8_package/src/OCE/module_example.F90 (modified) GO8 package merge, essential changes only. Ticket #2648. Mon, 05 Jul 2021 10:10:35 GMT ayoung [15078] * NEMO/branches/UKMO/NEMO_r4.2RC_GO8_package (modified) * NEMO/branches/UKMO/NEMO_r4.2RC_GO8_package/src (modified) * NEMO/branches/UKMO/NEMO_r4.2RC_GO8_package/src/ICE/icevar.F90 (modified) * NEMO/branches/UKMO/NEMO_r4.2RC_GO8_package/src/OCE/DOM/domqco.F90 (modified) * NEMO/branches/UKMO/NEMO_r4.2RC_GO8_package/src/OCE/OBS/diaobs.F90 (modified) * NEMO/branches/UKMO/NEMO_r4.2RC_GO8_package/src/OCE/TRA/traadv.F90 (modified) * NEMO/branches/UKMO/NEMO_r4.2RC_GO8_package/src/OCE/TRA/traadv_ubs_lf.F90 (modified) * NEMO/branches/UKMO/NEMO_r4.2RC_GO8_package/src/OCE/ZDF/zdfgls.F90 (modified) * NEMO/branches/UKMO/NEMO_r4.2RC_GO8_package/src/OCE/ZDF/zdftke.F90 (modified) * NEMO/branches/UKMO/NEMO_r4.2RC_GO8_package/src/TOP/TRP/trcadv.F90 (modified) * NEMO/branches/UKMO/NEMO_r4.2RC_GO8_package/src/TOP/trc.F90 (modified) Picking up bug fixes r15065-15077. Ticket #2648. Fri, 02 Jul 2021 09:06:58 GMT dcarneir [15068] * NEMO/branches/UKMO/dev_r15064_SI3_IAU_SIC (copied) IAU step for SIC with SI3 Thu, 01 Jul 2021 09:18:18 GMT ayoung [15065] * NEMO/branches/UKMO/NEMO_r4.2RC_GO8_package (copied) Creating GO8 package branch for validation of r4.2RC. Ticket #2648. Wed, 30 Jun 2021 14:37:09 GMT dcarneir [15064] * NEMO/branches/UKMO/NEMO_4.0.4_GO8_package_FOAM/src/OCE/ASM/asmbkg.F90 (modified) Including avt_k in assim_background file Wed, 30 Jun 2021 14:22:24 GMT dcarneir [15063] * NEMO/branches/UKMO/NEMO_4.0.4_GO8_package_FOAM (copied) Branch for changes in ASM related to FOAM Thu, 24 Jun 2021 11:22:42 GMT andmirek [15051] * NEMO/branches/UKMO/NEMO_4.0.1_NGMS_couple_stage3/src/OCE/SBC/sbccpl.F90 (modified) dissable wind stress temporary (until it's available in lfric trunk) Wed, 23 Jun 2021 12:23:53 GMT dford [15047] * NEMO/branches/UKMO/NEMO_4.0.4_generic_obs (copied) Branch for developments to make OBS interface more generic. Tue, 22 Jun 2021 08:14:31 GMT pdavis [15038] * NEMO/branches/UKMO/SubsetVerticalLevels/NEMOGCM/CONFIG/SHARED/field_def.xml (modified) Adding variable definitions to output on the top 40 vertical levels ... Mon, 21 Jun 2021 11:07:02 GMT ayoung [15035] * NEMO/branches/UKMO/NEMO_4.0-HEAD_DJC_backwards_port/src/OCE/DYN/dynhpg.F90 (modified) Backporting djc into r4.0-HEAD. #2480. Mon, 21 Jun 2021 10:51:57 GMT ayoung [15034] * NEMO/branches/UKMO/NEMO_4.0-HEAD_DJC_backwards_port (copied) DJC Backwards port to r4.0-HEAD. #2480. Fri, 18 Jun 2021 15:03:57 GMT pdavis [15025] * NEMO/branches/UKMO/SubsetVerticalLevels (copied) Branch to output limited number of vertical levels Thu, 17 Jun 2021 20:59:55 GMT jcastill [15016] * NEMO/branches/UKMO/r12083_coupling_sequence/src/OCE/IOM/iom.F90 (modified) Small change to make the code work with XIOS 2.0 Wed, 16 Jun 2021 08:06:19 GMT annkeen [14998] * NEMO/branches/UKMO/NEMO_4.0.4_EAP_rheology/cfgs/METO_GO (added) * NEMO/branches/UKMO/NEMO_4.0.4_EAP_rheology/cfgs/METO_GO/EXPREF (added) * NEMO/branches/UKMO/NEMO_4.0.4_EAP_rheology/cfgs/METO_GO/EXPREF/context_nemo-BASIC.xml (added) * NEMO/branches/UKMO/NEMO_4.0.4_EAP_rheology/cfgs/METO_GO/EXPREF/context_nemo-CMIP6.xml (added) * NEMO/branches/UKMO/NEMO_4.0.4_EAP_rheology/cfgs/METO_GO/EXPREF/context_nemo-CUSTOM.xml (added) * NEMO/branches/UKMO/NEMO_4.0.4_EAP_rheology/cfgs/METO_GO/EXPREF/file_def_nemo-ice-BASIC-10D.xml (added) * NEMO/branches/UKMO/NEMO_4.0.4_EAP_rheology/cfgs/METO_GO/EXPREF/file_def_nemo-ice-BASIC-1M.xml (added) * NEMO/branches/UKMO/NEMO_4.0.4_EAP_rheology/cfgs/METO_GO/EXPREF/file_def_nemo-ice-BASIC-INVALID_PERIOD.xml (added) * NEMO/branches/UKMO/NEMO_4.0.4_EAP_rheology/cfgs/METO_GO/EXPREF/file_def_nemo-ice-CMIP6-10D.xml (added) * NEMO/branches/UKMO/NEMO_4.0.4_EAP_rheology/cfgs/METO_GO/EXPREF/file_def_nemo-ice-CMIP6-1M.xml (added) * NEMO/branches/UKMO/NEMO_4.0.4_EAP_rheology/cfgs/METO_GO/EXPREF/file_def_nemo-ice-CMIP6-INVALID_PERIOD.xml (added) * NEMO/branches/UKMO/NEMO_4.0.4_EAP_rheology/cfgs/METO_GO/EXPREF/file_def_nemo-oce-BASIC-10D.xml (added) * NEMO/branches/UKMO/NEMO_4.0.4_EAP_rheology/cfgs/METO_GO/EXPREF/file_def_nemo-oce-BASIC-1M.xml (added) * NEMO/branches/UKMO/NEMO_4.0.4_EAP_rheology/cfgs/METO_GO/EXPREF/file_def_nemo-oce-BASIC-INVALID_PERIOD.xml (added) * NEMO/branches/UKMO/NEMO_4.0.4_EAP_rheology/cfgs/METO_GO/EXPREF/file_def_nemo-oce-CMIP6-10D.xml (added) * NEMO/branches/UKMO/NEMO_4.0.4_EAP_rheology/cfgs/METO_GO/EXPREF/file_def_nemo-oce-CMIP6-1M.xml (added) * NEMO/branches/UKMO/NEMO_4.0.4_EAP_rheology/cfgs/METO_GO/EXPREF/file_def_nemo-oce-CMIP6-INVALID_PERIOD.xml (added) * NEMO/branches/UKMO/NEMO_4.0.4_EAP_rheology/cfgs/METO_GO/EXPREF/iodef.xml (added) * NEMO/branches/UKMO/NEMO_4.0.4_EAP_rheology/cfgs/METO_GO/EXPREF/iodef_coupled.xml (added) * NEMO/branches/UKMO/NEMO_4.0.4_EAP_rheology/cfgs/SHARED/field_def_nemo-ice.xml (modified) * NEMO/branches/UKMO/NEMO_4.0.4_EAP_rheology/src/ICE/ice.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_EAP_rheology/src/ICE/icedyn_rdgrft.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_EAP_rheology/src/ICE/icedyn_rhg.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_EAP_rheology/src/ICE/icedyn_rhg_eap.F90 (added) * NEMO/branches/UKMO/NEMO_4.0.4_EAP_rheology/src/ICE/icedyn_rhg_evp.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_EAP_rheology/src/ICE/icewri.F90 (modified) Add EAP sea ice rheology code (from NOCS) Tue, 08 Jun 2021 14:37:12 GMT davestorkey [14960] * NEMO/branches/UKMO/NEMO_4.0.4_GO8_package/src/OCE/SBC/sbcisf.F90 (modified) Fix restartability issue in ISF code. See: ... Wed, 02 Jun 2021 10:20:17 GMT timgraham [14940] * NEMO/branches/UKMO/NEMO_4.0.4_icesheet_and_river_coupling/src/OCE/SBC/sbcrnf.F90 (modified) Remove debugging write statements Wed, 02 Jun 2021 10:13:48 GMT timgraham [14939] * NEMO/branches/UKMO/NEMO_4.0.4_icesheet_and_river_coupling/cfgs/SHARED/namelist_ref (modified) * NEMO/branches/UKMO/NEMO_4.0.4_icesheet_and_river_coupling/src/OCE/SBC/sbcrnf.F90 (modified) Changes to allow use of a climatological iceberg distribution but taking ... Tue, 01 Jun 2021 08:51:02 GMT cguiavarch [14934] * NEMO/branches/UKMO/NEMO_4.0.4_GO8_package/src/OCE/SBC/sbcrnf.F90 (modified) Add freshwater temperature content from iceberg and ice cavities Mon, 24 May 2021 15:40:43 GMT dancopsey [14898] * NEMO/branches/UKMO/NEMO_4.0.4_bouncing_icebergs/src/OCE/ICB/icb_oce.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_bouncing_icebergs/src/OCE/ICB/icbdyn.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_bouncing_icebergs/src/OCE/ICB/icbini.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_bouncing_icebergs/src/OCE/ICB/icbthm.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_bouncing_icebergs/src/OCE/ICB/icbutl.F90 (modified) Make iceberg top melt a combination of sea ice top melt and ocean solar. Tue, 18 May 2021 16:06:20 GMT dancopsey [14880] * NEMO/branches/UKMO/NEMO_4.0.4_bouncing_icebergs/src/OCE/ICB/icb_oce.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_bouncing_icebergs/src/OCE/ICB/icbdyn.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_bouncing_icebergs/src/OCE/ICB/icbini.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_bouncing_icebergs/src/OCE/ICB/icbthm.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_bouncing_icebergs/src/OCE/ICB/icbutl.F90 (modified) Introduce a small amount of top melt to icebergs Fri, 14 May 2021 15:21:36 GMT edblockley [14866] * NEMO/branches/UKMO/NEMO_4.0.4_GO8_package/cfgs/SHARED/namelist_ice_ref (modified) * NEMO/branches/UKMO/NEMO_4.0.4_GO8_package/src/ICE/icestp.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_GO8_package/src/ICE/icethd_pnd.F90 (modified) Fixing reproducibility issue in melt-ponds scheme Fri, 30 Apr 2021 10:53:12 GMT dancopsey [14774] * NEMO/branches/UKMO/NEMO_4.0.1_FKOSM_m11715 (modified) * NEMO/branches/UKMO/NEMO_4.0.1_FKOSM_m11715/src (modified) * NEMO/branches/UKMO/NEMO_4.0.1_FKOSM_m11715/src/OCE/ZDF/zdfosm.F90 (modified) Merge in revisions 14705 to 14759 of: ... Fri, 23 Apr 2021 16:53:37 GMT dancopsey [14745] * NEMO/branches/UKMO/NEMO_4.0.1_FKOSM_m11715/src/OCE/stpctl.F90 (modified) Remove check on V velocities Fri, 23 Apr 2021 10:24:01 GMT dancopsey [14741] * NEMO/branches/UKMO/NEMO_4.0.4_bouncing_icebergs/src/OCE/ICB/icb_oce.F90 (modified) Revert to original setting for sea_ice/iceberg drag (0.9). Fri, 23 Apr 2021 10:17:26 GMT dancopsey [14740] * NEMO/branches/UKMO/NEMO_4.0.4_bouncing_icebergs/src/OCE/ICB/icb_oce.F90 (modified) Remove all drag between sea ice and icebergs. Fri, 23 Apr 2021 09:53:02 GMT dancopsey [14739] * NEMO/branches/UKMO/NEMO_4.0.4_bouncing_icebergs/src/OCE/ICB/icb_oce.F90 (modified) Halve sea ice drag coefficient Tue, 20 Apr 2021 16:41:39 GMT dancopsey [14735] * NEMO/branches/UKMO/NEMO_4.0.4_penetrating_solar/src/ICE/icethd_dh.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_penetrating_solar/src/OCE/SBC/sbccpl.F90 (modified) Allow deposition alongside sublimation Tue, 20 Apr 2021 12:46:30 GMT andmirek [14733] * NEMO/branches/UKMO/NEMO_4.0.1_NGMS_couple_stage3/src/OCE/SBC/sbccpl.F90 (modified) Add two additional coupling fields Mon, 19 Apr 2021 16:05:12 GMT annkeen [14731] * NEMO/branches/UKMO/NEMO_4.0.4_EAP_rheology (copied) UKMO EAP rheology branch relative to NEMO 4.0.4 Mon, 19 Apr 2021 12:24:29 GMT dancopsey [14727] * NEMO/branches/UKMO/NEMO_4.0.4_GO8_package (modified) * NEMO/branches/UKMO/NEMO_4.0.4_GO8_package/src (modified) * NEMO/branches/UKMO/NEMO_4.0.4_GO8_package/src/ICE/icethd_pnd.F90 (modified) Remove frozen lid if there is no melt pond. Mon, 19 Apr 2021 09:08:17 GMT dancopsey [14726] * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_minor/src/ICE/icethd_pnd.F90 (modified) Simply make lid disappear when pond disappears Wed, 14 Apr 2021 09:39:36 GMT dancopsey [14711] * NEMO/branches/UKMO/NEMO_4.0.4_bouncing_icebergs/src/OCE/ICB/icbdyn.F90 (modified) Add option for icebergs to bounce away from the coast Tue, 13 Apr 2021 16:31:16 GMT dancopsey [14706] * NEMO/branches/UKMO/NEMO_4.0.1_FKOSM_m11715 (modified) * NEMO/branches/UKMO/NEMO_4.0.1_FKOSM_m11715/src (modified) * NEMO/branches/UKMO/NEMO_4.0.1_FKOSM_m11715/src/OCE/ZDF/zdfosm.F90 (modified) Merge in revisions 14678 to 14705 of: ... Tue, 13 Apr 2021 11:43:24 GMT dancopsey [14697] * NEMO/branches/UKMO/NEMO_4.0.4_bouncing_icebergs (copied) Make a branch to bounce icebergs off of the coast Wed, 07 Apr 2021 15:52:57 GMT dancopsey [14679] * NEMO/branches/UKMO/NEMO_4.0.1_FKOSM_m11715 (modified) * NEMO/branches/UKMO/NEMO_4.0.1_FKOSM_m11715/cfgs/SHARED (modified) * NEMO/branches/UKMO/NEMO_4.0.1_FKOSM_m11715/cfgs/SHARED/field_def_nemo-oce.xml (modified) * NEMO/branches/UKMO/NEMO_4.0.1_FKOSM_m11715/src (modified) * NEMO/branches/UKMO/NEMO_4.0.1_FKOSM_m11715/src/OCE/ZDF/zdfosm.F90 (modified) Merge in revisions 14541 to 14678 of: ... Thu, 01 Apr 2021 14:19:43 GMT dancopsey [14672] * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_minor/src/ICE/icethd_pnd.F90 (modified) Remove frozen lids if the ponds disappear Thu, 01 Apr 2021 11:34:55 GMT dancopsey [14671] * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_minor (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_minor/cfgs/METO_GO (copied) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_minor/cfgs/ORCA2_ICE_PISCES/EXPREF/file_def_nemo-ice.xml (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_minor/cfgs/ORCA2_ICE_PISCES/EXPREF/file_def_nemo-oce.xml (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_minor/cfgs/ORCA2_SAS_ICE/EXPREF/file_def_nemo-ice.xml (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_minor/cfgs/SHARED (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_minor/cfgs/SHARED/domain_def_nemo.xml (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_minor/cfgs/SHARED/field_def_nemo-ice.xml (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_minor/cfgs/SHARED/field_def_nemo-oce.xml (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_minor/cfgs/SHARED/grid_def_nemo.xml (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_minor/cfgs/SHARED/namelist_ice_ref (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_minor/cfgs/SHARED/namelist_ref (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_minor/src (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_minor/src/ICE/ice.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_minor/src/ICE/icedyn_adv_pra.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_minor/src/ICE/icedyn_adv_umx.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_minor/src/ICE/icedyn_rdgrft.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_minor/src/ICE/iceitd.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_minor/src/ICE/icerst.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_minor/src/ICE/icestp.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_minor/src/ICE/icetab.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_minor/src/ICE/icethd.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_minor/src/ICE/icethd_pnd.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_minor/src/ICE/iceupdate.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_minor/src/ICE/icevar.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_minor/src/ICE/icewri.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_minor/src/OCE/DIA/diaprod.F90 (copied) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_minor/src/OCE/DIA/diawri.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_minor/src/OCE/DOM/domain.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_minor/src/OCE/DOM/dommsk.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_minor/src/OCE/ICB/icbdia.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_minor/src/OCE/ICB/icbdyn.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_minor/src/OCE/ICB/icbrst.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_minor/src/OCE/ICB/icbutl.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_minor/src/OCE/IOM/in_out_manager.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_minor/src/OCE/IOM/iom.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_minor/src/OCE/IOM/restart.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_minor/src/OCE/LDF/ldftra.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_minor/src/OCE/SBC/sbcssm.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_minor/src/OCE/ZDF/zdfmxl.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_minor/src/OCE/step.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_minor/src/OCE/step_oce.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_minor/src/SAS/sbcssm.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_minor/tests (modified) Merged in up to revision 14474 of the GO8_package branch Thu, 01 Apr 2021 11:28:28 GMT dancopsey [14670] * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_minor (copied) Branch to apply the minimum of TOPO pond fixes Thu, 01 Apr 2021 09:55:21 GMT dancopsey [14669] * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_ponds/src/ICE/icethd_pnd.F90 (modified) Add fixes to melt pond lids Thu, 01 Apr 2021 08:44:38 GMT vsmart [14668] * NEMO/branches/UKMO/NEMO_4.0.1_NGMS_couple_stage2_spmd/src/OCE/nemogcm.F90 (modified) Make new subroutines public Wed, 31 Mar 2021 15:48:47 GMT vsmart [14662] * NEMO/branches/UKMO/NEMO_4.0.1_NGMS_couple_stage2_spmd/src/OCE/nemo.f90 (modified) * NEMO/branches/UKMO/NEMO_4.0.1_NGMS_couple_stage2_spmd/src/OCE/nemogcm.F90 (modified) Update to maintain use of nemo_gcm subroutine Wed, 31 Mar 2021 15:18:48 GMT vsmart [14661] * NEMO/branches/UKMO/NEMO_4.0.1_NGMS_couple_stage2_spmd/src/OCE/LBC/lib_mpp.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.1_NGMS_couple_stage2_spmd/src/OCE/nemo.f90 (modified) * NEMO/branches/UKMO/NEMO_4.0.1_NGMS_couple_stage2_spmd/src/OCE/nemogcm.F90 (modified) Changes made to run from cap code. Restructure of nemogcm into init, ... Wed, 31 Mar 2021 10:14:57 GMT vsmart [14660] * NEMO/branches/UKMO/NEMO_4.0.1_NGMS_couple_stage2_spmd (copied) Branch for SPMD coupling using NG-coupling suite V0.3 Wed, 31 Mar 2021 09:40:35 GMT dancopsey [14659] * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_ponds (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_ponds/cfgs/METO_GO (copied) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_ponds/cfgs/ORCA2_ICE_PISCES/EXPREF/file_def_nemo-ice.xml (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_ponds/cfgs/ORCA2_ICE_PISCES/EXPREF/file_def_nemo-oce.xml (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_ponds/cfgs/ORCA2_SAS_ICE/EXPREF/file_def_nemo-ice.xml (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_ponds/cfgs/SHARED (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_ponds/cfgs/SHARED/domain_def_nemo.xml (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_ponds/cfgs/SHARED/field_def_nemo-ice.xml (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_ponds/cfgs/SHARED/field_def_nemo-oce.xml (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_ponds/cfgs/SHARED/grid_def_nemo.xml (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_ponds/cfgs/SHARED/namelist_ice_ref (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_ponds/cfgs/SHARED/namelist_ref (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_ponds/src (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_ponds/src/ICE/ice.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_ponds/src/ICE/icedyn_adv_pra.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_ponds/src/ICE/icedyn_adv_umx.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_ponds/src/ICE/icedyn_rdgrft.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_ponds/src/ICE/iceitd.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_ponds/src/ICE/icerst.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_ponds/src/ICE/icestp.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_ponds/src/ICE/icetab.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_ponds/src/ICE/icethd.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_ponds/src/ICE/icethd_pnd.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_ponds/src/ICE/iceupdate.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_ponds/src/ICE/icevar.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_ponds/src/ICE/icewri.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_ponds/src/OCE/DIA/diaprod.F90 (copied) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_ponds/src/OCE/DIA/diawri.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_ponds/src/OCE/DOM/domain.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_ponds/src/OCE/DOM/dommsk.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_ponds/src/OCE/ICB/icbdia.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_ponds/src/OCE/ICB/icbdyn.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_ponds/src/OCE/ICB/icbrst.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_ponds/src/OCE/ICB/icbutl.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_ponds/src/OCE/IOM/in_out_manager.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_ponds/src/OCE/IOM/iom.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_ponds/src/OCE/IOM/restart.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_ponds/src/OCE/LDF/ldftra.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_ponds/src/OCE/SBC/sbcssm.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_ponds/src/OCE/ZDF/zdfmxl.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_ponds/src/OCE/step.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_ponds/src/OCE/step_oce.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_ponds/src/SAS/sbcssm.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_ponds/tests (modified) Merge in NEMO_4.0.4_GO8_package branch from revision r14076 to r14474 Wed, 31 Mar 2021 09:36:09 GMT dancopsey [14658] * NEMO/branches/UKMO/NEMO_4.0.4_fix_topo_ponds (copied) Branch to try out a few fixes to topographic melt ponds Fri, 26 Mar 2021 12:53:14 GMT dancopsey [14643] * NEMO/branches/UKMO/NEMO_4.0.4_icesheet_and_river_coupling/src/OCE/IOM/iom.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_icesheet_and_river_coupling/src/OCE/SBC/sbccpl.F90 (modified) Output timing information Thu, 25 Mar 2021 15:14:14 GMT dancopsey [14639] * NEMO/branches/UKMO/NEMO_4.0.4_fix_rigorous (copied) Make branch to fix rigorous compile issues Thu, 25 Mar 2021 13:31:42 GMT jenniewaters [14638] * NEMO/branches/UKMO/NEMO_4.0.4_FOAM_devs/src/OCE/ASM/asmbkg.F90 (modified) Try using avt_k. Thu, 25 Mar 2021 12:03:26 GMT jenniewaters [14637] * NEMO/branches/UKMO/NEMO_4.0.4_FOAM_devs/src/OCE/ASM/asmbkg.F90 (modified) Include avt in assim_background file Thu, 25 Mar 2021 11:49:46 GMT jenniewaters [14635] * NEMO/branches/UKMO/NEMO_4.0.4_FOAM_devs (copied) UKMO branch to implement FOAM options Thu, 18 Mar 2021 16:35:09 GMT dancopsey [14616] * NEMO/branches/UKMO/NEMO_4.0.4_penetrating_solar/src/OCE/SBC/sbccpl.F90 (modified) Add qevap_ice as the enthalpy in sublimating ice/snow. Tue, 16 Mar 2021 08:29:18 GMT dancopsey [14615] * NEMO/branches/UKMO/NEMO_4.0.4_remade_heat_balance/src/ICE/iceupdate.F90 (modified) Added missing ampersand Mon, 15 Mar 2021 18:16:56 GMT dancopsey [14614] * NEMO/branches/UKMO/NEMO_4.0.4_remade_heat_balance/src/ICE/iceupdate.F90 (modified) Reinstate enthalpy stored in snow precip Tue, 09 Mar 2021 11:51:51 GMT cguiavarch [14603] * NEMO/branches/UKMO/NEMO_4.0.4_mppmask (modified) * NEMO/branches/UKMO/NEMO_4.0.4_mppmask/src (modified) * NEMO/branches/UKMO/NEMO_4.0.4_mppmask/src/OCE/LBC/mppini.F90 (modified) Read mppmask from domain_cfg instead of bottom_level Tue, 09 Mar 2021 11:35:01 GMT cguiavarch [14602] * NEMO/branches/UKMO/NEMO_4.0.4_mppmask (copied) Create a branch to read a mppmask instead of bottom level to remove ... Mon, 08 Mar 2021 10:55:02 GMT dancopsey [14598] * NEMO/branches/UKMO/NEMO_4.0.4_remade_heat_balance/cfgs/SHARED/field_def_nemo-ice.xml (modified) * NEMO/branches/UKMO/NEMO_4.0.4_remade_heat_balance/src/ICE/iceupdate.F90 (modified) Get XIOS to output lateral melt Thu, 04 Mar 2021 12:19:57 GMT dancopsey [14585] * NEMO/branches/UKMO/NEMO_4.0.4_remade_heat_balance/src/ICE/ice.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_remade_heat_balance/src/ICE/ice1d.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_remade_heat_balance/src/ICE/icestp.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_remade_heat_balance/src/ICE/icethd.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_remade_heat_balance/src/ICE/icethd_da.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_remade_heat_balance/src/ICE/iceupdate.F90 (modified) * Calculate the heat flux used up in lateral melting (hfx_lam). This ... Thu, 04 Mar 2021 12:03:23 GMT dancopsey [14584] * NEMO/branches/UKMO/NEMO_4.0.4_remade_heat_balance (copied) Make a branch Thu, 04 Mar 2021 12:01:46 GMT dancopsey [14583] * NEMO/branches/UKMO/NEMO_4.0.4_penetrating_solar/src/ICE/iceupdate.F90 (modified) Undo last changes to iceupdate.F90. I will make these changes using a ... Mon, 01 Mar 2021 17:09:46 GMT dancopsey [14562] * NEMO/branches/UKMO/NEMO_4.0.4_penetrating_solar/src/ICE/iceupdate.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_penetrating_solar/src/OCE/SBC/sbccpl.F90 (modified) Remove sublimation and snow precip from surface energy balance Thu, 25 Feb 2021 11:46:00 GMT dancopsey [14546] * NEMO/branches/UKMO/NEMO_4.0.1_FKOSM_m11715/src/OCE/stpctl.F90 (modified) Add check on V velocities Wed, 24 Feb 2021 17:54:44 GMT dancopsey [14543] * NEMO/branches/UKMO/NEMO_4.0.1_FKOSM_m11715/src/OCE/ZDF/zdfosm.F90 (modified) Moving test for turning off shear parameterisation in lower IF test. As ... Wed, 24 Feb 2021 17:49:51 GMT dancopsey [14542] * NEMO/branches/UKMO/NEMO_4.0.1_FKOSM_m11715 (modified) * NEMO/branches/UKMO/NEMO_4.0.1_FKOSM_m11715/src (modified) * NEMO/branches/UKMO/NEMO_4.0.1_FKOSM_m11715/src/OCE/ZDF/zdfosm.F90 (modified) Merge in revisions 14522 to 14541 of: ... Tue, 23 Feb 2021 10:16:03 GMT dancopsey [14533] * NEMO/branches/UKMO/NEMO_4.0.1_FKOSM_m11715 (modified) * NEMO/branches/UKMO/NEMO_4.0.1_FKOSM_m11715/cfgs/eORCA1_AGE_OSM_DEBUG (copied) * NEMO/branches/UKMO/NEMO_4.0.1_FKOSM_m11715/src (modified) * NEMO/branches/UKMO/NEMO_4.0.1_FKOSM_m11715/src/OCE/ZDF/zdfosm.F90 (modified) Merge in revisions 14512 to 14522 of George's branch: ... Tue, 23 Feb 2021 09:58:10 GMT dancopsey [14532] * NEMO/branches/UKMO/NEMO_4.0.1_FKOSM_m11715/src/OCE/ZDF/zdfosm.F90 (modified) Move turning off of shear paremeterisation to turn it off completely Fri, 19 Feb 2021 18:12:44 GMT dancopsey [14513] * NEMO/branches/UKMO/NEMO_4.0.1_FKOSM_m11715/src/OCE/ZDF/zdfosm.F90 (modified) Turn sheer off in shallow seas. Thu, 18 Feb 2021 15:50:29 GMT dancopsey [14487] * NEMO/branches/UKMO/NEMO_4.0.1_FKOSM_m11715/src/OCE/ZDF/zdfosm.F90 (modified) Remove temporary fix (it wasn't fixing the problem). Wed, 17 Feb 2021 14:39:01 GMT edblockley [14474] * NEMO/branches/UKMO/NEMO_4.0.4_GO8_package/cfgs/METO_GO/EXPREF/file_def_nemo-ice-BASIC-10D.xml (modified) * NEMO/branches/UKMO/NEMO_4.0.4_GO8_package/cfgs/METO_GO/EXPREF/file_def_nemo-ice-BASIC-1M.xml (modified) * NEMO/branches/UKMO/NEMO_4.0.4_GO8_package/cfgs/METO_GO/EXPREF/file_def_nemo-ice-CMIP6-10D.xml (modified) * NEMO/branches/UKMO/NEMO_4.0.4_GO8_package/cfgs/METO_GO/EXPREF/file_def_nemo-ice-CMIP6-1M.xml (modified) * NEMO/branches/UKMO/NEMO_4.0.4_GO8_package/cfgs/SHARED/field_def_nemo-ice.xml (modified) * NEMO/branches/UKMO/NEMO_4.0.4_GO8_package/src/ICE/icewri.F90 (modified) Adding new diagnostic for effective melt-pond fraction (per grid-cell ... Tue, 16 Feb 2021 17:55:27 GMT dancopsey [14473] * NEMO/branches/UKMO/NEMO_4.0.1_FKOSM_m11715/src/OCE/ZDF/zdfosm.F90 (modified) Make sure hbl is always positive. Temporary fix to be removed when we ... Tue, 16 Feb 2021 13:41:33 GMT edblockley [14468] * NEMO/branches/UKMO/NEMO_4.0.4_GO8_package/src/ICE/icethd_pnd.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_GO8_package/src/ICE/iceupdate.F90 (modified) Back-porting Clem's bug fix to ocean-ice heat budget that was causing ... Mon, 15 Feb 2021 16:03:06 GMT edblockley [14452] * NEMO/branches/UKMO/NEMO_4.0.4_GO8_package/src/ICE/icevar.F90 (modified) Fixing bug in effective melt-pond area calculation that should have been ... Mon, 15 Feb 2021 14:59:14 GMT edblockley [14451] * NEMO/branches/UKMO/NEMO_4.0.4_GO8_package/src/ICE/ice.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_GO8_package/src/ICE/icethd_pnd.F90 (modified) Removing duplicate definition of pond flushing logical that crept in as ... Mon, 15 Feb 2021 09:35:14 GMT dancopsey [14450] * NEMO/branches/UKMO/NEMO_4.0.4_ocean_mean_fluxes/src/OCE/SBC/sbccpl.F90 (modified) Avoid conflicts and don't use a_i_last_couple on incoming fields twice. Thu, 11 Feb 2021 16:54:55 GMT dancopsey [14443] * NEMO/branches/UKMO/NEMO_4.0.1_FKOSM_m11715 (modified) * NEMO/branches/UKMO/NEMO_4.0.1_FKOSM_m11715/src (modified) * NEMO/branches/UKMO/NEMO_4.0.1_FKOSM_m11715/src/OCE/ZDF/zdfosm.F90 (modified) Custom merge from revision 14412 to 14441 of: ... Thu, 11 Feb 2021 16:50:43 GMT davestorkey [14442] * NEMO/branches/UKMO/NEMO_4.0.4_GO8_package/src/OCE/DIA/diawri.F90 (modified) UKMO/NEMO_4.0.4_GO8_package : bug fix for previous commit. Tue, 09 Feb 2021 18:18:32 GMT dancopsey [14424] * NEMO/branches/UKMO/NEMO_4.0.4_ocean_mean_fluxes/src/OCE/SBC/sbccpl.F90 (modified) Process ocean mean ocean fluxes instead of grid box mean ocean fluxes. Tue, 09 Feb 2021 17:49:21 GMT dancopsey [14423] * NEMO/branches/UKMO/NEMO_4.0.4_ocean_mean_fluxes (modified) * NEMO/branches/UKMO/NEMO_4.0.4_ocean_mean_fluxes/src (modified) * NEMO/branches/UKMO/NEMO_4.0.4_ocean_mean_fluxes/src/OCE/SBC/cpl_oasis3.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_ocean_mean_fluxes/src/OCE/SBC/sbccpl.F90 (modified) Merge in solar penetrating branch up to revision 14393. Tue, 09 Feb 2021 17:44:36 GMT dancopsey [14422] * NEMO/branches/UKMO/NEMO_4.0.4_ocean_mean_fluxes (copied) Make branch Tue, 09 Feb 2021 14:03:41 GMT dancopsey [14420] * NEMO/branches/UKMO/NEMO_4.0.4_penetrating_solar/src/OCE/SBC/sbccpl.F90 (modified) The ocean only fluxes have already been converted to grid box means on ... Fri, 05 Feb 2021 17:47:59 GMT dancopsey [14414] * NEMO/branches/UKMO/NEMO_4.0.1_FKOSM_m11715/src/OCE/ZDF/zdfosm.F90 (modified) Change misstyped ln_dSia_osm to ln_dia_osm. Fri, 05 Feb 2021 16:18:45 GMT dancopsey [14413] * NEMO/branches/UKMO/NEMO_4.0.1_FKOSM_m11715 (modified) * NEMO/branches/UKMO/NEMO_4.0.1_FKOSM_m11715/cfgs/SHARED (modified) * NEMO/branches/UKMO/NEMO_4.0.1_FKOSM_m11715/cfgs/SHARED/field_def_nemo-oce.xml (modified) * NEMO/branches/UKMO/NEMO_4.0.1_FKOSM_m11715/cfgs/SHARED/namelist_ref (modified) * NEMO/branches/UKMO/NEMO_4.0.1_FKOSM_m11715/src (modified) * NEMO/branches/UKMO/NEMO_4.0.1_FKOSM_m11715/src/OCE/DIA/diawri.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.1_FKOSM_m11715/src/OCE/TRA/tranxt.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.1_FKOSM_m11715/src/OCE/ZDF/zdfosm.F90 (modified) Custom merge from revision 13684 to 14412 of: ... Thu, 04 Feb 2021 09:48:50 GMT dancopsey [14393] * NEMO/branches/UKMO/NEMO_4.0.4_penetrating_solar/src/OCE/SBC/sbccpl.F90 (modified) Add transmitted solar onto zqsr_ice and zqsr_tot. Move calculation of ... Thu, 04 Feb 2021 09:08:21 GMT dancopsey [14392] * NEMO/branches/UKMO/NEMO_4.0.4_penetrating_solar/src/OCE/SBC/sbccpl.F90 (modified) Include heat involved in sublimation in the qns_ice flux. Weight qsr_tot ... Wed, 03 Feb 2021 14:31:16 GMT dancopsey [14383] * NEMO/branches/UKMO/NEMO_4.0.4_penetrating_solar/src/OCE/SBC/sbccpl.F90 (modified) Make net sea ice heat flux be calculated from conductive and melting ... Mon, 25 Jan 2021 16:40:50 GMT davestorkey [14342] * NEMO/branches/UKMO/NEMO_4.0.4_GO8_package/cfgs/SHARED/field_def_nemo-oce.xml (modified) * NEMO/branches/UKMO/NEMO_4.0.4_GO8_package/cfgs/SHARED/namelist_ref (modified) * NEMO/branches/UKMO/NEMO_4.0.4_GO8_package/src/OCE/DIA/diawri.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_GO8_package/src/OCE/LDF/ldftra.F90 (modified) UKMO/NEMO_4.0.4_GO8_package: Add Gent-McWilliams variants. Mon, 25 Jan 2021 13:59:12 GMT davestorkey [14340] * NEMO/branches/UKMO/NEMO_4.0.4_GO8_package/src/OCE/ICB/icbdia.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_GO8_package/src/OCE/ICB/icbdyn.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_GO8_package/src/OCE/ICB/icbutl.F90 (modified) Fix iceberg speed limiter. (This is Pierre's version which will probably ... Fri, 22 Jan 2021 21:37:04 GMT edblockley [14335] * NEMO/branches/UKMO/NEMO_4.0.4_GO8_package/src/ICE/icestp.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_GO8_package/src/ICE/icetab.F90 (modified) Back-porting changes changeset:13715 and changeset:13721 from 4.0.5 to ... Wed, 20 Jan 2021 14:42:16 GMT dancopsey [14322] * NEMO/branches/UKMO/NEMO_4.0.4_revert_a_i_last_couple/src/ICE/ice.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_revert_a_i_last_couple/src/OCE/SBC/sbc_ice.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_revert_a_i_last_couple/src/OCE/SBC/sbccpl.F90 (modified) Reverted changeset [13444] Wed, 20 Jan 2021 14:31:58 GMT dancopsey [14321] * NEMO/branches/UKMO/NEMO_4.0.4_revert_a_i_last_couple (copied) Revert the code change that went into NEMO4.0.4 as changeset [13444] and ... Mon, 18 Jan 2021 13:39:48 GMT frrh [14308] * NEMO/branches/UKMO/NEMO_4.0.1_NGMS_couple_stage3/src/OCE/SBC/sbc_oce.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.1_NGMS_couple_stage3/src/OCE/SBC/sbccpl.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.1_NGMS_couple_stage3/src/OCE/SBC/sbcmod.F90 (modified) Save working version Mon, 18 Jan 2021 13:25:45 GMT frrh [14307] * NEMO/branches/UKMO/NEMO_4.0.1_NGMS_couple_stage3 (copied) Developments for actually using incoming TAUX/Y Thu, 14 Jan 2021 16:21:39 GMT edblockley [14302] * NEMO/branches/UKMO/NEMO_4.0.4_GO8_package/cfgs/METO_GO/EXPREF/file_def_nemo-ice-BASIC-10D.xml (modified) * NEMO/branches/UKMO/NEMO_4.0.4_GO8_package/cfgs/METO_GO/EXPREF/file_def_nemo-ice-BASIC-1M.xml (modified) * NEMO/branches/UKMO/NEMO_4.0.4_GO8_package/cfgs/METO_GO/EXPREF/file_def_nemo-ice-CMIP6-10D.xml (modified) * NEMO/branches/UKMO/NEMO_4.0.4_GO8_package/cfgs/METO_GO/EXPREF/file_def_nemo-ice-CMIP6-1M.xml (modified) * NEMO/branches/UKMO/NEMO_4.0.4_GO8_package/cfgs/ORCA2_SAS_ICE/EXPREF/file_def_nemo-ice.xml (modified) * NEMO/branches/UKMO/NEMO_4.0.4_GO8_package/cfgs/SHARED/field_def_nemo-ice.xml (modified) * NEMO/branches/UKMO/NEMO_4.0.4_GO8_package/cfgs/SHARED/namelist_ice_ref (modified) * NEMO/branches/UKMO/NEMO_4.0.4_GO8_package/src/ICE/ice.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_GO8_package/src/ICE/icedyn_adv_pra.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_GO8_package/src/ICE/icedyn_adv_umx.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_GO8_package/src/ICE/icedyn_rdgrft.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_GO8_package/src/ICE/iceitd.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_GO8_package/src/ICE/icestp.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_GO8_package/src/ICE/icethd.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_GO8_package/src/ICE/icethd_pnd.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_GO8_package/src/ICE/icevar.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_GO8_package/src/ICE/icewri.F90 (modified) Porting topographic melt-ponds from Martin's branch ... Wed, 13 Jan 2021 17:48:59 GMT dancopsey [14301] * NEMO/branches/UKMO/NEMO_4.0.4_penetrating_solar (modified) * NEMO/branches/UKMO/NEMO_4.0.4_penetrating_solar/src (modified) * NEMO/branches/UKMO/NEMO_4.0.4_penetrating_solar/src/OCE/SBC/cpl_oasis3.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_penetrating_solar/src/OCE/SBC/sbccpl.F90 (modified) Merged in NEMO4.0.3 version of this branch from revision 13833 to 14248 Wed, 13 Jan 2021 17:43:53 GMT dancopsey [14300] * NEMO/branches/UKMO/NEMO_4.0.4_penetrating_solar (copied) Make a branch Wed, 13 Jan 2021 16:30:46 GMT dancopsey [14299] * NEMO/branches/UKMO/NEMO_4.0.4_icesheet_and_river_coupling (modified) * NEMO/branches/UKMO/NEMO_4.0.4_icesheet_and_river_coupling/cfgs/SHARED (modified) * NEMO/branches/UKMO/NEMO_4.0.4_icesheet_and_river_coupling/cfgs/SHARED/field_def_nemo-oce.xml (modified) * NEMO/branches/UKMO/NEMO_4.0.4_icesheet_and_river_coupling/cfgs/SHARED/namelist_ref (modified) * NEMO/branches/UKMO/NEMO_4.0.4_icesheet_and_river_coupling/src (modified) * NEMO/branches/UKMO/NEMO_4.0.4_icesheet_and_river_coupling/src/OCE/ICB/icbclv.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_icesheet_and_river_coupling/src/OCE/IOM/restart.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_icesheet_and_river_coupling/src/OCE/SBC/cpl_oasis3.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_icesheet_and_river_coupling/src/OCE/SBC/cpl_rnf_1d.F90 (copied) * NEMO/branches/UKMO/NEMO_4.0.4_icesheet_and_river_coupling/src/OCE/SBC/sbc_oce.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_icesheet_and_river_coupling/src/OCE/SBC/sbccpl.F90 (modified) * NEMO/branches/UKMO/NEMO_4.0.4_icesheet_and_river_coupling/src/OCE/SBC/sbcisf.F90 (modified) Merge in NEMO4.0.3 version of this branch from revision 13777 to 13793 Wed, 13 Jan 2021 10:54:19 GMT dancopsey [14296] * NEMO/branches/UKMO/NEMO_4.0.4_icesheet_and_river_coupling (copied) Make a branch Tue, 12 Jan 2021 18:20:04 GMT dancopsey [14293] * NEMO/branches/UKMO/NEMO_4.0.4_fix_a_ip_eff (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_a_ip_eff/src (modified) * NEMO/branches/UKMO/NEMO_4.0.4_fix_a_ip_eff/src/ICE/icevar.F90 (modified) Merged in NEMO4.0.3 vserion of this branch, from revision 13774 to ... Tue, 12 Jan 2021 18:16:04 GMT dancopsey [14292] * NEMO/branches/UKMO/NEMO_4.0.4_fix_a_ip_eff (copied) Make a new branch Tue, 12 Jan 2021 18:13:35 GMT dancopsey [14291] * NEMO/branches/UKMO/NEMO_4.0.4_isnow_comb_t1_ice (modified) * NEMO/branches/UKMO/NEMO_4.0.4_isnow_comb_t1_ice/src (modified) * NEMO/branches/UKMO/NEMO_4.0.4_isnow_comb_t1_ice/src/ICE/icethd_zdf_bl99.F90 (modified) Merge in NEMO4.0.3 version of this branch from revision 13772 to 13773