# # ChangeLog for branches/UKMO/dev_r5518_obs_oper_strthr # # Generated by Trac 1.0.1 # 2024-05-14T00:45:52+02:00 Mon, 20 Sep 2021 12:08:08 GMT jroberts [15273] * branches/UKMO/dev_r5518_obs_oper_strthr/NEMOGCM/NEMO/OPA_SRC/DOM/daymod.F90 (modified) Test to try and resolve conflicts on fcm make merge Mon, 20 Sep 2021 10:32:09 GMT jroberts [15272] * branches/UKMO/dev_r5518_obs_oper_strthr/NEMOGCM/NEMO/OPA_SRC/DOM/daymod.F90 (modified) Sort out spacing in new code Tue, 14 Sep 2021 14:34:36 GMT jroberts [15258] * branches/UKMO/dev_r5518_obs_oper_strthr/NEMOGCM/NEMO/OPA_SRC/DOM/daymod.F90 (modified) Remove nn_timing=2 as cause merge conflict Tue, 14 Sep 2021 11:47:06 GMT jroberts [15256] * branches/UKMO/dev_r5518_obs_oper_strthr/NEMOGCM/CONFIG/SHARED/namelist_ref (modified) * branches/UKMO/dev_r5518_obs_oper_strthr/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90 (modified) * branches/UKMO/dev_r5518_obs_oper_strthr/NEMOGCM/NEMO/OPA_SRC/BDY/bdytides.F90 (modified) * branches/UKMO/dev_r5518_obs_oper_strthr/NEMOGCM/NEMO/OPA_SRC/DOM/daymod.F90 (modified) * branches/UKMO/dev_r5518_obs_oper_strthr/NEMOGCM/NEMO/OPA_SRC/DOM/dom_oce.F90 (modified) * branches/UKMO/dev_r5518_obs_oper_strthr/NEMOGCM/NEMO/OPA_SRC/DOM/domain.F90 (modified) * branches/UKMO/dev_r5518_obs_oper_strthr/NEMOGCM/NEMO/OPA_SRC/IOM/in_out_manager.F90 (modified) * branches/UKMO/dev_r5518_obs_oper_strthr/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90 (modified) * branches/UKMO/dev_r5518_obs_oper_strthr/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90 (modified) * branches/UKMO/dev_r5518_obs_oper_strthr/NEMOGCM/NEMO/OPA_SRC/OBS/obs_prep.F90 (modified) * branches/UKMO/dev_r5518_obs_oper_strthr/NEMOGCM/NEMO/OPA_SRC/SBC/sbctide.F90 (modified) Changes manually merged from ... Tue, 14 Sep 2021 11:24:03 GMT jroberts [15253] * branches/UKMO/dev_r5518_obs_oper_strthr (copied) NEMO branch to put sub-daily cycling into FOAM R&D suite Wed, 25 Aug 2021 10:39:08 GMT dcarneir [15203] * 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/obs_oper.F90 (modified) Removing flag of bad data from negative SITs which will be used for the ...