# # ChangeLog for branches/2012/dev_MERGE_2012/NEMOGCM/NEMO # # Generated by Trac 1.0.1 # 2024-04-19T23:16:11+02:00 Mon, 14 Jan 2013 16:25:10 GMT cetlod [3750] * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OFF_SRC/nemogcm.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/trcwri.F90 (modified) Change of iom_setkt call in TOP ; the change is related to the ... Mon, 14 Jan 2013 16:21:43 GMT cetlod [3749] * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/trcnam.F90 (modified) correction of some missing initialisation in TOP Sat, 12 Jan 2013 12:58:21 GMT vichi [3743] * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/trc_oce.F90 (modified) Removed the key_pisces macro for light absorption with bio model The ... Thu, 10 Jan 2013 12:35:35 GMT charris [3740] * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90 (modified) Minor correction to error message. Thu, 13 Dec 2012 19:55:08 GMT smasson [3737] * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90 (modified) dev_MERGE_2012: update iom for vertical zooms with xios Wed, 12 Dec 2012 15:45:03 GMT smasson [3732] * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90 (modified) dev_MERGE_2012: update to use xios and agrif Thu, 06 Dec 2012 16:12:04 GMT acc [3723] * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/DYN/dynnept.F90 (modified) Bugfix #1036. Tidy up dyn_nept_init to avoid unnecessary allocations and ... Fri, 30 Nov 2012 15:27:10 GMT cetlod [3719] * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/TRP/trcsbc.F90 (modified) dev_MERGE_2012 : TOP_SRC/TRP/trcsbc.F90 minor bug correction Fri, 30 Nov 2012 15:15:07 GMT cetlod [3718] * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/GYRE_BFM/EXP00/namelist_top (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/GYRE_PISCES/EXP00/namelist_top (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_LIM_CFC_C14b/EXP00/namelist_top (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_LIM_PISCES/EXP00/namelist_top (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist_top (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/TRA/traadv.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_cen2.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_muscl.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/TRP/trcadv.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/TRP/trcnam_trp.F90 (modified) dev_MERGE_2012 : modification in MUSCL routines ; needed to be able to ... Wed, 28 Nov 2012 16:33:24 GMT acc [3716] * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OFF_SRC/nemogcm.F90 (modified) Branch dev_MERGE_2012. Updating of OFF_SRC/nemogcm.F90 to replace old ... Wed, 28 Nov 2012 10:08:28 GMT smasson [3704] * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90 (modified) dev_MERGE_2012: add surface currents outputs Wed, 28 Nov 2012 10:02:28 GMT cbricaud [3703] * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/BDY/bdydta.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/BDY/bdydyn3d.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/BDY/bdyini.F90 (modified) split lines which are too long in some bdy routines Wed, 28 Nov 2012 10:01:44 GMT cbricaud [3702] * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90 (modified) correction of indexes out of arrays bounds in domzgr for SUBROUTINE ... Wed, 28 Nov 2012 09:57:47 GMT smasson [3701] * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/step.F90 (modified) dev_MERGE_2012: add missing modifications for xios Wed, 28 Nov 2012 09:24:37 GMT rblod [3698] * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/NST_SRC/agrif_opa_sponge.F90 (modified) correction for agrif_opa_sponge on dev_merge_2012, see ticket #1031 Wed, 28 Nov 2012 08:46:30 GMT smasson [3695] * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/AMM12/EXP00/domain_def.xml (added) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/AMM12/EXP00/field_def.xml (added) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/AMM12/EXP00/iodef.xml (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/AMM12/EXP00/xmlio_server.def (deleted) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/AMM12/cpp_AMM12.fcm (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/AMM12_PISCES/EXP00/domain_def.xml (added) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/AMM12_PISCES/EXP00/field_def.xml (added) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/AMM12_PISCES/EXP00/iodef.xml (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/AMM12_PISCES/EXP00/xmlio_server.def (deleted) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/AMM12_PISCES/cpp_AMM12_PISCES.fcm (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/GYRE/EXP00/domain_def.xml (added) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/GYRE/EXP00/field_def.xml (added) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/GYRE/EXP00/iodef.xml (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/GYRE/EXP00/xmlio_server.def (deleted) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/GYRE/cpp_GYRE.fcm (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/GYRE_BFM/EXP00/domain_def.xml (added) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/GYRE_BFM/EXP00/field_def.xml (added) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/GYRE_BFM/EXP00/iodef.xml (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/GYRE_BFM/EXP00/xmlio_server.def (deleted) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/GYRE_BFM/cpp_GYRE_BFM.fcm (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/GYRE_PISCES/EXP00/domain_def.xml (added) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/GYRE_PISCES/EXP00/field_def.xml (added) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/GYRE_PISCES/EXP00/iodef.xml (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/GYRE_PISCES/EXP00/xmlio_server.def (deleted) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/GYRE_PISCES/cpp_GYRE_PISCES.fcm (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA025_LIM/EXP00/domain_def.xml (added) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA025_LIM/EXP00/field_def.xml (added) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/domain_def.xml (added) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/field_def.xml (added) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/iodef.xml (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/xmlio_server.def (deleted) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_LIM/cpp_ORCA2_LIM.fcm (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_LIM_CFC_C14b/EXP00/domain_def.xml (added) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_LIM_CFC_C14b/EXP00/field_def.xml (added) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_LIM_CFC_C14b/EXP00/iodef.xml (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_LIM_CFC_C14b/EXP00/xmlio_server.def (deleted) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_LIM_CFC_C14b/cpp_ORCA2_LIM_CFC_C14b.fcm (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_LIM_PISCES/EXP00/domain_def.xml (added) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_LIM_PISCES/EXP00/field_def.xml (added) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_LIM_PISCES/EXP00/iodef.xml (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_LIM_PISCES/EXP00/xmlio_server.def (deleted) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_LIM_PISCES/cpp_ORCA2_LIM_PISCES.fcm (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/domain_def.xml (added) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/field_def.xml (added) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/iodef.xml (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/xmlio_server.def (deleted) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/cpp_ORCA2_OFF_PISCES.fcm (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_SAS_LIM/EXP00/domain_def.xml (added) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_SAS_LIM/EXP00/field_def.xml (added) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_SAS_LIM/EXP00/iodef.xml (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_SAS_LIM/EXP00/xmlio_server.def (deleted) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_SAS_LIM/cpp_ORCA2_SAS_LIM.fcm (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/PELAGOS/EXP00/domain_def.xml (added) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/PELAGOS/EXP00/field_def.xml (added) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/PELAGOS/EXP00/iodef.xml (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/PELAGOS/EXP00/xmlio_server.def (deleted) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/PELAGOS/cpp_PELAGOS.fcm (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/PELAGOS025/EXP00/domain_def.xml (added) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/PELAGOS025/EXP00/field_def.xml (added) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/PELAGOS_OFF/EXP00/domain_def.xml (added) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/PELAGOS_OFF/EXP00/field_def.xml (added) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/PELAGOS_OFF/EXP00/iodef.xml (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/PELAGOS_OFF/EXP00/xmlio_server.def (deleted) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/SHARED (added) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/SHARED/domain_def.xml (added) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/SHARED/field_def.xml (added) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/makenemo (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/EXTERNAL/XMLF90 (deleted) * branches/2012/dev_MERGE_2012/NEMOGCM/EXTERNAL/XMLIO_SERVER (deleted) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/TOOLS/COMPILE/bld.cfg (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/TOOLS/COMPILE/bldxag.cfg (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/TOOLS/COMPILE/bldxio.cfg (deleted) * branches/2012/dev_MERGE_2012/NEMOGCM/TOOLS/COMPILE/bldxioxag.cfg (deleted) dev_MERGE_2012: add xios Tue, 27 Nov 2012 15:46:36 GMT cetlod [3687] * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OFF_SRC/dtadyn.F90 (modified) dev_MERGE_2012 : bug correction in dtadyn.F90, see ticket #1028 Tue, 27 Nov 2012 15:42:15 GMT cbricaud [3686] * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zprod.F90 (modified) split a line which too long in p4zprod.F90 Tue, 27 Nov 2012 15:34:27 GMT cbricaud [3684] * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90 (modified) split a line which too long in domzgr.F90 Tue, 27 Nov 2012 14:53:23 GMT cetlod [3681] * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zrem.F90 (deleted) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zsink.F90 (deleted) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/TRP/trcsbc.F90 (modified) dev_MERGE_2012: minor bugs corrections, see ticket #1028 Tue, 27 Nov 2012 14:42:24 GMT rblod [3680] * branches/2012/dev_MERGE_2012 (modified) * branches/2012/dev_MERGE_2012/DOC/NEMO_book.pdf (modified) * branches/2012/dev_MERGE_2012/DOC/TexFiles/Biblio/Biblio.bib (modified) * branches/2012/dev_MERGE_2012/DOC/TexFiles/Chapters/Chap_DIA.tex (modified) * branches/2012/dev_MERGE_2012/DOC/TexFiles/Chapters/Chap_DOM.tex (modified) * branches/2012/dev_MERGE_2012/DOC/TexFiles/Figures/FIG_DOM_compare_coordinates_surface.pdf (copied) * branches/2012/dev_MERGE_2012/DOC/TexFiles/Namelist/namzgr_sco (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/ARCH/CMCC (copied) * branches/2012/dev_MERGE_2012/NEMOGCM/ARCH/CNRS/arch-X64_CURIE.fcm (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/ARCH/NOC/arch-ALTIX_NAUTILUS.fcm (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/ARCH/NOC/arch-ALTIX_NAUTILUS_MPT.fcm (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/ARCH/NOC/arch-ALTIX_NAUTILUS_SETTE.fcm (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/ARCH/arch-PW6_CALYPSO.fcm (deleted) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/AMM12/EXP00/namelist (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/AMM12_PISCES/EXP00/namelist (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/GYRE/EXP00/namelist (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/GYRE/cpp_GYRE.fcm (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/GYRE_BFM (copied) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/GYRE_LOBSTER (deleted) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/GYRE_PISCES (copied) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA025_LIM (copied) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/1_namelist (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_LIM_CFC_C14b (copied) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_LIM_PISCES/EXP00/iodef.xml (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_LIM_PISCES/EXP00/namelist_pisces (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_LIM_PISCES/EXP00/namelist_top (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_LIM_PISCES/cpp_ORCA2_LIM_PISCES.fcm (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/iodef.xml (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist_pisces (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist_top (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/xmlio_server.def (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/cpp_ORCA2_OFF_PISCES.fcm (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/PELAGOS (copied) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/PELAGOS025 (copied) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/PELAGOS_OFF (copied) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/cfg.txt (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/makenemo (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/EXTERNAL/IOIPSL/tools/flio_rbld.f90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/LIM_SRC_2/limrhg_2.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/LIM_SRC_2/limtrp_2.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/LIM_SRC_3/limrhg.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/NST_SRC/agrif2model.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/NST_SRC/agrif_ice.F90 (copied) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/NST_SRC/agrif_lim2_interp.F90 (copied) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/NST_SRC/agrif_lim2_update.F90 (copied) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/NST_SRC/agrif_oce.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/NST_SRC/agrif_opa_sponge.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/NST_SRC/agrif_top_interp.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/NST_SRC/agrif_top_sponge.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/NST_SRC/agrif_top_update.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/NST_SRC/agrif_user.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OFF_SRC/domrea.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OFF_SRC/dtadyn.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OFF_SRC/nemogcm.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/BDY/bdydyn2d.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/BDY/bdydyn3d.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/BDY/bdyice_lim2.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/BDY/bdyini.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/BDY/bdytra.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/C1D/step_c1d.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/DIA/diadct.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/DOM/daymod.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/DOM/dom_oce.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/DOM/domain.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/DOM/domwri.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/DOM/istate.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_exp.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_flt.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/DYN/sshwzv.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/IOM/in_out_manager.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/IOM/iom_def.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/IOM/prtctl.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/IOM/restart.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/LBC/lbclnk.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/OBC/obcdyn.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/OBC/obcdyn_bt.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/OBC/obctra.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/SBC/cyclone.F90 (copied) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/SBC/fldread.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/SBC/sbc_oce.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/SBC/sbcapr.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_core.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim_2.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/SBC/sbcrnf.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/SBC/sbcssm.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/SBC/sbcwave.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/TRA/traadv.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_cen2.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_muscl.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/TRA/traqsr.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/TRA/trasbc.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/TRD/trdmld.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/TRD/trdmld_rst.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfgls.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfini.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/ZDF/zdftke.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/lib_cray.f90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/par_AMM_12km.h90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/step.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/step_oce.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/C14b/par_c14b.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/C14b/trcrst_c14b.F90 (deleted) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/C14b/trcsms_c14b.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/C14b/trcwri_c14b.F90 (copied) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/CFC/par_cfc.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/CFC/trcrst_cfc.F90 (deleted) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/CFC/trcsms_cfc.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/CFC/trcwri_cfc.F90 (copied) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/LOBSTER (deleted) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/MY_TRC/par_my_trc.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/MY_TRC/trcnam_my_trc.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/MY_TRC/trcrst_my_trc.F90 (deleted) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/MY_TRC/trcsms_my_trc.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/MY_TRC/trcwri_my_trc.F90 (copied) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/PISCES/P2Z (copied) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z (copied) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zsed.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/PISCES/SED (copied) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zbio.F90 (deleted) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zche.F90 (deleted) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zflx.F90 (deleted) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zint.F90 (deleted) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zlim.F90 (deleted) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zlys.F90 (deleted) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zmeso.F90 (deleted) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zmicro.F90 (deleted) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zmort.F90 (deleted) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zopt.F90 (deleted) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zprod.F90 (deleted) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zsed.F90 (deleted) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/PISCES/par_pisces.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/PISCES/sms_pisces.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/PISCES/trcini_pisces.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/PISCES/trcnam_pisces.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/PISCES/trcrst_pisces.F90 (deleted) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/PISCES/trcsms_pisces.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/PISCES/trcwri_pisces.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/SED (deleted) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/TRP/trcadv.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/TRP/trcnam_trp.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/TRP/trcnxt.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/TRP/trcrad.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/TRP/trcsbc.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/TRP/trctrp.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/TRP/trczdf.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/TRP/trdmld_trc.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/TRP/trdmld_trc_rst.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/TRP/trdmod_trc_oce.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/oce_trc.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/par_trc.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/prtctl_trc.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/trc.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/trcini.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/trcnam.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/trcrst.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/trcsms.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/trcstp.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/trcsub.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/trcwri.F90 (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-X64_CURIE (copied) * branches/2012/dev_MERGE_2012/NEMOGCM/SETTE/input_AMM12.cfg (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/SETTE/input_AMM12_PISCES.cfg (deleted) * branches/2012/dev_MERGE_2012/NEMOGCM/SETTE/prepare_job.sh (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/SETTE/sette.sh (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/SETTE/sette_beginner.sh (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/TOOLS/COMPILE/Fmake_WORK.sh (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/TOOLS/COMPILE/agrifpp.sh (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/TOOLS/COMPILE/bld.cfg (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/TOOLS/COMPILE/bld_preproagr.cfg (copied) * branches/2012/dev_MERGE_2012/NEMOGCM/TOOLS/COMPILE/bldxag.cfg (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/TOOLS/COMPILE/bldxio.cfg (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/TOOLS/COMPILE/bldxioxag.cfg (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/TOOLS/SECTIONS_DIADCT/src/declarations.f90 (modified) First commit of the final branch for 2012 (future nemo_3_5), see ticket ... Tue, 27 Nov 2012 13:27:00 GMT rblod [3677] * branches/2012/dev_MERGE_2012 (copied) Create the final ranch for the merge 2012 #1028 Mon, 26 Nov 2012 15:29:08 GMT cbricaud [3670] * branches/2012/dev_NOC_MERCATOR_2012/NEMOGCM/NEMO/OPA_SRC/SBC/tide_mod.F90 (modified) declare tide as a PUBLIC variable , to compile with AGRIF