Changes between Version 2 and Version 3 of ticket/0890_NOC_UKMO_MERGE

Timestamp:

2011-11-14T18:49:40+01:00 (12 years ago)

Author:

acc

Comment:

--

ticket/0890_NOC_UKMO_MERGE

@@ -153 +153 @@
 }}}
 
+'''Step 4'''. Merge in changes from the NOCS merge
+
+
+{{{
+svn merge 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_2011_MERGE dev_NOC_UKMO_MERGE
+ 
+--- Merging differences between repository URLs into 'dev_NOC_UKMO_MERGE':
+U    dev_NOC_UKMO_MERGE/DOC/TexFiles/Biblio/Biblio.bib
+U    dev_NOC_UKMO_MERGE/DOC/TexFiles/Chapters/Chap_DYN.tex
+U    dev_NOC_UKMO_MERGE/DOC/TexFiles/Chapters/Chap_MISC.tex
+U    dev_NOC_UKMO_MERGE/DOC/TexFiles/Chapters/Chap_ZDF.tex
+U    dev_NOC_UKMO_MERGE/DOC/TexFiles/Namelist/namdyn_hpg
+U    dev_NOC_UKMO_MERGE/DOC/TexFiles/Namelist/nambfr
+U    dev_NOC_UKMO_MERGE/DOC/TexFiles/Namelist/namtra_ldf
+A    dev_NOC_UKMO_MERGE/DOC/TexFiles/Namelist/namdyn_nept
+U    dev_NOC_UKMO_MERGE/NEMOGCM/CONFIG/GYRE/EXP00/namelist
+U    dev_NOC_UKMO_MERGE/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist
+U    dev_NOC_UKMO_MERGE/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/1_namelist
+U    dev_NOC_UKMO_MERGE/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist
+U    dev_NOC_UKMO_MERGE/NEMOGCM/CONFIG/POMME/EXP00/namelist
+U    dev_NOC_UKMO_MERGE/NEMOGCM/ARCH/arch-ALTIX_NAUTILUS4.fcm
+U    dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OFF_SRC/domrea.F90
+U    dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90
+U    dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/DOM/istate.F90
+U    dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90
+U    dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/DYN/dynbfr.F90
+U    dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/DYN/dynnxt.F90
+U    dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90
+U    dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/DYN/dynzdf_imp.F90
+Conflict discovered in '/Users/omfman/NEMO/SRC_PARIS/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90'.
+Select: (p) postpone, (df) diff-full, (e) edit,
+        (mc) mine-conflict, (tc) theirs-conflict,
+        (s) show all options: p
+C    dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90
+A    dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/DYN/dynnept.F90
+U    dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90
+U    dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/LBC/lbcnfd.F90
+U    dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/LDF/ldfslp.F90
+U    dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/LDF/ldftra_oce.F90
+U    dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/LDF/ldftra.F90
+U    dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/SBC/sbcrnf.F90
+U    dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfmxl.F90
+U    dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfbfr.F90
+U    dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/TRA/eosbn2.F90
+Conflict discovered in '/Users/omfman/NEMO/SRC_PARIS/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_iso_grif.F90'.
+Select: (p) postpone, (df) diff-full, (e) edit,
+        (mc) mine-conflict, (tc) theirs-conflict,
+        (s) show all options: p
+C    dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_iso_grif.F90
+U    dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_lap.F90
+U    dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/step.F90
+U    dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/LIM_SRC_2/limistate_2.F90
+U    dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/LIM_SRC_2/iceini_2.F90
+U    dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/TOP_SRC/MY_TRC/trcini_my_trc.F90
+Conflict discovered in '/Users/omfman/NEMO/SRC_PARIS/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/TOP_SRC/TRP/trcadv.F90'.
+      REAL(wp), DIMENSION(jpi,jpj,jpk,kjpt), INTENT(inout) ::   pta        ! tracer trend
+Select: (p) postpone, (df) diff-full, (e) edit,
+        (mc) mine-conflict, (tc) theirs-conflict,
+        (s) show all options: p
+C    dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/TOP_SRC/TRP/trcadv.F90
+Conflict discovered in '/Users/omfman/NEMO/SRC_PARIS/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/TOP_SRC/TRP/trcldf.F90'.
+Select: (p) postpone, (df) diff-full, (e) edit,
+        (mc) mine-conflict, (tc) theirs-conflict,
+        (s) show all options: p
+C    dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/TOP_SRC/TRP/trcldf.F90
+U    dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/TOP_SRC/oce_trc.F90
+U    dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/NST_SRC/agrif_opa_update.F90
+}}}
+
+'''Step 5'''. resolve conflicts (most arising from the tracer sub-timestepping) and commit
+
+
+{{{
+svn ci -m"Branch dev_NOC_UKMO_MERGE #890. Resolved conflicts (most arising from the tracer sub-timestepping)"Password: 
+Sending        DOC/TexFiles/Biblio/Biblio.bib
+                   zdpdy2 = zcoef0 / e2v(ji,jj) * &
+Sending        DOC/TexFiles/Chapters/Chap_DYN.tex
+Sending        DOC/TexFiles/Chapters/Chap_MISC.tex
+Sending        DOC/TexFiles/Chapters/Chap_ZDF.tex
+Sending        DOC/TexFiles/Namelist/nambfr
+Sending        DOC/TexFiles/Namelist/namdyn_hpg
+Adding         DOC/TexFiles/Namelist/namdyn_nept
+Sending        DOC/TexFiles/Namelist/namtra_ldf
+Sending        NEMOGCM/ARCH/arch-ALTIX_NAUTILUS4.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/OPA_SRC/DOM/domvvl.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/DOM/istate.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_ts.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/DYN/dynzdf_imp.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/LBC/lbcnfd.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.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
+Sending        NEMOGCM/NEMO/OPA_SRC/TRA/eosbn2.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/ZDF/zdfbfr.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/nemogcm.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/step.F90
+Sending        NEMOGCM/NEMO/TOP_SRC/TRP/trcadv.F90
+Sending        NEMOGCM/NEMO/TOP_SRC/TRP/trcldf.F90
+Transmitting file data .................................
+Committed revision 3101.
+
+svn ci -m"Branch dev_NOC_UKMO_MERGE #890. Corrected minor typo in dynhpg.F90"Password: 
+Sending        NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90
+Transmitting file data .
+Committed revision 3102.
+}}}
+