This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Carpet — Adaptive Mesh Refinement for the Cactus Framework http://carpetcode.org/".
The branch, master has been updated via d0a739ecfb8f10d788d02f2c8fc932d39de96d01 (commit) via 0fd9403c44dcc6dee4d8762d236c9146f0df92d1 (commit) via 4a1ecd2273e575c87a4d9a1b19467eae7af2532a (commit) via dbd1803ac57a1b0a79992e45297f1b57c855efe9 (commit) from 8359eda5b4f02eb5d7ffae2abb0518e653a56fd2 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit d0a739ecfb8f10d788d02f2c8fc932d39de96d01 Merge: 8359eda 0fd9403 Author: Erik Schnetter schnetter@gmail.com Date: Fri Dec 6 10:43:02 2013 -0500
Merge commit '0fd9403c44dcc6dee4d8762d236c9146f0df92d1'
Conflicts: Carpet/Carpet/src/Restrict.cc Carpet/CarpetLib/src/dh.cc
-----------------------------------------------------------------------
Summary of changes: Carpet/Carpet/src/Restrict.cc | 14 +- Carpet/Carpet/test/test_restrict_sync.par | 167 +++ Carpet/Carpet/test/test_restrict_sync/phi.x.asc | 1454 +++++++++++++++++++++++ Carpet/CarpetLib/src/dh.cc | 15 +- 4 files changed, 1643 insertions(+), 7 deletions(-) create mode 100644 Carpet/Carpet/test/test_restrict_sync.par create mode 100644 Carpet/Carpet/test/test_restrict_sync/phi.x.asc
hooks/post-receive -- Carpet — Adaptive Mesh Refinement for the Cactus Framework http://carpetcode.org/