Commits September 2011

commits@lists.einsteintoolkit.org

6 participants
58 discussions

[svn:einsteintoolkit] WeylScal4/trunk/ (Rev. 84)
by roland.haas＠physics.gatech.edu 30 Sep '11

30 Sep '11

User: rhaas Date: 2011/09/30 09:55 AM Modified: /trunk/ schedule.ccl Log: Regenerate code. File Changes: Directory: /trunk/ ================== File [modified]: schedule.ccl Delta lines: +3 -3 =================================================================== --- trunk/schedule.ccl 2011-09-30 14:55:19 UTC (rev 83) +++ trunk/schedule.ccl 2011-09-30 14:55:38 UTC (rev 84) @@ -26,7 +26,7 @@ if (CCTK_EQUALS(fd_order, "Nth")) { - schedule group psis_calc_Nth_group in MoL_PseudoEvolution + schedule group psis_calc_Nth_group in MoL_PseudoEvolution after ADMBase_SetADMVars { # no language specified } "psis_calc_Nth" @@ -71,7 +71,7 @@ if (CCTK_EQUALS(fd_order, "2nd")) { - schedule group psis_calc_2nd_group in MoL_PseudoEvolution + schedule group psis_calc_2nd_group in MoL_PseudoEvolution after ADMBase_SetADMVars { # no language specified } "psis_calc_2nd" @@ -116,7 +116,7 @@ if (CCTK_EQUALS(fd_order, "4th")) { - schedule group psis_calc_4th_group in MoL_PseudoEvolution + schedule group psis_calc_4th_group in MoL_PseudoEvolution after ADMBase_SetADMVars { # no language specified } "psis_calc_4th"

1 0

[svn:einsteintoolkit] WeylScal4/trunk/m/ (Rev. 83)
by roland.haas＠physics.gatech.edu 30 Sep '11

30 Sep '11

User: rhaas Date: 2011/09/30 09:55 AM Removed: /trunk/m/ WeylScal4.patch Modified: /trunk/m/ Makefile, WeylScal4.m Log: WeylScal4 needs to be scheduled after ADMBase_SetADMVars this fixes ticket #579 (scheduling was correct before due to alphabetical sorting) have make abort when there is an error creating the thorn File Changes: Directory: /trunk/m/ ==================== File [modified]: Makefile Delta lines: +1 -0 =================================================================== --- trunk/m/Makefile 2011-09-30 01:31:34 UTC (rev 82) +++ trunk/m/Makefile 2011-09-30 14:55:19 UTC (rev 83) @@ -8,6 +8,7 @@ WeylScal4.out: WeylScal4.m rm -rf WeylScal4 ./runmath.sh $^ + grep --silent 'Thorn ./WeylScal4 created successfully' WeylScal4.out for thorn in WeylScal4; do \ ./copy-if-changed.sh $$thorn/configuration.ccl ../../$$thorn/configuration.ccl && \ ./copy-if-changed.sh $$thorn/interface.ccl ../../$$thorn/interface.ccl && \ File [modified]: WeylScal4.m Delta lines: +1 -0 =================================================================== --- trunk/m/WeylScal4.m 2011-09-30 01:31:34 UTC (rev 82) +++ trunk/m/WeylScal4.m 2011-09-30 14:55:19 UTC (rev 83) @@ -119,6 +119,7 @@ { Name -> "psis_calc_" <> fdOrder, Where -> Interior, + After -> "ADMBase_SetADMVars", ConditionalOnKeyword -> {"fd_order", fdOrder}, Shorthands -> shorthands, Equations -> File [removed]: WeylScal4.patch Delta lines: +0 -0 Deleted: trunk/m/WeylScal4.patch

1 0

[svn:einsteintoolkit] manifest/trunk/ (Rev. 114)
by knarf＠cct.lsu.edu 29 Sep '11

29 Sep '11

User: knarf Date: 2011/09/29 11:05 PM Modified: /trunk/ einsteintoolkit.th Log: switch to new location for the python version of simfactory File Changes: Directory: /trunk/ ================== File [modified]: einsteintoolkit.th Delta lines: +2 -1 =================================================================== --- trunk/einsteintoolkit.th 2011-09-27 00:51:07 UTC (rev 113) +++ trunk/einsteintoolkit.th 2011-09-30 04:05:53 UTC (rev 114) @@ -29,7 +29,8 @@ !TARGET = $ROOT !TYPE = svn !URL = https://svn.cct.lsu.edu/repos/numrel/$1/trunk -!CHECKOUT = simfactory +!CHECKOUT = simfactory2 +!NAME = simfactory # Example parameter files !TARGET = $ROOT

1 0

[svn:einsteintoolkit] WeylScal4/trunk/test/ (Rev. 82)
by roland.haas＠physics.gatech.edu 29 Sep '11

29 Sep '11

User: rhaas Date: 2011/09/29 08:31 PM Modified: /trunk/test/ teukolsky.par, teukolskyID.par /trunk/test/teukolsky/ Psi4i.d.asc, Psi4i.x.asc, Psi4i.y.asc, Psi4i.z.asc, Psi4r.d.asc, Psi4r.x.asc, Psi4r.y.asc, Psi4r.z.asc /trunk/test/teukolskyID/ Psi4i.d.asc, Psi4i.x.asc, Psi4i.y.asc, Psi4i.z.asc, Psi4r.d.asc, Psi4r.x.asc, Psi4r.y.asc, Psi4r.z.asc Log: modify and regenerate test suites, they now pass (trivially) * changed spatial prolongation order to 3 (from 1), mostly because the git version of Carpet seems to have a bug in the order 1 code. This was what prevented the testsuite from running with more than one processor * increased resolution a bit to disentangle prolongation effects from outer boundary effects, also needed due to higher order spatial prolongation * the ID testsuite produces almost identical data to the previous curie release version when the same parfile is used. The differences are only in the outer boundary and go away if ADMBase is reverted to revision 60 (which changed the outer boundary condition for "static" evolutions) * the evolving tests do not agree as well. Agreement gets better if McLachlan is reverted to the Curie release version, but even so there are grid points at the edge of the prolongated region that do not match. This is very likey due to changes in when Psi4 is computed (Curie computes in PostRestrict, Maxwell does not). Since the differences creep in from these points, and these differences increase with time I decided to regenerate the test rather than finding out which precise change in McLachlan/Carpet/MoL/ADMBase/Kranc causes these to show up. * this requires (as of 2011-09-29 a patch to Carpet/Initialise.cc/CallRegrid) File Changes: Directory: /trunk/test/ ======================= File [modified]: teukolsky.par Delta lines: <Unavailable> File [modified]: teukolskyID.par Delta lines: <Unavailable> Directory: /trunk/test/teukolsky/ ================================= File [modified]: Psi4i.d.asc Delta lines: <Unavailable> File [modified]: Psi4i.x.asc Delta lines: <Unavailable> File [modified]: Psi4i.y.asc Delta lines: <Unavailable> File [modified]: Psi4i.z.asc Delta lines: <Unavailable> File [modified]: Psi4r.d.asc Delta lines: <Unavailable> File [modified]: Psi4r.x.asc Delta lines: <Unavailable> File [modified]: Psi4r.y.asc Delta lines: <Unavailable> File [modified]: Psi4r.z.asc Delta lines: <Unavailable> Directory: /trunk/test/teukolskyID/ =================================== File [modified]: Psi4i.d.asc Delta lines: <Unavailable> File [modified]: Psi4i.x.asc Delta lines: <Unavailable> File [modified]: Psi4i.y.asc Delta lines: <Unavailable> File [modified]: Psi4i.z.asc Delta lines: <Unavailable> File [modified]: Psi4r.d.asc Delta lines: <Unavailable> File [modified]: Psi4r.x.asc Delta lines: <Unavailable> File [modified]: Psi4r.y.asc Delta lines: <Unavailable> File [modified]: Psi4r.z.asc Delta lines: <Unavailable>

1 0

[svn:einsteintoolkit] www/release-info/ (Rev. 622)
by roland.haas＠physics.gatech.edu 27 Sep '11

27 Sep '11

User: rhaas Date: 2011/09/27 08:26 PM Removed: /release-info/ minkowski-gcc45__1_1.log, minkowski-gcc45__2_1.log, minkowski-gcc45__2_2.log Log: remove old files File Changes: Directory: /release-info/ ========================= File [removed]: minkowski-gcc45__1_1.log Delta lines: <Unavailable> File [removed]: minkowski-gcc45__2_1.log Delta lines: <Unavailable> File [removed]: minkowski-gcc45__2_2.log Delta lines: <Unavailable>

1 0

[svn:einsteintoolkit] www/release-info/ (Rev. 621)
by roland.haas＠physics.gatech.edu 27 Sep '11

27 Sep '11

User: rhaas Date: 2011/09/27 08:25 PM Modified: /release-info/ run_tests_py Log: fix type in python run script File Changes: Directory: /release-info/ ========================= File [modified]: run_tests_py Delta lines: +1 -1 =================================================================== --- release-info/run_tests_py 2011-09-28 01:25:00 UTC (rev 620) +++ release-info/run_tests_py 2011-09-28 01:25:56 UTC (rev 621) @@ -19,7 +19,7 @@ export CCTK_TESTSUITE_RUN_PROCESSORS=2 export OMP_NUM_THREADS=2;; esac - simfactory/bin/sim create-submit --testsuite ${HOSTNAME}__${CCTK_TESTSUITE_RUN_PROCESSORS}_${OMP_NUM_THREADS} --procs ${CCTK_TESTSUITE_RUN_PROCESSORS} --num-threads ${OMP_NUM_THREADS} ---ppn-used ${CCTK_TESTSUITE_RUN_PROCESSORS} -walltime 3:00:00 + simfactory/bin/sim create-submit --testsuite ${HOSTNAME}__${CCTK_TESTSUITE_RUN_PROCESSORS}_${OMP_NUM_THREADS} --procs ${CCTK_TESTSUITE_RUN_PROCESSORS} --num-threads ${OMP_NUM_THREADS} --ppn-used ${CCTK_TESTSUITE_RUN_PROCESSORS} --walltime 3:00:00 # additional runs hostname | grep ^numrel && ./simfactory/bin/sim create-submit --configuration gcc --testsuite ${HOSTNAME}-gcc__${CCTK_TESTSUITE_RUN_PROCESSORS}_${OMP_NUM_THREADS} --procs ${CCTK_TESTSUITE_RUN_PROCESSORS} --num-threads ${OMP_NUM_THREADS} --ppn-used ${CCTK_TESTSUITE_RUN_PROCESSORS} --walltime 3:00:00

1 0

[svn:einsteintoolkit] www/release-info/ (Rev. 620)
by roland.haas＠physics.gatech.edu 27 Sep '11

27 Sep '11

User: rhaas Date: 2011/09/27 08:25 PM Added: /release-info/ minkowski-gcc4.6__1_1.log, minkowski-gcc4.6__2_1.log, minkowski-gcc4.6__2_2.log Log: results for minkowski using gcc 4.6 File Changes: Directory: /release-info/ ========================= File [added]: minkowski-gcc4.6__1_1.log Delta lines: <Unavailable> File [added]: minkowski-gcc4.6__2_1.log Delta lines: <Unavailable> File [added]: minkowski-gcc4.6__2_2.log Delta lines: <Unavailable>

1 0

[svn:einsteintoolkit] WeylScal4/trunk/src/ (Rev. 81)
by roland.haas＠physics.gatech.edu 27 Sep '11

27 Sep '11

User: rhaas Date: 2011/09/27 07:26 PM Modified: /trunk/src/ Differencing.h, psis_calc_2nd.cc, psis_calc_4th.cc, psis_calc_Nth.cc Log: Regenerate code. File Changes: Directory: /trunk/src/ ====================== File [modified]: Differencing.h Delta lines: +0 -216 =================================================================== --- trunk/src/Differencing.h 2011-09-28 00:25:42 UTC (rev 80) +++ trunk/src/Differencing.h 2011-09-28 00:26:04 UTC (rev 81) @@ -862,219 +862,3 @@ } #endif -#ifndef KRANC_DIFF_FUNCTIONS -# define PDplus1(u) ((-(*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(0)+cdk*(0)]) + (*(CCTK_REAL const*)&((char const*)(u))[cdi*(1)+cdj*(0)+cdk*(0)]))*p1odx) -#else -# define PDplus1(u) (PDplus1_impl(u,p1odx,cdj,cdk)) -static CCTK_REAL PDplus1_impl(CCTK_REAL const* restrict const u, CCTK_REAL const p1odx, ptrdiff_t const cdj, ptrdiff_t const cdk) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED; -static CCTK_REAL PDplus1_impl(CCTK_REAL const* restrict const u, CCTK_REAL const p1odx, ptrdiff_t const cdj, ptrdiff_t const cdk) -{ - ptrdiff_t const cdi=sizeof(CCTK_REAL); - return (-(*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(0)+cdk*(0)]) + (*(CCTK_REAL const*)&((char const*)(u))[cdi*(1)+cdj*(0)+cdk*(0)]))*p1odx; -} -#endif - -#ifndef KRANC_DIFF_FUNCTIONS -# define PDplus2(u) ((-(*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(0)+cdk*(0)]) + (*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(1)+cdk*(0)]))*p1ody) -#else -# define PDplus2(u) (PDplus2_impl(u,p1ody,cdj,cdk)) -static CCTK_REAL PDplus2_impl(CCTK_REAL const* restrict const u, CCTK_REAL const p1ody, ptrdiff_t const cdj, ptrdiff_t const cdk) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED; -static CCTK_REAL PDplus2_impl(CCTK_REAL const* restrict const u, CCTK_REAL const p1ody, ptrdiff_t const cdj, ptrdiff_t const cdk) -{ - ptrdiff_t const cdi=sizeof(CCTK_REAL); - return (-(*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(0)+cdk*(0)]) + (*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(1)+cdk*(0)]))*p1ody; -} -#endif - -#ifndef KRANC_DIFF_FUNCTIONS -# define PDplus3(u) ((-(*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(0)+cdk*(0)]) + (*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(0)+cdk*(1)]))*p1odz) -#else -# define PDplus3(u) (PDplus3_impl(u,p1odz,cdj,cdk)) -static CCTK_REAL PDplus3_impl(CCTK_REAL const* restrict const u, CCTK_REAL const p1odz, ptrdiff_t const cdj, ptrdiff_t const cdk) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED; -static CCTK_REAL PDplus3_impl(CCTK_REAL const* restrict const u, CCTK_REAL const p1odz, ptrdiff_t const cdj, ptrdiff_t const cdk) -{ - ptrdiff_t const cdi=sizeof(CCTK_REAL); - return (-(*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(0)+cdk*(0)]) + (*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(0)+cdk*(1)]))*p1odz; -} -#endif - -#ifndef KRANC_DIFF_FUNCTIONS -# define PDminus1(u) (((*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(0)+cdk*(0)]) - (*(CCTK_REAL const*)&((char const*)(u))[cdi*(-1)+cdj*(0)+cdk*(0)]))*p1odx) -#else -# define PDminus1(u) (PDminus1_impl(u,p1odx,cdj,cdk)) -static CCTK_REAL PDminus1_impl(CCTK_REAL const* restrict const u, CCTK_REAL const p1odx, ptrdiff_t const cdj, ptrdiff_t const cdk) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED; -static CCTK_REAL PDminus1_impl(CCTK_REAL const* restrict const u, CCTK_REAL const p1odx, ptrdiff_t const cdj, ptrdiff_t const cdk) -{ - ptrdiff_t const cdi=sizeof(CCTK_REAL); - return ((*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(0)+cdk*(0)]) - (*(CCTK_REAL const*)&((char const*)(u))[cdi*(-1)+cdj*(0)+cdk*(0)]))*p1odx; -} -#endif - -#ifndef KRANC_DIFF_FUNCTIONS -# define PDminus2(u) (((*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(0)+cdk*(0)]) - (*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(-1)+cdk*(0)]))*p1ody) -#else -# define PDminus2(u) (PDminus2_impl(u,p1ody,cdj,cdk)) -static CCTK_REAL PDminus2_impl(CCTK_REAL const* restrict const u, CCTK_REAL const p1ody, ptrdiff_t const cdj, ptrdiff_t const cdk) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED; -static CCTK_REAL PDminus2_impl(CCTK_REAL const* restrict const u, CCTK_REAL const p1ody, ptrdiff_t const cdj, ptrdiff_t const cdk) -{ - ptrdiff_t const cdi=sizeof(CCTK_REAL); - return ((*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(0)+cdk*(0)]) - (*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(-1)+cdk*(0)]))*p1ody; -} -#endif - -#ifndef KRANC_DIFF_FUNCTIONS -# define PDminus3(u) (((*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(0)+cdk*(0)]) - (*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(0)+cdk*(-1)]))*p1odz) -#else -# define PDminus3(u) (PDminus3_impl(u,p1odz,cdj,cdk)) -static CCTK_REAL PDminus3_impl(CCTK_REAL const* restrict const u, CCTK_REAL const p1odz, ptrdiff_t const cdj, ptrdiff_t const cdk) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED; -static CCTK_REAL PDminus3_impl(CCTK_REAL const* restrict const u, CCTK_REAL const p1odz, ptrdiff_t const cdj, ptrdiff_t const cdk) -{ - ptrdiff_t const cdi=sizeof(CCTK_REAL); - return ((*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(0)+cdk*(0)]) - (*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(0)+cdk*(-1)]))*p1odz; -} -#endif - -#ifndef KRANC_DIFF_FUNCTIONS -# define PDplus11(u) (((*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(0)+cdk*(0)]) - 2*(*(CCTK_REAL const*)&((char const*)(u))[cdi*(1)+cdj*(0)+cdk*(0)]) + (*(CCTK_REAL const*)&((char const*)(u))[cdi*(2)+cdj*(0)+cdk*(0)]))*p1odx2) -#else -# define PDplus11(u) (PDplus11_impl(u,p1odx2,cdj,cdk)) -static CCTK_REAL PDplus11_impl(CCTK_REAL const* restrict const u, CCTK_REAL const p1odx2, ptrdiff_t const cdj, ptrdiff_t const cdk) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED; -static CCTK_REAL PDplus11_impl(CCTK_REAL const* restrict const u, CCTK_REAL const p1odx2, ptrdiff_t const cdj, ptrdiff_t const cdk) -{ - ptrdiff_t const cdi=sizeof(CCTK_REAL); - return ((*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(0)+cdk*(0)]) - 2*(*(CCTK_REAL const*)&((char const*)(u))[cdi*(1)+cdj*(0)+cdk*(0)]) + (*(CCTK_REAL const*)&((char const*)(u))[cdi*(2)+cdj*(0)+cdk*(0)]))*p1odx2; -} -#endif - -#ifndef KRANC_DIFF_FUNCTIONS -# define PDplus12(u) (((*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(0)+cdk*(0)]) - (*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(1)+cdk*(0)]) - (*(CCTK_REAL const*)&((char const*)(u))[cdi*(1)+cdj*(0)+cdk*(0)]) + (*(CCTK_REAL const*)&((char const*)(u))[cdi*(1)+cdj*(1)+cdk*(0)]))*p1odxdy) -#else -# define PDplus12(u) (PDplus12_impl(u,p1odxdy,cdj,cdk)) -static CCTK_REAL PDplus12_impl(CCTK_REAL const* restrict const u, CCTK_REAL const p1odxdy, ptrdiff_t const cdj, ptrdiff_t const cdk) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED; -static CCTK_REAL PDplus12_impl(CCTK_REAL const* restrict const u, CCTK_REAL const p1odxdy, ptrdiff_t const cdj, ptrdiff_t const cdk) -{ - ptrdiff_t const cdi=sizeof(CCTK_REAL); - return ((*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(0)+cdk*(0)]) - (*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(1)+cdk*(0)]) - (*(CCTK_REAL const*)&((char const*)(u))[cdi*(1)+cdj*(0)+cdk*(0)]) + (*(CCTK_REAL const*)&((char const*)(u))[cdi*(1)+cdj*(1)+cdk*(0)]))*p1odxdy; -} -#endif - -#ifndef KRANC_DIFF_FUNCTIONS -# define PDplus13(u) (((*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(0)+cdk*(0)]) - (*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(0)+cdk*(1)]) - (*(CCTK_REAL const*)&((char const*)(u))[cdi*(1)+cdj*(0)+cdk*(0)]) + (*(CCTK_REAL const*)&((char const*)(u))[cdi*(1)+cdj*(0)+cdk*(1)]))*p1odxdz) -#else -# define PDplus13(u) (PDplus13_impl(u,p1odxdz,cdj,cdk)) -static CCTK_REAL PDplus13_impl(CCTK_REAL const* restrict const u, CCTK_REAL const p1odxdz, ptrdiff_t const cdj, ptrdiff_t const cdk) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED; -static CCTK_REAL PDplus13_impl(CCTK_REAL const* restrict const u, CCTK_REAL const p1odxdz, ptrdiff_t const cdj, ptrdiff_t const cdk) -{ - ptrdiff_t const cdi=sizeof(CCTK_REAL); - return ((*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(0)+cdk*(0)]) - (*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(0)+cdk*(1)]) - (*(CCTK_REAL const*)&((char const*)(u))[cdi*(1)+cdj*(0)+cdk*(0)]) + (*(CCTK_REAL const*)&((char const*)(u))[cdi*(1)+cdj*(0)+cdk*(1)]))*p1odxdz; -} -#endif - -#ifndef KRANC_DIFF_FUNCTIONS -# define PDplus21(u) (((*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(0)+cdk*(0)]) - (*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(1)+cdk*(0)]) - (*(CCTK_REAL const*)&((char const*)(u))[cdi*(1)+cdj*(0)+cdk*(0)]) + (*(CCTK_REAL const*)&((char const*)(u))[cdi*(1)+cdj*(1)+cdk*(0)]))*p1odxdy) -#else -# define PDplus21(u) (PDplus21_impl(u,p1odxdy,cdj,cdk)) -static CCTK_REAL PDplus21_impl(CCTK_REAL const* restrict const u, CCTK_REAL const p1odxdy, ptrdiff_t const cdj, ptrdiff_t const cdk) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED; -static CCTK_REAL PDplus21_impl(CCTK_REAL const* restrict const u, CCTK_REAL const p1odxdy, ptrdiff_t const cdj, ptrdiff_t const cdk) -{ - ptrdiff_t const cdi=sizeof(CCTK_REAL); - return ((*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(0)+cdk*(0)]) - (*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(1)+cdk*(0)]) - (*(CCTK_REAL const*)&((char const*)(u))[cdi*(1)+cdj*(0)+cdk*(0)]) + (*(CCTK_REAL const*)&((char const*)(u))[cdi*(1)+cdj*(1)+cdk*(0)]))*p1odxdy; -} -#endif - -#ifndef KRANC_DIFF_FUNCTIONS -# define PDplus22(u) (((*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(0)+cdk*(0)]) - 2*(*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(1)+cdk*(0)]) + (*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(2)+cdk*(0)]))*p1ody2) -#else -# define PDplus22(u) (PDplus22_impl(u,p1ody2,cdj,cdk)) -static CCTK_REAL PDplus22_impl(CCTK_REAL const* restrict const u, CCTK_REAL const p1ody2, ptrdiff_t const cdj, ptrdiff_t const cdk) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED; -static CCTK_REAL PDplus22_impl(CCTK_REAL const* restrict const u, CCTK_REAL const p1ody2, ptrdiff_t const cdj, ptrdiff_t const cdk) -{ - ptrdiff_t const cdi=sizeof(CCTK_REAL); - return ((*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(0)+cdk*(0)]) - 2*(*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(1)+cdk*(0)]) + (*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(2)+cdk*(0)]))*p1ody2; -} -#endif - -#ifndef KRANC_DIFF_FUNCTIONS -# define PDplus23(u) (((*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(0)+cdk*(0)]) - (*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(0)+cdk*(1)]) - (*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(1)+cdk*(0)]) + (*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(1)+cdk*(1)]))*p1odydz) -#else -# define PDplus23(u) (PDplus23_impl(u,p1odydz,cdj,cdk)) -static CCTK_REAL PDplus23_impl(CCTK_REAL const* restrict const u, CCTK_REAL const p1odydz, ptrdiff_t const cdj, ptrdiff_t const cdk) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED; -static CCTK_REAL PDplus23_impl(CCTK_REAL const* restrict const u, CCTK_REAL const p1odydz, ptrdiff_t const cdj, ptrdiff_t const cdk) -{ - ptrdiff_t const cdi=sizeof(CCTK_REAL); - return ((*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(0)+cdk*(0)]) - (*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(0)+cdk*(1)]) - (*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(1)+cdk*(0)]) + (*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(1)+cdk*(1)]))*p1odydz; -} -#endif - -#ifndef KRANC_DIFF_FUNCTIONS -# define PDplus31(u) (((*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(0)+cdk*(0)]) - (*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(0)+cdk*(1)]) - (*(CCTK_REAL const*)&((char const*)(u))[cdi*(1)+cdj*(0)+cdk*(0)]) + (*(CCTK_REAL const*)&((char const*)(u))[cdi*(1)+cdj*(0)+cdk*(1)]))*p1odxdz) -#else -# define PDplus31(u) (PDplus31_impl(u,p1odxdz,cdj,cdk)) -static CCTK_REAL PDplus31_impl(CCTK_REAL const* restrict const u, CCTK_REAL const p1odxdz, ptrdiff_t const cdj, ptrdiff_t const cdk) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED; -static CCTK_REAL PDplus31_impl(CCTK_REAL const* restrict const u, CCTK_REAL const p1odxdz, ptrdiff_t const cdj, ptrdiff_t const cdk) -{ - ptrdiff_t const cdi=sizeof(CCTK_REAL); - return ((*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(0)+cdk*(0)]) - (*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(0)+cdk*(1)]) - (*(CCTK_REAL const*)&((char const*)(u))[cdi*(1)+cdj*(0)+cdk*(0)]) + (*(CCTK_REAL const*)&((char const*)(u))[cdi*(1)+cdj*(0)+cdk*(1)]))*p1odxdz; -} -#endif - -#ifndef KRANC_DIFF_FUNCTIONS -# define PDplus32(u) (((*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(0)+cdk*(0)]) - (*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(0)+cdk*(1)]) - (*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(1)+cdk*(0)]) + (*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(1)+cdk*(1)]))*p1odydz) -#else -# define PDplus32(u) (PDplus32_impl(u,p1odydz,cdj,cdk)) -static CCTK_REAL PDplus32_impl(CCTK_REAL const* restrict const u, CCTK_REAL const p1odydz, ptrdiff_t const cdj, ptrdiff_t const cdk) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED; -static CCTK_REAL PDplus32_impl(CCTK_REAL const* restrict const u, CCTK_REAL const p1odydz, ptrdiff_t const cdj, ptrdiff_t const cdk) -{ - ptrdiff_t const cdi=sizeof(CCTK_REAL); - return ((*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(0)+cdk*(0)]) - (*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(0)+cdk*(1)]) - (*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(1)+cdk*(0)]) + (*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(1)+cdk*(1)]))*p1odydz; -} -#endif - -#ifndef KRANC_DIFF_FUNCTIONS -# define PDplus33(u) (((*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(0)+cdk*(0)]) - 2*(*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(0)+cdk*(1)]) + (*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(0)+cdk*(2)]))*p1odz2) -#else -# define PDplus33(u) (PDplus33_impl(u,p1odz2,cdj,cdk)) -static CCTK_REAL PDplus33_impl(CCTK_REAL const* restrict const u, CCTK_REAL const p1odz2, ptrdiff_t const cdj, ptrdiff_t const cdk) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED; -static CCTK_REAL PDplus33_impl(CCTK_REAL const* restrict const u, CCTK_REAL const p1odz2, ptrdiff_t const cdj, ptrdiff_t const cdk) -{ - ptrdiff_t const cdi=sizeof(CCTK_REAL); - return ((*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(0)+cdk*(0)]) - 2*(*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(0)+cdk*(1)]) + (*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(0)+cdk*(2)]))*p1odz2; -} -#endif - -#ifndef KRANC_DIFF_FUNCTIONS -# define PDonesided2nd1(u) ((3*(*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(0)+cdk*(0)]) + (*(CCTK_REAL const*)&((char const*)(u))[cdi*(2*dir(1))+cdj*(0)+cdk*(0)]) - 4*(*(CCTK_REAL const*)&((char const*)(u))[cdi*(dir(1))+cdj*(0)+cdk*(0)]))*pm1o2dx*dir(1)) -#else -# define PDonesided2nd1(u) (PDonesided2nd1_impl(u,pm1o2dx,cdj,cdk)) -static CCTK_REAL PDonesided2nd1_impl(CCTK_REAL const* restrict const u, CCTK_REAL const pm1o2dx, ptrdiff_t const cdj, ptrdiff_t const cdk) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED; -static CCTK_REAL PDonesided2nd1_impl(CCTK_REAL const* restrict const u, CCTK_REAL const pm1o2dx, ptrdiff_t const cdj, ptrdiff_t const cdk) -{ - ptrdiff_t const cdi=sizeof(CCTK_REAL); - return (3*(*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(0)+cdk*(0)]) + (*(CCTK_REAL const*)&((char const*)(u))[cdi*(2*dir(1))+cdj*(0)+cdk*(0)]) - 4*(*(CCTK_REAL const*)&((char const*)(u))[cdi*(dir(1))+cdj*(0)+cdk*(0)]))*pm1o2dx*dir(1); -} -#endif - -#ifndef KRANC_DIFF_FUNCTIONS -# define PDonesided2nd2(u) ((3*(*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(0)+cdk*(0)]) + (*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(2*dir(2))+cdk*(0)]) - 4*(*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(dir(2))+cdk*(0)]))*pm1o2dy*dir(2)) -#else -# define PDonesided2nd2(u) (PDonesided2nd2_impl(u,pm1o2dy,cdj,cdk)) -static CCTK_REAL PDonesided2nd2_impl(CCTK_REAL const* restrict const u, CCTK_REAL const pm1o2dy, ptrdiff_t const cdj, ptrdiff_t const cdk) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED; -static CCTK_REAL PDonesided2nd2_impl(CCTK_REAL const* restrict const u, CCTK_REAL const pm1o2dy, ptrdiff_t const cdj, ptrdiff_t const cdk) -{ - ptrdiff_t const cdi=sizeof(CCTK_REAL); - return (3*(*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(0)+cdk*(0)]) + (*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(2*dir(2))+cdk*(0)]) - 4*(*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(dir(2))+cdk*(0)]))*pm1o2dy*dir(2); -} -#endif - -#ifndef KRANC_DIFF_FUNCTIONS -# define PDonesided2nd3(u) ((3*(*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(0)+cdk*(0)]) + (*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(0)+cdk*(2*dir(3))]) - 4*(*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(0)+cdk*(dir(3))]))*pm1o2dz*dir(3)) -#else -# define PDonesided2nd3(u) (PDonesided2nd3_impl(u,pm1o2dz,cdj,cdk)) -static CCTK_REAL PDonesided2nd3_impl(CCTK_REAL const* restrict const u, CCTK_REAL const pm1o2dz, ptrdiff_t const cdj, ptrdiff_t const cdk) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED; -static CCTK_REAL PDonesided2nd3_impl(CCTK_REAL const* restrict const u, CCTK_REAL const pm1o2dz, ptrdiff_t const cdj, ptrdiff_t const cdk) -{ - ptrdiff_t const cdi=sizeof(CCTK_REAL); - return (3*(*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(0)+cdk*(0)]) + (*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(0)+cdk*(2*dir(3))]) - 4*(*(CCTK_REAL const*)&((char const*)(u))[cdi*(0)+cdj*(0)+cdk*(dir(3))]))*pm1o2dz*dir(3); -} -#endif - File [modified]: psis_calc_2nd.cc Delta lines: +0 -9 =================================================================== --- trunk/src/psis_calc_2nd.cc 2011-09-28 00:25:42 UTC (rev 80) +++ trunk/src/psis_calc_2nd.cc 2011-09-28 00:26:04 UTC (rev 81) @@ -132,21 +132,12 @@ CCTK_REAL const p1o840dx = 0.00119047619047619047619047619048*INV(dx); CCTK_REAL const p1o840dy = 0.00119047619047619047619047619048*INV(dy); CCTK_REAL const p1o840dz = 0.00119047619047619047619047619048*INV(dz); - CCTK_REAL const p1odx = INV(dx); CCTK_REAL const p1odx2 = INV(SQR(dx)); - CCTK_REAL const p1odxdy = INV(dx)*INV(dy); - CCTK_REAL const p1odxdz = INV(dx)*INV(dz); - CCTK_REAL const p1ody = INV(dy); CCTK_REAL const p1ody2 = INV(SQR(dy)); - CCTK_REAL const p1odydz = INV(dy)*INV(dz); - CCTK_REAL const p1odz = INV(dz); CCTK_REAL const p1odz2 = INV(SQR(dz)); CCTK_REAL const pm1o12dx2 = -0.0833333333333333333333333333333*INV(SQR(dx)); CCTK_REAL const pm1o12dy2 = -0.0833333333333333333333333333333*INV(SQR(dy)); CCTK_REAL const pm1o12dz2 = -0.0833333333333333333333333333333*INV(SQR(dz)); - CCTK_REAL const pm1o2dx = -0.5*INV(dx); - CCTK_REAL const pm1o2dy = -0.5*INV(dy); - CCTK_REAL const pm1o2dz = -0.5*INV(dz); /* Loop over the grid points */ #pragma omp parallel File [modified]: psis_calc_4th.cc Delta lines: +0 -9 =================================================================== --- trunk/src/psis_calc_4th.cc 2011-09-28 00:25:42 UTC (rev 80) +++ trunk/src/psis_calc_4th.cc 2011-09-28 00:26:04 UTC (rev 81) @@ -132,21 +132,12 @@ CCTK_REAL const p1o840dx = 0.00119047619047619047619047619048*INV(dx); CCTK_REAL const p1o840dy = 0.00119047619047619047619047619048*INV(dy); CCTK_REAL const p1o840dz = 0.00119047619047619047619047619048*INV(dz); - CCTK_REAL const p1odx = INV(dx); CCTK_REAL const p1odx2 = INV(SQR(dx)); - CCTK_REAL const p1odxdy = INV(dx)*INV(dy); - CCTK_REAL const p1odxdz = INV(dx)*INV(dz); - CCTK_REAL const p1ody = INV(dy); CCTK_REAL const p1ody2 = INV(SQR(dy)); - CCTK_REAL const p1odydz = INV(dy)*INV(dz); - CCTK_REAL const p1odz = INV(dz); CCTK_REAL const p1odz2 = INV(SQR(dz)); CCTK_REAL const pm1o12dx2 = -0.0833333333333333333333333333333*INV(SQR(dx)); CCTK_REAL const pm1o12dy2 = -0.0833333333333333333333333333333*INV(SQR(dy)); CCTK_REAL const pm1o12dz2 = -0.0833333333333333333333333333333*INV(SQR(dz)); - CCTK_REAL const pm1o2dx = -0.5*INV(dx); - CCTK_REAL const pm1o2dy = -0.5*INV(dy); - CCTK_REAL const pm1o2dz = -0.5*INV(dz); /* Loop over the grid points */ #pragma omp parallel File [modified]: psis_calc_Nth.cc Delta lines: +0 -9 =================================================================== --- trunk/src/psis_calc_Nth.cc 2011-09-28 00:25:42 UTC (rev 80) +++ trunk/src/psis_calc_Nth.cc 2011-09-28 00:26:04 UTC (rev 81) @@ -132,21 +132,12 @@ CCTK_REAL const p1o840dx = 0.00119047619047619047619047619048*INV(dx); CCTK_REAL const p1o840dy = 0.00119047619047619047619047619048*INV(dy); CCTK_REAL const p1o840dz = 0.00119047619047619047619047619048*INV(dz); - CCTK_REAL const p1odx = INV(dx); CCTK_REAL const p1odx2 = INV(SQR(dx)); - CCTK_REAL const p1odxdy = INV(dx)*INV(dy); - CCTK_REAL const p1odxdz = INV(dx)*INV(dz); - CCTK_REAL const p1ody = INV(dy); CCTK_REAL const p1ody2 = INV(SQR(dy)); - CCTK_REAL const p1odydz = INV(dy)*INV(dz); - CCTK_REAL const p1odz = INV(dz); CCTK_REAL const p1odz2 = INV(SQR(dz)); CCTK_REAL const pm1o12dx2 = -0.0833333333333333333333333333333*INV(SQR(dx)); CCTK_REAL const pm1o12dy2 = -0.0833333333333333333333333333333*INV(SQR(dy)); CCTK_REAL const pm1o12dz2 = -0.0833333333333333333333333333333*INV(SQR(dz)); - CCTK_REAL const pm1o2dx = -0.5*INV(dx); - CCTK_REAL const pm1o2dy = -0.5*INV(dy); - CCTK_REAL const pm1o2dz = -0.5*INV(dz); /* Loop over the grid points */ #pragma omp parallel

1 0

[svn:einsteintoolkit] WeylScal4/trunk/m/ (Rev. 80)
by roland.haas＠physics.gatech.edu 27 Sep '11

27 Sep '11

User: rhaas Date: 2011/09/27 07:25 PM Modified: /trunk/m/ WeylScal4.m Log: remove unused differential operator which causes compilation to fail File Changes: Directory: /trunk/m/ ==================== File [modified]: WeylScal4.m Delta lines: +1 -12 =================================================================== --- trunk/m/WeylScal4.m 2011-09-25 19:20:15 UTC (rev 79) +++ trunk/m/WeylScal4.m 2011-09-28 00:25:42 UTC (rev 80) @@ -28,18 +28,7 @@ PDstandard[i_] -> StandardCenteredDifferenceOperator[1,fdOrder/2,i], PDstandard[i_, i_] -> StandardCenteredDifferenceOperator[2,fdOrder/2,i], PDstandard[i_, j_] -> StandardCenteredDifferenceOperator[1,fdOrder/2,i] * - StandardCenteredDifferenceOperator[1,fdOrder/2,j], - - PDplus[i_] -> DPlus[i], - PDminus[i_] -> DMinus[i], - PDplus[i_,j_] -> DPlus[i] DPlus[j], - - PDonesided2nd[1] -> dir[1] (-shift[1]^(2 dir[1]) + 4 shift[1]^dir[1] - 3 )/ - (2 spacing[1]), - PDonesided2nd[2] -> dir[2] (-shift[2]^(2 dir[2]) + 4 shift[2]^dir[2] - 3 )/ - (2 spacing[2]), - PDonesided2nd[3] -> dir[3] (-shift[3]^(2 dir[3]) + 4 shift[3]^dir[3] - 3 )/ - (2 spacing[3]) + StandardCenteredDifferenceOperator[1,fdOrder/2,j] }; (*PD = PDstandard2nd;*)

1 0

[svn:einsteintoolkit] SphericalHarmonicRecon/trunk/test/ (Rev. 8)
by yosef＠astro.rit.edu 27 Sep '11

27 Sep '11

User: zlochower Date: 2011/09/27 03:31 PM Modified: /trunk/test/ regression_test.par Log: incorrect data file location fixed File Changes: Directory: /trunk/test/ ======================= File [modified]: regression_test.par Delta lines: +2 -2 =================================================================== --- trunk/test/regression_test.par 2011-09-06 18:39:29 UTC (rev 7) +++ trunk/test/regression_test.par 2011-09-27 20:31:09 UTC (rev 8) @@ -33,8 +33,8 @@ #Override extraction parameters--------------- SphericalHarmonicRecon::time_derivative_in_file = "yes" -#SphericalHarmonicRecon::metric_data_filename = "../../../arrangements/PITTNullCode/SphericalHarmonicRecon/test/metric_test_case.h5" -SphericalHarmonicRecon::metric_data_filename = "metric_test_case.h5" +SphericalHarmonicRecon::metric_data_filename = "../../../arrangements/PITTNullCode/SphericalHarmonicRecon/test/metric_test_case.h5" +#SphericalHarmonicRecon::metric_data_filename = "metric_test_case.h5" #Extraction data------------------------

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Commits September 2011