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

Timestamp:

2011-11-10T15:15:01+01:00 (12 years ago)

Author:

acc

Comment:

--

ticket/0874_NOC_2011_MERGE

@@ -12 +12 @@
 dev_r2855_NOCS_mppsca              [added to merge at changeset 3009] Note: ignored trunk changes between 2802 and 2855; merge still based on 2802; see notes on step 7
 
-dev_r2802_NOCL_bfrimp
-dev_r2802_NOCL_prjhpg
-dev_r2802_NOCL_Smagorinsky
-dev_r2802_NOCL_vppm
+dev_r2802_NOCL_bfrimp              [added to merge at changeset 3072]
+dev_r2802_NOCL_prjhpg              [added to merge at changeset 3074]
+dev_r2802_NOCL_Smagorinsky         [postponed to 2012]
+dev_r2802_NOCL_vppm                [postponed to 2012]
 }}}
 
@@ -333 +333 @@
 Transmitting file data ...
 Committed revision 3072.
+}}}
+
+'''Step 11'''. Merge in changes from the dev_r2802_NOCL_prjhpg branch; revert unwanted changes and remove unwanted additions; add missing namelist changes; partially impose coding standards
+and add a first attempt at documentation:
+{{{
+
+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_prjhpg
+ 
+--- Merging r2836 through r3073 into '.':
+A    NEMOGCM/ARCH/arch-pgf90_mobius.fcm
+A    NEMOGCM/ARCH/arch-gfortran_ubuntu.fcm
+U    NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90
+A    NEMOGCM/NEMO/OPA_SRC/par_AMM7.h90
+U    NEMOGCM/NEMO/OPA_SRC/par_oce.F90
+A    NEMOGCM/NEMO/OPA_SRC/par_AMM12.h90
+
+svn revert NEMOGCM/ARCH/arch-pgf90_mobius.fcm NEMOGCM/ARCH/arch-gfortran_ubuntu.fcm NEMOGCM/NEMO/OPA_SRC/par_AMM7.h90 NEMOGCM/NEMO/OPA_SRC/par_oce.F90 NEMOGCM/NEMO/OPA_SRC/par_AMM12.h90
+Reverted 'NEMOGCM/ARCH/arch-pgf90_mobius.fcm'
+Reverted 'NEMOGCM/ARCH/arch-gfortran_ubuntu.fcm'
+Reverted 'NEMOGCM/NEMO/OPA_SRC/par_AMM7.h90'
+Reverted 'NEMOGCM/NEMO/OPA_SRC/par_oce.F90'
+Reverted 'NEMOGCM/NEMO/OPA_SRC/par_AMM12.h90'
+
+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 ci -m"Branch dev_NOC_2011_MERGE. #874. Step 11. Merge in changes from the dev_r2802_NOCL_prjhpg. Partially imposed coding standards (more could be done); added missing namelist changes and added first attempt at documentation"
+Password: 
+
+Sending        DOC/TexFiles/Chapters/Chap_DYN.tex
+Sending        DOC/TexFiles/Namelist/namdyn_hpg
+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/DYN/dynhpg.F90
+Transmitting file data ........
+Committed revision 3074.
+}}}
+
+'''Step 12'''. Merge in trunk changes between revisions 2802 and 2855. Check if no conflicits arise:
+
+
+{{{
+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/trunk@2855
+ 
+--- Merging r2803 through r2855 into '.':
+U    NEMOGCM/NEMO/LIM_SRC_2/limistate_2.F90
+U    NEMOGCM/NEMO/LIM_SRC_2/iceini_2.F90
+
+svn ci -m"Branch dev_NOC_2011_MERGE. #874. Step 12. Merge in trunk changes between revision 2802 and 2855. This branch is now ready for the 2011 merge."
+
+Sending        NEMOGCM/NEMO/LIM_SRC_2/iceini_2.F90
+Sending        NEMOGCM/NEMO/LIM_SRC_2/limistate_2.F90
+Transmitting file data ..
+Committed revision 3075.
 }}}