Commits

commits@lists.einsteintoolkit.org

2 participants
6997 discussions

[Carpet] branch, psamr, updated. ET_2013_11_v0-32-g198946c
by Carpet git repositories 07 Jan '14

07 Jan '14

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 198946c094dffc6367680f8d554274b43fa8993c (commit) via 7469d8a376795454ff0d6838d0d395541041b018 (commit) via 4d72bda475a2330da5973bd71c9f23e5291b3cf0 (commit) via dffae286fc5f41b29869eebe24ef0c73f28431dc (commit) via 4697d4e29062c060078a2f004ccf7d3a871da553 (commit) via 7cc66d545b5694b682a7df9c6239404748b7a696 (commit) via bf8c5e675066da9fd5d5db708a32e1f10e7e20e5 (commit) via 3e55f78e5f9596b3e65d74e754af00323117603d (commit) via aa4ca64a9ce83e742742cc09bd56f1d0e76602cf (commit) via a7e4428c5be2b76f6f546c5b2a8d157af7cecb5a (commit) via 25b0877ecb1f086080a527d81ba90d2fc629226a (commit) via 8f0a9f60cbd6f4c7766e9275d9c9572d604290d9 (commit) via 6c463ae9b245910a7c7628fb6871f1e889b1918a (commit) via 8fe1110956d01d60b397c2486d0b51387594264c (commit) via 34c034242fb69059e73082bf514f71bd466279af (commit) via 68ba0010e053cfb1112732821c2d6731f3dc1645 (commit) via d0a739ecfb8f10d788d02f2c8fc932d39de96d01 (commit) via 8359eda5b4f02eb5d7ffae2abb0518e653a56fd2 (commit) via d6949619a2957892b071d973d14a1a71bbd25f1d (commit) via 0fd9403c44dcc6dee4d8762d236c9146f0df92d1 (commit) via 4a1ecd2273e575c87a4d9a1b19467eae7af2532a (commit) via dbd1803ac57a1b0a79992e45297f1b57c855efe9 (commit) via ff87da44fab3c385c79cd92c68d619c694025a20 (commit) via 40c820d4ca704ebde88fdea1fd3b7a0f0a22b3ec (commit) via 456d8db4f4a672e1cf048e230248910aaf8b2733 (commit) via b6f01959161fded698c02d3b1099cef0258d4cce (commit) via 390fe95c7756d5102226ccb48eadbcee62e1a52d (commit) via 52d01b54ee0a65c04eab2961a96c4c446b323b68 (commit) via 965a83725ca6fb26c60daaaa56d5bdfc04ce678d (commit) via 7b4fac2f0c1b44fc7f6934d0edff186aaf6fd7e7 (commit) from 98a93927faf1e19de7f469f056b79a430c846d41 (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 198946c094dffc6367680f8d554274b43fa8993c Merge: 98a9392 7469d8a Author: Frank Loeffler <knarf(a)cct.lsu.edu> Date: Tue Jan 7 09:40:21 2014 -0600 Merge branch 'master' into psamr ----------------------------------------------------------------------- Summary of changes: Carpet/Carpet/src/Evolve.cc | 30 +- Carpet/Carpet/src/Initialise.cc | 28 +- Carpet/Carpet/src/Restrict.cc | 16 +- Carpet/Carpet/test/outer-buffers.par | 143 - Carpet/Carpet/test/outer-buffers/arrays1d[0].x.asc | 259 - Carpet/Carpet/test/outer-buffers/phi..asc | 159 - Carpet/Carpet/test/outer-buffers/phi.average.asc | 21 - Carpet/Carpet/test/outer-buffers/phi.count.asc | 21 - Carpet/Carpet/test/outer-buffers/phi.maximum.asc | 21 - Carpet/Carpet/test/outer-buffers/phi.minimum.asc | 21 - Carpet/Carpet/test/outer-buffers/phi.norm1.asc | 21 - Carpet/Carpet/test/outer-buffers/phi.norm2.asc | 21 - Carpet/Carpet/test/outer-buffers/phi.norm_inf.asc | 21 - Carpet/Carpet/test/outer-buffers/phi.x.asc | 1018 ---- Carpet/Carpet/test/outer-buffers/phi.y.asc | 1018 ---- Carpet/Carpet/test/outer-buffers/phi.z.asc | 1018 ---- Carpet/Carpet/test/outer-buffers/phit..asc | 159 - Carpet/Carpet/test/outer-buffers/phit.average.asc | 21 - Carpet/Carpet/test/outer-buffers/phit.count.asc | 21 - Carpet/Carpet/test/outer-buffers/phit.maximum.asc | 21 - Carpet/Carpet/test/outer-buffers/phit.minimum.asc | 21 - Carpet/Carpet/test/outer-buffers/phit.norm1.asc | 21 - Carpet/Carpet/test/outer-buffers/phit.norm2.asc | 21 - Carpet/Carpet/test/outer-buffers/phit.norm_inf.asc | 21 - Carpet/Carpet/test/outer-buffers/phit.x.asc | 1018 ---- Carpet/Carpet/test/outer-buffers/phit.y.asc | 1018 ---- Carpet/Carpet/test/outer-buffers/phit.z.asc | 1018 ---- Carpet/Carpet/test/outer-buffers/phix..asc | 159 - Carpet/Carpet/test/outer-buffers/phix.average.asc | 21 - Carpet/Carpet/test/outer-buffers/phix.count.asc | 21 - Carpet/Carpet/test/outer-buffers/phix.maximum.asc | 21 - Carpet/Carpet/test/outer-buffers/phix.minimum.asc | 21 - Carpet/Carpet/test/outer-buffers/phix.norm1.asc | 21 - Carpet/Carpet/test/outer-buffers/phix.norm2.asc | 21 - Carpet/Carpet/test/outer-buffers/phix.norm_inf.asc | 21 - Carpet/Carpet/test/outer-buffers/phix.x.asc | 1018 ---- Carpet/Carpet/test/outer-buffers/phix.y.asc | 1018 ---- Carpet/Carpet/test/outer-buffers/phix.z.asc | 1018 ---- Carpet/Carpet/test/outer-buffers/phiy..asc | 159 - Carpet/Carpet/test/outer-buffers/phiy.average.asc | 21 - Carpet/Carpet/test/outer-buffers/phiy.count.asc | 21 - Carpet/Carpet/test/outer-buffers/phiy.maximum.asc | 21 - Carpet/Carpet/test/outer-buffers/phiy.minimum.asc | 21 - Carpet/Carpet/test/outer-buffers/phiy.norm1.asc | 21 - Carpet/Carpet/test/outer-buffers/phiy.norm2.asc | 21 - Carpet/Carpet/test/outer-buffers/phiy.norm_inf.asc | 21 - Carpet/Carpet/test/outer-buffers/phiy.x.asc | 1018 ---- Carpet/Carpet/test/outer-buffers/phiy.y.asc | 1018 ---- Carpet/Carpet/test/outer-buffers/phiy.z.asc | 1018 ---- Carpet/Carpet/test/outer-buffers/phiz..asc | 159 - Carpet/Carpet/test/outer-buffers/phiz.average.asc | 21 - Carpet/Carpet/test/outer-buffers/phiz.count.asc | 21 - Carpet/Carpet/test/outer-buffers/phiz.maximum.asc | 21 - Carpet/Carpet/test/outer-buffers/phiz.minimum.asc | 21 - Carpet/Carpet/test/outer-buffers/phiz.norm1.asc | 21 - Carpet/Carpet/test/outer-buffers/phiz.norm2.asc | 21 - Carpet/Carpet/test/outer-buffers/phiz.norm_inf.asc | 21 - Carpet/Carpet/test/outer-buffers/phiz.x.asc | 1018 ---- Carpet/Carpet/test/outer-buffers/phiz.y.asc | 1018 ---- Carpet/Carpet/test/outer-buffers/phiz.z.asc | 1018 ---- Carpet/Carpet/test/test_restrict_sync.par | 167 + Carpet/Carpet/test/test_restrict_sync/phi.x.asc | 1454 ++++++ Carpet/CarpetIOHDF5/src/CarpetIOHDF5.cc | 2 +- Carpet/CarpetIOHDF5/src/Input.cc | 2 + Carpet/CarpetIOHDF5/src/Output.cc | 19 +- Carpet/CarpetIOHDF5/src/util/hdf5_slicer.cc | 8 +- Carpet/CarpetInterp/test/waveinterp-1p.par | 4 +- Carpet/CarpetInterp/test/waveinterp-2p.par | 4 +- Carpet/CarpetLib/src/dh.cc | 17 +- Carpet/CarpetRegrid2/param.ccl | 5 + Carpet/CarpetRegrid2/src/paramcheck.cc | 20 +- Carpet/CarpetRegrid2/src/property.cc | 114 + Carpet/CarpetRegrid2/src/property.hh | 12 + Carpet/CarpetRegrid2/src/regrid.cc | 1 + Carpet/LoopControl/param.ccl | 4 +- .../carpetintegrate-linear/integrand.average.asc | 43 +- .../carpetintegrate-linear/integrand.count.asc | 5 +- .../test/carpetintegrate-linear/integrand.d.asc | 5156 ++++++++++++++++++++ .../carpetintegrate-linear/integrand.iaverage.asc | 23 + .../carpetintegrate-linear/integrand.icount.asc | 23 + .../carpetintegrate-linear/integrand.inorm1.asc | 23 + .../carpetintegrate-linear/integrand.inorm2.asc | 23 + .../carpetintegrate-linear/integrand.maximum.asc | 5 +- .../carpetintegrate-linear/integrand.minimum.asc | 7 +- .../carpetintegrate-linear/integrand.norm1.asc | 43 +- .../carpetintegrate-linear/integrand.norm2.asc | 43 +- .../carpetintegrate-linear/integrand.norm_inf.asc | 5 +- .../test/carpetintegrate-linear/integrand.sum.asc | 43 +- .../test/carpetintegrate-linear/integrand.x.asc | 3917 +++++++-------- .../test/carpetintegrate-linear/integrand.y.asc | 3917 +++++++-------- .../test/carpetintegrate-linear/integrand.z.asc | 2344 +++++---- .../test/carpetintegrate-linear/weight.average.asc | 45 +- .../test/carpetintegrate-linear/weight.count.asc | 5 +- .../test/carpetintegrate-linear/weight.d.asc | 5156 ++++++++++++++++++++ .../carpetintegrate-linear/weight.iaverage.asc | 23 + .../test/carpetintegrate-linear/weight.icount.asc | 23 + .../test/carpetintegrate-linear/weight.inorm1.asc | 23 + .../test/carpetintegrate-linear/weight.inorm2.asc | 23 + .../test/carpetintegrate-linear/weight.maximum.asc | 5 +- .../test/carpetintegrate-linear/weight.minimum.asc | 5 +- .../test/carpetintegrate-linear/weight.norm1.asc | 45 +- .../test/carpetintegrate-linear/weight.norm2.asc | 45 +- .../carpetintegrate-linear/weight.norm_inf.asc | 5 +- .../test/carpetintegrate-linear/weight.sum.asc | 45 +- .../test/carpetintegrate-linear/weight.x.asc | 3917 +++++++-------- .../test/carpetintegrate-linear/weight.y.asc | 3917 +++++++-------- .../test/carpetintegrate-linear/weight.z.asc | 2344 +++++---- .../test/carpetintegrate/integrand.average.asc | 5 +- .../test/carpetintegrate/integrand.count.asc | 5 +- .../test/carpetintegrate/integrand.d.asc | 5156 ++++++++++++++++++++ .../integrand.iaverage.asc} | 5 +- .../test/carpetintegrate/integrand.icount.asc | 23 + .../integrand.inorm1.asc} | 5 +- .../integrand.inorm2.asc} | 5 +- .../test/carpetintegrate/integrand.maximum.asc | 5 +- .../test/carpetintegrate/integrand.minimum.asc | 5 +- .../test/carpetintegrate/integrand.norm1.asc | 5 +- .../test/carpetintegrate/integrand.norm2.asc | 5 +- .../test/carpetintegrate/integrand.norm_inf.asc | 5 +- .../test/carpetintegrate/integrand.sum.asc | 5 +- .../test/carpetintegrate/integrand.x.asc | 3917 +++++++-------- .../test/carpetintegrate/integrand.y.asc | 3917 +++++++-------- .../test/carpetintegrate/integrand.z.asc | 2344 +++++---- .../test/carpetintegrate/weight.average.asc | 45 +- .../test/carpetintegrate/weight.count.asc | 5 +- .../test/carpetintegrate/weight.d.asc | 5156 ++++++++++++++++++++ .../test/carpetintegrate/weight.iaverage.asc | 23 + .../test/carpetintegrate/weight.icount.asc | 23 + .../test/carpetintegrate/weight.inorm1.asc | 23 + .../test/carpetintegrate/weight.inorm2.asc | 23 + .../test/carpetintegrate/weight.maximum.asc | 5 +- .../test/carpetintegrate/weight.minimum.asc | 5 +- .../test/carpetintegrate/weight.norm1.asc | 45 +- .../test/carpetintegrate/weight.norm2.asc | 45 +- .../test/carpetintegrate/weight.norm_inf.asc | 5 +- .../test/carpetintegrate/weight.sum.asc | 45 +- .../test/carpetintegrate/weight.x.asc | 3917 +++++++-------- .../test/carpetintegrate/weight.y.asc | 3917 +++++++-------- .../test/carpetintegrate/weight.z.asc | 2344 +++++---- CarpetExtra/CarpetIntegrateTest/test/test.ccl | 1 + .../carpetprolongatetest::difference.d.asc | 10 +- .../carpetprolongatetest::difference.x.asc | 42 +- .../carpetprolongatetest::difference.y.asc | 42 +- .../carpetprolongatetest::difference.z.asc | 10 +- .../carpetprolongatetest::scalar.d.asc | 10 +- .../carpetprolongatetest::scalar.x.asc | 42 +- .../carpetprolongatetest::scalar.y.asc | 42 +- .../carpetprolongatetest::scalar.z.asc | 10 +- .../carpetprolongatetest::difference.d.asc | 10 +- .../carpetprolongatetest::difference.x.asc | 42 +- .../carpetprolongatetest::difference.y.asc | 42 +- .../carpetprolongatetest::difference.z.asc | 10 +- .../carpetprolongatetest::errornorm..asc | 2 +- .../carpetprolongatetest::scalar.d.asc | 10 +- .../carpetprolongatetest::scalar.x.asc | 42 +- .../carpetprolongatetest::scalar.y.asc | 42 +- .../carpetprolongatetest::scalar.z.asc | 10 +- .../carpetprolongatetest::difference.d.asc | 14 +- .../carpetprolongatetest::difference.x.asc | 42 +- .../carpetprolongatetest::difference.y.asc | 42 +- .../carpetprolongatetest::difference.z.asc | 14 +- .../carpetprolongatetest::scalar.d.asc | 14 +- .../carpetprolongatetest::scalar.x.asc | 42 +- .../carpetprolongatetest::scalar.y.asc | 42 +- .../carpetprolongatetest::scalar.z.asc | 14 +- .../carpetprolongatetest::difference.d.asc | 14 +- .../carpetprolongatetest::difference.x.asc | 42 +- .../carpetprolongatetest::difference.y.asc | 42 +- .../carpetprolongatetest::difference.z.asc | 14 +- .../carpetprolongatetest::scalar.d.asc | 14 +- .../carpetprolongatetest::scalar.x.asc | 42 +- .../carpetprolongatetest::scalar.y.asc | 42 +- .../carpetprolongatetest::scalar.z.asc | 14 +- .../carpetprolongatetest::interp_difference.d.asc | 25 +- .../carpetprolongatetest::interp_difference.x.asc | 49 +- ...carpetprolongatetest::interp_difference.xyz.asc | 445 +- .../carpetprolongatetest::interp_difference.y.asc | 49 +- .../carpetprolongatetest::interp_difference.z.asc | 49 +- .../carpetprolongatetest::interp_errornorm..asc | 31 +- .../test_interp/carpetprolongatetest::scalar.d.asc | 73 +- .../test_interp/carpetprolongatetest::scalar.x.asc | 769 +-- .../test_interp/carpetprolongatetest::scalar.y.asc | 769 +-- .../test_interp/carpetprolongatetest::scalar.z.asc | 769 +-- .../test_o9/carpetprolongatetest::difference.d.asc | 56 +- .../test_o9/carpetprolongatetest::difference.x.asc | 752 ++- .../test_o9/carpetprolongatetest::difference.y.asc | 752 ++- .../test_o9/carpetprolongatetest::difference.z.asc | 432 +- .../test_o9/carpetprolongatetest::errornorm..asc | 13 +- .../test_o9/carpetprolongatetest::scalar.d.asc | 42 +- .../test_o9/carpetprolongatetest::scalar.x.asc | 752 ++- .../test_o9/carpetprolongatetest::scalar.y.asc | 752 ++- .../test_o9/carpetprolongatetest::scalar.z.asc | 432 +- .../CarpetProlongateTest/test/test_o9/test_o9.par | 4 +- .../{CarpetEFenceTest => HighOrderWaveTest}/README | 7 +- CarpetExtra/HighOrderWaveTest/configuration.ccl | 1 + .../doc/documentation.tex | 4 +- CarpetExtra/HighOrderWaveTest/interface.ccl | 2 + .../HighOrderWaveTest/par/test_restrict_sync.par | 157 + CarpetExtra/HighOrderWaveTest/param.ccl | 1 + CarpetExtra/HighOrderWaveTest/schedule.ccl | 1 + .../src/make.code.defn | 2 +- .../HighOrderWaveTest/test/test_restrict_sync.par | 157 + .../test/test_restrict_sync/phi.z.asc | 240 + 203 files changed, 48156 insertions(+), 41691 deletions(-) delete mode 100644 Carpet/Carpet/test/outer-buffers.par delete mode 100644 Carpet/Carpet/test/outer-buffers/arrays1d[0].x.asc delete mode 100644 Carpet/Carpet/test/outer-buffers/phi..asc delete mode 100644 Carpet/Carpet/test/outer-buffers/phi.average.asc delete mode 100644 Carpet/Carpet/test/outer-buffers/phi.count.asc delete mode 100644 Carpet/Carpet/test/outer-buffers/phi.maximum.asc delete mode 100644 Carpet/Carpet/test/outer-buffers/phi.minimum.asc delete mode 100644 Carpet/Carpet/test/outer-buffers/phi.norm1.asc delete mode 100644 Carpet/Carpet/test/outer-buffers/phi.norm2.asc delete mode 100644 Carpet/Carpet/test/outer-buffers/phi.norm_inf.asc delete mode 100644 Carpet/Carpet/test/outer-buffers/phi.x.asc delete mode 100644 Carpet/Carpet/test/outer-buffers/phi.y.asc delete mode 100644 Carpet/Carpet/test/outer-buffers/phi.z.asc delete mode 100644 Carpet/Carpet/test/outer-buffers/phit..asc delete mode 100644 Carpet/Carpet/test/outer-buffers/phit.average.asc delete mode 100644 Carpet/Carpet/test/outer-buffers/phit.count.asc delete mode 100644 Carpet/Carpet/test/outer-buffers/phit.maximum.asc delete mode 100644 Carpet/Carpet/test/outer-buffers/phit.minimum.asc delete mode 100644 Carpet/Carpet/test/outer-buffers/phit.norm1.asc delete mode 100644 Carpet/Carpet/test/outer-buffers/phit.norm2.asc delete mode 100644 Carpet/Carpet/test/outer-buffers/phit.norm_inf.asc delete mode 100644 Carpet/Carpet/test/outer-buffers/phit.x.asc delete mode 100644 Carpet/Carpet/test/outer-buffers/phit.y.asc delete mode 100644 Carpet/Carpet/test/outer-buffers/phit.z.asc delete mode 100644 Carpet/Carpet/test/outer-buffers/phix..asc delete mode 100644 Carpet/Carpet/test/outer-buffers/phix.average.asc delete mode 100644 Carpet/Carpet/test/outer-buffers/phix.count.asc delete mode 100644 Carpet/Carpet/test/outer-buffers/phix.maximum.asc delete mode 100644 Carpet/Carpet/test/outer-buffers/phix.minimum.asc delete mode 100644 Carpet/Carpet/test/outer-buffers/phix.norm1.asc delete mode 100644 Carpet/Carpet/test/outer-buffers/phix.norm2.asc delete mode 100644 Carpet/Carpet/test/outer-buffers/phix.norm_inf.asc delete mode 100644 Carpet/Carpet/test/outer-buffers/phix.x.asc delete mode 100644 Carpet/Carpet/test/outer-buffers/phix.y.asc delete mode 100644 Carpet/Carpet/test/outer-buffers/phix.z.asc delete mode 100644 Carpet/Carpet/test/outer-buffers/phiy..asc delete mode 100644 Carpet/Carpet/test/outer-buffers/phiy.average.asc delete mode 100644 Carpet/Carpet/test/outer-buffers/phiy.count.asc delete mode 100644 Carpet/Carpet/test/outer-buffers/phiy.maximum.asc delete mode 100644 Carpet/Carpet/test/outer-buffers/phiy.minimum.asc delete mode 100644 Carpet/Carpet/test/outer-buffers/phiy.norm1.asc delete mode 100644 Carpet/Carpet/test/outer-buffers/phiy.norm2.asc delete mode 100644 Carpet/Carpet/test/outer-buffers/phiy.norm_inf.asc delete mode 100644 Carpet/Carpet/test/outer-buffers/phiy.x.asc delete mode 100644 Carpet/Carpet/test/outer-buffers/phiy.y.asc delete mode 100644 Carpet/Carpet/test/outer-buffers/phiy.z.asc delete mode 100644 Carpet/Carpet/test/outer-buffers/phiz..asc delete mode 100644 Carpet/Carpet/test/outer-buffers/phiz.average.asc delete mode 100644 Carpet/Carpet/test/outer-buffers/phiz.count.asc delete mode 100644 Carpet/Carpet/test/outer-buffers/phiz.maximum.asc delete mode 100644 Carpet/Carpet/test/outer-buffers/phiz.minimum.asc delete mode 100644 Carpet/Carpet/test/outer-buffers/phiz.norm1.asc delete mode 100644 Carpet/Carpet/test/outer-buffers/phiz.norm2.asc delete mode 100644 Carpet/Carpet/test/outer-buffers/phiz.norm_inf.asc delete mode 100644 Carpet/Carpet/test/outer-buffers/phiz.x.asc delete mode 100644 Carpet/Carpet/test/outer-buffers/phiz.y.asc delete mode 100644 Carpet/Carpet/test/outer-buffers/phiz.z.asc create mode 100644 Carpet/Carpet/test/test_restrict_sync.par create mode 100644 Carpet/Carpet/test/test_restrict_sync/phi.x.asc create mode 100644 CarpetExtra/CarpetIntegrateTest/test/carpetintegrate-linear/integrand.d.asc create mode 100644 CarpetExtra/CarpetIntegrateTest/test/carpetintegrate-linear/integrand.iaverage.asc create mode 100644 CarpetExtra/CarpetIntegrateTest/test/carpetintegrate-linear/integrand.icount.asc create mode 100644 CarpetExtra/CarpetIntegrateTest/test/carpetintegrate-linear/integrand.inorm1.asc create mode 100644 CarpetExtra/CarpetIntegrateTest/test/carpetintegrate-linear/integrand.inorm2.asc create mode 100644 CarpetExtra/CarpetIntegrateTest/test/carpetintegrate-linear/weight.d.asc create mode 100644 CarpetExtra/CarpetIntegrateTest/test/carpetintegrate-linear/weight.iaverage.asc create mode 100644 CarpetExtra/CarpetIntegrateTest/test/carpetintegrate-linear/weight.icount.asc create mode 100644 CarpetExtra/CarpetIntegrateTest/test/carpetintegrate-linear/weight.inorm1.asc create mode 100644 CarpetExtra/CarpetIntegrateTest/test/carpetintegrate-linear/weight.inorm2.asc create mode 100644 CarpetExtra/CarpetIntegrateTest/test/carpetintegrate/integrand.d.asc copy CarpetExtra/CarpetIntegrateTest/test/{carpetintegrate-linear/weight.maximum.asc => carpetintegrate/integrand.iaverage.asc} (86%) create mode 100644 CarpetExtra/CarpetIntegrateTest/test/carpetintegrate/integrand.icount.asc copy CarpetExtra/CarpetIntegrateTest/test/{carpetintegrate-linear/weight.maximum.asc => carpetintegrate/integrand.inorm1.asc} (86%) copy CarpetExtra/CarpetIntegrateTest/test/{carpetintegrate-linear/weight.maximum.asc => carpetintegrate/integrand.inorm2.asc} (86%) create mode 100644 CarpetExtra/CarpetIntegrateTest/test/carpetintegrate/weight.d.asc create mode 100644 CarpetExtra/CarpetIntegrateTest/test/carpetintegrate/weight.iaverage.asc create mode 100644 CarpetExtra/CarpetIntegrateTest/test/carpetintegrate/weight.icount.asc create mode 100644 CarpetExtra/CarpetIntegrateTest/test/carpetintegrate/weight.inorm1.asc create mode 100644 CarpetExtra/CarpetIntegrateTest/test/carpetintegrate/weight.inorm2.asc copy CarpetExtra/{CarpetEFenceTest => HighOrderWaveTest}/README (55%) create mode 100644 CarpetExtra/HighOrderWaveTest/configuration.ccl copy CarpetExtra/{CarpetEFenceTest => HighOrderWaveTest}/doc/documentation.tex (98%) create mode 100644 CarpetExtra/HighOrderWaveTest/interface.ccl create mode 100644 CarpetExtra/HighOrderWaveTest/par/test_restrict_sync.par create mode 100644 CarpetExtra/HighOrderWaveTest/param.ccl create mode 100644 CarpetExtra/HighOrderWaveTest/schedule.ccl copy CarpetExtra/{Nirvana => HighOrderWaveTest}/src/make.code.defn (63%) create mode 100644 CarpetExtra/HighOrderWaveTest/test/test_restrict_sync.par create mode 100644 CarpetExtra/HighOrderWaveTest/test/test_restrict_sync/phi.z.asc hooks/post-receive -- Carpet — Adaptive Mesh Refinement for the Cactus Framework <http://carpetcode.org/>

1 0

[Carpet] branch, psamr, updated. carpet-6-init-402-g98a9392
by Carpet git repositories 07 Jan '14

07 Jan '14

1 0

[Carpet] branch, psamr, updated. carpet-6-init-401-g67e7301
by Carpet git repositories 07 Jan '14

07 Jan '14

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 67e7301c0eb6bfef253d12d19f4e59c8327c0549 (commit) via 15fc3538a066846c30b0525103af56c3d87a4d95 (commit) via 9c7f841c2afad5ef8a1e1c8294d487f38885a377 (commit) via d43e472044d51790713abd2c50e2389eee366843 (commit) via 7c18b11f9a014731b63415bfde936c7f9d9be999 (commit) via 5de40cab297db3f809e1ee97f7c3d32bf736df0d (commit) via 3b0a847e8d5844efb3a4b52ad016764aa8bfcdab (commit) via 4ddd5ce5a6a1d73f58d60f51de8a3b9a41b01b96 (commit) via 75dbdb96f5676fd48fd04214adacba128011d7cb (commit) via bb964e0e1c59599be04f41ed4fd7a9a0f251a8e0 (commit) via b2233aab187fae609b1e02f2f7ed8b37819f9762 (commit) via d4eaa6a1a47c834565024b8f6ee093b9f3f9273c (commit) via c33997058605f27f15bb4d3caf6859da38f50149 (commit) via cfaded9a3c86e20bda1e12de34da59e600801347 (commit) via 6a7fc6a508a64020bdd3dcd1618bc8a1c115037e (commit) via ae71ad5e952a892c7b4a326daa078bccf6e4393b (commit) via 63c7615a27857f00a602b6ab5ccff2cc512bf503 (commit) via 666a5538cfde2a95339e5e9155e00457fd4b0185 (commit) via 8237792551e9f5f9ca95e98d78a709b5722ed25f (commit) via b13c69008fd5d9b0d04f417cec3c21f507e3a6f4 (commit) via c83793e7f141d969bad07757ed970aa053a3ad57 (commit) via be2bd96c56aa6dd5b1fb6654b130f3e44e049e8e (commit) via b9dcd6e71ae740d1660af390d473680439604551 (commit) via e99f723c8589aa0b9b2c84e1448c81d10843eb81 (commit) via 1f11d59bdc897023e049d16a3e58a18cef2403cc (commit) via 369933761ae450342b1771b561da3796c18c0f6e (commit) via b991b3a287c25a543b5c6bb81273e88d50893e55 (commit) via 326c42c490629de1c8de3c59b6c62e1e831757b1 (commit) via 0f3d4fb290766ee35cb39f7f3ce78c09d505010f (commit) via abdb6d9a6af1d0ae04d08933a1566805d46394ef (commit) via 1f8decfd8b7c80b55cf2c7ccd19889971cdb3528 (commit) via cbae83ccbe1076d089918e87eae606a79a30311f (commit) via 911ab59919a935b1d25146830673b2d200c74fed (commit) via d8cc74e37df4ff3750ccaed11b67e152cc0295f3 (commit) via d746b25592639a0f8eecab042553fe2a639be9d9 (commit) via 0e435fca01c0ce3356565c661afb0ff9d64880a1 (commit) via 38923afb0681b02fae2171cf54671cbe587ff748 (commit) via b7204bb29c90d0cf59680cfc8232a3a0de388a73 (commit) via 86ad98a5dc018ec767b3b981d6eddc3a73264d93 (commit) via eceb64cf06c7d0e9dbf037795cbb18184cb8bfbd (commit) via d64cd7ecf401f32c463f33de973c56bb6dab1710 (commit) via c1ee3366f750ad66a2fed562734b50a8557a2b6f (commit) via bc08df460473e83129b972eed6472bc99b14de5e (commit) via d37f25ab50b6155026196665c502864e9696dd5b (commit) via b3bc3f55da065426329f806ea9b26538bb6e4ee1 (commit) via 737235b0e507f0b459ae907ca0dda9f7ed595198 (commit) via 493f90970931ccdc8421bf5882bb14237508f70c (commit) via 66a468f4fc38188cd7a71261234a073f2a3e8c73 (commit) via c02dd99bbded56ab4dee2477cbc045b65708420d (commit) via a80e3537a7cd6d1a1b3db0bd31a271984b2958a2 (commit) via 1d493b9a1e1792eee4697d6d4985770cdb0522f8 (commit) via 27461a762da51d0c3151e7a55f13719e393ebded (commit) via 86ef2ebd9b2be15a67133625e960c8b2c7e7c57f (commit) via ee44d002712e9ba9e703e1bb22a626e8c58c1603 (commit) via fdadb2cfc19a42ada49fc91c12e56646848ca8b9 (commit) via dff327351eb8642931e7d7b328224e29a9133eca (commit) via ecb3547afa2f9904e4c4df720413e4685d2b51e2 (commit) via 7671fa71925aebfd787497bae61cf6da6ddeac54 (commit) via 984857f8041d5c4727b7f025a409ff3a165385fe (commit) via a098b911dc93593011c598e4e8b30b90b97fd6d6 (commit) via df54e9dc11a342b66921cdd66d77ebaf8b961172 (commit) via 9d85fef489365db1e205e906c80507854540ad06 (commit) via 6b415f376d2470aebb13e678d14e475e7c80a505 (commit) via f76e4b872473b41c30ef410c5931a4bbfdd73e0a (commit) via c59c3c235d48c34b1e4360576792ad38ecf253b2 (commit) via d74f9bc22f1da0e9f78e5f56de318a124d438e6d (commit) via 10dd72a5c8c8426b64df459e54e4a31ba26bdc82 (commit) via cb34e2dc04c82084d0e5fd1965153beb2f0c784a (commit) via db8acd75b9304ed558ce78a8ef6263ecec7ca24e (commit) via 46a706392b1a12331d0786d8f24ed4756fd8c725 (commit) via 4838dede790d61ed684ab2f4b9c3d7cf17270a78 (commit) via fc35c561a049d905763de37d60690fc15473d65d (commit) via 2ee083f401442bcca7265de784e1b0f00a185c25 (commit) via 77e61bb9a06ef271348c96d762935442c7439f0c (commit) via 2dedcb0e7340b0682d530dc26e764408b301e3b8 (commit) via 1843ac6e88b63d8eeaadfca723f4b2d13698cd62 (commit) via 94a4c0d3883162bdd70a70f1e044450b9f54c925 (commit) via c01a59ae14083f59511cac96ae7ea8f058c4bc27 (commit) via 3b0d7530fb66ec6340dba8e923e0c7176a06e3a6 (commit) via ea740d6943d91904e50c22bf40112b9f597c69e8 (commit) via 1208584f656f4af6a0b3d511882f77727f4638f3 (commit) via b6b6b71ca4c1de25e5d8f2dbc515d052b72aba32 (commit) via 849b1e88db67e2a49d8acb04f71e1951ddc8b02c (commit) via 6a344ba05da78f55de86fc966817cfdba159bc82 (commit) via 3271def579ef3202e3f311fe2af04d3bce9775e0 (commit) via a88f220f1dd9eb1d2cfbddbd9149321c27b24efb (commit) via 8971b8ba5639d39a161d03bdd8c1e2643e5f0f37 (commit) via 7119df45e3bd7e7ad353719f7b41a71ebb604912 (commit) via 3a4bc5a1416ea920644f3e0850920898f52459aa (commit) via 60860682850aca790187e17d7f2badd34a22345d (commit) via 9166952a1e2571bf5656345d7f8f1d1246e033d7 (commit) via dbe1636f5ed6ec4859719ff08f731735e123c59e (commit) via 25b21b980e695c15c23b106c28a562822ae4bbf9 (commit) via 5460dec57150cfee432bb79de47eac264d72efa0 (commit) via 320d6af5dd93dc1b5e124ba40679a48c201b2058 (commit) via ac1ecd7d99c9a241d4849ce43020c24791943bd1 (commit) via 5b0af3fbd208cb39658bc3945a3861d51686af2b (commit) via 3c219316f64935ca454ff46ee67e3ce4b877ba66 (commit) via 88e0d330988697021405cfd1034b99193cb5807c (commit) via e3e9d9c11e6658fbc57b306d8881579a48d6f69e (commit) via e6d432076b3f84d8920eaccecf72f7b1c9e60180 (commit) via b369f71cb6c6f39a861077a7ad827c0792769b0c (commit) via 2c954388dd07afc1715839dad9720e0c7df99207 (commit) via c4ed131c8190db169ae911e9ec65f8ad0e5a8d55 (commit) via 1221068097e23952a22e6a4c962f5b4e55511ec9 (commit) via e6e3f56a902da271e13b151aa4388b5bee325b0e (commit) via 3bd10ccb63673b78023687ae05505f62df20c12d (commit) via 1c675b70943bfa44111cb3629c7df8b5be258ee9 (commit) via f807a4b7c526141dcac08a582feb1dba52cbe6ff (commit) via 306327851d0f3f28b33459ac29b4318a6ee4bcfc (commit) via c024f7e97655c2daf25fdcd18ddc8ee48b7bd412 (commit) via fb8888e0a686e1cec2351cd52631d2c838f4a87a (commit) from baa565c5d1f15ca0f5d1852cef442c8a32b320a7 (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 67e7301c0eb6bfef253d12d19f4e59c8327c0549 Merge: baa565c 15fc353 Author: Frank Löffler <knarf(a)cct.lsu.edu> Date: Tue Jan 7 09:16:27 2014 -0600 merge from master ----------------------------------------------------------------------- Summary of changes: Carpet/Carpet/configuration.ccl | 2 +- Carpet/Carpet/interface.ccl | 17 +- Carpet/Carpet/param.ccl | 24 +- Carpet/Carpet/schedule.ccl | 1 + Carpet/Carpet/src/CallFunction.cc | 100 +- Carpet/Carpet/src/CarpetStartup.cc | 10 - Carpet/Carpet/src/Checksum.cc | 5 +- Carpet/Carpet/src/Comm.cc | 37 +- Carpet/Carpet/src/Cycle.cc | 5 +- Carpet/Carpet/src/Evolve.cc | 38 +- Carpet/Carpet/src/Initialise.cc | 56 +- .../LoadBalanceReal/splitregions_recursively.cc | 3 +- Carpet/Carpet/src/OutputGH.cc | 9 +- Carpet/Carpet/src/Poison.cc | 7 +- Carpet/Carpet/src/Recompose.cc | 25 +- Carpet/Carpet/src/Restrict.cc | 17 +- Carpet/Carpet/src/SetupGH.cc | 264 ++-- Carpet/Carpet/src/Shutdown.cc | 73 +- Carpet/Carpet/src/Storage.cc | 4 + Carpet/Carpet/src/TimerNode.hh | 119 -- Carpet/Carpet/src/TimerSet.cc | 190 --- Carpet/Carpet/src/TimerSet.hh | 69 - Carpet/Carpet/src/Timers.cc | 88 -- Carpet/Carpet/src/Timers.hh | 84 -- Carpet/Carpet/src/Timing.cc | 96 ++ Carpet/Carpet/src/carpet.hh | 4 + Carpet/Carpet/src/functions.hh | 6 +- Carpet/Carpet/src/helpers.cc | 30 +- Carpet/Carpet/src/make.code.defn | 6 +- Carpet/Carpet/src/modes.cc | 108 +- Carpet/Carpet/src/variables.cc | 12 +- Carpet/Carpet/src/variables.hh | 14 +- Carpet/CarpetIOASCII/interface.ccl | 3 +- Carpet/CarpetIOASCII/src/ioascii.cc | 13 +- Carpet/CarpetIOBasic/interface.ccl | 3 +- Carpet/CarpetIOBasic/src/iobasic.cc | 12 +- Carpet/CarpetIOHDF5/interface.ccl | 3 +- Carpet/CarpetIOHDF5/src/CarpetIOHDF5.cc | 16 +- Carpet/CarpetIOHDF5/src/Input.cc | 105 +- Carpet/CarpetIOHDF5/src/OutputSlice.cc | 8 +- Carpet/CarpetIOHDF5/test/alias_datasets.par | 61 + .../test/alias_datasets/phi.average.asc | 3 + .../CarpetIOHDF5/test/alias_datasets/phi.count.asc | 3 + .../test/alias_datasets/phi.maximum.asc | 3 + .../test/alias_datasets/phi.minimum.asc | 3 + .../CarpetIOHDF5/test/alias_datasets/phi.norm1.asc | 3 + .../CarpetIOHDF5/test/alias_datasets/phi.norm2.asc | 3 + .../test/alias_datasets/phi.norm_inf.asc | 3 + .../test/alias_datasets/psi.average.asc | 3 + .../CarpetIOHDF5/test/alias_datasets/psi.count.asc | 3 + .../test/alias_datasets/psi.maximum.asc | 3 + .../test/alias_datasets/psi.minimum.asc | 3 + .../CarpetIOHDF5/test/alias_datasets/psi.norm1.asc | 3 + .../CarpetIOHDF5/test/alias_datasets/psi.norm2.asc | 3 + .../test/alias_datasets/psi.norm_inf.asc | 3 + Carpet/CarpetIOHDF5/test/input_initial_data/phi.h5 | Bin 12553 -> 15189 bytes Carpet/CarpetIOHDF5/test/input_initial_data/psi.h5 | Bin 12553 -> 21193 bytes Carpet/CarpetIOScalar/interface.ccl | 3 +- Carpet/CarpetIOScalar/src/ioscalar.cc | 14 +- Carpet/CarpetInterp2/interface.ccl | 1 + Carpet/CarpetInterp2/param.ccl | 5 + Carpet/CarpetInterp2/src/fasterp.cc | 126 +- Carpet/CarpetLib/configuration.ccl | 4 +- Carpet/CarpetLib/interface.ccl | 4 +- Carpet/CarpetLib/param.ccl | 15 + Carpet/CarpetLib/src/commstate.cc | 86 +- Carpet/CarpetLib/src/commstate.hh | 22 +- Carpet/CarpetLib/src/data.cc | 141 ++- Carpet/CarpetLib/src/data.hh | 1 + Carpet/CarpetLib/src/defs.cc | 33 +- Carpet/CarpetLib/src/defs.hh | 2 + Carpet/CarpetLib/src/dh.cc | 153 +-- Carpet/CarpetLib/src/dh.hh | 19 +- Carpet/CarpetLib/src/gdata.cc | 16 +- Carpet/CarpetLib/src/gdata.hh | 11 +- Carpet/CarpetLib/src/gf.cc | 39 - Carpet/CarpetLib/src/gf.hh | 14 - Carpet/CarpetLib/src/ggf.cc | 48 +- Carpet/CarpetLib/src/ggf.hh | 14 +- Carpet/CarpetLib/src/gh.cc | 52 +- Carpet/CarpetLib/src/gh.hh | 19 +- Carpet/CarpetLib/src/interpolate_3d_2tl.cc | 4 +- Carpet/CarpetLib/src/interpolate_3d_3tl.cc | 20 +- Carpet/CarpetLib/src/interpolate_3d_4tl.cc | 4 +- Carpet/CarpetLib/src/interpolate_3d_5tl.cc | 4 +- Carpet/CarpetLib/src/interpolate_eno_3d_3tl.cc | 4 +- Carpet/CarpetLib/src/mem.cc | 142 ++- Carpet/CarpetLib/src/mem.hh | 3 + Carpet/CarpetLib/src/prolongate_3d_cc_eno_rf2.cc | 82 ++ Carpet/CarpetLib/src/prolongate_3d_real8_eno.F90 | 14 +- Carpet/CarpetLib/src/prolongate_3d_real8_tvd.F90 | 12 +- Carpet/CarpetLib/src/prolongate_3d_real8_weno.F90 | 14 +- Carpet/CarpetLib/src/restrict_3d_cc_o3_rf2.cc | 106 ++ Carpet/CarpetLib/src/restrict_3d_cc_o5_rf2.cc | 46 +- Carpet/CarpetLib/src/restrict_3d_cc_rf2.cc | 29 + Carpet/CarpetLib/src/restrict_3d_rf2.cc | 35 +- Carpet/CarpetLib/src/restrict_3d_vc_rf2.cc | 42 +- Carpet/CarpetLib/src/th.cc | 17 +- Carpet/CarpetLib/src/th.hh | 4 +- Carpet/CarpetLib/src/timestat.hh | 7 + Carpet/CarpetRegrid/src/automatic.cc | 8 +- Carpet/CarpetRegrid2/interface.ccl | 3 +- Carpet/CarpetRegrid2/src/regrid.cc | 311 ++--- Carpet/CarpetSlab/src/slab.cc | 3 +- Carpet/CarpetTest/interface.ccl | 2 +- Carpet/CarpetTest/param.ccl | 4 + Carpet/CarpetTest/schedule.ccl | 10 +- .../CarpetTest/src/carpettest_check_arguments.F77 | 26 +- Carpet/CarpetTest/src/carpettest_check_sizes.c | 1 - Carpet/CarpetTest/test/arraysizes.par | 3 + Carpet/CarpetTest/test/arraysizes/arr1.x.asc | 12 + Carpet/CarpetTest/test/arraysizes/arr1.xl | 15 - Carpet/CarpetTest/test/arraysizes/arr2.x.asc | 9 + Carpet/CarpetTest/test/arraysizes/arr2.xl | 13 - Carpet/CarpetTest/test/arraysizes/arr2.xy.asc | 60 + Carpet/CarpetTest/test/arraysizes/arr2.xyp | 56 - Carpet/CarpetTest/test/arraysizes/arr2.y.asc | 10 + Carpet/CarpetTest/test/arraysizes/arr2.yl | 14 - Carpet/CarpetTest/test/arraysizes/arr3.x.asc | 5 + Carpet/CarpetTest/test/arraysizes/arr3.xl | 10 - Carpet/CarpetTest/test/arraysizes/arr3.xy.asc | 18 + Carpet/CarpetTest/test/arraysizes/arr3.xyp | 23 - Carpet/CarpetTest/test/arraysizes/arr3.xyz.asc | 89 ++ Carpet/CarpetTest/test/arraysizes/arr3.xyzv | 92 -- Carpet/CarpetTest/test/arraysizes/arr3.xz.asc | 24 + Carpet/CarpetTest/test/arraysizes/arr3.xzp | 27 - Carpet/CarpetTest/test/arraysizes/arr3.y.asc | 6 + Carpet/CarpetTest/test/arraysizes/arr3.yl | 11 - Carpet/CarpetTest/test/arraysizes/arr3.yz.asc | 29 + Carpet/CarpetTest/test/arraysizes/arr3.yzp | 32 - Carpet/CarpetTest/test/arraysizes/arr3.z.asc | 9 + Carpet/CarpetTest/test/arraysizes/arr3.zl | 12 - Carpet/CarpetTest/test/arraysizes/gf.d.asc | 14 + Carpet/CarpetTest/test/arraysizes/gf.x.asc | 13 + Carpet/CarpetTest/test/arraysizes/gf.xl | 17 - Carpet/CarpetTest/test/arraysizes/gf.xy.asc | 113 ++ Carpet/CarpetTest/test/arraysizes/gf.xyp | 117 -- Carpet/CarpetTest/test/arraysizes/gf.xyz.asc | 1336 ++++++++++++++++++++ Carpet/CarpetTest/test/arraysizes/gf.xyzv | 1117 ---------------- Carpet/CarpetTest/test/arraysizes/gf.xz.asc | 136 ++ Carpet/CarpetTest/test/arraysizes/gf.xzp | 117 -- Carpet/CarpetTest/test/arraysizes/gf.y.asc | 13 + Carpet/CarpetTest/test/arraysizes/gf.yl | 17 - Carpet/CarpetTest/test/arraysizes/gf.yz.asc | 136 ++ Carpet/CarpetTest/test/arraysizes/gf.yzp | 117 -- Carpet/CarpetTest/test/arraysizes/gf.z.asc | 16 + Carpet/CarpetTest/test/arraysizes/gf.zl | 17 - Carpet/CarpetTest/test/arraysizes/sc.xl | 8 - Carpet/CarpetTest/test/test.ccl | 2 +- Carpet/CycleClock/src/clock.cc | 14 + Carpet/CycleClock/src/cycle.cc | 4 + Carpet/CycleClock/src/cycleclock.h | 8 +- ....par => bench-minkowski-carpet-1lev-dynopt.par} | 8 +- .../par/bench-minkowski-carpet-1lev-legacy.par | 2 +- .../par/bench-minkowski-carpet-1lev-test.par | 2 +- .../par/bench-minkowski-carpet-1lev-tiled.par | 2 +- Carpet/LoopControl/param.ccl | 28 + Carpet/LoopControl/schedule.ccl | 10 +- Carpet/LoopControl/src/loopcontrol.cc | 348 +++-- Carpet/LoopControl/src/loopcontrol.h | 8 +- Carpet/LoopControl/src/loopcontrol_fortran.h | 37 +- Carpet/LoopControl/src/loopcontrol_types.F90 | 13 +- Carpet/Timers/README | 14 + Carpet/Timers/configuration.ccl | 8 + Carpet/Timers/doc/documentation.tex | 144 +++ Carpet/Timers/interface.ccl | 14 + Carpet/Timers/param.ccl | 36 + Carpet/Timers/schedule.ccl | 11 + Carpet/{Carpet => Timers}/src/CactusTimer.cc | 43 +- Carpet/{Carpet => Timers}/src/CactusTimer.hh | 72 +- Carpet/Timers/src/CactusTimerSet.cc | 185 +++ Carpet/Timers/src/CactusTimerSet.hh | 62 + Carpet/Timers/src/Timer.cc | 143 +++ Carpet/Timers/src/Timer.hh | 89 ++ .../src/TimerNode.cc => Timers/src/TimerTree.cc} | 182 +-- Carpet/Timers/src/TimerTree.hh | 121 ++ Carpet/Timers/src/make.code.defn | 7 + .../CarpetIOF5_standalone/src/coordinate_system.cc | 4 +- CarpetExtra/CarpetEFenceTest/README | 9 + CarpetExtra/CarpetEFenceTest/configuration.ccl | 1 + CarpetExtra/CarpetEFenceTest/doc/documentation.tex | 144 +++ CarpetExtra/CarpetEFenceTest/interface.ccl | 4 + CarpetExtra/CarpetEFenceTest/param.ccl | 7 + CarpetExtra/CarpetEFenceTest/schedule.ccl | 8 + CarpetExtra/CarpetEFenceTest/src/breach_fence.c | 21 + CarpetExtra/CarpetEFenceTest/src/make.code.defn | 7 + CarpetExtra/CarpetEFenceTest/test/test_lower.par | 58 + .../test/test_lower/test_lower.par | 58 + .../carpetprolongatetest::difference.d.asc | 10 +- .../carpetprolongatetest::difference.x.asc | 42 +- .../carpetprolongatetest::difference.y.asc | 42 +- .../carpetprolongatetest::difference.z.asc | 10 +- .../carpetprolongatetest::scalar.d.asc | 10 +- .../carpetprolongatetest::scalar.x.asc | 42 +- .../carpetprolongatetest::scalar.y.asc | 42 +- .../carpetprolongatetest::scalar.z.asc | 10 +- .../carpetprolongatetest::difference.d.asc | 10 +- .../carpetprolongatetest::difference.x.asc | 42 +- .../carpetprolongatetest::difference.y.asc | 42 +- .../carpetprolongatetest::difference.z.asc | 10 +- .../carpetprolongatetest::errornorm..asc | 2 +- .../carpetprolongatetest::scalar.d.asc | 10 +- .../carpetprolongatetest::scalar.x.asc | 42 +- .../carpetprolongatetest::scalar.y.asc | 42 +- .../carpetprolongatetest::scalar.z.asc | 10 +- .../carpetprolongatetest::difference.d.asc | 14 +- .../carpetprolongatetest::difference.x.asc | 42 +- .../carpetprolongatetest::difference.y.asc | 42 +- .../carpetprolongatetest::difference.z.asc | 14 +- .../carpetprolongatetest::scalar.d.asc | 14 +- .../carpetprolongatetest::scalar.x.asc | 42 +- .../carpetprolongatetest::scalar.y.asc | 42 +- .../carpetprolongatetest::scalar.z.asc | 14 +- .../carpetprolongatetest::difference.d.asc | 14 +- .../carpetprolongatetest::difference.x.asc | 42 +- .../carpetprolongatetest::difference.y.asc | 42 +- .../carpetprolongatetest::difference.z.asc | 14 +- .../carpetprolongatetest::scalar.d.asc | 14 +- .../carpetprolongatetest::scalar.x.asc | 42 +- .../carpetprolongatetest::scalar.y.asc | 42 +- .../carpetprolongatetest::scalar.z.asc | 14 +- .../test_o9/carpetprolongatetest::difference.d.asc | 56 +- .../test_o9/carpetprolongatetest::difference.x.asc | 752 +++++------ .../test_o9/carpetprolongatetest::difference.y.asc | 752 +++++------ .../test_o9/carpetprolongatetest::difference.z.asc | 432 +++---- .../test_o9/carpetprolongatetest::errornorm..asc | 13 +- .../test_o9/carpetprolongatetest::scalar.d.asc | 42 +- .../test_o9/carpetprolongatetest::scalar.x.asc | 752 +++++------ .../test_o9/carpetprolongatetest::scalar.y.asc | 752 +++++------ .../test_o9/carpetprolongatetest::scalar.z.asc | 432 +++---- .../CarpetProlongateTest/test/test_o9/test_o9.par | 4 +- 231 files changed, 8104 insertions(+), 6158 deletions(-) delete mode 100644 Carpet/Carpet/src/TimerNode.hh delete mode 100644 Carpet/Carpet/src/TimerSet.cc delete mode 100644 Carpet/Carpet/src/TimerSet.hh delete mode 100644 Carpet/Carpet/src/Timers.cc delete mode 100644 Carpet/Carpet/src/Timers.hh create mode 100644 Carpet/CarpetIOHDF5/test/alias_datasets.par create mode 100644 Carpet/CarpetIOHDF5/test/alias_datasets/phi.average.asc create mode 100644 Carpet/CarpetIOHDF5/test/alias_datasets/phi.count.asc create mode 100644 Carpet/CarpetIOHDF5/test/alias_datasets/phi.maximum.asc create mode 100644 Carpet/CarpetIOHDF5/test/alias_datasets/phi.minimum.asc create mode 100644 Carpet/CarpetIOHDF5/test/alias_datasets/phi.norm1.asc create mode 100644 Carpet/CarpetIOHDF5/test/alias_datasets/phi.norm2.asc create mode 100644 Carpet/CarpetIOHDF5/test/alias_datasets/phi.norm_inf.asc create mode 100644 Carpet/CarpetIOHDF5/test/alias_datasets/psi.average.asc create mode 100644 Carpet/CarpetIOHDF5/test/alias_datasets/psi.count.asc create mode 100644 Carpet/CarpetIOHDF5/test/alias_datasets/psi.maximum.asc create mode 100644 Carpet/CarpetIOHDF5/test/alias_datasets/psi.minimum.asc create mode 100644 Carpet/CarpetIOHDF5/test/alias_datasets/psi.norm1.asc create mode 100644 Carpet/CarpetIOHDF5/test/alias_datasets/psi.norm2.asc create mode 100644 Carpet/CarpetIOHDF5/test/alias_datasets/psi.norm_inf.asc create mode 100644 Carpet/CarpetTest/test/arraysizes/arr1.x.asc delete mode 100644 Carpet/CarpetTest/test/arraysizes/arr1.xl create mode 100644 Carpet/CarpetTest/test/arraysizes/arr2.x.asc delete mode 100644 Carpet/CarpetTest/test/arraysizes/arr2.xl create mode 100644 Carpet/CarpetTest/test/arraysizes/arr2.xy.asc delete mode 100644 Carpet/CarpetTest/test/arraysizes/arr2.xyp create mode 100644 Carpet/CarpetTest/test/arraysizes/arr2.y.asc delete mode 100644 Carpet/CarpetTest/test/arraysizes/arr2.yl create mode 100644 Carpet/CarpetTest/test/arraysizes/arr3.x.asc delete mode 100644 Carpet/CarpetTest/test/arraysizes/arr3.xl create mode 100644 Carpet/CarpetTest/test/arraysizes/arr3.xy.asc delete mode 100644 Carpet/CarpetTest/test/arraysizes/arr3.xyp create mode 100644 Carpet/CarpetTest/test/arraysizes/arr3.xyz.asc delete mode 100644 Carpet/CarpetTest/test/arraysizes/arr3.xyzv create mode 100644 Carpet/CarpetTest/test/arraysizes/arr3.xz.asc delete mode 100644 Carpet/CarpetTest/test/arraysizes/arr3.xzp create mode 100644 Carpet/CarpetTest/test/arraysizes/arr3.y.asc delete mode 100644 Carpet/CarpetTest/test/arraysizes/arr3.yl create mode 100644 Carpet/CarpetTest/test/arraysizes/arr3.yz.asc delete mode 100644 Carpet/CarpetTest/test/arraysizes/arr3.yzp create mode 100644 Carpet/CarpetTest/test/arraysizes/arr3.z.asc delete mode 100644 Carpet/CarpetTest/test/arraysizes/arr3.zl create mode 100644 Carpet/CarpetTest/test/arraysizes/gf.d.asc create mode 100644 Carpet/CarpetTest/test/arraysizes/gf.x.asc delete mode 100644 Carpet/CarpetTest/test/arraysizes/gf.xl create mode 100644 Carpet/CarpetTest/test/arraysizes/gf.xy.asc delete mode 100644 Carpet/CarpetTest/test/arraysizes/gf.xyp create mode 100644 Carpet/CarpetTest/test/arraysizes/gf.xyz.asc delete mode 100644 Carpet/CarpetTest/test/arraysizes/gf.xyzv create mode 100644 Carpet/CarpetTest/test/arraysizes/gf.xz.asc delete mode 100644 Carpet/CarpetTest/test/arraysizes/gf.xzp create mode 100644 Carpet/CarpetTest/test/arraysizes/gf.y.asc delete mode 100644 Carpet/CarpetTest/test/arraysizes/gf.yl create mode 100644 Carpet/CarpetTest/test/arraysizes/gf.yz.asc delete mode 100644 Carpet/CarpetTest/test/arraysizes/gf.yzp create mode 100644 Carpet/CarpetTest/test/arraysizes/gf.z.asc delete mode 100644 Carpet/CarpetTest/test/arraysizes/gf.zl delete mode 100644 Carpet/CarpetTest/test/arraysizes/sc.xl copy Carpet/LoopControl/par/{bench-minkowski-carpet-1lev-tiled.par => bench-minkowski-carpet-1lev-dynopt.par} (93%) create mode 100644 Carpet/Timers/README create mode 100644 Carpet/Timers/configuration.ccl create mode 100644 Carpet/Timers/doc/documentation.tex create mode 100644 Carpet/Timers/interface.ccl create mode 100644 Carpet/Timers/param.ccl create mode 100644 Carpet/Timers/schedule.ccl rename Carpet/{Carpet => Timers}/src/CactusTimer.cc (88%) rename Carpet/{Carpet => Timers}/src/CactusTimer.hh (56%) create mode 100644 Carpet/Timers/src/CactusTimerSet.cc create mode 100644 Carpet/Timers/src/CactusTimerSet.hh create mode 100644 Carpet/Timers/src/Timer.cc create mode 100644 Carpet/Timers/src/Timer.hh rename Carpet/{Carpet/src/TimerNode.cc => Timers/src/TimerTree.cc} (78%) create mode 100644 Carpet/Timers/src/TimerTree.hh create mode 100644 Carpet/Timers/src/make.code.defn create mode 100644 CarpetExtra/CarpetEFenceTest/README create mode 100644 CarpetExtra/CarpetEFenceTest/configuration.ccl create mode 100644 CarpetExtra/CarpetEFenceTest/doc/documentation.tex create mode 100644 CarpetExtra/CarpetEFenceTest/interface.ccl create mode 100644 CarpetExtra/CarpetEFenceTest/param.ccl create mode 100644 CarpetExtra/CarpetEFenceTest/schedule.ccl create mode 100644 CarpetExtra/CarpetEFenceTest/src/breach_fence.c create mode 100644 CarpetExtra/CarpetEFenceTest/src/make.code.defn create mode 100644 CarpetExtra/CarpetEFenceTest/test/test_lower.par create mode 100644 CarpetExtra/CarpetEFenceTest/test/test_lower/test_lower.par hooks/post-receive -- Carpet — Adaptive Mesh Refinement for the Cactus Framework <http://carpetcode.org/>

1 0

[Carpet] branch, psamr, created. carpet-6-init-289-gbaa565c
by Carpet git repositories 07 Jan '14

07 Jan '14

1 0

[svn:einsteintoolkit] incoming/MemSpeed/ (Rev. 110)
by rhaas＠tapir.caltech.edu 06 Jan '14

06 Jan '14

User: rhaas Date: 2014/01/06 11:53 PM Removed: /MemSpeed/ Log: remove MemSpeed since it is now in CactusUtil

1 0

[svn:einsteintoolkit] incoming/ (Rev. 109)
by rhaas＠tapir.caltech.edu 06 Jan '14

06 Jan '14

User: rhaas Date: 2014/01/06 11:52 PM Modified: / README Log: update description of thorn status File Changes: Directory: / ============ File [modified]: README Delta lines: +2 -2 =================================================================== --- README 2014-01-03 11:01:21 UTC (rev 108) +++ README 2014-01-07 05:52:36 UTC (rev 109) @@ -4,11 +4,11 @@ CartesianCoordinates deleted; is included in CTGamma CoreCollapseControl Roland Haas; needs documentation and testsuites IDFileHydro deleted; code moved into HydroBase in rev 64 of HydroBase -MemSpeed Erik Schnetter, accepted into CactusUtils +MemSpeed deleted; is included in CactusUtils SphericalHarmonicReconGen (PITTNull), Christian Reisswig; ready to be included. Roland provided testcases. Christian R. still needs to write basic doc. SphericalSlice Christian Reisswig; needs testsuites. This is currently included in Llama. ParitySymmetry Erik Schnetter, Zlochower -TOVSolverHot ? +TOVSolverHot Christian D. Ott; needs cleanup, testsuites, possibly documentation ZelmaniQuadWaveExtract Christian D. Ott; needs a bit cleanup, testsuites, documentation

1 0

[Carpet] branch, master, updated. ET_2013_11_v0-27-g7469d8a
by Carpet git repositories 05 Jan '14

05 Jan '14

1 0

[svn:einsteintoolkit] NullNews/branches/tapir/ (Rev. 21)
by bela＠caltech.edu 03 Jan '14

03 Jan '14

User: szilagyi Date: 2014/01/03 04:35 PM Modified: /branches/tapir/ interface.ccl, param.ccl, schedule.ccl /branches/tapir/src/ NullNews_SphHarmDecomp.F90, make.code.defn Log: remove some of the debugging code File Changes: Directory: /branches/tapir/src/ =============================== File [modified]: NullNews_SphHarmDecomp.F90 Delta lines: +32 -30 =================================================================== --- branches/tapir/src/NullNews_SphHarmDecomp.F90 2014-01-03 03:45:42 UTC (rev 20) +++ branches/tapir/src/NullNews_SphHarmDecomp.F90 2014-01-03 22:35:37 UTC (rev 21) @@ -17,7 +17,7 @@ implicit none CCTK_COMPLEX, dimension (:,:,:), allocatable:: cmplxtmp - CCTK_COMPLEX, dimension (:,:,:), allocatable:: NewsError + ! CCTK_COMPLEX, dimension (:,:,:), allocatable:: NewsError CCTK_COMPLEX, dimension(2:lmax, -lmax:lmax) :: NewsSphCoeff CCTK_COMPLEX, dimension(2:lmax, -lmax:lmax) :: NewsBSphCoeff CCTK_COMPLEX, dimension(2:lmax, -lmax:lmax) :: Psi4SphCoeff @@ -48,29 +48,29 @@ ! write (*,*) "computing ylm coefs: time=", cctk_time, ", J=", maxval(abs(Jn)) ! fill the waveforms with Ylm at Scri before decomposition - if (Ylm_at_Scri == 1) then +! if (Ylm_at_Scri == 1) then - News = YlmScri_2 - NewsB = YlmScri_2 - Psi4 = YlmScri_2 - News_uBondi = YlmScri_2 - NewsB_uBondi = YlmScri_2 - Psi4_uBondi = YlmScri_2 - Jn = YlmScri_2 - Jn_l = YlmScri_2 - Qn = YlmScri_1 - Qn_l = YlmScri_1 - Un = YlmScri_1 - Un_l = YlmScri_1 - omegan = YlmScri_0 - deltan = YlmScri_0 - betan = YlmScri_0 - uBondi = YlmScri_0 +! News = YlmScri_2 +! NewsB = YlmScri_2 +! Psi4 = YlmScri_2 +! News_uBondi = YlmScri_2 +! NewsB_uBondi = YlmScri_2 +! Psi4_uBondi = YlmScri_2 +! Jn = YlmScri_2 +! Jn_l = YlmScri_2 +! Qn = YlmScri_1 +! Qn_l = YlmScri_1 +! Un = YlmScri_1 +! Un_l = YlmScri_1 +! omegan = YlmScri_0 +! deltan = YlmScri_0 +! betan = YlmScri_0 +! uBondi = YlmScri_0 - end if +! end if - allocate(NewsError(null_lsh(1), null_lsh(2), 2) ) + ! allocate(NewsError(null_lsh(1), null_lsh(2), 2) ) ! SpinDecompCoefs(GH, nq, np, s, z, f, sphcoef) @@ -78,30 +78,30 @@ time = cctk_time - call SpinDecompCoefs(cctkGH, null_lsh(1), null_lsh(2), NewsSpinWeight, & + call SpinDecompCoefs(cctkGH, null_lsh(1), null_lsh(2), 2, & zeta, News, NewsSphCoeff) - call SpinDecompCoefs(cctkGH, null_lsh(1), null_lsh(2), NewsSpinWeight, & + call SpinDecompCoefs(cctkGH, null_lsh(1), null_lsh(2), 2, & zeta, NewsB, NewsBSphCoeff) - call SpinDecompCoefs(cctkGH, null_lsh(1), null_lsh(2), NewsSpinWeight, & + call SpinDecompCoefs(cctkGH, null_lsh(1), null_lsh(2), 2, & zeta, Psi4, Psi4SphCoeff) if (compute_lin_strain .ne. 0) then - call SpinDecompCoefs(cctkGH, null_lsh(1), null_lsh(2), NewsSpinWeight, & + call SpinDecompCoefs(cctkGH, null_lsh(1), null_lsh(2), 2, & zeta, linStrain, linStrainSphCoeff) endif else time = constant_uBondi - call SpinDecompCoefs(cctkGH, null_lsh(1), null_lsh(2), NewsSpinWeight, & + call SpinDecompCoefs(cctkGH, null_lsh(1), null_lsh(2), 2, & zeta, News_uBondi, NewsSphCoeff) - call SpinDecompCoefs(cctkGH, null_lsh(1), null_lsh(2), NewsSpinWeight, & + call SpinDecompCoefs(cctkGH, null_lsh(1), null_lsh(2), 2, & zeta, NewsB_uBondi, NewsBSphCoeff) - call SpinDecompCoefs(cctkGH, null_lsh(1), null_lsh(2), NewsSpinWeight, & + call SpinDecompCoefs(cctkGH, null_lsh(1), null_lsh(2), 2, & zeta, Psi4_uBondi, Psi4SphCoeff) if (compute_lin_strain .ne. 0) then - call SpinDecompCoefs(cctkGH, null_lsh(1), null_lsh(2), NewsSpinWeight, & + call SpinDecompCoefs(cctkGH, null_lsh(1), null_lsh(2), 2, & zeta, linStrain_uBondi, linStrainSphCoeff) endif endif @@ -137,7 +137,7 @@ deallocate(cmplxtmp) endif - deallocate(NewsError) + ! deallocate(NewsError) ! Only output if this is processor 0 if (CCTK_MyProc(cctkGH) .gt. 0) then @@ -154,7 +154,9 @@ endif if (debug_output == 1) then - + + time = cctk_time - 0.5 * cctk_delta_time + call NullDecomp_WriteCoefFile('J_scri', truncate, 2, lmax, JnSphCoeff, time) call NullDecomp_WriteCoefFile('Jl_scri', truncate, 2, lmax, Jn_lSphCoeff, time) File [modified]: make.code.defn Delta lines: +1 -1 =================================================================== --- branches/tapir/src/make.code.defn 2014-01-03 03:45:42 UTC (rev 20) +++ branches/tapir/src/make.code.defn 2014-01-03 22:35:37 UTC (rev 21) @@ -4,7 +4,7 @@ # Source files in this directory SRCS = NullNews_Bondi.F90 NullNews_GetNews.F90 NullNews_Init.F90 \ NullNews_Omega.F90 NullNews_ScriUtil.F90 NullNews_ScriVals.F90 NullNews_CalcPsi4.F90 NullNews_SphHarmDecomp.F90 \ - NullNews_YlmScri.F90 NullNews_interp_to_constant_uBondi.cc + NullNews_interp_to_constant_uBondi.cc # Subdirectories containing source files SUBDIRS = Directory: /branches/tapir/ =========================== File [modified]: interface.ccl Delta lines: +7 -7 =================================================================== --- branches/tapir/interface.ccl 2014-01-03 03:45:42 UTC (rev 20) +++ branches/tapir/interface.ccl 2014-01-03 22:35:37 UTC (rev 21) @@ -179,13 +179,13 @@ starting } "store state" -CCTK_COMPLEX YlmScri_group[2] TYPE=ARRAY dim=2 size=\ -(NullGrid::N_ang_pts_inside_eq+2*(NullGrid::N_ang_ev_outside_eq+NullGrid::N_ang_stencil_size)),\ -(NullGrid::N_ang_pts_inside_eq+2*(NullGrid::N_ang_ev_outside_eq+NullGrid::N_ang_stencil_size)) \ - GHOSTSIZE=NullGrid::N_ang_ghost_pts,NullGrid::N_ang_ghost_pts -{ - YlmScri_2, YlmScri_1, YlmScri_0 -} "Ylm at Scri by patch" +# CCTK_COMPLEX YlmScri_group[2] TYPE=ARRAY dim=2 size=\ +# (NullGrid::N_ang_pts_inside_eq+2*(NullGrid::N_ang_ev_outside_eq+NullGrid::N_ang_stencil_size)),\ +# (NullGrid::N_ang_pts_inside_eq+2*(NullGrid::N_ang_ev_outside_eq+NullGrid::N_ang_stencil_size)) \ +# GHOSTSIZE=NullGrid::N_ang_ghost_pts,NullGrid::N_ang_ghost_pts +# { +# YlmScri_2, YlmScri_1, YlmScri_0 +# } "Ylm at Scri by patch" File [modified]: param.ccl Delta lines: +7 -7 =================================================================== --- branches/tapir/param.ccl 2014-01-03 03:45:42 UTC (rev 20) +++ branches/tapir/param.ccl 2014-01-03 22:35:37 UTC (rev 21) @@ -42,10 +42,10 @@ { } "no" -CCTK_INT NewsSpinWeight "What weight for the News when writing the spherical harmonics?" -{ - 0:2 :: "Small range" -} 2 +# CCTK_INT NewsSpinWeight "What weight for the News when writing the spherical harmonics?" +# { +# 0:2 :: "Small range" +# } 2 BOOLEAN DEBUG_skip_BondiNews "should the bondi news algorithm be skipped?" { @@ -91,9 +91,9 @@ { } "no" -BOOLEAN Ylm_at_Scri "This switch is introduced to check convergence for the spherical decomposition" -{ -} "no" +# BOOLEAN Ylm_at_Scri "This switch is introduced to check convergence for the spherical decomposition" +# { +# } "no" int l_YlmScri "l in Ylm at Scri" { File [modified]: schedule.ccl Delta lines: +9 -10 =================================================================== --- branches/tapir/schedule.ccl 2014-01-03 03:45:42 UTC (rev 20) +++ branches/tapir/schedule.ccl 2014-01-03 22:35:37 UTC (rev 21) @@ -83,14 +83,13 @@ } -if (Ylm_at_Scri == 1) -{ - STORAGE: YlmScri_group +# if (Ylm_at_Scri == 1) +# { +# STORAGE: YlmScri_group +# +# schedule NullNews_YlmScri at INITIAL after NullNews_Init # before?? +# { +# LANG: Fortran +# } "fill the waveform at Scri with spherical harmonics" +# } - schedule NullNews_YlmScri at INITIAL after NullNews_Init # before?? - { - LANG: Fortran - } "fill the waveform at Scri with spherical harmonics" - -} -

1 0

[svn:einsteintoolkit] incoming/PITTNullCode/SphericalHarmonicReconGen/ (Rev. 108)
by bela＠caltech.edu 03 Jan '14

03 Jan '14

User: szilagyi Date: 2014/01/03 05:01 AM Modified: /PITTNullCode/SphericalHarmonicReconGen/ param.ccl, schedule.ccl /PITTNullCode/SphericalHarmonicReconGen/src/ read.cc Log: work on the adaptive timestep controller File Changes: Directory: /PITTNullCode/SphericalHarmonicReconGen/ =================================================== File [modified]: param.ccl Delta lines: +6 -0 =================================================================== --- PITTNullCode/SphericalHarmonicReconGen/param.ccl 2014-01-03 09:40:13 UTC (rev 107) +++ PITTNullCode/SphericalHarmonicReconGen/param.ccl 2014-01-03 11:01:21 UTC (rev 108) @@ -32,6 +32,12 @@ (0:* :: "larger than zero" } 0.1 +CCTK_REAL adjust_timestep__max_relative_change_per_step \ +"Maximum allowed relative change of the time-step during a single step. Ignored if time_interpolate==false." +{ + (0:1] :: "The smaller the value the more gradual the change in cctk_delta_time." +} 0.1 + CCTK_INT sphere_number "the sphere number (if multiple spheres are present in one file) that corresponds to the worldtube radius NullSHRExtract::cr" { 0:* :: "positive" File [modified]: schedule.ccl Delta lines: +4 -1 =================================================================== --- PITTNullCode/SphericalHarmonicReconGen/schedule.ccl 2014-01-03 09:40:13 UTC (rev 107) +++ PITTNullCode/SphericalHarmonicReconGen/schedule.ccl 2014-01-03 11:01:21 UTC (rev 108) @@ -21,9 +21,12 @@ #} "Schedule group for reconstructing world-tube data" if(adjust_timestep) { - SCHEDULE SphericalHarmonicReconGeneric_SetTimeStep IN PreStep + SCHEDULE SphericalHarmonicReconGeneric_SetTimeStep at CCTK_PRESTEP \ + before NullNews_InterpCycleTimelevels \ + before NullGrid_CopyTime { LANG: C + OPTIONS: global } "Set the time-step" } SCHEDULE SphericalHarmonicReconGeneric_ReadData IN SphericalHarmonicReconRead Directory: /PITTNullCode/SphericalHarmonicReconGen/src/ ======================================================= File [modified]: read.cc Delta lines: +23 -7 =================================================================== --- PITTNullCode/SphericalHarmonicReconGen/src/read.cc 2014-01-03 09:40:13 UTC (rev 107) +++ PITTNullCode/SphericalHarmonicReconGen/src/read.cc 2014-01-03 11:01:21 UTC (rev 108) @@ -105,20 +105,34 @@ " SphericalHarmonicReconGeneric_Startup"); } + CCTK_REAL &dt = cctkGH->cctk_delta_time; + // no adaptivity for the 1st few time-steps + if(cctk_iteration<5) { + CCTK_VInfo(CCTK_THORNSTRING, "Time-step has been left at %g",(double)dt); + return; + } SHR::SPH_database& db=*(SHR::db[0]); - CCTK_REAL &dt = cctkGH->cctk_delta_time; - if(db.n_timesteps()<2) return; // no adjustment - if(cctk_time<=db.time(0)) { + const double dt_old = dt; + const double time=cctk_time + SHR::initial_time_in_file; + const double eps=1.e-10*(db.time(1)-db.time(0)); + if(db.n_timesteps()<2) { + CCTK_VInfo(CCTK_THORNSTRING, "Time-step has been left at %g",(double)dt); + return; // no adjustment + } + if(time<db.time(0)-eps) { dt = db.time(1)-db.time(0); + CCTK_VInfo(CCTK_THORNSTRING, "Time-step has been left at %g",(double)dt); return; } - if(cctk_time>=db.time(db.n_timesteps()-1)) return; // no adjustment + if(time>eps+db.time(db.n_timesteps()-1)) { + CCTK_VInfo(CCTK_THORNSTRING, "Time-step has been left at %g",(double)dt); + return; // no adjustment + } - // locate by bisection the interval containing cctk_time + // locate by bisection the interval containing time for(int l0=0,l1=db.n_timesteps()-1,c=0;;++c) { const int lh=static_cast<int>(0.5*(l0+l1)); - const double eps=1.e-10*(db.time(1)-db.time(0)); - if(cctk_time<db.time(lh)-eps) l1=lh; + if(time<db.time(lh)-eps) l1=lh; else l0=lh; if(l1==l0+1) { dt = db.time(l1)-db.time(l0); @@ -131,6 +145,8 @@ if (time_interpolate) { dt /= adjust_timestep__steps_per_time_level; + // change the time-step gradually + dt = dt_old + (dt - dt_old) * adjust_timestep__max_relative_change_per_step; dt = std::min(dt,adjust_timestep__maximum_time_step); } if(verbose) CCTK_VInfo(CCTK_THORNSTRING, "Time-step has been set to %g",(double)dt);

1 0

[svn:einsteintoolkit] incoming/PITTNullCode/SphericalHarmonicReconGen/ (Rev. 107)
by bela＠caltech.edu 03 Jan '14

03 Jan '14

User: szilagyi Date: 2014/01/03 03:40 AM Modified: /PITTNullCode/SphericalHarmonicReconGen/ param.ccl, schedule.ccl /PITTNullCode/SphericalHarmonicReconGen/src/ read.cc Log: work on adaptive time-stepping File Changes: Directory: /PITTNullCode/SphericalHarmonicReconGen/ =================================================== File [modified]: param.ccl Delta lines: +16 -0 =================================================================== --- PITTNullCode/SphericalHarmonicReconGen/param.ccl 2013-12-27 22:16:05 UTC (rev 106) +++ PITTNullCode/SphericalHarmonicReconGen/param.ccl 2014-01-03 09:40:13 UTC (rev 107) @@ -16,6 +16,22 @@ { } no +BOOLEAN adjust_timestep "Should the time-step be adjusted?" +{ +} no + +CCTK_INT adjust_timestep__steps_per_time_level \ +"Number of time-steps between two time-values in the datafile. Ignored if time_interpolate==false." +{ + 1:* :: "at least one" +} 1 + +CCTK_REAL adjust_timestep__maximum_time_step \ +"Maximum allowed time-step. Ignored if time_interpolate==false." +{ + (0:* :: "larger than zero" +} 0.1 + CCTK_INT sphere_number "the sphere number (if multiple spheres are present in one file) that corresponds to the worldtube radius NullSHRExtract::cr" { 0:* :: "positive" File [modified]: schedule.ccl Delta lines: +6 -0 =================================================================== --- PITTNullCode/SphericalHarmonicReconGen/schedule.ccl 2013-12-27 22:16:05 UTC (rev 106) +++ PITTNullCode/SphericalHarmonicReconGen/schedule.ccl 2014-01-03 09:40:13 UTC (rev 107) @@ -20,6 +20,12 @@ #{ #} "Schedule group for reconstructing world-tube data" +if(adjust_timestep) { + SCHEDULE SphericalHarmonicReconGeneric_SetTimeStep IN PreStep + { + LANG: C + } "Set the time-step" +} SCHEDULE SphericalHarmonicReconGeneric_ReadData IN SphericalHarmonicReconRead { LANG: C Directory: /PITTNullCode/SphericalHarmonicReconGen/src/ ======================================================= File [modified]: read.cc Delta lines: +43 -0 =================================================================== --- PITTNullCode/SphericalHarmonicReconGen/src/read.cc 2013-12-27 22:16:05 UTC (rev 106) +++ PITTNullCode/SphericalHarmonicReconGen/src/read.cc 2014-01-03 09:40:13 UTC (rev 107) @@ -93,6 +93,49 @@ } + void SphericalHarmonicReconGeneric_SetTimeStep(CCTK_ARGUMENTS) + { + DECLARE_CCTK_ARGUMENTS; + DECLARE_CCTK_PARAMETERS; + + if (! SHR::initialized) + { + CCTK_WARN(CCTK_WARN_ABORT, "Schedule mismatch. \n" + " SphericalHarmonicReconGeneric_SetTimeStep must be called after\n" + " SphericalHarmonicReconGeneric_Startup"); + } + + SHR::SPH_database& db=*(SHR::db[0]); + CCTK_REAL &dt = cctkGH->cctk_delta_time; + if(db.n_timesteps()<2) return; // no adjustment + if(cctk_time<=db.time(0)) { + dt = db.time(1)-db.time(0); + return; + } + if(cctk_time>=db.time(db.n_timesteps()-1)) return; // no adjustment + + // locate by bisection the interval containing cctk_time + for(int l0=0,l1=db.n_timesteps()-1,c=0;;++c) { + const int lh=static_cast<int>(0.5*(l0+l1)); + const double eps=1.e-10*(db.time(1)-db.time(0)); + if(cctk_time<db.time(lh)-eps) l1=lh; + else l0=lh; + if(l1==l0+1) { + dt = db.time(l1)-db.time(l0); + break; + } + if(c>2+db.n_timesteps()) CCTK_WARN(0, "run-away bisection algorithm"); + } + + //if (CCTK_MyProc(cctkGH) == 0) + if (time_interpolate) + { + dt /= adjust_timestep__steps_per_time_level; + dt = std::min(dt,adjust_timestep__maximum_time_step); + } + if(verbose) CCTK_VInfo(CCTK_THORNSTRING, "Time-step has been set to %g",(double)dt); + } + void SphericalHarmonicReconGeneric_ReadData(CCTK_ARGUMENTS) { DECLARE_CCTK_ARGUMENTS;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Commits