Version 2 (modified by acc, 13 years ago) (diff) |
---|
Step 1. Create merge branch from a copy of the trunk at the shared base revision of the two site merges:
svn copy svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2855 \ svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_NOC_UKMO_MERGE \ -m"Create branch for the merge of all NOC and UKMO 2011 developments. See ticket #890. Step 1: copy trunk at the base revision number used by both site merge branches" : Committed revision 3089.
Step2. Merge in changes from the dev_UKM0_2011 branch. revert unwanted changes to NEMO_book.pdf and arch files. Commit changes
svn ci -m"Branch dev_NOC_UKMO_MERGE #890. Step 2. Merge in changes from the dev_UKM0_2011 branch with unwanted changes reverted" Password: Sending DOC/TexFiles/Biblio/Biblio.bib Sending DOC/TexFiles/Chapters/Chap_ASM.tex Sending DOC/TexFiles/Chapters/Chap_OBS.tex Sending DOC/TexFiles/Chapters/Chap_SBC.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/namobs_example Sending DOC/TexFiles/Namelist/namsbc_cpl Deleting DOC/TexFiles/Namelist/namsbc_cpl_co2 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/AMM Adding NEMOGCM/CONFIG/AMM-PISCES 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 Replacing NEMOGCM/NEMO/OPA_SRC/BDY 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/domzgr.F90 Sending NEMOGCM/NEMO/OPA_SRC/DOM/phycst.F90 Sending NEMOGCM/NEMO/OPA_SRC/DYN/divcur.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/sshwzv.F90 Sending NEMOGCM/NEMO/OPA_SRC/FLO/floblk.F90 Sending NEMOGCM/NEMO/OPA_SRC/IOM/prtctl.F90 Sending NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90 Sending NEMOGCM/NEMO/OPA_SRC/LBC/mppini.F90 Replacing NEMOGCM/NEMO/OPA_SRC/OBC/obc_vectopt_loop_substitute.h90 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/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/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/p4zsed.F90 Sending NEMOGCM/NEMO/TOP_SRC/PISCES/trcrst_pisces.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/trcdta.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 Sending NEMOGCM/TOOLS/COMPILE/cfg.txt Adding NEMOGCM/TOOLS/OBSTOOLS Adding NEMOGCM/TOOLS/REBUILD_NEMO Transmitting file data ................................................................................................... Committed revision 3094.
Step 3. Undo some changes necessary to fully reinstate OBC and fix a bug in obcdta.F90
svn ci -m"Branch dev_NOC_UKMO_MERGE #890. Undid some changes to fully reinstate OBC code" Sending NEMOGCM/NEMO/OPA_SRC/FLO/floblk.F90 Sending NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90 Sending NEMOGCM/NEMO/OPA_SRC/OBC/obcdta.F90 Transmitting file data ... Committed revision 3096.