# # ChangeLog for branches/2011/dev_NOC_UKMO_MERGE # # Generated by Trac 1.0.1 # 2024-04-28T00:52:39+02:00 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 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 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 ... 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 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: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 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 ... Thu, 22 Sep 2011 10:35:29 GMT acc [2855] * trunk/NEMOGCM/NEMO/LIM_SRC_2/iceini_2.F90 (modified) * trunk/NEMOGCM/NEMO/LIM_SRC_2/limistate_2.F90 (modified) Minor corrections to LIM2 initialisation and allocation, see ticket: ...