Changes between Version 8 and Version 9 of ticket/0874_NOC_2011_MERGE

Timestamp:

2011-11-10T11:16:44+01:00 (13 years ago)

Author:

acc

Comment:

--

ticket/0874_NOC_2011_MERGE

@@ -287 +287 @@
 ORCA2LIMPIS reproducibility passed
 POMME       reproducibility passed
+}}}
+
+'''Step 10'''. Merge in changes from the 2011/dev_r2802_NOCL_bfrimp branch; revert and remove unwanted changes; resolve conflicits in dynspg_ts.F90; check in changes:
+
+
+{{{
+svn merge svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2802 \
+          svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_r2802_NOCL_bfrimp
+
+--- Merging r2806 through r3057 into '.':
+
+A    NEMOGCM/ARCH/arch-pgf90_mobius.fcm 
+A    NEMOGCM/ARCH/arch-gfortran_ubuntu.fcm 
+A    NEMOGCM/NEMO/OPA_SRC/par_AMM7.h90 
+A    NEMOGCM/NEMO/OPA_SRC/par_AMM12.h90
+U    DOC/TexFiles/Chapters/Chap_ZDF.tex
+U    DOC/NEMO_book.pdf
+U    NEMOGCM/NEMO/OPA_SRC/DYN/dynbfr.F90
+U    NEMOGCM/NEMO/OPA_SRC/DYN/dynzdf_imp.F90
+C    NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90
+U    NEMOGCM/NEMO/OPA_SRC/ZDF/zdfbfr.F90
+
+svn revert DOC/NEMO_book.pdf
+svn revert NEMOGCM/ARCH/arch-pgf90_mobius.fcm
+svn revert NEMOGCM/ARCH/arch-gfortran_ubuntu.fcm
+svn revert NEMOGCM/NEMO/OPA_SRC/par_AMM7.h90
+svn revert NEMOGCM/NEMO/OPA_SRC/par_AMM12.h90
+svn revert NEMOGCM/NEMO/OPA_SRC/par_oce.F90
+rm NEMOGCM/ARCH/arch-pgf90_mobius.fcm NEMOGCM/ARCH/arch-gfortran_ubuntu.fcm NEMOGCM/NEMO/OPA_SRC/par_AMM7.h90 NEMOGCM/NEMO/OPA_SRC/par_AMM12.h90 
+svn resolved NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90
+
+svn ci -m"Branch dev_NOC_2011_MERGE. #874. Step 10. Merge in changes from dev_r2802_NOCL_bfrimp branch (plus some additions and conflicit resolutions)"
+
+Sending        DOC/TexFiles/Chapters/Chap_ZDF.tex
+Sending        DOC/TexFiles/Namelist/nambfr
+Sending        NEMOGCM/CONFIG/GYRE/EXP00/namelist
+Sending        NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist
+Sending        NEMOGCM/CONFIG/ORCA2_LIM/EXP00/1_namelist
+Sending        NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist
+Sending        NEMOGCM/CONFIG/POMME/EXP00/namelist
+Sending        NEMOGCM/NEMO/OPA_SRC/DYN/dynbfr.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/DYN/dynzdf_imp.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/ZDF/zdfbfr.F90
+Transmitting file data ...
+Committed revision 3072.
 }}}