# # ChangeLog for branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/CONFIG # # Generated by Trac 1.0.1 # 2024-04-27T10:55:19+02:00 Fri, 27 Jan 2012 14:37:34 GMT rblod [3289] * 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/iodef.xml (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/EXTERNAL/AGRIF/LIB/Makefile (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/EXTERNAL/AGRIF/LIB/Makefile.lex (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/EXTERNAL/AGRIF/LIB/UtilFortran.c (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/EXTERNAL/AGRIF/LIB/UtilListe.c (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/EXTERNAL/AGRIF/LIB/Writedeclarations.c (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/EXTERNAL/AGRIF/LIB/decl.h (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/EXTERNAL/AGRIF/LIB/fortran.c (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/EXTERNAL/AGRIF/LIB/fortran.tab.c (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/EXTERNAL/AGRIF/LIB/fortran.y (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/EXTERNAL/AGRIF/LIB/fortran.yy.c (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/EXTERNAL/AGRIF/LIB/main.c (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/NST_SRC/agrif_user.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/lib_fortran.F90 (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 (modified) Fix agrif for 3_4_beta see ticket #921 Wed, 04 Jan 2012 15:59:04 GMT cbricaud [3247] * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/CONFIG/AMM12/EXP00/namelist (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/NEMO/OPA_SRC/DIA/diaharm.F90 (modified) correction for diaharm.F90: see ticket 901 Tue, 13 Dec 2011 11:34:45 GMT clevy [3220] * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/CONFIG/AMM12/EXP00/namelist (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/CONFIG/AMM12_PISCES/EXP00/namelist (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/CONFIG/GYRE/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) add namelist variable nn_timing, see ticket #829 Tue, 13 Dec 2011 10:32:08 GMT smasson [3219] * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/CONFIG/makenemo (modified) bugfix for option -s of makenemo Mon, 12 Dec 2011 12:43:24 GMT rblod [3213] * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/CONFIG/makenemo (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/TOOLS/maketools (modified) Correct maketools according to previous changes Wed, 07 Dec 2011 15:11:41 GMT rblod [3204] * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/CONFIG/POMME (deleted) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/CONFIG/cfg.txt (modified) Remove OMME configuration see ticket #895 Wed, 07 Dec 2011 15:07:49 GMT rblod [3201] * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/CONFIG/cfg.txt (copied) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/CONFIG/makenemo (modified) Final (?) commit for ticket #894 Wed, 07 Dec 2011 14:53:38 GMT rblod [3198] * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/ARCH/arch-gfortran_osx.fcm (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/ARCH/arch-ifort_osx.fcm (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/CONFIG/makenemo (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/TOOLS/COMPILE/Fcheck_archfile.sh (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/TOOLS/COMPILE/Fcheck_config.sh (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/TOOLS/COMPILE/Fclean_config.sh (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/TOOLS/COMPILE/Fcopy_dir.sh (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/TOOLS/COMPILE/Flist_archfile.sh (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/TOOLS/COMPILE/Fmake_WORK.sh (modified) Add new functionalities to makenemo, see ticket #894 Mon, 05 Dec 2011 09:37:00 GMT davestorkey [3190] * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/CONFIG/AMM12/EXP00/namelist (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/CONFIG/AMM12_PISCES/EXP00/namelist (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/CONFIG/GYRE/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) Remove redundant variables from nambdy namelist. Thu, 24 Nov 2011 15:38:35 GMT cetlod [3177] * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/CONFIG/AMM12_PISCES/EXP00/namelist_pisces (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/CONFIG/ORCA2_LIM_PISCES/EXP00/namelist_pisces (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist_pisces (modified) update PISCES namelist according to changeset:3174 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 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 ... 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 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