# # ChangeLog for / # # Generated by Trac 1.0.1 # 2024-03-28T17:58:55+01: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 Sun, 13 Jan 2013 08:41:23 GMT pabouttier [3748] * trunk/NEMOGCM/CONFIG/cfg.txt (modified) * trunk/NEMOGCM/CONFIG/makenemo (modified) Remove TAM-relative instructions from the trunk in cfg.txt and makenemo ... Sun, 13 Jan 2013 08:32:23 GMT pabouttier [3747] * trunk/NEMOGCM/CONFIG/ORCA2_TAM (deleted) Remove CONFIG/ORCA2_TAM from the trunk, see ticket 1035 Sun, 13 Jan 2013 08:31:56 GMT pabouttier [3746] * trunk/NEMOGCM/NEMO/OPATAM_SRC (deleted) Remove OPATAM_SRC from the trunk, see ticket 1035 Sun, 13 Jan 2013 08:31:08 GMT pabouttier [3745] * tags/nemo_v3_4_1 (copied) Tagging consolidated nemo_v3_4 Sat, 12 Jan 2013 12:59:49 GMT vichi [3744] * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/GYRE_BFM/EXP00/CO2.nml (deleted) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/GYRE_BFM/EXP00/LightAdaptation.nml (deleted) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/GYRE_BFM/EXP00/MesoZoo.nml (deleted) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/GYRE_BFM/EXP00/MicroZoo.nml (deleted) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/GYRE_BFM/EXP00/Param.nml (deleted) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/GYRE_BFM/EXP00/PelBac.nml (deleted) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/GYRE_BFM/EXP00/PelChem.nml (deleted) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/GYRE_BFM/EXP00/PelGlobal.nml (deleted) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/GYRE_BFM/EXP00/PhotoAvailableRadiation.nml (deleted) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/GYRE_BFM/EXP00/Phyto.nml (deleted) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/GYRE_BFM/EXP00/Settling.nml (deleted) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/GYRE_BFM/EXP00/bfm.nml (deleted) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/GYRE_BFM/EXP00/namelist (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/GYRE_BFM/EXP00/namelist_top (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/GYRE_BFM/README (modified) Update of the GYRE_BFM configuration The BFM namelists have been ... 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 13:58:11 GMT smasson [3742] * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/makenemo (modified) dev_MERGE_2012: remove old part of makenemo related to the compilation ... Thu, 10 Jan 2013 13:57:02 GMT smasson [3741] * branches/2012/dev_MERGE_2012/NEMOGCM/ARCH/CNRS/arch-macport_osx.fcm (modified) dev_MERGE_2012: update comments in arch-macport_osx.fcm 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. Tue, 18 Dec 2012 12:11:03 GMT acc [3739] * trunk/NEMOGCM/NEMO/OPA_SRC/SBC/sbcdcy.F90 (modified) ticket #1040. Fix to sbcdcy.F90 to avoid possible infinite scaling ... Fri, 14 Dec 2012 12:28:37 GMT cetlod [3738] * branches/2013/dev_r3411_CNRS4_IOCRS/NEMOGCM/CONFIG/ORCA2_LIM_CRS/MY_SRC/dom_oce.F90 (modified) * branches/2013/dev_r3411_CNRS4_IOCRS/NEMOGCM/CONFIG/ORCA2_LIM_CRS/MY_SRC/iom.F90 (modified) * branches/2013/dev_r3411_CNRS4_IOCRS/NEMOGCM/CONFIG/ORCA2_LIM_CRS/MY_SRC/lbcnfd.F90 (deleted) * branches/2013/dev_r3411_CNRS4_IOCRS/NEMOGCM/CONFIG/ORCA2_LIM_CRS/MY_SRC/par_AMM_12km.h90 (added) * branches/2013/dev_r3411_CNRS4_IOCRS/NEMOGCM/CONFIG/ORCA2_LIM_CRS/MY_SRC/par_EEL_R2.h90 (added) * branches/2013/dev_r3411_CNRS4_IOCRS/NEMOGCM/CONFIG/ORCA2_LIM_CRS/MY_SRC/par_EEL_R5.h90 (added) * branches/2013/dev_r3411_CNRS4_IOCRS/NEMOGCM/CONFIG/ORCA2_LIM_CRS/MY_SRC/par_EEL_R6.h90 (added) * branches/2013/dev_r3411_CNRS4_IOCRS/NEMOGCM/CONFIG/ORCA2_LIM_CRS/MY_SRC/par_GYRE.h90 (added) * branches/2013/dev_r3411_CNRS4_IOCRS/NEMOGCM/CONFIG/ORCA2_LIM_CRS/MY_SRC/par_ORCA_R025.h90 (added) * branches/2013/dev_r3411_CNRS4_IOCRS/NEMOGCM/CONFIG/ORCA2_LIM_CRS/MY_SRC/par_ORCA_R05.h90 (added) * branches/2013/dev_r3411_CNRS4_IOCRS/NEMOGCM/CONFIG/ORCA2_LIM_CRS/MY_SRC/par_ORCA_R1.h90 (added) * branches/2013/dev_r3411_CNRS4_IOCRS/NEMOGCM/CONFIG/ORCA2_LIM_CRS/MY_SRC/par_ORCA_R2.h90 (added) * branches/2013/dev_r3411_CNRS4_IOCRS/NEMOGCM/CONFIG/ORCA2_LIM_CRS/MY_SRC/par_ORCA_R4.h90 (added) * branches/2013/dev_r3411_CNRS4_IOCRS/NEMOGCM/CONFIG/ORCA2_LIM_CRS/MY_SRC/par_oce.F90 (modified) * branches/2013/dev_r3411_CNRS4_IOCRS/NEMOGCM/CONFIG/ORCA2_LIM_CRS/MY_SRC/step.F90 (modified) * branches/2013/dev_r3411_CNRS4_IOCRS/NEMOGCM/CONFIG/ORCA2_LIM_CRS/MY_SRC/step_oce.F90 (modified) * branches/2013/dev_r3411_CNRS4_IOCRS/NEMOGCM/NEMO/OPA_SRC/CRS/crs_dom.F90 (modified) * branches/2013/dev_r3411_CNRS4_IOCRS/NEMOGCM/NEMO/OPA_SRC/CRS/crs_iom.F90 (modified) * branches/2013/dev_r3411_CNRS4_IOCRS/NEMOGCM/NEMO/OPA_SRC/CRS/crsdiawri.F90 (modified) * branches/2013/dev_r3411_CNRS4_IOCRS/NEMOGCM/NEMO/OPA_SRC/CRS/crsini.F90 (modified) * branches/2013/dev_r3411_CNRS4_IOCRS/NEMOGCM/NEMO/OPA_SRC/CRS/crslbclnk.F90 (modified) dev_r3411_CNRS4_IOCRS : some corrections 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 Thu, 13 Dec 2012 15:40:43 GMT acc [3736] * 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 (deleted) * branches/2012/dev_MERGE_2012/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-mpmd-ALTIX_NAUTILUS_MPT (added) Branch dev_MERGE_2012. Update arch files for NOC/ALTIX system Wed, 12 Dec 2012 21:49:39 GMT cetlod [3735] * branches/2013/dev_r3411_CNRS4_IOCRS/NEMOGCM/NEMO/OPA_SRC/CRS/crs.F90 (modified) * branches/2013/dev_r3411_CNRS4_IOCRS/NEMOGCM/NEMO/OPA_SRC/CRS/crs_dom.F90 (modified) * branches/2013/dev_r3411_CNRS4_IOCRS/NEMOGCM/NEMO/OPA_SRC/CRS/crsdiawri.F90 (added) * branches/2013/dev_r3411_CNRS4_IOCRS/NEMOGCM/NEMO/OPA_SRC/CRS/crsini.F90 (modified) dev_r3411_CNRS4_IOCRS : some improvments Wed, 12 Dec 2012 18:42:08 GMT cetlod [3734] * branches/2013/dev_r3411_CNRS4_IOCRS/NEMOGCM/CONFIG/ORCA2_LIM_CRS/MY_SRC/lbcnfd.F90 (added) dev_r3411_CNRS4_IOCRS : minor changes in lbcnfd.F90 - jpiglo to npiglo Wed, 12 Dec 2012 16:06:16 GMT gm [3733] * trunk/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfkpp.F90 (modified) trunk: #1038 : zdfkpp correct a bug of compilation in KPP physics 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 Wed, 12 Dec 2012 15:33:53 GMT smasson [3731] * branches/2012/dev_MERGE_2012/NEMOGCM/ARCH/CNRS/arch-X64_CURIE.fcm (modified) dev_MERGE_2012: update arch file for curie Wed, 12 Dec 2012 15:30:53 GMT smasson [3730] * branches/2012/dev_MERGE_2012/NEMOGCM/ARCH/CNRS/arch-PW6_VARGAS.fcm (modified) dev_MERGE_2012: update arch file for vargas Wed, 12 Dec 2012 13:45:09 GMT smasson [3729] * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/SHARED/field_def.xml (modified) dev_MERGE_2012: bugfix on field_def.xml Tue, 11 Dec 2012 10:28:19 GMT smasson [3728] * branches/2012/dev_MERGE_2012/NEMOGCM/ARCH/CNRS/arch-macport_osx.fcm (modified) dev_MERGE_2012: macport + XIOS compilation options Mon, 10 Dec 2012 15:35:39 GMT cetlod [3727] * branches/2013/dev_r3411_CNRS4_IOCRS/NEMOGCM/CONFIG/ORCA2_LIM_CRS/EXP00/namelist_crs (modified) * branches/2013/dev_r3411_CNRS4_IOCRS/NEMOGCM/CONFIG/ORCA2_LIM_CRS/MY_SRC/nemogcm.F90 (modified) * branches/2013/dev_r3411_CNRS4_IOCRS/NEMOGCM/NEMO/OPA_SRC/CRS/crs_dom.F90 (modified) * branches/2013/dev_r3411_CNRS4_IOCRS/NEMOGCM/NEMO/OPA_SRC/CRS/crsini.F90 (modified) dev_r3411_CNRS4_IOCRS: minor corrections Mon, 10 Dec 2012 10:37:43 GMT acc [3726] * trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynnept.F90 (modified) Bugfix #1036 (repeated on the trunk). Tidy up dyn_nept_init to avoid ... Mon, 10 Dec 2012 10:27:16 GMT acc [3725] * branches/2012/dev_MERGE_2012/NEMOGCM/SETTE/sette_rpt (modified) Branch dev_MERGE_2012. Minor fix to the sette_rpt script to remove ... Thu, 06 Dec 2012 18:10:50 GMT cetlod [3724] * branches/CMIP5_IPSL/CONFIG/ORCA2_LIM/EXP00/namelist (modified) * branches/CMIP5_IPSL/CONFIG/ORCA2_LIM_PISCES/EXP00/namelist (modified) CMIP5 branch : correction of the magnitude of the damping on salinity 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 ... Thu, 06 Dec 2012 16:05:00 GMT rblod [3722] * trunk (modified) * trunk/NEMOGCM/ARCH/NOC/arch-ALTIX_NAUTILUS.fcm (modified) * trunk/NEMOGCM/ARCH/NOC/arch-ALTIX_NAUTILUS_MPT.fcm (modified) * trunk/NEMOGCM/ARCH/NOC/arch-ALTIX_NAUTILUS_SETTE.fcm (modified) * trunk/NEMOGCM/CONFIG/ORCA2_TAM (copied) * trunk/NEMOGCM/CONFIG/cfg.txt (modified) * trunk/NEMOGCM/CONFIG/makenemo (modified) * trunk/NEMOGCM/NEMO/OPATAM_SRC (copied) * trunk/NEMOGCM/TOOLS/COMPILE/bldtam.cfg (copied) Submission of dev_r3604_LEGI8_TAM merge branch - See Ticket #1035 Wed, 05 Dec 2012 06:23:56 GMT gm [3721] * trunk/NEMOGCM/NEMO/OPA_SRC/DIA/diahth.F90 (modified) trunk: #1033 : diahth.F90, correct a bug in the computation of the 300m ... Tue, 04 Dec 2012 10:10:08 GMT cbricaud [3720] * trunk/DOC/TexFiles/Chapters/Chap_CFG.tex (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/DOM/domain.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/LBC/lbclnk.F90 (modified) correction ticket 955 & 956 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 ... Thu, 29 Nov 2012 11:15:49 GMT acc [3717] * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/SHARED/field_def.xml (modified) Branch dev_MERGE_2012. Correct SHARED/field_def.xml by updating group ... 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 16:06:02 GMT acc [3715] * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/GYRE/EXP00/iodef.xml (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/GYRE_PISCES/EXP00/iodef.xml (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/SETTE/iodef_sette.xml (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/SETTE/sette_rpt (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/TOOLS/COMPILE/Fmake_config.sh (modified) Branch dev_MERGE_2012. Tidying of iodef files and tools for SETTE. Wed, 28 Nov 2012 13:54:14 GMT acc [3714] * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/SHARED/field_def.xml (modified) Branch dev_MERGE_2012. Update the shared field_def.xml file with some ... Wed, 28 Nov 2012 13:29:42 GMT smasson [3713] * branches/2012/dev_MERGE_2012/NEMOGCM/ARCH/CNRS/arch-PW6_VARGAS.fcm (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/ARCH/CNRS/arch-X64_VAYU.fcm (modified) dev_MERGE_2012: update arch files for XIOS Wed, 28 Nov 2012 13:09:07 GMT flavoni [3712] * trunk/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/1_namelist (modified) add in 1_namelist namtrj block Wed, 28 Nov 2012 12:02:09 GMT flavoni [3711] * trunk/NEMOGCM/NEMO/OPA_SRC/DOM/istate.F90 (modified) forgot USE sol_oce in istate.F90 Wed, 28 Nov 2012 11:59:39 GMT smasson [3710] * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/iodef.xml (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_LIM_PISCES/EXP00/iodef.xml (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_SAS_LIM/EXP00/iodef.xml (modified) bugfix in iodef.xml files Wed, 28 Nov 2012 11:53:52 GMT smasson [3709] * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/AMM12/EXP00/iodef.xml (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/GYRE_BFM/EXP00/iodef.xml (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_LIM_CFC_C14b/EXP00/iodef.xml (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/iodef.xml (modified) dev_MERGE_2012: bugfix in iodef.xml files Wed, 28 Nov 2012 11:07:08 GMT flavoni [3708] * branches/2012/dev_MERGE_2012/NEMOGCM/SETTE/sette.sh (modified) Ãset correct restart name for AMM12 test in sette Wed, 28 Nov 2012 10:24:08 GMT smasson [3707] * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/GYRE/EXP00/iodef.xml (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/GYRE_PISCES/EXP00/iodef.xml (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/iodef.xml (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_LIM_PISCES/EXP00/iodef.xml (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/iodef.xml (modified) dev_MERGE_2012: update iodef.xml for reference configurations Wed, 28 Nov 2012 10:23:57 GMT cetlod [3706] * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/cfg.txt (modified) dev_MERGE_2012 : update cfg.txt file Wed, 28 Nov 2012 10:21:57 GMT cetlod [3705] * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/AMM12_PISCES (deleted) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA025_LIM (deleted) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/PELAGOS (deleted) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/PELAGOS025 (deleted) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/PELAGOS_OFF (deleted) * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/cfg.txt (modified) dev_MERGE_2012 : delete not reference configurations 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:43:02 GMT flavoni [3700] * branches/2012/dev_MERGE_2012/NEMOGCM/SETTE/sette.sh (modified) add possibility to do tests with or without xios in SETTE Wed, 28 Nov 2012 09:42:45 GMT gm [3699] * branches/2012/dev_MERGE_2012/DOC/TexFiles/Chapters/Chap_SBC.tex (modified) * branches/2012/dev_MERGE_2012/DOC/TexFiles/Namelist/namsbc_sas (added) dev_MERGE_2012: fix latex compilation errors + add namsbc_sas 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 09:09:07 GMT rfurner [3697] * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/AMM12/EXP00/namelist (modified) small namelist change to remove mesh output from amm12 Wed, 28 Nov 2012 09:07:11 GMT smasson [3696] * branches/2012/dev_MERGE_2012/NEMOGCM/ARCH/CNRS/arch-X64_CURIE.fcm (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/ARCH/CNRS/arch-X64_VAYU.fcm (added) dev_MERGE_2012: add arch file example with xios 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 Wed, 28 Nov 2012 08:37:52 GMT flavoni [3694] * branches/2012/dev_MERGE_2012/NEMOGCM/SETTE/param.cfg (modified) * branches/2012/dev_MERGE_2012/NEMOGCM/SETTE/sette.sh (modified) add key_tyde for AMM12 in sette.sh test & correct param.cfg Wed, 28 Nov 2012 08:06:00 GMT rblod [3693] * trunk/NEMOGCM/NEMO/OPA_SRC/DOM/istate.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/SOL/solver.F90 (modified) Fix Agrif and solver, see tocket #1030 Wed, 28 Nov 2012 07:54:04 GMT rblod [3692] * trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynnxt.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_flt.F90 (modified) correct pb with agrif and obc (potentially bdy) see ticket #1029 Tue, 27 Nov 2012 17:20:52 GMT gm [3691] * trunk/NEMOGCM/NEMO/OPA_SRC/TRA/trasbc.F90 (modified) trunk: #834 runoff in depth bug + removal of useless lbc_lnk ... Tue, 27 Nov 2012 16:51:05 GMT gm [3690] * trunk/NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/DIA/diawri_dimg.h90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/SBC/sbcssr.F90 (modified) trunk: #860 : Unallocated arrays qrp and erp sometimes passed from ... Tue, 27 Nov 2012 16:19:49 GMT gm [3689] * trunk/NEMOGCM/NEMO/OPA_SRC/DYN/sshwzv.F90 (modified) trunk: #807 : ASSIM: bug in sshwzv.F90 wrong place for ssha update in ... Tue, 27 Nov 2012 15:48:36 GMT cetlod [3688] * branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist (modified) dev_MERGE_2012 : update namelist for OFFLINE, see ticket #1028 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:39:02 GMT cetlod [3685] * trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zsink.F90 (modified) trunk: minor bug correction in p4zsink 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 15:21:24 GMT gm [3683] * trunk/DOC/NEMO_book.pdf (modified) * trunk/DOC/TexFiles/Biblio/Biblio.bib (modified) * trunk/DOC/TexFiles/Chapters/Chap_CFG.tex (modified) * trunk/DOC/TexFiles/Chapters/Chap_DIA.tex (modified) * trunk/DOC/TexFiles/Chapters/Chap_DOM.tex (modified) * trunk/DOC/TexFiles/Chapters/Chap_DYN.tex (modified) * trunk/DOC/TexFiles/Chapters/Chap_TRA.tex (modified) * trunk/DOC/TexFiles/Chapters/Chap_ZDF.tex (modified) trunk: #926 NEMO_book.pdf : references are invisible + error corrections Tue, 27 Nov 2012 15:12:51 GMT vichi [3682] * trunk/NEMOGCM/NEMO/OPA_SRC/SBC/sbcrnf.F90 (modified) Corrected a bug when checking the values of the river depth from a given ... 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 14:35:21 GMT cbricaud [3679] * trunk/NEMOGCM/NEMO/OPA_SRC/SBC/tide_mod.F90 (modified) declare TYPE tide as PUBLIC, because of compilation error with key_tide ... Tue, 27 Nov 2012 13:55:48 GMT vichi [3678] * trunk/NEMOGCM/EXTERNAL/XMLIO_SERVER/src/IOSERVER/mod_mpi_buffer_client.F90 (modified) Corrected bug in ticket #1016 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 Tue, 27 Nov 2012 13:24:21 GMT vichi [3676] * trunk/NEMOGCM/EXTERNAL/XMLF90/src/xpath/m_path_orig.f90 (deleted) Removed unnecessary file from XMLF90 Tue, 27 Nov 2012 13:15:50 GMT cbricaud [3675] * branches/2012/dev_NOC_MERCATOR_2012/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/1_namelist (modified) add namberg namelist bloc in 1_namelist for run with argif ; in ... Tue, 27 Nov 2012 13:02:39 GMT epico [3674] * branches/2012/dev_LOCEAN_UKMO_CMCC_INGV_2012/NEMOGCM/CONFIG/AMM12/EXP00/namelist (modified) * branches/2012/dev_LOCEAN_UKMO_CMCC_INGV_2012/NEMOGCM/CONFIG/GYRE/EXP00/namelist (modified) * branches/2012/dev_LOCEAN_UKMO_CMCC_INGV_2012/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/1_namelist (modified) * branches/2012/dev_LOCEAN_UKMO_CMCC_INGV_2012/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist (modified) * branches/2012/dev_LOCEAN_UKMO_CMCC_INGV_2012/NEMOGCM/CONFIG/ORCA2_LIM_PISCES/EXP00/namelist_top (modified) * branches/2012/dev_LOCEAN_UKMO_CMCC_INGV_2012/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist (modified) * branches/2012/dev_LOCEAN_UKMO_CMCC_INGV_2012/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist_top (modified) update namelist with new parameter ln_traadv_msc_ups Tue, 27 Nov 2012 12:59:21 GMT vichi [3673] * trunk/NEMOGCM/EXTERNAL/fcm/lib/Fcm/CfgLine.pm (modified) Removed annoying warning during configuration build (Ticket #938) ... Tue, 27 Nov 2012 12:56:13 GMT flavoni [3672] * branches/2012/dev_LOCEAN_UKMO_CMCC_INGV_2012/NEMOGCM/SETTE/sette_beginner.sh (modified) update sette_beginner in merged branch Tue, 27 Nov 2012 12:49:55 GMT epico [3671] * branches/2012/dev_LOCEAN_UKMO_CMCC_INGV_2012/NEMOGCM/NEMO/OPA_SRC/TRA/traadv.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_CMCC_INGV_2012/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_muscl.F90 (modified) Reorganize the MUSCL upstream switching scheme 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 Mon, 26 Nov 2012 15:08:48 GMT pabouttier [3669] * branches/2012/dev_r3604_LEGI8_TAM/NEMOGCM/CONFIG/ORCA2_TAM/EXP00/namelist (modified) * branches/2012/dev_r3604_LEGI8_TAM/NEMOGCM/CONFIG/ORCA2_TAM/cpp_ORCA2_TAM.fcm (modified) Update cppkeys and namelist for ORCA2_TAM configuration - See Ticket ... Mon, 26 Nov 2012 15:05:24 GMT pabouttier [3668] * branches/2012/dev_r3604_LEGI8_TAM/NEMOGCM/NEMO/OPATAM_SRC/LBC/cla_tam.F90 (modified) * branches/2012/dev_r3604_LEGI8_TAM/NEMOGCM/NEMO/OPATAM_SRC/SBC/sbc_oce_tam.F90 (modified) Missing allocation for sbc_ice variables in TAM - See Ticket #1026 Mon, 26 Nov 2012 14:45:53 GMT acc [3667] * branches/2012/dev_NOC_MERCATOR_2012/NEMOGCM/SETTE/sette.sh (modified) * branches/2012/dev_NOC_MERCATOR_2012/NEMOGCM/SETTE/sette_rpt (added) Branch dev_NOC_MERCATOR_2012. Return sette.sh to LOCEAN settings and add ... Mon, 26 Nov 2012 14:22:04 GMT cetlod [3666] * branches/2012/dev_LOCEAN_UKMO_CMCC_INGV_2012/NEMOGCM/ARCH/CMCC (copied) * branches/2012/dev_LOCEAN_UKMO_CMCC_INGV_2012/NEMOGCM/ARCH/arch-PW6_CALYPSO.fcm (deleted) * branches/2012/dev_LOCEAN_UKMO_CMCC_INGV_2012/NEMOGCM/CONFIG/AMM12/EXP00/namelist (modified) * branches/2012/dev_LOCEAN_UKMO_CMCC_INGV_2012/NEMOGCM/CONFIG/AMM12_PISCES/EXP00/namelist (modified) * branches/2012/dev_LOCEAN_UKMO_CMCC_INGV_2012/NEMOGCM/CONFIG/GYRE/EXP00/namelist (modified) * branches/2012/dev_LOCEAN_UKMO_CMCC_INGV_2012/NEMOGCM/CONFIG/GYRE_BFM (copied) * branches/2012/dev_LOCEAN_UKMO_CMCC_INGV_2012/NEMOGCM/CONFIG/ORCA025_LIM (copied) * branches/2012/dev_LOCEAN_UKMO_CMCC_INGV_2012/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist (modified) * branches/2012/dev_LOCEAN_UKMO_CMCC_INGV_2012/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist (modified) * branches/2012/dev_LOCEAN_UKMO_CMCC_INGV_2012/NEMOGCM/CONFIG/PELAGOS (copied) * branches/2012/dev_LOCEAN_UKMO_CMCC_INGV_2012/NEMOGCM/CONFIG/PELAGOS025 (copied) * branches/2012/dev_LOCEAN_UKMO_CMCC_INGV_2012/NEMOGCM/CONFIG/PELAGOS_OFF (copied) * branches/2012/dev_LOCEAN_UKMO_CMCC_INGV_2012/NEMOGCM/CONFIG/cfg.txt (modified) * branches/2012/dev_LOCEAN_UKMO_CMCC_INGV_2012/NEMOGCM/EXTERNAL/IOIPSL/tools/flio_rbld.f90 (modified) * branches/2012/dev_LOCEAN_UKMO_CMCC_INGV_2012/NEMOGCM/NEMO/OFF_SRC/domrea.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_CMCC_INGV_2012/NEMOGCM/NEMO/OFF_SRC/dtadyn.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_CMCC_INGV_2012/NEMOGCM/NEMO/OFF_SRC/nemogcm.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_CMCC_INGV_2012/NEMOGCM/NEMO/OPA_SRC/BDY/bdydyn2d.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_CMCC_INGV_2012/NEMOGCM/NEMO/OPA_SRC/BDY/bdydyn3d.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_CMCC_INGV_2012/NEMOGCM/NEMO/OPA_SRC/BDY/bdyice_lim2.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_CMCC_INGV_2012/NEMOGCM/NEMO/OPA_SRC/BDY/bdyini.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_CMCC_INGV_2012/NEMOGCM/NEMO/OPA_SRC/BDY/bdytra.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_CMCC_INGV_2012/NEMOGCM/NEMO/OPA_SRC/DOM/dom_oce.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_CMCC_INGV_2012/NEMOGCM/NEMO/OPA_SRC/LBC/lbclnk.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_CMCC_INGV_2012/NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_CMCC_INGV_2012/NEMOGCM/NEMO/OPA_SRC/OBC/obcdyn.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_CMCC_INGV_2012/NEMOGCM/NEMO/OPA_SRC/OBC/obcdyn_bt.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_CMCC_INGV_2012/NEMOGCM/NEMO/OPA_SRC/OBC/obctra.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_CMCC_INGV_2012/NEMOGCM/NEMO/OPA_SRC/SBC/fldread.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_CMCC_INGV_2012/NEMOGCM/NEMO/OPA_SRC/SBC/sbc_oce.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_CMCC_INGV_2012/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_CMCC_INGV_2012/NEMOGCM/NEMO/OPA_SRC/SBC/sbcrnf.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_CMCC_INGV_2012/NEMOGCM/NEMO/OPA_SRC/SBC/sbcwave.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_CMCC_INGV_2012/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_muscl.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_CMCC_INGV_2012/NEMOGCM/NEMO/TOP_SRC/MY_TRC/par_my_trc.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_CMCC_INGV_2012/NEMOGCM/NEMO/TOP_SRC/MY_TRC/trcsms_my_trc.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_CMCC_INGV_2012/NEMOGCM/NEMO/TOP_SRC/TRP/trcadv.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_CMCC_INGV_2012/NEMOGCM/NEMO/TOP_SRC/TRP/trcnam_trp.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_CMCC_INGV_2012/NEMOGCM/NEMO/TOP_SRC/TRP/trczdf.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_CMCC_INGV_2012/NEMOGCM/NEMO/TOP_SRC/trc.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_CMCC_INGV_2012/NEMOGCM/NEMO/TOP_SRC/trcnam.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_CMCC_INGV_2012/NEMOGCM/NEMO/TOP_SRC/trcsub.F90 (modified) commit the changes resulting for the merged branches, see ticket #1025 Mon, 26 Nov 2012 14:14:40 GMT cbricaud [3665] * branches/2012/dev_NOC_MERCATOR_2012/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-ifort_MERCATOR_CLUSTER (modified) * branches/2012/dev_NOC_MERCATOR_2012/NEMOGCM/SETTE/prepare_job.sh (modified) correction of Mercator's modifications for prepare_job.sh Mon, 26 Nov 2012 14:02:52 GMT cetlod [3664] * branches/2012/dev_LOCEAN_UKMO_CMCC_INGV_2012 (copied) Step 1 : copy LOCEAN/UKMO branch into a new one, ... Mon, 26 Nov 2012 14:02:42 GMT flavoni [3663] * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/SETTE/input_AMM12.cfg (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/SETTE/input_AMM12_PISCES.cfg (deleted) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/SETTE/sette.sh (modified) update amm12 tar file, and tests in sette.sh, see ticket #1021 Mon, 26 Nov 2012 13:57:51 GMT pabouttier [3662] * branches/2012/dev_r3604_LEGI8_TAM/NEMOGCM/NEMO/OPATAM_SRC/TAM/trj_tam.F90 (modified) Multiple allocation of the same variables in tam_trj.F90 - See Ticket ... Mon, 26 Nov 2012 13:40:22 GMT cbricaud [3661] * branches/2012/dev_NOC_MERCATOR_2012/NEMOGCM/SETTE/prepare_job.sh (modified) phase prepare_job.sh with trunk , rev 3555, due to an old Mercator ... Mon, 26 Nov 2012 13:30:32 GMT pabouttier [3660] * branches/2012/dev_r3604_LEGI8_TAM/NEMOGCM/NEMO/OPATAM_SRC/TRA/zpshde_tam.F90 (modified) Use ikum1 and ikvm1 in zpshde_tam - part 2 - See ticket #1023 Mon, 26 Nov 2012 13:26:29 GMT pabouttier [3659] * branches/2012/dev_r3604_LEGI8_TAM/NEMOGCM/NEMO/OPATAM_SRC/TRA/zpshde_tam.F90 (modified) Use ikum1 and ikvm1 in zpshde_tam - See ticket #1023 Mon, 26 Nov 2012 13:08:30 GMT pabouttier [3658] * branches/2012/dev_r3604_LEGI8_TAM/NEMOGCM/NEMO/OPATAM_SRC/SBC/sbcssr_tam.F90 (modified) * branches/2012/dev_r3604_LEGI8_TAM/NEMOGCM/NEMO/OPATAM_SRC/TRA/zpshde_tam.F90 (modified) * branches/2012/dev_r3604_LEGI8_TAM/NEMOGCM/NEMO/OPATAM_SRC/nemogcm_tam.F90 (modified) * branches/2012/dev_r3604_LEGI8_TAM/NEMOGCM/NEMO/OPATAM_SRC/step_tam.F90 (modified) * branches/2012/dev_r3604_LEGI8_TAM/NEMOGCM/NEMO/OPATAM_SRC/tamtst.F90 (modified) Missing allocation for sbcssr_tam variables - see Ticket #1022 Mon, 26 Nov 2012 12:56:01 GMT flavoni [3657] * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/CONFIG/AMM12/EXP00/namelist (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/CONFIG/AMM12_PISCES/EXP00/namelist (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/CONFIG/GYRE/EXP00/namelist (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/CONFIG/ORCA2_LIM_CFC_C14b/EXP00/namelist (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/SETTE/sette.sh (modified) set nn_timing = 0 by default in all configurations, and changed sette.sh ... Mon, 26 Nov 2012 11:29:11 GMT cetlod [3656] * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/OPA_SRC/C1D/step_c1d.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/OPA_SRC/DOM/daymod.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/OPA_SRC/DOM/istate.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/OPA_SRC/step.F90 (modified) branch LOCEAN/UKMO 2012 : update branch according to Sebastien Masson ... Mon, 26 Nov 2012 11:27:06 GMT cetlod [3655] * branches/2012/dev_LOCEAN_2012/NEMOGCM/NEMO/OPA_SRC/C1D/step_c1d.F90 (modified) * branches/2012/dev_LOCEAN_2012/NEMOGCM/NEMO/OPA_SRC/DOM/daymod.F90 (modified) * branches/2012/dev_LOCEAN_2012/NEMOGCM/NEMO/OPA_SRC/DOM/istate.F90 (modified) * branches/2012/dev_LOCEAN_2012/NEMOGCM/NEMO/OPA_SRC/step.F90 (modified) branch LOCEAN 2012 : update branch according to Sebastien Masson sunday ... Mon, 26 Nov 2012 11:13:40 GMT gm [3654] * trunk/DOC/TexFiles/Namelist/namdyn_vor (modified) * trunk/NEMOGCM/CONFIG/AMM12/EXP00/namelist (modified) * trunk/NEMOGCM/CONFIG/AMM12_PISCES/EXP00/namelist (modified) * trunk/NEMOGCM/CONFIG/GYRE/EXP00/namelist (modified) * trunk/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/1_namelist (modified) * trunk/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist (modified) trunk: #933 error in comment of namelist mandyn_vor Mon, 26 Nov 2012 10:58:31 GMT cetlod [3653] * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/ARCH/CNRS/arch-X64_CURIE.fcm (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/CONFIG/GYRE/cpp_GYRE.fcm (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/CONFIG/GYRE_LOBSTER (deleted) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/CONFIG/GYRE_PISCES (copied) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/CONFIG/ORCA2_LIM_CFC_C14b (copied) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/CONFIG/ORCA2_LIM_PISCES/EXP00/iodef.xml (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/CONFIG/ORCA2_LIM_PISCES/EXP00/namelist_pisces (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/CONFIG/ORCA2_LIM_PISCES/cpp_ORCA2_LIM_PISCES.fcm (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/iodef.xml (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist_pisces (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist_top (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/xmlio_server.def (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/cpp_ORCA2_OFF_PISCES.fcm (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/CONFIG/cfg.txt (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/CONFIG/makenemo (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/LIM_SRC_2/limrhg_2.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/LIM_SRC_2/limtrp_2.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/LIM_SRC_3/limrhg.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/NST_SRC/agrif2model.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/NST_SRC/agrif_ice.F90 (copied) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/NST_SRC/agrif_lim2_interp.F90 (copied) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/NST_SRC/agrif_lim2_update.F90 (copied) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/NST_SRC/agrif_oce.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/NST_SRC/agrif_opa_sponge.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/NST_SRC/agrif_top_interp.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/NST_SRC/agrif_top_sponge.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/NST_SRC/agrif_top_update.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/NST_SRC/agrif_user.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/OFF_SRC/dtadyn.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/OPA_SRC/DOM/daymod.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/OPA_SRC/DOM/istate.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_exp.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_flt.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/OPA_SRC/DYN/sshwzv.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/OPA_SRC/IOM/in_out_manager.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/OPA_SRC/IOM/iom_def.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/OPA_SRC/IOM/prtctl.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/OPA_SRC/IOM/restart.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/OPA_SRC/SBC/cyclone.F90 (copied) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/OPA_SRC/SBC/fldread.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/OPA_SRC/SBC/sbcapr.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_core.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim_2.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/OPA_SRC/SBC/sbcrnf.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/OPA_SRC/SBC/sbcssm.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_cen2.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/OPA_SRC/TRA/traqsr.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/OPA_SRC/TRA/trasbc.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/OPA_SRC/TRD/trdmld.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/OPA_SRC/TRD/trdmld_rst.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfgls.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfini.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/OPA_SRC/ZDF/zdftke.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/OPA_SRC/lib_cray.f90 (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/OPA_SRC/step_oce.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/TOP_SRC/C14b/par_c14b.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/TOP_SRC/C14b/trcrst_c14b.F90 (deleted) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/TOP_SRC/C14b/trcsms_c14b.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/TOP_SRC/C14b/trcwri_c14b.F90 (copied) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/TOP_SRC/CFC/par_cfc.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/TOP_SRC/CFC/trcrst_cfc.F90 (deleted) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/TOP_SRC/CFC/trcsms_cfc.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/TOP_SRC/CFC/trcwri_cfc.F90 (copied) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/TOP_SRC/LOBSTER (deleted) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/TOP_SRC/MY_TRC/par_my_trc.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/TOP_SRC/MY_TRC/trcnam_my_trc.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/TOP_SRC/MY_TRC/trcrst_my_trc.F90 (deleted) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/TOP_SRC/MY_TRC/trcwri_my_trc.F90 (copied) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/TOP_SRC/PISCES/P2Z (copied) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z (copied) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/TOP_SRC/PISCES/SED (copied) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zbio.F90 (deleted) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zche.F90 (deleted) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zflx.F90 (deleted) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zint.F90 (deleted) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zlim.F90 (deleted) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zlys.F90 (deleted) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zmeso.F90 (deleted) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zmicro.F90 (deleted) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zmort.F90 (deleted) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zopt.F90 (deleted) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zprod.F90 (deleted) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zrem.F90 (deleted) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zsed.F90 (deleted) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zsink.F90 (deleted) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/TOP_SRC/PISCES/par_pisces.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/TOP_SRC/PISCES/sms_pisces.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/TOP_SRC/PISCES/trcini_pisces.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/TOP_SRC/PISCES/trcnam_pisces.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/TOP_SRC/PISCES/trcrst_pisces.F90 (deleted) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/TOP_SRC/PISCES/trcsms_pisces.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/TOP_SRC/PISCES/trcwri_pisces.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/TOP_SRC/SED (deleted) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/TOP_SRC/TRP/trcnxt.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/TOP_SRC/TRP/trcrad.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/TOP_SRC/TRP/trcsbc.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/TOP_SRC/TRP/trctrp.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/TOP_SRC/TRP/trdmld_trc.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/TOP_SRC/TRP/trdmld_trc_rst.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/TOP_SRC/TRP/trdmod_trc_oce.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/TOP_SRC/oce_trc.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/TOP_SRC/par_trc.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/TOP_SRC/prtctl_trc.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/TOP_SRC/trc.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/TOP_SRC/trcini.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/TOP_SRC/trcnam.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/TOP_SRC/trcrst.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/TOP_SRC/trcsms.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/TOP_SRC/trcstp.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/TOP_SRC/trcwri.F90 (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-X64_CURIE (copied) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/SETTE/prepare_job.sh (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/SETTE/sette.sh (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/TOOLS/COMPILE/Fmake_WORK.sh (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/TOOLS/COMPILE/agrifpp.sh (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/TOOLS/COMPILE/bld.cfg (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/TOOLS/COMPILE/bld_preproagr.cfg (copied) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/TOOLS/COMPILE/bldxag.cfg (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/TOOLS/COMPILE/bldxio.cfg (modified) * branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/TOOLS/COMPILE/bldxioxag.cfg (modified) commit the changes from LOCEAN & UKMO merge, see ticket #1021 Mon, 26 Nov 2012 10:50:15 GMT flavoni [3652] * trunk/NEMOGCM/SETTE/sette.sh (modified) remove bad line for OFFline restartability test in SETTE, see ticket ... Mon, 26 Nov 2012 10:46:39 GMT cbricaud [3651] * branches/2012/dev_NOC_MERCATOR_2012 (modified) * branches/2012/dev_NOC_MERCATOR_2012/NEMOGCM/ARCH/NOC/arch-ALTIX_NAUTILUS.fcm (modified) * branches/2012/dev_NOC_MERCATOR_2012/NEMOGCM/ARCH/NOC/arch-ALTIX_NAUTILUS_MPT.fcm (modified) * branches/2012/dev_NOC_MERCATOR_2012/NEMOGCM/ARCH/NOC/arch-ALTIX_NAUTILUS_SETTE.fcm (modified) * branches/2012/dev_NOC_MERCATOR_2012/NEMOGCM/ARCH/arch-ifort_MERCATOR_CLUSTER.fcm (modified) * branches/2012/dev_NOC_MERCATOR_2012/NEMOGCM/CONFIG/AMM12/EXP00/namelist (modified) * branches/2012/dev_NOC_MERCATOR_2012/NEMOGCM/CONFIG/AMM12_PISCES/EXP00/namelist (modified) * branches/2012/dev_NOC_MERCATOR_2012/NEMOGCM/CONFIG/GYRE/EXP00/namelist (modified) * branches/2012/dev_NOC_MERCATOR_2012/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist (modified) * branches/2012/dev_NOC_MERCATOR_2012/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist (modified) * branches/2012/dev_NOC_MERCATOR_2012/NEMOGCM/CONFIG/cfg.txt (modified) * branches/2012/dev_NOC_MERCATOR_2012/NEMOGCM/NEMO/OPA_SRC/BDY/bdy_oce.F90 (modified) * branches/2012/dev_NOC_MERCATOR_2012/NEMOGCM/NEMO/OPA_SRC/BDY/bdydta.F90 (modified) * branches/2012/dev_NOC_MERCATOR_2012/NEMOGCM/NEMO/OPA_SRC/BDY/bdydyn3d.F90 (modified) * branches/2012/dev_NOC_MERCATOR_2012/NEMOGCM/NEMO/OPA_SRC/BDY/bdyini.F90 (modified) * branches/2012/dev_NOC_MERCATOR_2012/NEMOGCM/NEMO/OPA_SRC/BDY/bdytides.F90 (modified) * branches/2012/dev_NOC_MERCATOR_2012/NEMOGCM/NEMO/OPA_SRC/BDY/bdytra.F90 (modified) * branches/2012/dev_NOC_MERCATOR_2012/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 (modified) * branches/2012/dev_NOC_MERCATOR_2012/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90 (modified) * branches/2012/dev_NOC_MERCATOR_2012/NEMOGCM/NEMO/OPA_SRC/OBS/obs_oper.F90 (modified) * branches/2012/dev_NOC_MERCATOR_2012/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_seaice.F90 (modified) * branches/2012/dev_NOC_MERCATOR_2012/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_sla.F90 (modified) * branches/2012/dev_NOC_MERCATOR_2012/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_sst.F90 (modified) * branches/2012/dev_NOC_MERCATOR_2012/NEMOGCM/NEMO/OPA_SRC/OBS/obs_surf_def.F90 (modified) * branches/2012/dev_NOC_MERCATOR_2012/NEMOGCM/NEMO/OPA_SRC/SBC/fldread.F90 (modified) * branches/2012/dev_NOC_MERCATOR_2012/NEMOGCM/NEMO/OPA_SRC/SBC/sbcapr.F90 (modified) * branches/2012/dev_NOC_MERCATOR_2012/NEMOGCM/NEMO/OPA_SRC/SBC/sbcdcy.F90 (modified) * branches/2012/dev_NOC_MERCATOR_2012/NEMOGCM/NEMO/OPA_SRC/SBC/sbctide.F90 (modified) * branches/2012/dev_NOC_MERCATOR_2012/NEMOGCM/NEMO/OPA_SRC/SBC/tideini.F90 (copied) * branches/2012/dev_NOC_MERCATOR_2012/NEMOGCM/NEMO/OPA_SRC/SBC/updtide.F90 (modified) * branches/2012/dev_NOC_MERCATOR_2012/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 (modified) * branches/2012/dev_NOC_MERCATOR_2012/NEMOGCM/NEMO/OPA_SRC/step.F90 (modified) * branches/2012/dev_NOC_MERCATOR_2012/NEMOGCM/NEMO/OPA_SRC/step_oce.F90 (modified) * branches/2012/dev_NOC_MERCATOR_2012/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-ifort_MERCATOR_CLUSTER (modified) * branches/2012/dev_NOC_MERCATOR_2012/NEMOGCM/SETTE/iodef_sette.xml (modified) * branches/2012/dev_NOC_MERCATOR_2012/NEMOGCM/SETTE/param.cfg (modified) * branches/2012/dev_NOC_MERCATOR_2012/NEMOGCM/SETTE/prepare_job.sh (modified) * branches/2012/dev_NOC_MERCATOR_2012/NEMOGCM/SETTE/sette.sh (modified) merge dev_MERCATOR_2012_rev3555 into dev_NOC_MERCATOR_2012 ; see ticket ...