# # ChangeLog for branches/2011/dev_NEMO_MERGE_2011/DOC # # Generated by Trac 1.0.1 # 2024-04-25T11:09:53+02:00 Wed, 18 Jan 2012 15:36:41 GMT agn [3268] * branches/2011/dev_NEMO_MERGE_2011/DOC/NEMO_book.tex (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Chapters/Annex_ISO.tex (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Namelist/namtra_ldf (modified) dev_NEMO_MERGE_2011:(DOC) Corrected Griffies namelist & refs Wed, 18 Jan 2012 10:28:11 GMT agn [3267] * branches/2011/dev_NEMO_MERGE_2011/DOC/NEMO_book.tex (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Chapters/Annex_ISO.tex (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Chapters/Chap_DOM.tex (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Chapters/Chap_LDF.tex (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Chapters/Chap_TRA.tex (modified) dev_NEMO_MERGE_2011:(DOC) Finish griffies description, remove need for ... Wed, 21 Dec 2011 16:11:36 GMT rblod [3236] * branches/2011/dev_NEMO_MERGE_2011/DOC/NEMO_book.pdf (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/NEMO_book.tex (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Figures/logo_ALL.pdf (added) Update front page Wed, 21 Dec 2011 14:43:54 GMT rblod [3235] * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Chapters/Introduction.tex (modified) Update introuction with changes 3.3/3.4 Wed, 21 Dec 2011 13:21:49 GMT rblod [3234] * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Chapters/Chap_CFG.tex (modified) Add AMM description Wed, 21 Dec 2011 11:54:03 GMT agn [3232] * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Chapters/Chap_DIA.tex (modified) dev_NEMO_MERGE_2011: corrected bug in DOC/TexFiles/Chapters/Chap_DIA.tex Tue, 20 Dec 2011 11:39:04 GMT davestorkey [3228] * branches/2011/dev_NEMO_MERGE_2011/DOC/NEMO_book.pdf (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Chapters/Chap_LBC.tex (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Namelist/nambdy (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Namelist/nambdy_dta (added) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Namelist/nambdy_dta2 (added) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Namelist/nambdy_index (added) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Namelist/nambdy_tide (modified) Update documentation for BDY changes at 3.4. Wed, 14 Dec 2011 11:52:44 GMT agn [3221] * branches/2011/dev_NEMO_MERGE_2011/DOC/NEMO_book.tex (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Biblio/Biblio.bib (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Chapters/Abstracts_Foreword.tex (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Chapters/Annex_A.tex (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Chapters/Annex_B.tex (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Chapters/Annex_C.tex (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Chapters/Annex_D.tex (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Chapters/Annex_E.tex (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Chapters/Chap_CFG.tex (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Chapters/Chap_Conservation.tex (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Chapters/Chap_DIA.tex (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Chapters/Chap_DOM.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_LBC.tex (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Chapters/Chap_LDF.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_Model_Basics.tex (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Chapters/Chap_Model_Basics_zstar.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_STP.tex (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Chapters/Chap_TRA.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.IV_adv_MUSCL.pdf (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Figures/Fig.IV_adv_flx.pdf (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Figures/Fig_DYN_dynspg_ts.pdf (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Figures/Fig_DYN_een_triad.pdf (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Figures/Fig_Gibraltar.pdf (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Figures/Fig_Gibraltar2.pdf (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Figures/Fig_IPSL_bande.pdf (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Figures/Fig_I_earth_referential.pdf (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Figures/Fig_I_ocean_bc.pdf (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Figures/Fig_LBC_jperio.pdf (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Figures/Fig_LBC_shlat.pdf (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Figures/Fig_LBC_uv.pdf (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Figures/Fig_LBC_zoom.pdf (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Figures/Fig_LDF_ZDF1.pdf (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Figures/Fig_North_Fold_T.pdf (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Figures/Fig_TRA_geoth.pdf (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Figures/Fig_adv_scheme.pdf (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Figures/Fig_cell.pdf (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Figures/Fig_cla.pdf (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Figures/Fig_eiv_slp.pdf (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Figures/Fig_hgr.pdf (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Figures/Fig_index_hor.pdf (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Figures/Fig_index_vert.pdf (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Figures/Fig_mixing_length.pdf (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Figures/Fig_mpp.pdf (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Figures/Fig_mppini2.pdf (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Figures/Fig_npc.pdf (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Figures/Fig_overlap.pdf (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Figures/Fig_sco_function.pdf (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Figures/Fig_z_zps_s_sps.pdf (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Figures/Fig_zdfddm.pdf (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Figures/Fig_zgr.pdf (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Figures/Fig_zgr_e3.pdf (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Figures/NEMO_logo.pdf (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Figures/Partial_step_scheme.pdf (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Figures/nemo_text_essai.pdf (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/NEMO.ist (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Namelist/nambbl (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Namelist/nambfr (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Namelist/namcla (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Namelist/namctl (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Namelist/namdom (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Namelist/namdyn_adv (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Namelist/namdyn_hpg (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Namelist/namdyn_ldf (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Namelist/namdyn_spg (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Namelist/namdyn_vor (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Namelist/nameos (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Namelist/namflo (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Namelist/namlbc (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Namelist/nammpp (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Namelist/namobc (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Namelist/namptr (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Namelist/namrun (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Namelist/namsbc (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Namelist/namsbc_alb (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Namelist/namsbc_ana (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Namelist/namsbc_clio (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Namelist/namsbc_core (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Namelist/namsbc_cpl (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Namelist/namsbc_flx (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Namelist/namsbc_rnf (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Namelist/namsbc_ssr (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Namelist/namsol (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Namelist/namtra_adv (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Namelist/namtra_ldf (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Namelist/namtra_qsr (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Namelist/namtrd (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Namelist/namtsd (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Namelist/namzdf (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Namelist/namzdf_ddm (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Namelist/namzdf_gls (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Namelist/namzdf_kpp (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Namelist/namzdf_ric (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Namelist/namzdf_tke (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Namelist/namzgr (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Namelist/namzgr_sco (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/ametsoc.bst (modified) * branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/LDF/ldfslp.F90 (modified) Tue, 13 Dec 2011 10:31:24 GMT agn [3218] * branches/2011/dev_NEMO_MERGE_2011/DOC/NEMO_book.tex (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Biblio/Biblio.bib (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Chapters/Abstracts_Foreword.tex (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Chapters/Annex_A.tex (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Chapters/Annex_B.tex (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Chapters/Annex_ISO.tex (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Chapters/Chap_ASM.tex (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Chapters/Chap_CFG.tex (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Chapters/Chap_DIA.tex (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Chapters/Chap_DOM.tex (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Chapters/Chap_LDF.tex (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Chapters/Chap_Model_Basics.tex (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Chapters/Chap_SBC.tex (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Figures/Fig_bdry_triads.pdf (added) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Figures/Fig_triad_MLB.pdf (added) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Namelist/namtra_ldf (modified) * branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/math_abbrev.sty (modified) agn: changes to documentation in dev_NEMO_MERGE_2011 --Reordered ... 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 ... 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