Version 4 (modified by cetlod, 13 years ago) (diff) |
---|
Last edited Timestamp?
Author : NEMO Team
ticket : #892
Branch : dev_NEMO_MERGE_2011
Description
Final step of the merge of all the branches
1st step : Copy the LOCEAN_CMCC_INGV_MERCATOR branch into the new branch==
svn copy svn+ssh://cetlod@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011 svn+ssh://cetlod@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_NEMO_MERGE_2011 -m "1st step of the final merge: Copy dev_LOCEAN_CMCC_INGV_MERCATOR_2011 branch into the new branch named dev_NEMO_MERGE_2011"
2nd step
svn co svn+ssh://cetlod@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_NEMO_MERGE_2011 dev_NEMO_MERGE_2011 cd dev_NEMO_MERGE_2011 svn merge -r 2855:3114 svn+ssh://cetlod@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_NOC_UKMO_MERGE . U DOC/TexFiles/Biblio/Biblio.bib A DOC/TexFiles/Figures/Fig_OBS_dataplot_main.pdf A DOC/TexFiles/Figures/Fig_OBS_dataplot_prof.pdf U DOC/TexFiles/Figures/logo_UKMO.pdf U DOC/TexFiles/Chapters/Introduction.tex U DOC/TexFiles/Chapters/Chap_DYN.tex U DOC/TexFiles/Chapters/Chap_MISC.tex U DOC/TexFiles/Chapters/Chap_SBC.tex U DOC/TexFiles/Chapters/Chap_ASM.tex U DOC/TexFiles/Chapters/Chap_OBS.tex U DOC/TexFiles/Chapters/Chap_ZDF.tex D DOC/TexFiles/Namelist/namsbc_cpl_co2 U DOC/TexFiles/Namelist/namdyn_hpg U DOC/TexFiles/Namelist/namsbc_cpl U DOC/TexFiles/Namelist/nambfr U DOC/TexFiles/Namelist/namtra_ldf U DOC/TexFiles/Namelist/namobs_example A DOC/TexFiles/Namelist/namdyn_nept A NEMOGCM/TOOLS/OBSTOOLS A NEMOGCM/TOOLS/OBSTOOLS/src A NEMOGCM/TOOLS/OBSTOOLS/src/fbstat.F90 A NEMOGCM/TOOLS/OBSTOOLS/src/obsvel_io.h90 A NEMOGCM/TOOLS/OBSTOOLS/src/enact2fb.F90 A NEMOGCM/TOOLS/OBSTOOLS/src/omonainfo.F90 A NEMOGCM/TOOLS/OBSTOOLS/src/proftools.F90 A NEMOGCM/TOOLS/OBSTOOLS/src/lbcnfd.F90 A NEMOGCM/TOOLS/OBSTOOLS/src/coords.F90 A NEMOGCM/TOOLS/OBSTOOLS/src/fbstatncio.F90 A NEMOGCM/TOOLS/OBSTOOLS/src/distance.h90 A NEMOGCM/TOOLS/OBSTOOLS/src/date_utils.F90 A NEMOGCM/TOOLS/OBSTOOLS/src/obs_prof_io.F90 A NEMOGCM/TOOLS/OBSTOOLS/src/fbacctype.F90 A NEMOGCM/TOOLS/OBSTOOLS/src/obs_conv_functions.h90 A NEMOGCM/TOOLS/OBSTOOLS/src/ioncdf.F90 A NEMOGCM/TOOLS/OBSTOOLS/src/corio2fb.F90 A NEMOGCM/TOOLS/OBSTOOLS/src/ddatetoymdhms.h90 A NEMOGCM/TOOLS/OBSTOOLS/src/obssla_types.h90 A NEMOGCM/TOOLS/OBSTOOLS/src/fbmatchup.F90 A NEMOGCM/TOOLS/OBSTOOLS/src/fbthin.F90 A NEMOGCM/TOOLS/OBSTOOLS/src/lib_mpp.F90 A NEMOGCM/TOOLS/OBSTOOLS/src/greg2jul.h90 A NEMOGCM/TOOLS/OBSTOOLS/src/str_c_to_for.h90 A NEMOGCM/TOOLS/OBSTOOLS/src/convmerge.F90 A NEMOGCM/TOOLS/OBSTOOLS/src/par_kind.F90 A NEMOGCM/TOOLS/OBSTOOLS/src/in_out_manager.F90 A NEMOGCM/TOOLS/OBSTOOLS/src/fbcomb.F90 A NEMOGCM/TOOLS/OBSTOOLS/src/fbaccdata.F90 A NEMOGCM/TOOLS/OBSTOOLS/src/ctl_stop.h90 A NEMOGCM/TOOLS/OBSTOOLS/src/grt_cir_dis.h90 A NEMOGCM/TOOLS/OBSTOOLS/src/fbsel.F90 A NEMOGCM/TOOLS/OBSTOOLS/src/obsprof_io.h90 A NEMOGCM/TOOLS/OBSTOOLS/src/obs_utils.F90 A NEMOGCM/TOOLS/OBSTOOLS/src/fbprint.F90 A NEMOGCM/TOOLS/OBSTOOLS/src/dom_oce.F90 A NEMOGCM/TOOLS/OBSTOOLS/src/obs_sla_types.F90 A NEMOGCM/TOOLS/OBSTOOLS/src/obs_fbm.F90 A NEMOGCM/TOOLS/OBSTOOLS/src/obs_conv.F90 A NEMOGCM/TOOLS/OBSTOOLS/src/par_oce.F90 A NEMOGCM/TOOLS/OBSTOOLS/src/toolspar_kind.F90 A NEMOGCM/TOOLS/OBSTOOLS/src/obs_sla_io.F90 A NEMOGCM/TOOLS/OBSTOOLS/src/sla2fb.F90 A NEMOGCM/TOOLS/OBSTOOLS/src/obssla_io.h90 A NEMOGCM/TOOLS/OBSTOOLS/src/index_sort.F90 A NEMOGCM/TOOLS/OBSTOOLS/src/grt_cir_dis_saa.h90 A NEMOGCM/TOOLS/OBSTOOLS/src/obs_vel_io.F90 A NEMOGCM/TOOLS/OBSTOOLS/src/vel2fb.F90 A NEMOGCM/TOOLS/OBSTOOLS/src/nctools.F90 A NEMOGCM/TOOLS/OBSTOOLS/src/wrk_nemo.F90 A NEMOGCM/TOOLS/OBSTOOLS/dataplot A NEMOGCM/TOOLS/OBSTOOLS/dataplot/dataplot_txttimeseries.pro A NEMOGCM/TOOLS/OBSTOOLS/dataplot/nice_contourlevels.pro A NEMOGCM/TOOLS/OBSTOOLS/dataplot/pr2.pro A NEMOGCM/TOOLS/OBSTOOLS/dataplot/eos_nemo.pro A NEMOGCM/TOOLS/OBSTOOLS/dataplot/read_seaice.pro A NEMOGCM/TOOLS/OBSTOOLS/dataplot/read_sst.pro A NEMOGCM/TOOLS/OBSTOOLS/dataplot/read_enact.pro A NEMOGCM/TOOLS/OBSTOOLS/dataplot/dataplot.pro A NEMOGCM/TOOLS/OBSTOOLS/dataplot/prend2.pro A NEMOGCM/TOOLS/OBSTOOLS/dataplot/read_sla.pro A NEMOGCM/TOOLS/OBSTOOLS/dataplot/colorbar_idl.pro A NEMOGCM/TOOLS/OBSTOOLS/dataplot/read_cdfobs.pro A NEMOGCM/TOOLS/OBSTOOLS/dataplot/README A NEMOGCM/TOOLS/OBSTOOLS/dataplot/read_feedback.pro A NEMOGCM/TOOLS/REBUILD_NEMO A NEMOGCM/TOOLS/REBUILD_NEMO/rebuild_nemo A NEMOGCM/TOOLS/REBUILD_NEMO/src A NEMOGCM/TOOLS/REBUILD_NEMO/src/rebuild_nemo.f90 C NEMOGCM/TOOLS/COMPILE/cfg.txt A NEMOGCM/SETTE/input_AMM12_PISCES.cfg A NEMOGCM/SETTE/input_AMM12.cfg C NEMOGCM/SETTE/sette.sh A NEMOGCM/CONFIG/AMM12_PISCES A NEMOGCM/CONFIG/AMM12_PISCES/cpp_AMM12_PISCES.fcm A NEMOGCM/CONFIG/AMM12_PISCES/EXP00 A NEMOGCM/CONFIG/AMM12_PISCES/EXP00/namelist_pisces A NEMOGCM/CONFIG/AMM12_PISCES/EXP00/iodef.xml A NEMOGCM/CONFIG/AMM12_PISCES/EXP00/xmlio_server.def A NEMOGCM/CONFIG/AMM12_PISCES/EXP00/namelist A NEMOGCM/CONFIG/AMM12_PISCES/EXP00/namelist_top C NEMOGCM/CONFIG/GYRE/EXP00/namelist C NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist U NEMOGCM/CONFIG/ORCA2_LIM/EXP00/1_namelist C NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist A NEMOGCM/CONFIG/AMM12 A NEMOGCM/CONFIG/AMM12/cpp_AMM12.fcm A NEMOGCM/CONFIG/AMM12/EXP00 A NEMOGCM/CONFIG/AMM12/EXP00/iodef.xml A NEMOGCM/CONFIG/AMM12/EXP00/xmlio_server.def A NEMOGCM/CONFIG/AMM12/EXP00/namelist C NEMOGCM/CONFIG/POMME/EXP00/namelist A NEMOGCM/ARCH/arch-PW6_METO.fcm A NEMOGCM/ARCH/arch-xlf_pwr6.fcm A NEMOGCM/ARCH/arch-ifort_linux_omp.fcm A NEMOGCM/ARCH/arch-mpxlf_aix.fcm U NEMOGCM/ARCH/arch-ALTIX_NAUTILUS4.fcm D NEMOGCM/ARCH/arch-xlf_aix.fcm A NEMOGCM/ARCH/arch-xlf_aix.fcm U NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90 U NEMOGCM/NEMO/OPA_SRC/DOM/dom_oce.F90 U NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90 C NEMOGCM/NEMO/OPA_SRC/DOM/istate.F90 U NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90 U NEMOGCM/NEMO/OPA_SRC/DOM/phycst.F90 U NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 U NEMOGCM/NEMO/OPA_SRC/IOM/prtctl.F90 U NEMOGCM/NEMO/OPA_SRC/DYN/dynbfr.F90 C NEMOGCM/NEMO/OPA_SRC/DYN/dynnxt.F90 C NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90 U NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_oce.F90 U NEMOGCM/NEMO/OPA_SRC/DYN/divcur.F90 U NEMOGCM/NEMO/OPA_SRC/DYN/dynzdf_imp.F90 U NEMOGCM/NEMO/OPA_SRC/DYN/sshwzv.F90 U NEMOGCM/NEMO/OPA_SRC/DYN/dynspg.F90 U NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_flt.F90 U NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 U NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_exp.F90 A NEMOGCM/NEMO/OPA_SRC/DYN/dynnept.F90 U NEMOGCM/NEMO/OPA_SRC/SOL/solver.F90 U NEMOGCM/NEMO/OPA_SRC/step_oce.F90 U NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90 U NEMOGCM/NEMO/OPA_SRC/LBC/lbcnfd.F90 U NEMOGCM/NEMO/OPA_SRC/LBC/mppini.F90 U NEMOGCM/NEMO/OPA_SRC/oce.F90 D NEMOGCM/NEMO/OPA_SRC/OBC/obcdyn_bt.F90 A NEMOGCM/NEMO/OPA_SRC/OBC/obcdyn_bt.F90 D NEMOGCM/NEMO/OPA_SRC/OBC/obcfla.F90 A NEMOGCM/NEMO/OPA_SRC/OBC/obcfla.F90 U NEMOGCM/NEMO/OPA_SRC/OBC/obcdta.F90 D NEMOGCM/NEMO/OPA_SRC/OBC/obcrst.F90 A NEMOGCM/NEMO/OPA_SRC/OBC/obcrst.F90 D NEMOGCM/NEMO/OPA_SRC/OBC/obc_vectopt_loop_substitute.h90 A NEMOGCM/NEMO/OPA_SRC/OBC/obc_vectopt_loop_substitute.h90 D NEMOGCM/NEMO/OPA_SRC/OBC/obcdyn.F90 A NEMOGCM/NEMO/OPA_SRC/OBC/obcdyn.F90 C NEMOGCM/NEMO/OPA_SRC/LDF/ldfslp.F90 U NEMOGCM/NEMO/OPA_SRC/LDF/ldftra_oce.F90 U NEMOGCM/NEMO/OPA_SRC/LDF/ldftra.F90 U NEMOGCM/NEMO/OPA_SRC/SBC/sbc_ice.F90 U NEMOGCM/NEMO/OPA_SRC/SBC/cpl_oasis3.F90 U NEMOGCM/NEMO/OPA_SRC/SBC/fldread.F90 U NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_if.F90 C NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90 U NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90 C NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_core.F90 U NEMOGCM/NEMO/OPA_SRC/SBC/sbcapr.F90 U NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim_2.F90 A NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_cice.F90 D NEMOGCM/NEMO/OPA_SRC/BDY/bdy_oce.F90 D NEMOGCM/NEMO/OPA_SRC/BDY/bdytra.F90 D NEMOGCM/NEMO/OPA_SRC/BDY/bdydta.F90 D NEMOGCM/NEMO/OPA_SRC/BDY/bdytides.F90 D NEMOGCM/NEMO/OPA_SRC/BDY/bdydyn.F90 D NEMOGCM/NEMO/OPA_SRC/BDY/bdyini.F90 D NEMOGCM/NEMO/OPA_SRC/BDY/bdyice.F90 D NEMOGCM/NEMO/OPA_SRC/BDY/bdyvol.F90 D NEMOGCM/NEMO/OPA_SRC/BDY/bdy_par.F90 D NEMOGCM/NEMO/OPA_SRC/BDY A NEMOGCM/NEMO/OPA_SRC/BDY A NEMOGCM/NEMO/OPA_SRC/BDY/bdyice_lim2.F90 A NEMOGCM/NEMO/OPA_SRC/BDY/bdy_oce.F90 A NEMOGCM/NEMO/OPA_SRC/BDY/bdytra.F90 A NEMOGCM/NEMO/OPA_SRC/BDY/bdydta.F90 A NEMOGCM/NEMO/OPA_SRC/BDY/bdytides.F90 A NEMOGCM/NEMO/OPA_SRC/BDY/bdydyn.F90 A NEMOGCM/NEMO/OPA_SRC/BDY/bdyini.F90 A NEMOGCM/NEMO/OPA_SRC/BDY/bdydyn2d.F90 A NEMOGCM/NEMO/OPA_SRC/BDY/bdyvol.F90 A NEMOGCM/NEMO/OPA_SRC/BDY/bdy_par.F90 A NEMOGCM/NEMO/OPA_SRC/BDY/bdydyn3d.F90 U NEMOGCM/NEMO/OPA_SRC/FLO/floblk.F90 U NEMOGCM/NEMO/OPA_SRC/ZDF/zdfbfr.F90 U NEMOGCM/NEMO/OPA_SRC/TRA/traldf_bilap.F90 U NEMOGCM/NEMO/OPA_SRC/TRA/traadv_eiv.F90 U NEMOGCM/NEMO/OPA_SRC/TRA/traadv_muscl.F90 U NEMOGCM/NEMO/OPA_SRC/TRA/traldf_iso.F90 U NEMOGCM/NEMO/OPA_SRC/TRA/eosbn2.F90 C NEMOGCM/NEMO/OPA_SRC/TRA/traadv_cen2.F90 U NEMOGCM/NEMO/OPA_SRC/TRA/trazdf.F90 U NEMOGCM/NEMO/OPA_SRC/TRA/traadv_ubs.F90 U NEMOGCM/NEMO/OPA_SRC/TRA/traldf_bilapg.F90 U NEMOGCM/NEMO/OPA_SRC/TRA/traldf_iso_grif.F90 U NEMOGCM/NEMO/OPA_SRC/TRA/traadv_tvd.F90 U NEMOGCM/NEMO/OPA_SRC/TRA/trazdf_imp.F90 U NEMOGCM/NEMO/OPA_SRC/TRA/trabbl.F90 U NEMOGCM/NEMO/OPA_SRC/TRA/traadv_muscl2.F90 U NEMOGCM/NEMO/OPA_SRC/TRA/trazdf_exp.F90 U NEMOGCM/NEMO/OPA_SRC/TRA/traldf_lap.F90 U NEMOGCM/NEMO/OPA_SRC/TRA/traldf.F90 U NEMOGCM/NEMO/OPA_SRC/TRA/traadv_qck.F90 U NEMOGCM/NEMO/OPA_SRC/TRA/traadv_qck.F90 U NEMOGCM/NEMO/OPA_SRC/TRA/tranxt.F90 U NEMOGCM/NEMO/OPA_SRC/TRA/traadv.F90 U NEMOGCM/NEMO/OPA_SRC/DIA/diahsb.F90 A NEMOGCM/NEMO/OPA_SRC/par_AMM_12km.h90 U NEMOGCM/NEMO/OPA_SRC/par_oce.F90 U NEMOGCM/NEMO/OPA_SRC/step.F90 U NEMOGCM/NEMO/LIM_SRC_2/limsbc_2.F90 U NEMOGCM/NEMO/LIM_SRC_2/limthd_zdf_2.F90 C NEMOGCM/NEMO/TOP_SRC/trcnam.F90 C NEMOGCM/NEMO/TOP_SRC/trc.F90 C NEMOGCM/NEMO/TOP_SRC/trcini.F90 C NEMOGCM/NEMO/TOP_SRC/PISCES/trcrst_pisces.F90 C NEMOGCM/NEMO/TOP_SRC/PISCES/p4zsed.F90 C NEMOGCM/NEMO/TOP_SRC/PISCES/trcsms_pisces.F90 U NEMOGCM/NEMO/TOP_SRC/C14b/trcsms_c14b.F90 U NEMOGCM/NEMO/TOP_SRC/CFC/trcsms_cfc.F90 U NEMOGCM/NEMO/TOP_SRC/CFC/trcnam_cfc.F90 A NEMOGCM/NEMO/TOP_SRC/trcsub.F90 U NEMOGCM/NEMO/TOP_SRC/trcdia.F90 U NEMOGCM/NEMO/TOP_SRC/TRP/trcnxt.F90 U NEMOGCM/NEMO/TOP_SRC/TRP/trcadv.F90 U NEMOGCM/NEMO/TOP_SRC/TRP/trcbbl.F90 U NEMOGCM/NEMO/TOP_SRC/TRP/trcdmp.F90 U NEMOGCM/NEMO/TOP_SRC/TRP/trczdf.F90 C NEMOGCM/NEMO/TOP_SRC/TRP/trcldf.F90 U NEMOGCM/NEMO/TOP_SRC/TRP/trdmld_trc.F90 U NEMOGCM/NEMO/TOP_SRC/TRP/trcrad.F90 U NEMOGCM/NEMO/TOP_SRC/TRP/trcsbc.F90 U NEMOGCM/NEMO/TOP_SRC/TRP/trdmod_trc.F90 U NEMOGCM/NEMO/TOP_SRC/trcwri.F90 U NEMOGCM/NEMO/TOP_SRC/LOBSTER/trcbio.F90 U NEMOGCM/NEMO/TOP_SRC/LOBSTER/trcsed.F90 U NEMOGCM/NEMO/TOP_SRC/LOBSTER/trcexp.F90 U NEMOGCM/NEMO/TOP_SRC/LOBSTER/trcopt.F90 U NEMOGCM/NEMO/TOP_SRC/oce_trc.F90 U NEMOGCM/NEMO/TOP_SRC/SED/sedmodel.F90 U NEMOGCM/NEMO/TOP_SRC/SED/sedwri.F90 U NEMOGCM/NEMO/TOP_SRC/SED/sedini.F90 C NEMOGCM/NEMO/TOP_SRC/trcstp.F90 C NEMOGCM/NEMO/TOP_SRC/trcdta.F90 C NEMOGCM/NEMO/TOP_SRC/trcrst.F90
===3rd ====
svn_ci "dev_NEMO_MERGE_2011: add in changes dev_NOC_UKMO_MERGE developments" Password: Sending DOC/TexFiles/Biblio/Biblio.bib Sending DOC/TexFiles/Chapters/Chap_ASM.tex Sending DOC/TexFiles/Chapters/Chap_DYN.tex Sending DOC/TexFiles/Chapters/Chap_MISC.tex Sending DOC/TexFiles/Chapters/Chap_OBS.tex Sending DOC/TexFiles/Chapters/Chap_SBC.tex Sending DOC/TexFiles/Chapters/Chap_ZDF.tex Sending DOC/TexFiles/Chapters/Introduction.tex Adding (bin) DOC/TexFiles/Figures/Fig_OBS_dataplot_main.pdf Adding (bin) DOC/TexFiles/Figures/Fig_OBS_dataplot_prof.pdf Sending DOC/TexFiles/Figures/logo_UKMO.pdf Sending DOC/TexFiles/Namelist/nambfr Sending DOC/TexFiles/Namelist/namdyn_hpg Adding DOC/TexFiles/Namelist/namdyn_nept Sending DOC/TexFiles/Namelist/namobs_example Sending DOC/TexFiles/Namelist/namsbc_cpl Deleting DOC/TexFiles/Namelist/namsbc_cpl_co2 Sending DOC/TexFiles/Namelist/namtra_ldf Sending NEMOGCM/ARCH/arch-ALTIX_NAUTILUS4.fcm Adding NEMOGCM/ARCH/arch-PW6_METO.fcm Adding NEMOGCM/ARCH/arch-ifort_linux_omp.fcm Adding NEMOGCM/ARCH/arch-mpxlf_aix.fcm Replacing NEMOGCM/ARCH/arch-xlf_aix.fcm Adding NEMOGCM/ARCH/arch-xlf_pwr6.fcm Adding NEMOGCM/CONFIG/AMM12 Adding NEMOGCM/CONFIG/AMM12/EXP00 Adding NEMOGCM/CONFIG/AMM12/EXP00/iodef.xml Adding NEMOGCM/CONFIG/AMM12/EXP00/namelist Adding NEMOGCM/CONFIG/AMM12/EXP00/xmlio_server.def Adding NEMOGCM/CONFIG/AMM12/cpp_AMM12.fcm Adding NEMOGCM/CONFIG/AMM12_PISCES Adding NEMOGCM/CONFIG/AMM12_PISCES/EXP00 Adding NEMOGCM/CONFIG/AMM12_PISCES/EXP00/iodef.xml Adding NEMOGCM/CONFIG/AMM12_PISCES/EXP00/namelist Adding NEMOGCM/CONFIG/AMM12_PISCES/EXP00/namelist_pisces Adding NEMOGCM/CONFIG/AMM12_PISCES/EXP00/namelist_top Adding NEMOGCM/CONFIG/AMM12_PISCES/EXP00/xmlio_server.def Adding NEMOGCM/CONFIG/AMM12_PISCES/cpp_AMM12_PISCES.fcm Sending NEMOGCM/CONFIG/GYRE/EXP00/namelist Sending NEMOGCM/CONFIG/ORCA2_LIM/EXP00/1_namelist Sending NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist Sending NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist Sending NEMOGCM/CONFIG/POMME/EXP00/namelist Sending NEMOGCM/NEMO/LIM_SRC_2/limsbc_2.F90 Sending NEMOGCM/NEMO/LIM_SRC_2/limthd_zdf_2.F90 Sending NEMOGCM/NEMO/OPA_SRC/BDY/bdy_oce.F90 Sending NEMOGCM/NEMO/OPA_SRC/BDY/bdy_par.F90 Sending NEMOGCM/NEMO/OPA_SRC/BDY/bdydta.F90 Sending NEMOGCM/NEMO/OPA_SRC/BDY/bdydyn.F90 Sending NEMOGCM/NEMO/OPA_SRC/BDY/bdyini.F90 Sending NEMOGCM/NEMO/OPA_SRC/BDY/bdytides.F90 Sending NEMOGCM/NEMO/OPA_SRC/BDY/bdytra.F90 Sending NEMOGCM/NEMO/OPA_SRC/BDY/bdyvol.F90 Sending NEMOGCM/NEMO/OPA_SRC/DIA/diahsb.F90 Sending NEMOGCM/NEMO/OPA_SRC/DOM/dom_oce.F90 Sending NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90 Sending NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90 Sending NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90 Sending NEMOGCM/NEMO/OPA_SRC/DOM/istate.F90 Sending NEMOGCM/NEMO/OPA_SRC/DOM/phycst.F90 Sending NEMOGCM/NEMO/OPA_SRC/DYN/divcur.F90 Sending NEMOGCM/NEMO/OPA_SRC/DYN/dynbfr.F90 Sending NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90 Adding NEMOGCM/NEMO/OPA_SRC/DYN/dynnept.F90 Sending NEMOGCM/NEMO/OPA_SRC/DYN/dynnxt.F90 Sending NEMOGCM/NEMO/OPA_SRC/DYN/dynspg.F90 Sending NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_exp.F90 Sending NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_flt.F90 Sending NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_oce.F90 Sending NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 Sending NEMOGCM/NEMO/OPA_SRC/DYN/dynzdf_imp.F90 Sending NEMOGCM/NEMO/OPA_SRC/DYN/sshwzv.F90 Sending NEMOGCM/NEMO/OPA_SRC/IOM/prtctl.F90 Sending NEMOGCM/NEMO/OPA_SRC/LBC/lbcnfd.F90 Sending NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90 Sending NEMOGCM/NEMO/OPA_SRC/LBC/mppini.F90 Sending NEMOGCM/NEMO/OPA_SRC/LDF/ldfslp.F90 Sending NEMOGCM/NEMO/OPA_SRC/LDF/ldftra.F90 Sending NEMOGCM/NEMO/OPA_SRC/LDF/ldftra_oce.F90 Replacing NEMOGCM/NEMO/OPA_SRC/OBC/obc_vectopt_loop_substitute.h90 Sending NEMOGCM/NEMO/OPA_SRC/OBC/obcdta.F90 Replacing NEMOGCM/NEMO/OPA_SRC/OBC/obcdyn.F90 Replacing NEMOGCM/NEMO/OPA_SRC/OBC/obcdyn_bt.F90 Replacing NEMOGCM/NEMO/OPA_SRC/OBC/obcfla.F90 Replacing NEMOGCM/NEMO/OPA_SRC/OBC/obcrst.F90 Sending NEMOGCM/NEMO/OPA_SRC/SBC/cpl_oasis3.F90 Sending NEMOGCM/NEMO/OPA_SRC/SBC/fldread.F90 Sending NEMOGCM/NEMO/OPA_SRC/SBC/sbc_ice.F90 Sending NEMOGCM/NEMO/OPA_SRC/SBC/sbcapr.F90 Sending NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_core.F90 Sending NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90 Adding NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_cice.F90 Sending NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_if.F90 Sending NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim_2.F90 Sending NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90 Sending NEMOGCM/NEMO/OPA_SRC/SOL/solver.F90 Sending NEMOGCM/NEMO/OPA_SRC/TRA/eosbn2.F90 Sending NEMOGCM/NEMO/OPA_SRC/TRA/traadv.F90 Sending NEMOGCM/NEMO/OPA_SRC/TRA/traadv_cen2.F90 Sending NEMOGCM/NEMO/OPA_SRC/TRA/traadv_eiv.F90 Sending NEMOGCM/NEMO/OPA_SRC/TRA/traadv_muscl.F90 Sending NEMOGCM/NEMO/OPA_SRC/TRA/traadv_muscl2.F90 Sending NEMOGCM/NEMO/OPA_SRC/TRA/traadv_qck.F90 Sending NEMOGCM/NEMO/OPA_SRC/TRA/traadv_tvd.F90 Sending NEMOGCM/NEMO/OPA_SRC/TRA/traadv_ubs.F90 Sending NEMOGCM/NEMO/OPA_SRC/TRA/trabbl.F90 Sending NEMOGCM/NEMO/OPA_SRC/TRA/traldf.F90 Sending NEMOGCM/NEMO/OPA_SRC/TRA/traldf_bilap.F90 Sending NEMOGCM/NEMO/OPA_SRC/TRA/traldf_bilapg.F90 Sending NEMOGCM/NEMO/OPA_SRC/TRA/traldf_iso.F90 Sending NEMOGCM/NEMO/OPA_SRC/TRA/traldf_iso_grif.F90 Sending NEMOGCM/NEMO/OPA_SRC/TRA/traldf_lap.F90 Sending NEMOGCM/NEMO/OPA_SRC/TRA/tranxt.F90 Sending NEMOGCM/NEMO/OPA_SRC/TRA/trazdf.F90 Sending NEMOGCM/NEMO/OPA_SRC/TRA/trazdf_exp.F90 Sending NEMOGCM/NEMO/OPA_SRC/TRA/trazdf_imp.F90 Sending NEMOGCM/NEMO/OPA_SRC/ZDF/zdfbfr.F90 Sending NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 Sending NEMOGCM/NEMO/OPA_SRC/oce.F90 Adding NEMOGCM/NEMO/OPA_SRC/par_AMM_12km.h90 Sending NEMOGCM/NEMO/OPA_SRC/par_oce.F90 Sending NEMOGCM/NEMO/OPA_SRC/step.F90 Sending NEMOGCM/NEMO/OPA_SRC/step_oce.F90 Sending NEMOGCM/NEMO/TOP_SRC/C14b/trcsms_c14b.F90 Sending NEMOGCM/NEMO/TOP_SRC/CFC/trcnam_cfc.F90 Sending NEMOGCM/NEMO/TOP_SRC/CFC/trcsms_cfc.F90 Sending NEMOGCM/NEMO/TOP_SRC/LOBSTER/trcbio.F90 Sending NEMOGCM/NEMO/TOP_SRC/LOBSTER/trcexp.F90 Sending NEMOGCM/NEMO/TOP_SRC/LOBSTER/trcopt.F90 Sending NEMOGCM/NEMO/TOP_SRC/LOBSTER/trcsed.F90 Sending NEMOGCM/NEMO/TOP_SRC/PISCES/trcsms_pisces.F90 Sending NEMOGCM/NEMO/TOP_SRC/SED/sedini.F90 Sending NEMOGCM/NEMO/TOP_SRC/SED/sedmodel.F90 Sending NEMOGCM/NEMO/TOP_SRC/SED/sedwri.F90 Sending NEMOGCM/NEMO/TOP_SRC/TRP/trcadv.F90 Sending NEMOGCM/NEMO/TOP_SRC/TRP/trcbbl.F90 Sending NEMOGCM/NEMO/TOP_SRC/TRP/trcdmp.F90 Sending NEMOGCM/NEMO/TOP_SRC/TRP/trcldf.F90 Sending NEMOGCM/NEMO/TOP_SRC/TRP/trcnxt.F90 Sending NEMOGCM/NEMO/TOP_SRC/TRP/trcrad.F90 Sending NEMOGCM/NEMO/TOP_SRC/TRP/trcsbc.F90 Sending NEMOGCM/NEMO/TOP_SRC/TRP/trczdf.F90 Sending NEMOGCM/NEMO/TOP_SRC/TRP/trdmld_trc.F90 Sending NEMOGCM/NEMO/TOP_SRC/TRP/trdmod_trc.F90 Sending NEMOGCM/NEMO/TOP_SRC/oce_trc.F90 Sending NEMOGCM/NEMO/TOP_SRC/trc.F90 Sending NEMOGCM/NEMO/TOP_SRC/trcdia.F90 Sending NEMOGCM/NEMO/TOP_SRC/trcini.F90 Sending NEMOGCM/NEMO/TOP_SRC/trcnam.F90 Sending NEMOGCM/NEMO/TOP_SRC/trcrst.F90 Sending NEMOGCM/NEMO/TOP_SRC/trcstp.F90 Adding NEMOGCM/NEMO/TOP_SRC/trcsub.F90 Sending NEMOGCM/NEMO/TOP_SRC/trcwri.F90 Adding NEMOGCM/SETTE/input_AMM12.cfg Adding NEMOGCM/SETTE/input_AMM12_PISCES.cfg Sending NEMOGCM/SETTE/sette.sh Sending NEMOGCM/TOOLS/COMPILE/cfg.txt Adding NEMOGCM/TOOLS/OBSTOOLS Adding NEMOGCM/TOOLS/OBSTOOLS/dataplot Adding NEMOGCM/TOOLS/OBSTOOLS/dataplot/README Adding NEMOGCM/TOOLS/OBSTOOLS/dataplot/colorbar_idl.pro Adding NEMOGCM/TOOLS/OBSTOOLS/dataplot/dataplot.pro Adding NEMOGCM/TOOLS/OBSTOOLS/dataplot/dataplot_txttimeseries.pro Adding NEMOGCM/TOOLS/OBSTOOLS/dataplot/eos_nemo.pro Adding NEMOGCM/TOOLS/OBSTOOLS/dataplot/nice_contourlevels.pro Adding NEMOGCM/TOOLS/OBSTOOLS/dataplot/pr2.pro Adding NEMOGCM/TOOLS/OBSTOOLS/dataplot/prend2.pro Adding NEMOGCM/TOOLS/OBSTOOLS/dataplot/read_cdfobs.pro Adding NEMOGCM/TOOLS/OBSTOOLS/dataplot/read_enact.pro Adding NEMOGCM/TOOLS/OBSTOOLS/dataplot/read_feedback.pro Adding NEMOGCM/TOOLS/OBSTOOLS/dataplot/read_seaice.pro Adding NEMOGCM/TOOLS/OBSTOOLS/dataplot/read_sla.pro Adding NEMOGCM/TOOLS/OBSTOOLS/dataplot/read_sst.pro Adding NEMOGCM/TOOLS/OBSTOOLS/src Adding NEMOGCM/TOOLS/OBSTOOLS/src/convmerge.F90 Adding NEMOGCM/TOOLS/OBSTOOLS/src/coords.F90 Adding NEMOGCM/TOOLS/OBSTOOLS/src/corio2fb.F90 Adding NEMOGCM/TOOLS/OBSTOOLS/src/ctl_stop.h90 Adding NEMOGCM/TOOLS/OBSTOOLS/src/date_utils.F90 Adding NEMOGCM/TOOLS/OBSTOOLS/src/ddatetoymdhms.h90 Adding NEMOGCM/TOOLS/OBSTOOLS/src/distance.h90 Adding NEMOGCM/TOOLS/OBSTOOLS/src/dom_oce.F90 Adding NEMOGCM/TOOLS/OBSTOOLS/src/enact2fb.F90 Adding NEMOGCM/TOOLS/OBSTOOLS/src/fbaccdata.F90 Adding NEMOGCM/TOOLS/OBSTOOLS/src/fbacctype.F90 Adding NEMOGCM/TOOLS/OBSTOOLS/src/fbcomb.F90 Adding NEMOGCM/TOOLS/OBSTOOLS/src/fbmatchup.F90 Adding NEMOGCM/TOOLS/OBSTOOLS/src/fbprint.F90 Adding NEMOGCM/TOOLS/OBSTOOLS/src/fbsel.F90 Adding NEMOGCM/TOOLS/OBSTOOLS/src/fbstat.F90 Adding NEMOGCM/TOOLS/OBSTOOLS/src/fbstatncio.F90 Adding NEMOGCM/TOOLS/OBSTOOLS/src/fbthin.F90 Adding NEMOGCM/TOOLS/OBSTOOLS/src/greg2jul.h90 Adding NEMOGCM/TOOLS/OBSTOOLS/src/grt_cir_dis.h90 Adding NEMOGCM/TOOLS/OBSTOOLS/src/grt_cir_dis_saa.h90 Adding NEMOGCM/TOOLS/OBSTOOLS/src/in_out_manager.F90 Adding NEMOGCM/TOOLS/OBSTOOLS/src/index_sort.F90 Adding NEMOGCM/TOOLS/OBSTOOLS/src/ioncdf.F90 Adding NEMOGCM/TOOLS/OBSTOOLS/src/lbcnfd.F90 Adding NEMOGCM/TOOLS/OBSTOOLS/src/lib_mpp.F90 Adding NEMOGCM/TOOLS/OBSTOOLS/src/nctools.F90 Adding NEMOGCM/TOOLS/OBSTOOLS/src/obs_conv.F90 Adding NEMOGCM/TOOLS/OBSTOOLS/src/obs_conv_functions.h90 Adding NEMOGCM/TOOLS/OBSTOOLS/src/obs_fbm.F90 Adding NEMOGCM/TOOLS/OBSTOOLS/src/obs_prof_io.F90 Adding NEMOGCM/TOOLS/OBSTOOLS/src/obs_sla_io.F90 Adding NEMOGCM/TOOLS/OBSTOOLS/src/obs_sla_types.F90 Adding NEMOGCM/TOOLS/OBSTOOLS/src/obs_utils.F90 Adding NEMOGCM/TOOLS/OBSTOOLS/src/obs_vel_io.F90 Adding NEMOGCM/TOOLS/OBSTOOLS/src/obsprof_io.h90 Adding NEMOGCM/TOOLS/OBSTOOLS/src/obssla_io.h90 Adding NEMOGCM/TOOLS/OBSTOOLS/src/obssla_types.h90 Adding NEMOGCM/TOOLS/OBSTOOLS/src/obsvel_io.h90 Adding NEMOGCM/TOOLS/OBSTOOLS/src/omonainfo.F90 Adding NEMOGCM/TOOLS/OBSTOOLS/src/par_kind.F90 Adding NEMOGCM/TOOLS/OBSTOOLS/src/par_oce.F90 Adding NEMOGCM/TOOLS/OBSTOOLS/src/proftools.F90 Adding NEMOGCM/TOOLS/OBSTOOLS/src/sla2fb.F90 Adding NEMOGCM/TOOLS/OBSTOOLS/src/str_c_to_for.h90 Adding NEMOGCM/TOOLS/OBSTOOLS/src/toolspar_kind.F90 Adding NEMOGCM/TOOLS/OBSTOOLS/src/vel2fb.F90 Adding NEMOGCM/TOOLS/OBSTOOLS/src/wrk_nemo.F90 Adding NEMOGCM/TOOLS/REBUILD_NEMO Adding NEMOGCM/TOOLS/REBUILD_NEMO/rebuild_nemo Adding NEMOGCM/TOOLS/REBUILD_NEMO/src Adding NEMOGCM/TOOLS/REBUILD_NEMO/src/rebuild_nemo.f90 Transmitting file data ............................................................................................................................... Committed revision 3116.
Testing
Testing could consider (where appropriate) other configurations in addition to NVTK].
NVTK Tested | '''YES/NO''' |
Other model configurations | '''YES/NO''' |
Processor configurations tested | [ Enter processor configs tested here ] |
If adding new functionality please confirm that the New code doesn't change results when it is switched off and ''works'' when switched on | '''YES/NO/NA''' |
(Answering UNSURE is likely to generate further questions from reviewers.)
'Please add further summary details here'
- Processor configurations tested
- etc----
Bit Comparability
Does this change preserve answers in your tested standard configurations (to the last bit) ? | '''YES/NO ''' |
Does this change bit compare across various processor configurations. (1xM, Nx1 and MxN are recommended) | '''YES/NO''' |
Is this change expected to preserve answers in all possible model configurations? | '''YES/NO''' |
Is this change expected to preserve all diagnostics? ,,''Preserving answers in model runs does not necessarily imply preserved diagnostics. '' | '''YES/NO''' |
If you answered '''NO''' to any of the above, please provide further details:
- Which routine(s) are causing the difference?
- Why the changes are not protected by a logical switch or new section-version
- What is needed to achieve regression with the previous model release (e.g. a regression branch, hand-edits etc). If this is not possible, explain why not.
- What do you expect to see occur in the test harness jobs?
- Which diagnostics have you altered and why have they changed?Please add details here........
System Changes
Does your change alter namelists? | '''YES/NO ''' |
Does your change require a change in compiler options? | '''YES/NO ''' |
If any of these apply, please document the changes required here.......
Resources
''Please ''summarize'' any changes in runtime or memory use caused by this change......''
IPR issues
Has the code been wholly (100%) produced by NEMO developers staff working exclusively on NEMO? | '''YES/ NO ''' |
If No:
- Identify the collaboration agreement details
- Ensure the code routine header is in accordance with the agreement, (Copyright/Redistribution? etc).Add further details here if required..........