# # ChangeLog for branches/UKMO/r5518_amm15_test/NEMOGCM/NEMO/OPA_SRC/DIA/diaptr.F90 # # Generated by Trac 1.0.1 # 2024-06-14T14:26:48+02:00 Thu, 27 Oct 2016 14:30:38 GMT jcastill [7143] * branches/UKMO/r5518_amm15_test (copied) Update branch UKMO/dev_r5518_amm15_test to trunk at r5936 for merging ... Fri, 13 Mar 2015 10:01:32 GMT cetlod [5147] * trunk/NEMOGCM (modified) * trunk/NEMOGCM/ARCH/OLD/NOC/arch-ALTIX_NAUTILUS.fcm (modified) * trunk/NEMOGCM/ARCH/arch-ALTIX_NAUTILUS_MPT.fcm (modified) * trunk/NEMOGCM/CONFIG/AMM12/EXP00/namelist_cfg (modified) * trunk/NEMOGCM/CONFIG/SHARED/domain_def.xml (modified) * trunk/NEMOGCM/CONFIG/SHARED/field_def.xml (modified) * trunk/NEMOGCM/CONFIG/SHARED/namelist_ref (modified) * trunk/NEMOGCM/CONFIG/cfg.txt (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/DIA/diaptr.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/DOM/phycst.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/TRA/eosbn2.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/TRA/traadv.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_cen2.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_muscl.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_muscl2.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_qck.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_tvd.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_ubs.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_bilap.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_bilapg.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_iso.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_iso_grif.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_lap.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/step.F90 (modified) Merge changes from dev_r5020_CNRS_DIAPTR into trunk, see ticket #1435