# # ChangeLog for branches/2011/dev_NOC_2011_MERGE # # Generated by Trac 1.0.1 # 2024-04-28T02:11:06+02:00 Mon, 14 Nov 2011 16:35:33 GMT acc [3099] * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90 (modified) Branch dev_NOC_2011_MERGE. Changes to dynhpg.F90 following review (#866) Mon, 14 Nov 2011 13:42:00 GMT acc [3088] * branches/2011/dev_NOC_2011_MERGE/trunk (deleted) Branch dev_NOC_2011_MERGE. Undo erroneous copy of trunk placed here by a ... Mon, 14 Nov 2011 13:13:55 GMT acc [3086] * branches/2011/dev_NOC_2011_MERGE/trunk (copied) Create branch for the merge of all NOC 2011 developments. See ticket ... Fri, 11 Nov 2011 12:38:49 GMT acc [3081] * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90 (modified) Branch dev_NOC_2011_MERGE. #874. Step 13. Additional bugfixes to ... Thu, 10 Nov 2011 17:23:33 GMT acc [3077] * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/LDF/ldfslp.F90 (modified) Branch dev_NOC_2011_MERGE. Minor correction to ldfslp (Griffies) Thu, 10 Nov 2011 14:03:24 GMT acc [3075] * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/NEMO/LIM_SRC_2/iceini_2.F90 (modified) * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/NEMO/LIM_SRC_2/limistate_2.F90 (modified) Branch dev_NOC_2011_MERGE. #874. Step 12. Merge in trunk changes between ... Thu, 10 Nov 2011 12:43:36 GMT acc [3074] * branches/2011/dev_NOC_2011_MERGE/DOC/TexFiles/Chapters/Chap_DYN.tex (modified) * branches/2011/dev_NOC_2011_MERGE/DOC/TexFiles/Namelist/namdyn_hpg (modified) * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/CONFIG/GYRE/EXP00/namelist (modified) * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/1_namelist (modified) * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist (modified) * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist (modified) * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/CONFIG/POMME/EXP00/namelist (modified) * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90 (modified) Branch dev_NOC_2011_MERGE. #874. Step 11. Merge in changes from the ... Wed, 09 Nov 2011 17:07:32 GMT acc [3072] * branches/2011/dev_NOC_2011_MERGE/DOC/TexFiles/Chapters/Chap_ZDF.tex (modified) * branches/2011/dev_NOC_2011_MERGE/DOC/TexFiles/Namelist/nambfr (modified) * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/CONFIG/GYRE/EXP00/namelist (modified) * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/1_namelist (modified) * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist (modified) * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist (modified) * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/CONFIG/POMME/EXP00/namelist (modified) * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/DYN/dynbfr.F90 (modified) * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 (modified) * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/DYN/dynzdf_imp.F90 (modified) * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfbfr.F90 (modified) Branch dev_NOC_2011_MERGE. #874. Step 10. Merge in changes from ... Fri, 04 Nov 2011 15:49:50 GMT acc [3044] * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist (modified) * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_lap.F90 (modified) Branch dev_NOC_2011_MERGE. #874. Step 9: minor corrections required for ... Fri, 28 Oct 2011 16:14:16 GMT acc [3027] * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/DYN/dynnept.F90 (modified) * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90 (modified) * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 (modified) Branch dev_NOC_2011_MERGE. #874. Step 8: minor corrections for single ... Thu, 27 Oct 2011 11:35:36 GMT acc [3009] * branches/2011/dev_NOC_2011_MERGE/DOC/TexFiles/Chapters/Chap_MISC.tex (modified) * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/CONFIG/GYRE/EXP00/namelist (modified) * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist (modified) * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist (modified) * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/LBC/lbcnfd.F90 (modified) * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90 (modified) * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 (modified) Branch dev_NOC_2011_MERGE. #874. Step 7: Merge in changes from ... Thu, 27 Oct 2011 11:10:32 GMT acc [3008] * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90 (modified) * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/DOM/istate.F90 (modified) * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/DYN/dynnxt.F90 (modified) * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 (modified) Branch dev_NOC_2011_MERGE. #874. Step 6: Merge in changes from ... Wed, 26 Oct 2011 16:22:58 GMT acc [3001] * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/NEMO/NST_SRC/agrif_opa_update.F90 (modified) Branch dev_NOC_2011_MERGE. #874. Step 5: Merge in trunk changes between ... Mon, 24 Oct 2011 15:58:09 GMT acc [2986] * branches/2011/dev_NOC_2011_MERGE/DOC/TexFiles/Biblio/Biblio.bib (modified) * branches/2011/dev_NOC_2011_MERGE/DOC/TexFiles/Chapters/Chap_DYN.tex (modified) * branches/2011/dev_NOC_2011_MERGE/DOC/TexFiles/Namelist/namdyn_nept (copied) * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/ARCH/arch-ALTIX_NAUTILUS4.fcm (modified) * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/CONFIG/GYRE/EXP00/namelist (modified) * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist (modified) * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist (modified) * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/CONFIG/POMME/EXP00/namelist (modified) * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/DYN/dynnept.F90 (copied) * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 (modified) * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/step.F90 (modified) Branch dev_NOC_2011_MERGE. #874. Step 4: Merge in changes from ... Mon, 24 Oct 2011 15:42:23 GMT acc [2985] * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/cpp_ORCA2_OFF_PISCES.fcm (modified) * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/NEMO/OFF_SRC/domrea.F90 (modified) * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/SBC/sbcrnf.F90 (modified) * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfmxl.F90 (modified) * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/NEMO/TOP_SRC/MY_TRC/trcini_my_trc.F90 (modified) * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/NEMO/TOP_SRC/oce_trc.F90 (modified) Branch dev_NOC_2011_MERGE. #874. Step 3: Merge in trunk changes between ... Mon, 24 Oct 2011 09:29:46 GMT acc [2980] * branches/2011/dev_NOC_2011_MERGE/DOC/TexFiles/Namelist/namtra_ldf (modified) * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/CONFIG/GYRE/EXP00/namelist (modified) * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist (modified) * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist (modified) * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/CONFIG/POMME/EXP00/namelist (modified) * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/LDF/ldfslp.F90 (modified) * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/LDF/ldftra.F90 (modified) * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/LDF/ldftra_oce.F90 (modified) * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/TRA/eosbn2.F90 (modified) * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_iso_grif.F90 (modified) * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/NEMO/TOP_SRC/TRP/trcadv.F90 (modified) * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/NEMO/TOP_SRC/TRP/trcldf.F90 (modified) Branch dev_NOC_2011_MERGE. #874. Step 2: Add changes from the ... Mon, 17 Oct 2011 12:53:50 GMT acc [2942] * branches/2011/dev_NOC_2011_MERGE (copied) Create branch for the merge of all NOC 2011 developments. See ticket ... Thu, 16 Jun 2011 07:35:07 GMT smasson [2782] * trunk/NEMOGCM/EXTERNAL/XMLIO_SERVER/src/IOSERVER/mod_pack.f90 (modified) * trunk/NEMOGCM/EXTERNAL/XMLIO_SERVER/src/XMLIO/mod_attribut.f90 (modified) bugfix in xmlio_server for some machines..., see ticket#837