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, psamr has been updated via aa734142998964860e888fc0a69ffc1921d3332d (commit) via 2a53ac2e49891b8db1a5bb6dbc8550eb7a260abb (commit) via 5930260426100d6a6c83aea5e80c6711e2970115 (commit) via 7d977402d5a81ac4941423715cde5bc383fb8b54 (commit) via 8c15ca1ed8101bb8aa9a072aa9a7ac54f8070874 (commit) via 4357322ccee0497e2d11fd35165b5029b37b7650 (commit) via 56d5d70785357eb18c158cd37f693c75a20f5125 (commit) via 77e5342fb97d18c28632133879346b027fd4f0a1 (commit) via 7963e442b6d58af5bee796b0af3193432cc0bda5 (commit) via 6a698dcf7a11fab8d7c85c4e5e4c239d9091fcca (commit) via baf2333c5b909d6daa93056b1c63b35040796b66 (commit) via f73efa0164d8296c361e486fabdd95c88469766a (commit) via 4eb42d62c2196356b2037bbb27ca730ea81ef48f (commit) via 05962f0ffa846fbf6e8d391a0350b5c92735b767 (commit) via 26d45bed2c5e03a867babf7a7228b87ffca6491f (commit) via e812ca2f8e1239fe46816a5608aa5cb588ee56d9 (commit) via 2106a8e13457d206ca75385ac451f00e8dca6c91 (commit) via a74e5ead7d3a6e113969c6cdfd0e805abfca9fe9 (commit) via 0315cf576bd033192f13c2ddbb1bfaafbcea10f6 (commit) via 5bb668030b9189d01689e34567907d95023c7303 (commit) via e18c62a39d70394704450f01ed6a1401bff40697 (commit) via 0d17588fccdb2e4882d3e0edb4ce0e29544c20d8 (commit) via 60183e2b8852ad6f6261ac6cdb0d6ffc9cd4dcb4 (commit) via dcd0afee1d6ce0572a789be017ccdd5b0d1824d3 (commit) via a1452d6958d955725f85959ff49f9d058825fcc6 (commit) via 720fc445668c9c5524c2e5000494e722d772c5e5 (commit) via 2ede3e9156b91bb5061802cdf9e50dca2bb2114d (commit) via 9e2ddc8e19613d96178c0ad968c67b9a6a5efb71 (commit) via c1cf2d3bf6fbaaa61957b40188f9abdd718d162d (commit) via 65c02c9e65351a3ec161746cc3f460cc0f04bdc6 (commit) via 9aa18585888d7215caa50b9352b3d84c50993ec1 (commit) via 3fe72d976addb2ac487250b2d317d78a402a08d1 (commit) via c5ad85895339ac0a8313c5b47e28195e1a94370a (commit) via ef5a0236b5a739fbfb672e43bc524c3e2a792015 (commit) via e8cc6f1840abe2ebe9a9ee99e999ce4b202a0925 (commit) via 89ac2c559cae1c2e0d9ec42f83a626f0b1772938 (commit) via e6a078cf5b80ffc673e0ea4803f6d347c4f67200 (commit) via 3f976bcab0f3e6651258331cd26c92b162ec685d (commit) via 0806d57fbb1ff924673e6615877b4b44fdc0195d (commit) via 03b3551b7e7e70ead2c3f94637ad90ac8aabb337 (commit) via d81e5373dbf931cffbf9eaba17598db81417fad1 (commit) via 14fd7b5084c17fdda0dffd19dfff090fbc40af75 (commit) via 5ba9dd55c677131d04bf2361b3fd7e8189794c01 (commit) via 0c4531003c617d55c75f312a9507c7b0244fb0a4 (commit) from b7d5d9f5773dec4c4965ccea83afaab0bbc8acd0 (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 aa734142998964860e888fc0a69ffc1921d3332d Merge: b7d5d9f 2a53ac2 Author: Frank Löffler knarf@cct.lsu.edu Date: Fri Sep 5 09:12:13 2014 -0500
psamr: merge origin/master into psamr
Merge remote-tracking branch 'origin/master' into psamr
Conflicts: Carpet/Carpet/src/Cycle.cc
-----------------------------------------------------------------------
Summary of changes: Carpet/Carpet/interface.ccl | 23 +- Carpet/Carpet/param.ccl | 2 +- Carpet/Carpet/src/Comm.cc | 53 + Carpet/Carpet/src/Cycle.cc | 30 +- Carpet/Carpet/src/Initialise.cc | 90 +- Carpet/Carpet/src/SetupGH.cc | 33 +- Carpet/Carpet/src/modes.cc | 5 +- Carpet/CarpetIOASCII/param.ccl | 23 +- Carpet/CarpetIOASCII/src/ioascii.cc | 25 +- Carpet/CarpetIOASCII/src/make.configuration.deps | 2 +- Carpet/CarpetIOBasic/src/iobasic.cc | 2 +- Carpet/CarpetIOHDF5/src/CarpetIOHDF5.cc | 38 +- Carpet/CarpetIOHDF5/src/Input.cc | 34 +- Carpet/CarpetIOHDF5/src/OutputSlice.cc | 12 +- Carpet/CarpetIOHDF5/src/make.configuration.deps | 6 +- .../CarpetIOHDF5/src/util/hdf5tobinary_slicer.cc | 20 +- .../phi.average.asc | 2 - .../CarpetWaveToyRecover_test_4proc/phi.count.asc | 2 - .../test/CarpetWaveToyRecover_test_4proc/phi.d.asc | 322 +- .../phi.maximum.asc | 2 - .../phi.minimum.asc | 2 - .../CarpetWaveToyRecover_test_4proc/phi.norm1.asc | 2 - .../CarpetWaveToyRecover_test_4proc/phi.norm2.asc | 2 - .../phi.norm_inf.asc | 2 - .../phi.product.asc | 2 - .../test/CarpetWaveToyRecover_test_4proc/phi.x.asc | 1922 ++++++---- .../test/CarpetWaveToyRecover_test_4proc/phi.y.asc | 1922 ++++------ .../test/CarpetWaveToyRecover_test_4proc/phi.z.asc | 1448 ++++---- Carpet/CarpetIOScalar/param.ccl | 7 + Carpet/CarpetIOScalar/src/ioscalar.cc | 15 +- Carpet/CarpetInterp/test/test.ccl | 3 + Carpet/CarpetInterp/test/waveinterp-1p.par | 16 +- .../test/waveinterp-1p/arrays1d[0].x.asc | 457 ++- .../test/waveinterp-1p/arrays1d[0].y.asc | 53 + .../test/waveinterp-1p/arrays1d[1].x.asc | 206 ++ .../test/waveinterp-1p/arrays1d[1].y.asc | 53 + .../test/waveinterp-1p/arrays1d[2].x.asc | 206 ++ .../test/waveinterp-1p/arrays1d[2].y.asc | 53 + Carpet/CarpetInterp/test/waveinterp-1p/phi..asc | 217 +- .../test/waveinterp-1p/phi.average.asc | 28 +- .../CarpetInterp/test/waveinterp-1p/phi.count.asc | 2 - Carpet/CarpetInterp/test/waveinterp-1p/phi.d.asc | 1915 ++++++++++ .../test/waveinterp-1p/phi.maximum.asc | 6 +- .../test/waveinterp-1p/phi.minimum.asc | 6 +- .../CarpetInterp/test/waveinterp-1p/phi.norm1.asc | 28 +- .../CarpetInterp/test/waveinterp-1p/phi.norm2.asc | 28 +- .../test/waveinterp-1p/phi.norm_inf.asc | 6 +- Carpet/CarpetInterp/test/waveinterp-1p/phi.x.asc | 1517 ++++---- Carpet/CarpetInterp/test/waveinterp-1p/phi.y.asc | 1517 ++++---- Carpet/CarpetInterp/test/waveinterp-1p/phi.z.asc | 1517 ++++---- Carpet/CarpetInterp/test/waveinterp-1p/phit..asc | 217 +- .../test/waveinterp-1p/phit.average.asc | 2 - .../CarpetInterp/test/waveinterp-1p/phit.count.asc | 2 - Carpet/CarpetInterp/test/waveinterp-1p/phit.d.asc | 1915 ++++++++++ .../test/waveinterp-1p/phit.maximum.asc | 2 - .../test/waveinterp-1p/phit.minimum.asc | 8 +- .../CarpetInterp/test/waveinterp-1p/phit.norm1.asc | 2 - .../CarpetInterp/test/waveinterp-1p/phit.norm2.asc | 2 - .../test/waveinterp-1p/phit.norm_inf.asc | 2 - Carpet/CarpetInterp/test/waveinterp-1p/phit.x.asc | 1517 ++++---- Carpet/CarpetInterp/test/waveinterp-1p/phit.y.asc | 1517 ++++---- Carpet/CarpetInterp/test/waveinterp-1p/phit.z.asc | 1517 ++++---- Carpet/CarpetInterp/test/waveinterp-1p/phix..asc | 217 +- .../test/waveinterp-1p/phix.average.asc | 16 +- .../CarpetInterp/test/waveinterp-1p/phix.count.asc | 2 - Carpet/CarpetInterp/test/waveinterp-1p/phix.d.asc | 1915 ++++++++++ .../test/waveinterp-1p/phix.maximum.asc | 26 +- .../test/waveinterp-1p/phix.minimum.asc | 26 +- .../CarpetInterp/test/waveinterp-1p/phix.norm1.asc | 28 +- .../CarpetInterp/test/waveinterp-1p/phix.norm2.asc | 28 +- .../test/waveinterp-1p/phix.norm_inf.asc | 26 +- Carpet/CarpetInterp/test/waveinterp-1p/phix.x.asc | 1517 ++++---- Carpet/CarpetInterp/test/waveinterp-1p/phix.y.asc | 1517 ++++---- Carpet/CarpetInterp/test/waveinterp-1p/phix.z.asc | 1517 ++++---- Carpet/CarpetInterp/test/waveinterp-1p/phiy..asc | 217 +- .../test/waveinterp-1p/phiy.average.asc | 22 +- .../CarpetInterp/test/waveinterp-1p/phiy.count.asc | 2 - Carpet/CarpetInterp/test/waveinterp-1p/phiy.d.asc | 1915 ++++++++++ .../test/waveinterp-1p/phiy.maximum.asc | 26 +- .../test/waveinterp-1p/phiy.minimum.asc | 26 +- .../CarpetInterp/test/waveinterp-1p/phiy.norm1.asc | 28 +- .../CarpetInterp/test/waveinterp-1p/phiy.norm2.asc | 28 +- .../test/waveinterp-1p/phiy.norm_inf.asc | 26 +- Carpet/CarpetInterp/test/waveinterp-1p/phiy.x.asc | 1517 ++++---- Carpet/CarpetInterp/test/waveinterp-1p/phiy.y.asc | 1517 ++++---- Carpet/CarpetInterp/test/waveinterp-1p/phiy.z.asc | 1517 ++++---- Carpet/CarpetInterp/test/waveinterp-1p/phiz..asc | 217 +- .../test/waveinterp-1p/phiz.average.asc | 12 +- .../CarpetInterp/test/waveinterp-1p/phiz.count.asc | 2 - Carpet/CarpetInterp/test/waveinterp-1p/phiz.d.asc | 1915 ++++++++++ .../test/waveinterp-1p/phiz.maximum.asc | 26 +- .../test/waveinterp-1p/phiz.minimum.asc | 26 +- .../CarpetInterp/test/waveinterp-1p/phiz.norm1.asc | 28 +- .../CarpetInterp/test/waveinterp-1p/phiz.norm2.asc | 28 +- .../test/waveinterp-1p/phiz.norm_inf.asc | 26 +- Carpet/CarpetInterp/test/waveinterp-1p/phiz.x.asc | 1517 ++++---- Carpet/CarpetInterp/test/waveinterp-1p/phiz.y.asc | 1517 ++++---- Carpet/CarpetInterp/test/waveinterp-1p/phiz.z.asc | 1517 ++++---- Carpet/CarpetInterp/test/waveinterp-2p.par | 13 +- .../test/waveinterp-2p/arrays1d[0].x.asc | 457 ++- .../test/waveinterp-2p/arrays1d[0].y.asc | 53 + .../test/waveinterp-2p/arrays1d[1].x.asc | 206 ++ .../test/waveinterp-2p/arrays1d[1].y.asc | 53 + .../test/waveinterp-2p/arrays1d[2].x.asc | 206 ++ .../test/waveinterp-2p/arrays1d[2].y.asc | 53 + Carpet/CarpetInterp/test/waveinterp-2p/phi..asc | 248 +- .../test/waveinterp-2p/phi.average.asc | 26 +- .../CarpetInterp/test/waveinterp-2p/phi.count.asc | 2 - Carpet/CarpetInterp/test/waveinterp-2p/phi.d.asc | 3797 ++++++++++++++++++++ .../test/waveinterp-2p/phi.maximum.asc | 6 +- .../test/waveinterp-2p/phi.minimum.asc | 6 +- .../CarpetInterp/test/waveinterp-2p/phi.norm1.asc | 26 +- .../CarpetInterp/test/waveinterp-2p/phi.norm2.asc | 28 +- .../test/waveinterp-2p/phi.norm_inf.asc | 6 +- Carpet/CarpetInterp/test/waveinterp-2p/phi.x.asc | 2199 +++++++----- Carpet/CarpetInterp/test/waveinterp-2p/phi.y.asc | 2199 +++++++----- Carpet/CarpetInterp/test/waveinterp-2p/phi.z.asc | 1672 ++++----- Carpet/CarpetInterp/test/waveinterp-2p/phit..asc | 248 +- .../test/waveinterp-2p/phit.average.asc | 2 - .../CarpetInterp/test/waveinterp-2p/phit.count.asc | 2 - Carpet/CarpetInterp/test/waveinterp-2p/phit.d.asc | 3797 ++++++++++++++++++++ .../test/waveinterp-2p/phit.maximum.asc | 2 - .../test/waveinterp-2p/phit.minimum.asc | 8 +- .../CarpetInterp/test/waveinterp-2p/phit.norm1.asc | 2 - .../CarpetInterp/test/waveinterp-2p/phit.norm2.asc | 2 - .../test/waveinterp-2p/phit.norm_inf.asc | 2 - Carpet/CarpetInterp/test/waveinterp-2p/phit.x.asc | 2199 +++++++----- Carpet/CarpetInterp/test/waveinterp-2p/phit.y.asc | 2199 +++++++----- Carpet/CarpetInterp/test/waveinterp-2p/phit.z.asc | 1672 ++++----- Carpet/CarpetInterp/test/waveinterp-2p/phix..asc | 248 +- .../test/waveinterp-2p/phix.average.asc | 16 +- .../CarpetInterp/test/waveinterp-2p/phix.count.asc | 2 - Carpet/CarpetInterp/test/waveinterp-2p/phix.d.asc | 3797 ++++++++++++++++++++ .../test/waveinterp-2p/phix.maximum.asc | 26 +- .../test/waveinterp-2p/phix.minimum.asc | 26 +- .../CarpetInterp/test/waveinterp-2p/phix.norm1.asc | 28 +- .../CarpetInterp/test/waveinterp-2p/phix.norm2.asc | 28 +- .../test/waveinterp-2p/phix.norm_inf.asc | 26 +- Carpet/CarpetInterp/test/waveinterp-2p/phix.x.asc | 2199 +++++++----- Carpet/CarpetInterp/test/waveinterp-2p/phix.y.asc | 2199 +++++++----- Carpet/CarpetInterp/test/waveinterp-2p/phix.z.asc | 1672 ++++----- Carpet/CarpetInterp/test/waveinterp-2p/phiy..asc | 248 +- .../test/waveinterp-2p/phiy.average.asc | 22 +- .../CarpetInterp/test/waveinterp-2p/phiy.count.asc | 2 - Carpet/CarpetInterp/test/waveinterp-2p/phiy.d.asc | 3797 ++++++++++++++++++++ .../test/waveinterp-2p/phiy.maximum.asc | 26 +- .../test/waveinterp-2p/phiy.minimum.asc | 26 +- .../CarpetInterp/test/waveinterp-2p/phiy.norm1.asc | 28 +- .../CarpetInterp/test/waveinterp-2p/phiy.norm2.asc | 28 +- .../test/waveinterp-2p/phiy.norm_inf.asc | 26 +- Carpet/CarpetInterp/test/waveinterp-2p/phiy.x.asc | 2199 +++++++----- Carpet/CarpetInterp/test/waveinterp-2p/phiy.y.asc | 2199 +++++++----- Carpet/CarpetInterp/test/waveinterp-2p/phiy.z.asc | 1672 ++++----- Carpet/CarpetInterp/test/waveinterp-2p/phiz..asc | 248 +- .../test/waveinterp-2p/phiz.average.asc | 12 +- .../CarpetInterp/test/waveinterp-2p/phiz.count.asc | 2 - Carpet/CarpetInterp/test/waveinterp-2p/phiz.d.asc | 3797 ++++++++++++++++++++ .../test/waveinterp-2p/phiz.maximum.asc | 26 +- .../test/waveinterp-2p/phiz.minimum.asc | 26 +- .../CarpetInterp/test/waveinterp-2p/phiz.norm1.asc | 28 +- .../CarpetInterp/test/waveinterp-2p/phiz.norm2.asc | 28 +- .../test/waveinterp-2p/phiz.norm_inf.asc | 26 +- Carpet/CarpetInterp/test/waveinterp-2p/phiz.x.asc | 2199 +++++++----- Carpet/CarpetInterp/test/waveinterp-2p/phiz.y.asc | 2199 +++++++----- Carpet/CarpetInterp/test/waveinterp-2p/phiz.z.asc | 1672 ++++----- Carpet/CarpetLib/src/backtrace.cc | 2 + Carpet/CarpetLib/src/bboxset2.hh | 4 +- Carpet/CarpetLib/src/cacheinfo.cc | 1 + Carpet/CarpetLib/src/commstate.cc | 6 +- Carpet/CarpetLib/src/data.cc | 36 +- Carpet/CarpetLib/src/dh.cc | 2 +- Carpet/CarpetLib/src/gdata.cc | 2 +- Carpet/CarpetLib/src/vect.cc | 2 +- Carpet/CarpetLib/src/vect.hh | 18 +- Carpet/CarpetRegrid/param.ccl | 6 +- Carpet/CarpetRegrid2/src/regrid.cc | 8 +- Carpet/LoopControl/src/loopcontrol.cc | 4 +- Carpet/Timers/src/CactusTimer.cc | 39 +- Carpet/Timers/src/CactusTimer.hh | 2 + Carpet/Timers/src/Timer.cc | 17 +- Carpet/Timers/src/TimerTree.cc | 13 +- .../CarpetIOFlexIOCheckpoint/src/ioflexio.hh | 18 +- .../CarpetIOFlexIOCheckpoint/src/ioflexioUtil.cc | 12 +- CarpetDev/CarpetIOF5/src/output.cc | 18 +- CarpetDev/CarpetIONirvana/src/CarpetIONirvana.cc | 18 +- CarpetExtra/CarpetProlongateTest/test/test.ccl | 3 +- CarpetExtra/Nirvana/Nirvana.sh | 3 + CarpetExtra/TestTimers2/configuration.ccl | 1 + CarpetExtra/TestTimers2/interface.ccl | 1 + .../TestTimers2}/param.ccl | 0 CarpetExtra/TestTimers2/schedule.ccl | 9 + CarpetExtra/TestTimers2/src/TestCactusTimers.cc | 28 + CarpetExtra/TestTimers2/src/TestTimers.cc | 20 + CarpetExtra/TestTimers2/src/make.code.defn | 2 + CarpetExtra/TestTimers2/test/testtimers.par | 3 + 195 files changed, 63605 insertions(+), 29981 deletions(-) create mode 100644 Carpet/CarpetInterp/test/waveinterp-1p/arrays1d[0].y.asc create mode 100644 Carpet/CarpetInterp/test/waveinterp-1p/arrays1d[1].x.asc create mode 100644 Carpet/CarpetInterp/test/waveinterp-1p/arrays1d[1].y.asc create mode 100644 Carpet/CarpetInterp/test/waveinterp-1p/arrays1d[2].x.asc create mode 100644 Carpet/CarpetInterp/test/waveinterp-1p/arrays1d[2].y.asc create mode 100644 Carpet/CarpetInterp/test/waveinterp-1p/phi.d.asc create mode 100644 Carpet/CarpetInterp/test/waveinterp-1p/phit.d.asc create mode 100644 Carpet/CarpetInterp/test/waveinterp-1p/phix.d.asc create mode 100644 Carpet/CarpetInterp/test/waveinterp-1p/phiy.d.asc create mode 100644 Carpet/CarpetInterp/test/waveinterp-1p/phiz.d.asc create mode 100644 Carpet/CarpetInterp/test/waveinterp-2p/arrays1d[0].y.asc create mode 100644 Carpet/CarpetInterp/test/waveinterp-2p/arrays1d[1].x.asc create mode 100644 Carpet/CarpetInterp/test/waveinterp-2p/arrays1d[1].y.asc create mode 100644 Carpet/CarpetInterp/test/waveinterp-2p/arrays1d[2].x.asc create mode 100644 Carpet/CarpetInterp/test/waveinterp-2p/arrays1d[2].y.asc create mode 100644 Carpet/CarpetInterp/test/waveinterp-2p/phi.d.asc create mode 100644 Carpet/CarpetInterp/test/waveinterp-2p/phit.d.asc create mode 100644 Carpet/CarpetInterp/test/waveinterp-2p/phix.d.asc create mode 100644 Carpet/CarpetInterp/test/waveinterp-2p/phiy.d.asc create mode 100644 Carpet/CarpetInterp/test/waveinterp-2p/phiz.d.asc create mode 100644 CarpetExtra/TestTimers2/configuration.ccl create mode 100644 CarpetExtra/TestTimers2/interface.ccl copy {Carpet/CarpetPSAMRTest => CarpetExtra/TestTimers2}/param.ccl (100%) create mode 100644 CarpetExtra/TestTimers2/schedule.ccl create mode 100644 CarpetExtra/TestTimers2/src/TestCactusTimers.cc create mode 100644 CarpetExtra/TestTimers2/src/TestTimers.cc create mode 100644 CarpetExtra/TestTimers2/src/make.code.defn create mode 100644 CarpetExtra/TestTimers2/test/testtimers.par
hooks/post-receive -- Carpet — Adaptive Mesh Refinement for the Cactus Framework http://carpetcode.org/