# # ChangeLog for branches # # Generated by Trac 1.0.1 # 2024-06-15T07:43:22+02:00 Thu, 17 Nov 2011 16:28:03 GMT cetlod [3147] * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/C14b/trcsms_c14b.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/LOBSTER/trcbio.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/LOBSTER/trcini_lobster.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/LOBSTER/trcopt.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/LOBSTER/trcsed.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/MY_TRC/trcsms_my_trc.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zflx.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zlys.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zopt.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zprod.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zrem.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zsed.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zsink.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/TRP/trcadv.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/TRP/trcsbc.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/TRP/trdmld_trc.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/trcdta.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/trcsub.F90 (modified) branch dev_NEMO_MERGE_2011:New dynamical allocation for TOP Thu, 17 Nov 2011 15:55:11 GMT cetlod [3146] * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/CONFIG/AMM12/EXP00/namelist (modified) dev_NEMO_MERGE_2011:Minor modification for AMM12 namelist Thu, 17 Nov 2011 15:53:24 GMT smasson [3145] * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/LIM_SRC_2/iceini_2.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/LIM_SRC_2/limadv_2.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/LIM_SRC_2/limdyn_2.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/LIM_SRC_2/limhdf_2.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/LIM_SRC_2/limmsh_2.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/LIM_SRC_2/limrhg_2.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/LIM_SRC_2/limsbc_2.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/LIM_SRC_2/limthd_2.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/LIM_SRC_2/limthd_lac_2.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/LIM_SRC_2/limthd_zdf_2.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/LIM_SRC_2/limtrp_2.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/LIM_SRC_2/limwri_2.F90 (modified) dev_NEMO_MERGE_2011: new dynamical allocation in LIM2 Thu, 17 Nov 2011 15:41:58 GMT smasson [3144] * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/wrk_nemo_2.F90 (modified) dev_NEMO_MERGE_2011: upgade wrk_nemo_2 to specify lower bounds of wrk ... Thu, 17 Nov 2011 15:26:08 GMT epico [3143] * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/SETTE/BATCH_TEMPLATE/sette_batch_template (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/SETTE/fcm_job.sh (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/SETTE/prepare_job.sh (added) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/SETTE/sette.sh (modified) improved sette scripts to support different batch queueing systems Thu, 17 Nov 2011 14:54:45 GMT acc [3142] * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Chapters/Chap_DYN.tex (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90 (modified) Branch dev_NEMO_MERGE_2011. Minor documentation changes and check in ... Wed, 16 Nov 2011 17:03:11 GMT flavoni [3141] * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/SETTE/input_AMM12.cfg (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/SETTE/input_AMM12_PISCES.cfg (modified) input amm12 Wed, 16 Nov 2011 16:12:00 GMT rblod [3140] * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/timing.F90 (added) Add timing module see ticket #829 Wed, 16 Nov 2011 16:11:51 GMT rblod [3139] * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/IOM/in_out_manager.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/step.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/step_oce.F90 (modified) Add timing module see ticket #829 Wed, 16 Nov 2011 15:40:31 GMT flavoni [3138] * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/SETTE/input_AMM12.cfg (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/SETTE/input_AMM12_PISCES.cfg (modified) change tar file name for AMM12, bad name it does not correspond to file ... Wed, 16 Nov 2011 15:09:43 GMT smasson [3137] * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/TOOLS/MISCELLANEOUS/chk_wrk_alloc.sh (added) dev_NEMO_MERGE_2011: small script to check if new wrk_alloc is properly ... Wed, 16 Nov 2011 14:40:58 GMT davestorkey [3136] * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/par_AMM_12km.h90 (modified) Tidy up par_AMM12.h90 Wed, 16 Nov 2011 14:22:54 GMT flavoni [3135] * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/SETTE/sette.sh.vargas (modified) new sette file for vargas Wed, 16 Nov 2011 14:14:00 GMT smasson [3134] * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/wrk_nemo_2.F90 (added) dev_NEMO_MERGE_2011: introduce new wrk_nemo Wed, 16 Nov 2011 13:50:18 GMT flavoni [3133] * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/SETTE/sette.sh.vargas (modified) new sette file for vargas Wed, 16 Nov 2011 13:45:00 GMT cetlod [3132] * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/DOM/dtatsd.F90 (added) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/DTA (deleted) dev_NEMO_MERGE_2011: Move dtatsd from DTA to DOM and suppress the ... Wed, 16 Nov 2011 13:39:27 GMT cetlod [3131] * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/par_POMME_R025.h90 (modified) dev_NEMO_MERGE_2011: suppression of obsolete parameters jpisl/jpnisl in ... Wed, 16 Nov 2011 13:38:33 GMT acc [3130] * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/SETTE/sette.sh (modified) Branch dev_NEMO_MERGE_2011. Updated sette.sh with AMM12 namelist changes ... Wed, 16 Nov 2011 11:55:16 GMT flavoni [3129] * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/SETTE/sette.sh (modified) delete 1 line Wed, 16 Nov 2011 11:48:25 GMT flavoni [3128] * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/SETTE/sette.sh (modified) adaptation of SETTE to new AMM12 configuration, and different way to ... Wed, 16 Nov 2011 11:25:23 GMT cetlod [3127] * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/ZDF/zdf.matrixsolver.h90 (deleted) dev_NEMO_MERGE_2011:remove unused file zdf.matrixsolver.h90 Wed, 16 Nov 2011 10:00:25 GMT acc [3126] * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/CONFIG/AMM12/EXP00/iodef.xml (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/CONFIG/AMM12/EXP00/namelist (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/CONFIG/AMM12_PISCES/EXP00/iodef.xml (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/CONFIG/AMM12_PISCES/EXP00/namelist (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/CONFIG/POMME/EXP00/namelist (modified) Branch dev_NEMO_MERGE_2011. Updated AMM12 namelists and iodef.xml. Also ... Wed, 16 Nov 2011 09:50:26 GMT cetlod [3125] * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfgls.F90 (modified) dev_NEMO_MERGE_2011:minor bug corrections in zdfgls Wed, 16 Nov 2011 09:25:18 GMT cetlod [3124] * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/C14b/trcnam_c14b.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/LOBSTER/trcexp.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zflx.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zlim.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zlys.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zmeso.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zmicro.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zprod.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zsed.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/trcrst_pisces.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/TRP/trcadv.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/TRP/trcnxt.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/TRP/trcrad.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/TRP/trczdf.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/trcdia.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/trcdta.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/trcini.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/trcrst.F90 (modified) dev_NEMO_MERGE_2011/NEMOGCM:minor modifications on the use of nittrc000 ... Wed, 16 Nov 2011 09:17:07 GMT acc [3123] * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/SETTE/sette.sh (modified) Branch dev_NEMO_MERGE_2011. Added AMM12 restartability test (not yet ... Tue, 15 Nov 2011 23:09:22 GMT cetlod [3122] * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/BDY/bdydta.F90 (modified) dev_NEMO_MERGE_2011: bug report in bdydta, comes from NOC_UKMO branch Tue, 15 Nov 2011 22:54:59 GMT rblod [3121] * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/BDY/bdydta.F90 (modified) Correct bug in bdydta Tue, 15 Nov 2011 21:55:04 GMT cetlod [3120] * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/TOOLS/COMPILE/cfg.txt (modified) Change AMM12-PISCES to AMM12_PISCES in cfg.txt Tue, 15 Nov 2011 21:45:47 GMT cetlod [3119] * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OFF_SRC/dommsk.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OFF_SRC/dtadyn.F90 (modified) branch dev_NEMO_MERGE_2011/NEMOGCM: minor bug corrections for offline ... Tue, 15 Nov 2011 21:27:32 GMT cetlod [3118] * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/TRP/trcldf.F90 (modified) branch dev_NEMO_MERGE_2011/NEMOGCM: minor bug corrections Tue, 15 Nov 2011 21:06:59 GMT cetlod [3117] * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/BDY/bdydyn2d.F90 (added) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/BDY/bdydyn3d.F90 (added) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/BDY/bdyice.F90 (deleted) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/BDY/bdyice_lim2.F90 (added) dev_NEMO_MERGE_2011: add in changes BDY updates Tue, 15 Nov 2011 20:55:40 GMT cetlod [3116] * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Biblio/Biblio.bib (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Chapters/Chap_ASM.tex (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Chapters/Chap_DYN.tex (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Chapters/Chap_MISC.tex (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Chapters/Chap_OBS.tex (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Chapters/Chap_SBC.tex (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Chapters/Chap_ZDF.tex (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Chapters/Introduction.tex (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Figures/Fig_OBS_dataplot_main.pdf (copied) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Figures/Fig_OBS_dataplot_prof.pdf (copied) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Figures/logo_UKMO.pdf (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Namelist/nambfr (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Namelist/namdyn_hpg (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Namelist/namdyn_nept (copied) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Namelist/namobs_example (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Namelist/namsbc_cpl (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Namelist/namsbc_cpl_co2 (deleted) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Namelist/namtra_ldf (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/ARCH/arch-ALTIX_NAUTILUS4.fcm (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/ARCH/arch-PW6_METO.fcm (copied) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/ARCH/arch-ifort_linux_omp.fcm (copied) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/ARCH/arch-mpxlf_aix.fcm (copied) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/ARCH/arch-xlf_aix.fcm (copied) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/ARCH/arch-xlf_pwr6.fcm (copied) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/CONFIG/AMM12 (copied) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/CONFIG/AMM12_PISCES (copied) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/CONFIG/AMM12_PISCES/EXP00/namelist (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/CONFIG/AMM12_PISCES/EXP00/namelist_pisces (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/CONFIG/AMM12_PISCES/EXP00/namelist_top (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/CONFIG/AMM12_PISCES/cpp_AMM12_PISCES.fcm (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/CONFIG/GYRE/EXP00/namelist (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/1_namelist (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/CONFIG/POMME/EXP00/namelist (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/LIM_SRC_2/limsbc_2.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/LIM_SRC_2/limthd_zdf_2.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/BDY/bdy_oce.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/BDY/bdy_par.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/BDY/bdydta.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/BDY/bdydyn.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/BDY/bdyini.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/BDY/bdytides.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/BDY/bdytra.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/BDY/bdyvol.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/DIA/diahsb.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/DOM/dom_oce.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/DOM/istate.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/DOM/phycst.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/DYN/divcur.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/DYN/dynbfr.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/DYN/dynnept.F90 (copied) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/DYN/dynnxt.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_exp.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_flt.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_oce.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/DYN/dynzdf_imp.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/DYN/sshwzv.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/IOM/prtctl.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/LBC/lbcnfd.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/LBC/mppini.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/LDF/ldfslp.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/LDF/ldftra.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/LDF/ldftra_oce.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/OBC/obc_vectopt_loop_substitute.h90 (copied) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/OBC/obcdta.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/OBC/obcdyn.F90 (copied) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/OBC/obcdyn_bt.F90 (copied) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/OBC/obcfla.F90 (copied) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/OBC/obcrst.F90 (copied) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/SBC/cpl_oasis3.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/SBC/fldread.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/SBC/sbc_ice.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/SBC/sbcapr.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_core.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_cice.F90 (copied) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_if.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim_2.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/SOL/solver.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/TRA/eosbn2.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/TRA/traadv.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_cen2.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_eiv.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_muscl.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_muscl2.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_qck.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_tvd.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_ubs.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/TRA/trabbl.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/TRA/traldf.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_bilap.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_bilapg.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_iso.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_iso_grif.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_lap.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/TRA/tranxt.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/TRA/trazdf.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/TRA/trazdf_exp.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/TRA/trazdf_imp.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfbfr.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/oce.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/par_AMM_12km.h90 (copied) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/par_oce.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/step.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/step_oce.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/C14b/trcsms_c14b.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/CFC/trcnam_cfc.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/CFC/trcsms_cfc.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/LOBSTER/trcbio.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/LOBSTER/trcexp.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/LOBSTER/trcopt.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/LOBSTER/trcsed.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/trcsms_pisces.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/SED/sedini.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/SED/sedmodel.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/SED/sedwri.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/TRP/trcadv.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/TRP/trcbbl.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/TRP/trcdmp.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/TRP/trcldf.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/TRP/trcnxt.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/TRP/trcrad.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/TRP/trcsbc.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/TRP/trczdf.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/TRP/trdmld_trc.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/TRP/trdmod_trc.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/oce_trc.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/trc.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/trcdia.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/trcini.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/trcnam.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/trcrst.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/trcstp.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/trcsub.F90 (copied) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/trcwri.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/SETTE/input_AMM12.cfg (copied) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/SETTE/input_AMM12_PISCES.cfg (copied) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/SETTE/sette.sh (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/TOOLS/COMPILE/cfg.txt (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/TOOLS/OBSTOOLS (copied) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/TOOLS/REBUILD_NEMO (copied) dev_NEMO_MERGE_2011: add in changes dev_NOC_UKMO_MERGE developments Tue, 15 Nov 2011 19:03:08 GMT cetlod [3115] * branches/2011/dev_NEMO_MERGE_2011 (copied) 1st step of the final merge: Copy dev_LOCEAN_CMCC_INGV_MERCATOR_2011 ... Tue, 15 Nov 2011 17:59:26 GMT rblod [3114] * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/TOOLS/COMPILE/cfg.txt (modified) Change AMM to AMM12 in cfg.txt Tue, 15 Nov 2011 15:21:27 GMT acc [3113] * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/CONFIG/AMM12/EXP00/namelist (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/CONFIG/AMM12_PISCES/EXP00/namelist (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/CONFIG/GYRE/EXP00/namelist (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/1_namelist (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/CONFIG/POMME/EXP00/namelist (modified) Branch dev_NOC_UKMO_MERGE #890. bdy namelist changes to all configs Tue, 15 Nov 2011 14:15:00 GMT acc [3112] * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/TOP_SRC/oce_trc.F90 (modified) Branch dev_NOC_UKMO_MERGE #890. Bug fix in oce_trc.F90. Duplicate ... Tue, 15 Nov 2011 14:14:38 GMT flavoni [3111] * branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011/NEMOGCM/NEMO/OPA_SRC/DYN/dynvor.F90 (modified) add missing loop in jk, in dynvor.F90 Tue, 15 Nov 2011 13:42:19 GMT acc [3110] * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/CONFIG/AMM12/cpp_AMM12.fcm (moved) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/CONFIG/AMM12_PISCES/cpp_AMM12_PISCES.fcm (moved) Branch dev_NOC_UKMO_MERGE #890. More tweaks to AMM reference ... Tue, 15 Nov 2011 13:32:34 GMT acc [3109] * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/CONFIG/AMM12/EXP00/namelist (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/CONFIG/AMM12_PISCES/EXP00/namelist (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/SETTE/input_AMM12.cfg (added) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/SETTE/input_AMM12_PISCES.cfg (added) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/SETTE/sette.sh (modified) Branch dev_NOC_UKMO_MERGE #890. More tweaks to AMM reference ... Tue, 15 Nov 2011 11:55:23 GMT acc [3108] * branches/2011/dev_NOC_UKMO_MERGE/DOC/TexFiles/Chapters/Chap_DYN.tex (modified) * branches/2011/dev_NOC_UKMO_MERGE/DOC/TexFiles/Namelist/namdyn_hpg (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/CONFIG/AMM12 (moved) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/CONFIG/AMM12/EXP00/namelist (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/CONFIG/AMM12_PISCES (moved) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/CONFIG/AMM12_PISCES/EXP00/namelist (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/CONFIG/GYRE/EXP00/namelist (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/1_namelist (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/CONFIG/POMME/EXP00/namelist (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/SETTE/sette.sh (modified) Branch dev_NOC_UKMO_MERGE #890. Changes to AMM reference configuration ... Tue, 15 Nov 2011 11:41:47 GMT poddo [3107] * branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_mfs.F90 (modified) correct bug to to tsn in mfs bulk Tue, 15 Nov 2011 11:40:00 GMT cbricaud [3106] * branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011/NEMOGCM/NEMO/OPA_SRC/DIA/diadct.F90 (modified) change tn and sn by tsn Tue, 15 Nov 2011 11:33:20 GMT poddo [3105] * branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011/DOC/TexFiles/Chapters/Chap_SBC.tex (modified) * branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011/DOC/TexFiles/Namelist/namsbc (modified) * branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011/DOC/TexFiles/Namelist/namsbc_ecmwf (deleted) * branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011/DOC/TexFiles/Namelist/namsbc_mfs (added) * branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011/NEMOGCM/CONFIG/GYRE/EXP00/namelist (modified) * branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist (modified) * branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist (modified) * branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011/NEMOGCM/CONFIG/POMME/EXP00/namelist (modified) * branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011/NEMOGCM/NEMO/OPA_SRC/SBC/sbc_oce.F90 (modified) * branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_core.F90 (modified) * branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_ecmwf.F90 (deleted) * branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_mfs.F90 (added) * branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90 (modified) * branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011/NEMOGCM/NEMO/OPA_SRC/SBC/sbcwave.F90 (modified) Rename mfs bulk routine, namelist and doc files Tue, 15 Nov 2011 10:08:25 GMT cetlod [3104] * branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011/DOC/NEMO_book.pdf (modified) * branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011/DOC/TexFiles/Biblio/Biblio.bib (modified) * branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011/DOC/TexFiles/Chapters/Chap_DIA.tex (modified) * branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011/DOC/TexFiles/Chapters/Chap_SBC.tex (modified) * branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011/DOC/TexFiles/Chapters/Chap_ZDF.tex (modified) * branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011/DOC/TexFiles/Figures/logo_MERCATOR.pdf (modified) * branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011/DOC/TexFiles/Namelist/nam_tide (copied) * branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011/DOC/TexFiles/Namelist/namdct (copied) * branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011/DOC/TexFiles/Namelist/namdia_harm (copied) * branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011/DOC/TexFiles/Namelist/namflo (modified) * branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011/DOC/TexFiles/Namelist/namsbc (modified) * branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011/DOC/TexFiles/Namelist/namsbc_ecmwf (copied) * branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011/DOC/TexFiles/Namelist/namsbc_wave (copied) * branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011/DOC/TexFiles/Namelist/namzdf_ric (modified) * branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011/NEMOGCM/CONFIG/GYRE/EXP00/iodef.xml (modified) * branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011/NEMOGCM/CONFIG/GYRE/EXP00/namelist (modified) * branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011/NEMOGCM/CONFIG/GYRE_LOBSTER/EXP00/iodef.xml (modified) * branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/1_namelist (modified) * branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/iodef.xml (modified) * branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist (modified) * branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011/NEMOGCM/CONFIG/ORCA2_LIM_PISCES/EXP00/iodef.xml (modified) * branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist (modified) * branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011/NEMOGCM/CONFIG/POMME/EXP00/iodef.xml (modified) * branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011/NEMOGCM/CONFIG/POMME/EXP00/namelist (modified) * branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011/NEMOGCM/NEMO/NST_SRC/agrif_opa_update.F90 (modified) * branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011/NEMOGCM/NEMO/OPA_SRC/DIA/diadct.F90 (copied) * branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011/NEMOGCM/NEMO/OPA_SRC/DIA/diaharm.F90 (copied) * branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011/NEMOGCM/NEMO/OPA_SRC/DIA/surdetermine.F90 (copied) * branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 (modified) * branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011/NEMOGCM/NEMO/OPA_SRC/FLO/flo4rk.F90 (modified) * branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011/NEMOGCM/NEMO/OPA_SRC/FLO/flo_oce.F90 (modified) * branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011/NEMOGCM/NEMO/OPA_SRC/FLO/floats.F90 (modified) * branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011/NEMOGCM/NEMO/OPA_SRC/FLO/flodom.F90 (modified) * branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011/NEMOGCM/NEMO/OPA_SRC/FLO/florst.F90 (copied) * branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011/NEMOGCM/NEMO/OPA_SRC/FLO/flowri.F90 (modified) * branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011/NEMOGCM/NEMO/OPA_SRC/IOM/in_out_manager.F90 (modified) * branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90 (modified) * branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011/NEMOGCM/NEMO/OPA_SRC/SBC/sbc_oce.F90 (modified) * branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_core.F90 (modified) * branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_ecmwf.F90 (copied) * branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90 (modified) * branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011/NEMOGCM/NEMO/OPA_SRC/SBC/sbctide.F90 (copied) * branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011/NEMOGCM/NEMO/OPA_SRC/SBC/sbcwave.F90 (copied) * branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011/NEMOGCM/NEMO/OPA_SRC/SBC/tide.h90 (copied) * branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011/NEMOGCM/NEMO/OPA_SRC/SBC/tide_mod.F90 (copied) * branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011/NEMOGCM/NEMO/OPA_SRC/SBC/updtide.F90 (copied) * branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfric.F90 (modified) * branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 (modified) * branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011/NEMOGCM/NEMO/OPA_SRC/step.F90 (modified) * branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011/NEMOGCM/NEMO/OPA_SRC/step_oce.F90 (modified) * branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011/NEMOGCM/TOOLS/SECTIONS_DIADCT (copied) dev_LOCEAN_CMCC_INGV_MERCATOR_2011:add in changes ... Tue, 15 Nov 2011 09:15:45 GMT cetlod [3103] * branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011 (copied) 1st step of the merge: Copy LOCEAN/CMCC branch into the new branch Mon, 14 Nov 2011 17:47:56 GMT acc [3102] * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90 (modified) Branch dev_NOC_UKMO_MERGE #890. Corrected minor typo in dynhpg.F90 Mon, 14 Nov 2011 17:39:45 GMT acc [3101] * branches/2011/dev_NOC_UKMO_MERGE/DOC/TexFiles/Biblio/Biblio.bib (modified) * branches/2011/dev_NOC_UKMO_MERGE/DOC/TexFiles/Chapters/Chap_DYN.tex (modified) * branches/2011/dev_NOC_UKMO_MERGE/DOC/TexFiles/Chapters/Chap_MISC.tex (modified) * branches/2011/dev_NOC_UKMO_MERGE/DOC/TexFiles/Chapters/Chap_ZDF.tex (modified) * branches/2011/dev_NOC_UKMO_MERGE/DOC/TexFiles/Namelist/nambfr (modified) * branches/2011/dev_NOC_UKMO_MERGE/DOC/TexFiles/Namelist/namdyn_hpg (modified) * branches/2011/dev_NOC_UKMO_MERGE/DOC/TexFiles/Namelist/namdyn_nept (copied) * branches/2011/dev_NOC_UKMO_MERGE/DOC/TexFiles/Namelist/namtra_ldf (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/ARCH/arch-ALTIX_NAUTILUS4.fcm (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/CONFIG/GYRE/EXP00/namelist (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/1_namelist (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/CONFIG/POMME/EXP00/namelist (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/DOM/istate.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/DYN/dynbfr.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/DYN/dynnept.F90 (copied) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/DYN/dynnxt.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/DYN/dynzdf_imp.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/LBC/lbcnfd.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/LDF/ldfslp.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/LDF/ldftra.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/LDF/ldftra_oce.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/TRA/eosbn2.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_iso_grif.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_lap.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfbfr.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/step.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/TOP_SRC/TRP/trcadv.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/TOP_SRC/TRP/trcldf.F90 (modified) Branch dev_NOC_UKMO_MERGE #890. Resolved conflicts (most arising from ... Mon, 14 Nov 2011 17:35:14 GMT cbricaud [3100] * branches/2011/dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist (modified) cosmetic changes for tide namelist Mon, 14 Nov 2011 16:35:33 GMT acc [3099] * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90 (modified) Branch dev_NOC_2011_MERGE. Changes to dynhpg.F90 following review (#866) Mon, 14 Nov 2011 16:04:39 GMT cetlod [3098] * branches/2011/dev_LOCEAN_CMCC_2011/NEMOGCM/NEMO/OPA_SRC/DYN/dynvor.F90 (modified) dev_LOCEAN_CMCC_2011:minor bug correction Mon, 14 Nov 2011 15:58:22 GMT cetlod [3097] * branches/2011/dev_LOCEAN_CMCC_2011/NEMOGCM/CONFIG/GYRE/EXP00/namelist (modified) * branches/2011/dev_LOCEAN_CMCC_2011/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist (modified) * branches/2011/dev_LOCEAN_CMCC_2011/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist (modified) * branches/2011/dev_LOCEAN_CMCC_2011/NEMOGCM/CONFIG/POMME/EXP00/namelist (modified) * branches/2011/dev_LOCEAN_CMCC_2011/NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90 (modified) * branches/2011/dev_LOCEAN_CMCC_2011/NEMOGCM/NEMO/OPA_SRC/DYN/dynvor.F90 (modified) dev_LOCEAN_CMCC_2011:Move one namelist parameter from dynvor to dommsk Mon, 14 Nov 2011 15:54:42 GMT acc [3096] * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/FLO/floblk.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/OBC/obcdta.F90 (modified) Branch dev_NOC_UKMO_MERGE #890. Undid some changes to fully reinstate ... Mon, 14 Nov 2011 15:41:21 GMT cetlod [3095] * branches/2011/dev_LOCEAN_CMCC_2011/NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90 (modified) * branches/2011/dev_LOCEAN_CMCC_2011/NEMOGCM/NEMO/OPA_SRC/DYN/dynvor.F90 (modified) dev_LOCEAN_CMCC_2011:Move the fmask modification from dommsk to dynvor Mon, 14 Nov 2011 15:28:04 GMT acc [3094] * branches/2011/dev_NOC_UKMO_MERGE/DOC/TexFiles/Biblio/Biblio.bib (modified) * branches/2011/dev_NOC_UKMO_MERGE/DOC/TexFiles/Chapters/Chap_ASM.tex (modified) * branches/2011/dev_NOC_UKMO_MERGE/DOC/TexFiles/Chapters/Chap_OBS.tex (modified) * branches/2011/dev_NOC_UKMO_MERGE/DOC/TexFiles/Chapters/Chap_SBC.tex (modified) * branches/2011/dev_NOC_UKMO_MERGE/DOC/TexFiles/Chapters/Introduction.tex (modified) * branches/2011/dev_NOC_UKMO_MERGE/DOC/TexFiles/Figures/Fig_OBS_dataplot_main.pdf (copied) * branches/2011/dev_NOC_UKMO_MERGE/DOC/TexFiles/Figures/Fig_OBS_dataplot_prof.pdf (copied) * branches/2011/dev_NOC_UKMO_MERGE/DOC/TexFiles/Figures/logo_UKMO.pdf (modified) * branches/2011/dev_NOC_UKMO_MERGE/DOC/TexFiles/Namelist/namobs_example (modified) * branches/2011/dev_NOC_UKMO_MERGE/DOC/TexFiles/Namelist/namsbc_cpl (modified) * branches/2011/dev_NOC_UKMO_MERGE/DOC/TexFiles/Namelist/namsbc_cpl_co2 (deleted) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/ARCH/arch-PW6_METO.fcm (copied) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/ARCH/arch-ifort_linux_omp.fcm (copied) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/ARCH/arch-mpxlf_aix.fcm (copied) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/ARCH/arch-xlf_aix.fcm (copied) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/ARCH/arch-xlf_pwr6.fcm (copied) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/CONFIG/AMM (copied) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/CONFIG/AMM-PISCES (copied) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/CONFIG/GYRE/EXP00/namelist (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/1_namelist (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/CONFIG/POMME/EXP00/namelist (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/LIM_SRC_2/limsbc_2.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/LIM_SRC_2/limthd_zdf_2.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/BDY (copied) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/DIA/diahsb.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/DOM/dom_oce.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/DOM/phycst.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/DYN/divcur.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/DYN/dynnxt.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_exp.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_flt.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_oce.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/DYN/sshwzv.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/FLO/floblk.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/IOM/prtctl.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/LBC/mppini.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/OBC/obc_vectopt_loop_substitute.h90 (copied) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/OBC/obcdyn.F90 (copied) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/OBC/obcdyn_bt.F90 (copied) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/OBC/obcfla.F90 (copied) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/OBC/obcrst.F90 (copied) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/SBC/cpl_oasis3.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/SBC/fldread.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/SBC/sbc_ice.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/SBC/sbcapr.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_core.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_cice.F90 (copied) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_if.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim_2.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/SOL/solver.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/TRA/traadv.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_cen2.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_eiv.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_muscl.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_muscl2.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_qck.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_tvd.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_ubs.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/TRA/trabbl.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/TRA/traldf.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_bilap.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_bilapg.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_iso.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_iso_grif.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_lap.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/TRA/tranxt.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/TRA/trazdf.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/TRA/trazdf_exp.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/TRA/trazdf_imp.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/oce.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/par_AMM_12km.h90 (copied) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/par_oce.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/step.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/step_oce.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/TOP_SRC/C14b/trcsms_c14b.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/TOP_SRC/CFC/trcnam_cfc.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/TOP_SRC/CFC/trcsms_cfc.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/TOP_SRC/LOBSTER/trcbio.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/TOP_SRC/LOBSTER/trcexp.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/TOP_SRC/LOBSTER/trcopt.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/TOP_SRC/LOBSTER/trcsed.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zsed.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/TOP_SRC/PISCES/trcrst_pisces.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/TOP_SRC/PISCES/trcsms_pisces.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/TOP_SRC/SED/sedini.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/TOP_SRC/SED/sedmodel.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/TOP_SRC/SED/sedwri.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/TOP_SRC/TRP/trcadv.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/TOP_SRC/TRP/trcbbl.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/TOP_SRC/TRP/trcdmp.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/TOP_SRC/TRP/trcldf.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/TOP_SRC/TRP/trcnxt.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/TOP_SRC/TRP/trcrad.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/TOP_SRC/TRP/trcsbc.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/TOP_SRC/TRP/trczdf.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/TOP_SRC/TRP/trdmld_trc.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/TOP_SRC/TRP/trdmod_trc.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/TOP_SRC/oce_trc.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/TOP_SRC/trc.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/TOP_SRC/trcdia.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/TOP_SRC/trcdta.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/TOP_SRC/trcini.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/TOP_SRC/trcnam.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/TOP_SRC/trcrst.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/TOP_SRC/trcstp.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/TOP_SRC/trcsub.F90 (copied) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/TOP_SRC/trcwri.F90 (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/TOOLS/COMPILE/cfg.txt (modified) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/TOOLS/OBSTOOLS (copied) * branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/TOOLS/REBUILD_NEMO (copied) Branch dev_NOC_UKMO_MERGE #890. Step 2. Merge in changes from the ... Mon, 14 Nov 2011 15:24:26 GMT cetlod [3093] * branches/2011/dev_LOCEAN_CMCC_2011/NEMOGCM/NEMO/TOP_SRC/trcstp.F90 (modified) dev_LOCEAN_CMCC_2011:Correct a typo Mon, 14 Nov 2011 14:46:00 GMT cetlod [3092] * branches/2011/dev_LOCEAN_CMCC_2011/DOC/TexFiles/Chapters/Chap_ASM.tex (modified) * branches/2011/dev_LOCEAN_CMCC_2011/NEMOGCM/CONFIG/GYRE/EXP00/namelist (modified) * branches/2011/dev_LOCEAN_CMCC_2011/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist (modified) * branches/2011/dev_LOCEAN_CMCC_2011/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist (modified) * branches/2011/dev_LOCEAN_CMCC_2011/NEMOGCM/CONFIG/POMME/EXP00/namelist (modified) * branches/2011/dev_LOCEAN_CMCC_2011/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90 (modified) * branches/2011/dev_LOCEAN_CMCC_2011/NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90 (modified) dev_LOCEAN_CMCC_2011:follow coding rules for ndivdmp namelist parameter Mon, 14 Nov 2011 14:12:52 GMT cetlod [3091] * branches/2011/dev_LOCEAN_2011/DOC/TexFiles/Chapters/Chap_DOM.tex (modified) * branches/2011/dev_LOCEAN_2011/DOC/TexFiles/Chapters/Chap_TRA.tex (modified) dev_LOCEAN_2011 : update documentation Mon, 14 Nov 2011 14:11:17 GMT cetlod [3090] * branches/2011/dev_LOCEAN_CMCC_2011/DOC/TexFiles/Chapters/Chap_DOM.tex (modified) * branches/2011/dev_LOCEAN_CMCC_2011/DOC/TexFiles/Chapters/Chap_TRA.tex (modified) dev_LOCEAN_CMCC_2011 : update documentation Mon, 14 Nov 2011 13:44:48 GMT acc [3089] * branches/2011/dev_NOC_UKMO_MERGE (copied) Create branch for the merge of all NOC and UKMO 2011 developments. See ... Mon, 14 Nov 2011 13:42:00 GMT acc [3088] * branches/2011/dev_NOC_2011_MERGE/trunk (deleted) Branch dev_NOC_2011_MERGE. Undo erroneous copy of trunk placed here by a ... Mon, 14 Nov 2011 13:17:10 GMT cbricaud [3087] * branches/2011/dev_MERCATOR_INGV_2011_MERGE/trunk (deleted) remove a mistake Mon, 14 Nov 2011 13:13:55 GMT acc [3086] * branches/2011/dev_NOC_2011_MERGE/trunk (copied) Create branch for the merge of all NOC 2011 developments. See ticket ... Mon, 14 Nov 2011 13:13:32 GMT cbricaud [3085] * branches/2011/dev_MERCATOR_INGV_2011_MERGE/DOC/TexFiles/Biblio/Biblio.bib (modified) * branches/2011/dev_MERCATOR_INGV_2011_MERGE/DOC/TexFiles/Chapters/Chap_SBC.tex (modified) * branches/2011/dev_MERCATOR_INGV_2011_MERGE/DOC/TexFiles/Chapters/Chap_ZDF.tex (modified) * branches/2011/dev_MERCATOR_INGV_2011_MERGE/DOC/TexFiles/Namelist/namsbc (modified) * branches/2011/dev_MERCATOR_INGV_2011_MERGE/DOC/TexFiles/Namelist/namsbc_ecmwf (copied) * branches/2011/dev_MERCATOR_INGV_2011_MERGE/DOC/TexFiles/Namelist/namsbc_wave (copied) * branches/2011/dev_MERCATOR_INGV_2011_MERGE/DOC/TexFiles/Namelist/namzdf_ric (modified) * branches/2011/dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/CONFIG/GYRE/EXP00/namelist (modified) * branches/2011/dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist (modified) * branches/2011/dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist (modified) * branches/2011/dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/CONFIG/POMME/EXP00/namelist (modified) * branches/2011/dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/NEMO/LIM_SRC_2/iceini_2.F90 (modified) * branches/2011/dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/NEMO/LIM_SRC_2/limistate_2.F90 (modified) * branches/2011/dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/SBC/sbc_oce.F90 (modified) * branches/2011/dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_core.F90 (modified) * branches/2011/dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_ecmwf.F90 (copied) * branches/2011/dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90 (modified) * branches/2011/dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/SBC/sbcwave.F90 (copied) * branches/2011/dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfric.F90 (modified) commit changes from dev_INGV_2011 Mon, 14 Nov 2011 12:07:57 GMT cetlod [3084] * branches/2011/dev_LOCEAN_CMCC_2011/DOC/TexFiles/Biblio/Biblio.bib (modified) * branches/2011/dev_LOCEAN_CMCC_2011/DOC/TexFiles/Chapters/Chap_ASM.tex (modified) * branches/2011/dev_LOCEAN_CMCC_2011/DOC/TexFiles/Chapters/Chap_DYN.tex (modified) * branches/2011/dev_LOCEAN_CMCC_2011/DOC/TexFiles/Namelist/namasm (modified) * branches/2011/dev_LOCEAN_CMCC_2011/DOC/TexFiles/Namelist/namdyn_vor (modified) * branches/2011/dev_LOCEAN_CMCC_2011/NEMOGCM/CONFIG/GYRE/EXP00/namelist (modified) * branches/2011/dev_LOCEAN_CMCC_2011/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist (modified) * branches/2011/dev_LOCEAN_CMCC_2011/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist (modified) * branches/2011/dev_LOCEAN_CMCC_2011/NEMOGCM/CONFIG/POMME/EXP00/namelist (modified) * branches/2011/dev_LOCEAN_CMCC_2011/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90 (modified) * branches/2011/dev_LOCEAN_CMCC_2011/NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90 (modified) * branches/2011/dev_LOCEAN_CMCC_2011/NEMOGCM/NEMO/OPA_SRC/DYN/dynvor.F90 (modified) dev_LOCEAN_CMCC_2011: add in changes CMCC devlopments into the new ... Mon, 14 Nov 2011 11:35:15 GMT cbricaud [3083] * branches/2011/dev_MERCATOR_INGV_2011_MERGE (copied) create branch for merge MERCATOR and INGV Mon, 14 Nov 2011 11:32:59 GMT cetlod [3082] * branches/2011/dev_LOCEAN_CMCC_2011 (copied) 1st step of the LOCEAN & CMCC merge: Copy LOCEAN branch into the new ... Fri, 11 Nov 2011 12:38:49 GMT acc [3081] * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90 (modified) Branch dev_NOC_2011_MERGE. #874. Step 13. Additional bugfixes to ... Fri, 11 Nov 2011 09:25:50 GMT hliu [3080] * branches/2011/dev_r2802_NOCL_prjhpg/NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90 (modified) remove some used local variables from OPA_SRC/DYN/dynhpg.F90 Thu, 10 Nov 2011 18:48:23 GMT hliu [3079] * branches/2011/dev_r2802_NOCL_prjhpg/NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90 (modified) 1).remove a bug in dynhpg.F90 2). simplified the code of dynhpg.F90 Thu, 10 Nov 2011 17:29:56 GMT rfurner [3078] * branches/2011/dev_UKM0_2011/DOC/NEMO_book.pdf (modified) * branches/2011/dev_UKM0_2011/DOC/TexFiles/Chapters/Chap_SBC.tex (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/BDY/bdydta.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/DOM/phycst.F90 (modified) ticket #885 small bug fix to bdydta, and changes to documentation and ... Thu, 10 Nov 2011 17:23:33 GMT acc [3077] * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/LDF/ldfslp.F90 (modified) Branch dev_NOC_2011_MERGE. Minor correction to ldfslp (Griffies) Thu, 10 Nov 2011 16:26:29 GMT davestorkey [3076] * branches/2011/dev_UKM0_2011/NEMOGCM/CONFIG/AMM/EXP00/namelist (modified) Update AMM namelist for new BDY module. Thu, 10 Nov 2011 14:03:24 GMT acc [3075] * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/NEMO/LIM_SRC_2/iceini_2.F90 (modified) * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/NEMO/LIM_SRC_2/limistate_2.F90 (modified) Branch dev_NOC_2011_MERGE. #874. Step 12. Merge in trunk changes between ... Thu, 10 Nov 2011 12:43:36 GMT acc [3074] * branches/2011/dev_NOC_2011_MERGE/DOC/TexFiles/Chapters/Chap_DYN.tex (modified) * branches/2011/dev_NOC_2011_MERGE/DOC/TexFiles/Namelist/namdyn_hpg (modified) * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/CONFIG/GYRE/EXP00/namelist (modified) * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/1_namelist (modified) * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist (modified) * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist (modified) * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/CONFIG/POMME/EXP00/namelist (modified) * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90 (modified) Branch dev_NOC_2011_MERGE. #874. Step 11. Merge in changes from the ... Thu, 10 Nov 2011 10:07:24 GMT rfurner [3073] * branches/2011/dev_UKM0_2011/DOC/NEMO_book.pdf (modified) * branches/2011/dev_UKM0_2011/DOC/TexFiles/Figures/logo_UKMO.pdf (modified) ticket #885 updated UKMO logo Wed, 09 Nov 2011 17:07:32 GMT acc [3072] * branches/2011/dev_NOC_2011_MERGE/DOC/TexFiles/Chapters/Chap_ZDF.tex (modified) * branches/2011/dev_NOC_2011_MERGE/DOC/TexFiles/Namelist/nambfr (modified) * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/CONFIG/GYRE/EXP00/namelist (modified) * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/1_namelist (modified) * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist (modified) * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist (modified) * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/CONFIG/POMME/EXP00/namelist (modified) * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/DYN/dynbfr.F90 (modified) * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 (modified) * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/DYN/dynzdf_imp.F90 (modified) * branches/2011/dev_NOC_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfbfr.F90 (modified) Branch dev_NOC_2011_MERGE. #874. Step 10. Merge in changes from ... Wed, 09 Nov 2011 16:54:30 GMT rfurner [3071] * branches/2011/dev_UKM0_2011/NEMOGCM/ARCH/arch-PW6_METO.fcm (copied) * branches/2011/dev_UKM0_2011/NEMOGCM/CONFIG/AMM (copied) * branches/2011/dev_UKM0_2011/NEMOGCM/CONFIG/AMM-PISCES (copied) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/par_AMM_12km.h90 (copied) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/par_oce.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/TOOLS/COMPILE/cfg.txt (modified) ticket #885 adding changes from branches/2011/dev_r2855_UKMO1_AMMCONFIG ... Wed, 09 Nov 2011 16:29:17 GMT rfurner [3070] * branches/2011/dev_UKM0_2011/DOC/NEMO_book.pdf (modified) * branches/2011/dev_UKM0_2011/DOC/TexFiles/Chapters/Chap_ASM.tex (modified) * branches/2011/dev_UKM0_2011/DOC/TexFiles/Chapters/Chap_OBS.tex (modified) * branches/2011/dev_UKM0_2011/DOC/TexFiles/Figures/Fig_OBS_dataplot_main.pdf (copied) * branches/2011/dev_UKM0_2011/DOC/TexFiles/Figures/Fig_OBS_dataplot_prof.pdf (copied) * branches/2011/dev_UKM0_2011/DOC/TexFiles/Namelist/namobs_example (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/TOOLS/OBSTOOLS (copied) ticket #885 adding changes from branches/dev_2802_OBStools between r2802 ... Wed, 09 Nov 2011 15:18:38 GMT djlea [3069] * branches/dev_2802_OBStools/DOC/NEMO_book.pdf (modified) * branches/dev_2802_OBStools/DOC/TexFiles/Chapters/Chap_ASM.tex (modified) * branches/dev_2802_OBStools/DOC/TexFiles/Chapters/Chap_OBS.tex (modified) * branches/dev_2802_OBStools/DOC/TexFiles/Namelist/namobs_example (modified) * branches/dev_2802_OBStools/NEMOGCM/TOOLS/OBSTOOLS/dataplot/prend2.pro (modified) * branches/dev_2802_OBStools/NEMOGCM/TOOLS/OBSTOOLS/dataplot/read_feedback.pro (modified) * branches/dev_2802_OBStools/NEMOGCM/TOOLS/OBSTOOLS/dataplot/read_sla.pro (modified) Update OBS and ASM documentation. Small updates and fixes to dataplot. Wed, 09 Nov 2011 13:29:55 GMT hliu [3068] * branches/2011/dev_r2802_NOCL_prjhpg/NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90 (modified) updated pressure-jacobian horizontal pressure gradient code. only one ... Wed, 09 Nov 2011 13:14:18 GMT rfurner [3067] * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/TRA/traadv.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_cen2.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_eiv.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_muscl.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_muscl2.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_qck.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_tvd.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_ubs.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/TRA/trabbl.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/TRA/traldf.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_bilap.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_bilapg.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_iso.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_iso_grif.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_lap.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/TRA/tranxt.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/TRA/trazdf.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/TRA/trazdf_exp.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/TRA/trazdf_imp.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/TOP_SRC/C14b/trcsms_c14b.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/TOP_SRC/CFC/trcnam_cfc.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/TOP_SRC/CFC/trcsms_cfc.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/TOP_SRC/LOBSTER/trcbio.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/TOP_SRC/LOBSTER/trcexp.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/TOP_SRC/LOBSTER/trcopt.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/TOP_SRC/LOBSTER/trcsed.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zsed.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/trcrst_pisces.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/trcsms_pisces.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/TOP_SRC/SED/sedini.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/TOP_SRC/SED/sedmodel.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/TOP_SRC/SED/sedwri.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/TOP_SRC/TRP/trcadv.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/TOP_SRC/TRP/trcbbl.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/TOP_SRC/TRP/trcdmp.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/TOP_SRC/TRP/trcldf.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/TOP_SRC/TRP/trcnxt.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/TOP_SRC/TRP/trcrad.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/TOP_SRC/TRP/trcsbc.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/TOP_SRC/TRP/trczdf.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/TOP_SRC/TRP/trdmld_trc.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/TOP_SRC/TRP/trdmod_trc.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/TOP_SRC/oce_trc.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/TOP_SRC/trc.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/TOP_SRC/trcdia.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/TOP_SRC/trcdta.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/TOP_SRC/trcini.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/TOP_SRC/trcnam.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/TOP_SRC/trcrst.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/TOP_SRC/trcstp.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/TOP_SRC/trcsub.F90 (copied) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/TOP_SRC/trcwri.F90 (modified) ticket #885 adding changes from branches/2011/dev_r2802_TOP_substepping ... Wed, 09 Nov 2011 13:09:37 GMT rfurner [3066] * branches/2011/dev_UKM0_2011/DOC/TexFiles/Biblio/Biblio.bib (modified) * branches/2011/dev_UKM0_2011/DOC/TexFiles/Chapters/Chap_SBC.tex (modified) * branches/2011/dev_UKM0_2011/DOC/TexFiles/Chapters/Introduction.tex (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/LIM_SRC_2/iceini_2.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/LIM_SRC_2/limistate_2.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/DOM/phycst.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/IOM/prtctl.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/LBC/mppini.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/SBC/sbc_ice.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_core.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_cice.F90 (copied) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 (modified) ticket #885 adding changes from branches/2011/dev_r2802_UKMO8_cice ... Wed, 09 Nov 2011 13:02:11 GMT rfurner [3065] * branches/2011/dev_UKM0_2011/DOC/TexFiles/Chapters/Chap_SBC.tex (modified) * branches/2011/dev_UKM0_2011/DOC/TexFiles/Namelist/namsbc_cpl (modified) * branches/2011/dev_UKM0_2011/DOC/TexFiles/Namelist/namsbc_cpl_co2 (deleted) * branches/2011/dev_UKM0_2011/NEMOGCM/CONFIG/GYRE/EXP00/namelist (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/1_namelist (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/CONFIG/POMME/EXP00/namelist (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/LIM_SRC_2/limsbc_2.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/LIM_SRC_2/limthd_zdf_2.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/SBC/cpl_oasis3.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_if.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim_2.F90 (modified) ticket #885 adding changes from branches/2011/dev_r2802_UKMO8_sbccpl ... Wed, 09 Nov 2011 12:07:11 GMT rfurner [3064] * branches/2011/dev_UKM0_2011/NEMOGCM/ARCH/arch-ifort_linux.fcm (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/ARCH/arch-ifort_linux_omp.fcm (copied) * branches/2011/dev_UKM0_2011/NEMOGCM/ARCH/arch-mpxlf_aix.fcm (copied) * branches/2011/dev_UKM0_2011/NEMOGCM/ARCH/arch-xlf_aix.fcm (copied) * branches/2011/dev_UKM0_2011/NEMOGCM/ARCH/arch-xlf_pwr6.fcm (copied) * branches/2011/dev_UKM0_2011/NEMOGCM/TOOLS/REBUILD_NEMO (copied) ticket #885 adding changes from branches/2011/dev_r2802_UKMET3_rebuild ... Wed, 09 Nov 2011 11:42:58 GMT rfurner [3063] * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/NST_SRC/agrif_opa_update.F90 (modified) ticket #885 adding trunk changes between 2787 and 2802 Wed, 09 Nov 2011 10:47:32 GMT rfurner [3062] * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/BDY (copied) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/BDY/bdy_oce.F90 (copied) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/BDY/bdy_par.F90 (copied) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/BDY/bdydta.F90 (copied) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/BDY/bdydyn.F90 (copied) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/BDY/bdyini.F90 (copied) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/BDY/bdytides.F90 (copied) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/BDY/bdytra.F90 (copied) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/BDY/bdyvol.F90 (copied) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/DIA/diahsb.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/DOM/dom_oce.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/DYN/divcur.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/DYN/dynnxt.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_exp.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_flt.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_oce.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/DYN/sshwzv.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/FLO/floblk.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/OBC/obc_vectopt_loop_substitute.h90 (copied) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/OBC/obcdyn.F90 (copied) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/OBC/obcdyn_bt.F90 (copied) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/OBC/obcfla.F90 (copied) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/OBC/obcrst.F90 (copied) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/SBC/fldread.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/SBC/sbcapr.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/SOL/solver.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/TRA/tranxt.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/oce.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/step.F90 (modified) * branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/step_oce.F90 (modified) ticket #885. added in changes from ... Wed, 09 Nov 2011 10:18:20 GMT rfurner [3061] * branches/2011/dev_UKM0_2011 (copied) ticket #885. Step 1: Created dev_UKMO_2011 merge branch Wed, 09 Nov 2011 10:16:50 GMT rfurner [3060] * branches/2011/dev_UKM0_2011 (deleted) removing merge branch to begin again at different revision Wed, 09 Nov 2011 10:00:41 GMT rfurner [3059] * branches/2011/dev_UKM0_2011 (copied) ticket #885. Step 1: Created dev_UKMO_2011 merge branch Wed, 09 Nov 2011 09:57:38 GMT hliu [3058] * branches/2011/dev_r2802_NOCL_vppm (deleted) Removing a unfinished dev branch (vppm) Tue, 08 Nov 2011 12:39:35 GMT hliu [3057] * branches/2011/dev_r2802_NOCL_bfrimp/DOC/NEMO_book.pdf (modified) * branches/2011/dev_r2802_NOCL_bfrimp/DOC/TexFiles/Chapters/Chap_ZDF.tex (modified) * branches/2011/dev_r2802_NOCL_bfrimp/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 (modified) * branches/2011/dev_r2802_NOCL_bfrimp/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfbfr.F90 (modified) update semi-implicit bottom friction branch, Document has been added in ... Tue, 08 Nov 2011 11:10:50 GMT charris [3056] * branches/2011/dev_r2802_UKMO8_sbccpl/DOC/TexFiles/Chapters/Chap_SBC.tex (modified) #662 Additional documentation. Mon, 07 Nov 2011 15:31:17 GMT cbricaud [3055] * branches/2011/dev_MERCATOR_2011_MERGE/NEMOGCM/CONFIG/GYRE/EXP00/namelist (modified) * branches/2011/dev_MERCATOR_2011_MERGE/NEMOGCM/CONFIG/GYRE/cpp_GYRE.fcm (modified) * branches/2011/dev_MERCATOR_2011_MERGE/NEMOGCM/CONFIG/GYRE_LOBSTER/EXP00/iodef.xml (modified) * branches/2011/dev_MERCATOR_2011_MERGE/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/1_namelist (modified) * branches/2011/dev_MERCATOR_2011_MERGE/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist (modified) * branches/2011/dev_MERCATOR_2011_MERGE/NEMOGCM/CONFIG/ORCA2_LIM/cpp_ORCA2_LIM.fcm (modified) * branches/2011/dev_MERCATOR_2011_MERGE/NEMOGCM/CONFIG/ORCA2_LIM_PISCES/EXP00/iodef.xml (modified) * branches/2011/dev_MERCATOR_2011_MERGE/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist (modified) * branches/2011/dev_MERCATOR_2011_MERGE/NEMOGCM/CONFIG/POMME/EXP00/iodef.xml (modified) * branches/2011/dev_MERCATOR_2011_MERGE/NEMOGCM/CONFIG/POMME/EXP00/namelist (modified) * branches/2011/dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/IOM/in_out_manager.F90 (modified) add changes from dev_r2802_MERCATOR9_floats Mon, 07 Nov 2011 15:23:26 GMT cbricaud [3054] * branches/2011/dev_r2802_MERCATOR9_floats/NEMOGCM/CONFIG/GYRE/EXP00/namelist (modified) * branches/2011/dev_r2802_MERCATOR9_floats/NEMOGCM/CONFIG/GYRE/cpp_GYRE.fcm (modified) * branches/2011/dev_r2802_MERCATOR9_floats/NEMOGCM/CONFIG/GYRE_LOBSTER/EXP00/iodef.xml (modified) * branches/2011/dev_r2802_MERCATOR9_floats/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/1_namelist (modified) * branches/2011/dev_r2802_MERCATOR9_floats/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist (modified) * branches/2011/dev_r2802_MERCATOR9_floats/NEMOGCM/CONFIG/ORCA2_LIM/cpp_ORCA2_LIM.fcm (modified) * branches/2011/dev_r2802_MERCATOR9_floats/NEMOGCM/CONFIG/ORCA2_LIM_PISCES/EXP00/iodef.xml (modified) * branches/2011/dev_r2802_MERCATOR9_floats/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist (modified) * branches/2011/dev_r2802_MERCATOR9_floats/NEMOGCM/CONFIG/POMME/EXP00/iodef.xml (modified) * branches/2011/dev_r2802_MERCATOR9_floats/NEMOGCM/CONFIG/POMME/EXP00/namelist (modified) add coorections Mon, 07 Nov 2011 15:15:57 GMT cbricaud [3053] * branches/2011/dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90 (modified) add corrections Mon, 07 Nov 2011 15:14:37 GMT cbricaud [3052] * branches/2011/dev_r2802_MERCATOR9_floats/NEMOGCM/NEMO/OPA_SRC/IOM/in_out_manager.F90 (modified) * branches/2011/dev_r2802_MERCATOR9_floats/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90 (modified) add corrections Mon, 07 Nov 2011 15:03:29 GMT cbricaud [3051] * branches/2011/dev_MERCATOR_2011_MERGE/DOC/TexFiles/Chapters/Chap_DIA.tex (modified) * branches/2011/dev_MERCATOR_2011_MERGE/DOC/TexFiles/Namelist/namflo (modified) * branches/2011/dev_MERCATOR_2011_MERGE/NEMOGCM/CONFIG/GYRE/EXP00/iodef.xml (modified) * branches/2011/dev_MERCATOR_2011_MERGE/NEMOGCM/CONFIG/GYRE/EXP00/namelist (modified) * branches/2011/dev_MERCATOR_2011_MERGE/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/iodef.xml (modified) * branches/2011/dev_MERCATOR_2011_MERGE/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist (modified) * branches/2011/dev_MERCATOR_2011_MERGE/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist (modified) * branches/2011/dev_MERCATOR_2011_MERGE/NEMOGCM/CONFIG/POMME/EXP00/namelist (modified) * branches/2011/dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/FLO/flo4rk.F90 (modified) * branches/2011/dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/FLO/flo_oce.F90 (modified) * branches/2011/dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/FLO/floats.F90 (modified) * branches/2011/dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/FLO/flodom.F90 (modified) * branches/2011/dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/FLO/florst.F90 (copied) * branches/2011/dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/FLO/flowri.F90 (modified) * branches/2011/dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/IOM/in_out_manager.F90 (modified) * branches/2011/dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90 (modified) * branches/2011/dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 (modified) add changes from dev_r2802_MERCATOR9_floats Mon, 07 Nov 2011 14:11:34 GMT acc [3050] * branches/2011/dev_LOCEAN_2011/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-ALTIX_NAUTILUS_MPT (modified) * branches/2011/dev_LOCEAN_2011/NEMOGCM/SETTE/fcm_job.sh (modified) Branch: 2011/dev_LOCEAN_2011. Minor corrections to SETTE scripts and ... Mon, 07 Nov 2011 13:22:59 GMT cbricaud [3049] * branches/2011/dev_MERCATOR_2011_MERGE/DOC/NEMO_book.pdf (modified) * branches/2011/dev_MERCATOR_2011_MERGE/DOC/TexFiles/Chapters/Chap_DIA.tex (modified) * branches/2011/dev_MERCATOR_2011_MERGE/DOC/TexFiles/Figures/logo_MERCATOR.pdf (modified) * branches/2011/dev_MERCATOR_2011_MERGE/DOC/TexFiles/Namelist/namdct (copied) * branches/2011/dev_MERCATOR_2011_MERGE/NEMOGCM/CONFIG/GYRE/EXP00/namelist (modified) * branches/2011/dev_MERCATOR_2011_MERGE/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist (modified) * branches/2011/dev_MERCATOR_2011_MERGE/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist (modified) * branches/2011/dev_MERCATOR_2011_MERGE/NEMOGCM/CONFIG/POMME/EXP00/namelist (modified) * branches/2011/dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/NST_SRC/agrif_opa_update.F90 (modified) * branches/2011/dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/DIA/diadct.F90 (copied) * branches/2011/dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/IOM/in_out_manager.F90 (modified) * branches/2011/dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 (modified) * branches/2011/dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/step.F90 (modified) * branches/2011/dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/step_oce.F90 (modified) * branches/2011/dev_MERCATOR_2011_MERGE/NEMOGCM/TOOLS/SECTIONS_DIADCT (copied) add changes from dev_r2802_MERCATOR10_diadct Mon, 07 Nov 2011 13:05:19 GMT cbricaud [3048] * branches/2011/dev_MERCATOR_2011_MERGE/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist (modified) cosmetic change on namelist