Commits

commits@lists.einsteintoolkit.org

2 participants
6997 discussions

[svn:einsteintoolkit] WeylScal4/trunk/ (Rev. 126)
by schnetter＠cct.lsu.edu 19 Nov '12

19 Nov '12

User: eschnett Date: 2012/11/19 10:26 AM Modified: /trunk/ param.ccl, schedule.ccl /trunk/src/ make.code.defn Log: Regenerate code File Changes: Directory: /trunk/src/ ====================== File [modified]: make.code.defn Delta lines: +1 -1 =================================================================== --- trunk/src/make.code.defn 2012-11-19 16:26:21 UTC (rev 125) +++ trunk/src/make.code.defn 2012-11-19 16:26:28 UTC (rev 126) @@ -1,3 +1,3 @@ # File produced by Kranc -SRCS = Startup.cc RegisterSymmetries.cc RegisterMoL.cc psi4_calc_Nth.cc psi4_calc_2nd.cc psi4_calc_4th.cc psis_calc_Nth.cc psis_calc_2nd.cc psis_calc_4th.cc invars_calc_Nth.cc invars_calc_2nd.cc invars_calc_4th.cc Boundaries.cc +SRCS = Startup.cc RegisterSymmetries.cc RegisterMoL.cc WeylScal4_psi4_calc_Nth.cc WeylScal4_psi4_calc_2nd.cc WeylScal4_psi4_calc_4th.cc WeylScal4_psis_calc_Nth.cc WeylScal4_psis_calc_2nd.cc WeylScal4_psis_calc_4th.cc WeylScal4_invars_calc_Nth.cc WeylScal4_invars_calc_2nd.cc WeylScal4_invars_calc_4th.cc Boundaries.cc Directory: /trunk/ ================== File [modified]: param.ccl Delta lines: +20 -18 =================================================================== --- trunk/param.ccl 2012-11-19 16:26:21 UTC (rev 125) +++ trunk/param.ccl 2012-11-19 16:26:28 UTC (rev 126) @@ -4,6 +4,8 @@ shares: GenericFD USES CCTK_STRING jacobian_group +USES CCTK_STRING jacobian_determinant_group +USES CCTK_STRING jacobian_inverse_group USES CCTK_STRING jacobian_derivative_group USES CCTK_INT jacobian_identity_map @@ -102,109 +104,109 @@ } 1 restricted: -CCTK_INT psi4_calc_Nth_calc_every "psi4_calc_Nth_calc_every" STEERABLE=ALWAYS +CCTK_INT WeylScal4_psi4_calc_Nth_calc_every "WeylScal4_psi4_calc_Nth_calc_every" STEERABLE=ALWAYS { *:* :: "" } 1 restricted: -CCTK_INT psi4_calc_2nd_calc_every "psi4_calc_2nd_calc_every" STEERABLE=ALWAYS +CCTK_INT WeylScal4_psi4_calc_2nd_calc_every "WeylScal4_psi4_calc_2nd_calc_every" STEERABLE=ALWAYS { *:* :: "" } 1 restricted: -CCTK_INT psi4_calc_4th_calc_every "psi4_calc_4th_calc_every" STEERABLE=ALWAYS +CCTK_INT WeylScal4_psi4_calc_4th_calc_every "WeylScal4_psi4_calc_4th_calc_every" STEERABLE=ALWAYS { *:* :: "" } 1 restricted: -CCTK_INT psis_calc_Nth_calc_every "psis_calc_Nth_calc_every" STEERABLE=ALWAYS +CCTK_INT WeylScal4_psis_calc_Nth_calc_every "WeylScal4_psis_calc_Nth_calc_every" STEERABLE=ALWAYS { *:* :: "" } 1 restricted: -CCTK_INT psis_calc_2nd_calc_every "psis_calc_2nd_calc_every" STEERABLE=ALWAYS +CCTK_INT WeylScal4_psis_calc_2nd_calc_every "WeylScal4_psis_calc_2nd_calc_every" STEERABLE=ALWAYS { *:* :: "" } 1 restricted: -CCTK_INT psis_calc_4th_calc_every "psis_calc_4th_calc_every" STEERABLE=ALWAYS +CCTK_INT WeylScal4_psis_calc_4th_calc_every "WeylScal4_psis_calc_4th_calc_every" STEERABLE=ALWAYS { *:* :: "" } 1 restricted: -CCTK_INT invars_calc_Nth_calc_every "invars_calc_Nth_calc_every" STEERABLE=ALWAYS +CCTK_INT WeylScal4_invars_calc_Nth_calc_every "WeylScal4_invars_calc_Nth_calc_every" STEERABLE=ALWAYS { *:* :: "" } 1 restricted: -CCTK_INT invars_calc_2nd_calc_every "invars_calc_2nd_calc_every" STEERABLE=ALWAYS +CCTK_INT WeylScal4_invars_calc_2nd_calc_every "WeylScal4_invars_calc_2nd_calc_every" STEERABLE=ALWAYS { *:* :: "" } 1 restricted: -CCTK_INT invars_calc_4th_calc_every "invars_calc_4th_calc_every" STEERABLE=ALWAYS +CCTK_INT WeylScal4_invars_calc_4th_calc_every "WeylScal4_invars_calc_4th_calc_every" STEERABLE=ALWAYS { *:* :: "" } 1 restricted: -CCTK_INT psi4_calc_Nth_calc_offset "psi4_calc_Nth_calc_offset" STEERABLE=ALWAYS +CCTK_INT WeylScal4_psi4_calc_Nth_calc_offset "WeylScal4_psi4_calc_Nth_calc_offset" STEERABLE=ALWAYS { *:* :: "" } 0 restricted: -CCTK_INT psi4_calc_2nd_calc_offset "psi4_calc_2nd_calc_offset" STEERABLE=ALWAYS +CCTK_INT WeylScal4_psi4_calc_2nd_calc_offset "WeylScal4_psi4_calc_2nd_calc_offset" STEERABLE=ALWAYS { *:* :: "" } 0 restricted: -CCTK_INT psi4_calc_4th_calc_offset "psi4_calc_4th_calc_offset" STEERABLE=ALWAYS +CCTK_INT WeylScal4_psi4_calc_4th_calc_offset "WeylScal4_psi4_calc_4th_calc_offset" STEERABLE=ALWAYS { *:* :: "" } 0 restricted: -CCTK_INT psis_calc_Nth_calc_offset "psis_calc_Nth_calc_offset" STEERABLE=ALWAYS +CCTK_INT WeylScal4_psis_calc_Nth_calc_offset "WeylScal4_psis_calc_Nth_calc_offset" STEERABLE=ALWAYS { *:* :: "" } 0 restricted: -CCTK_INT psis_calc_2nd_calc_offset "psis_calc_2nd_calc_offset" STEERABLE=ALWAYS +CCTK_INT WeylScal4_psis_calc_2nd_calc_offset "WeylScal4_psis_calc_2nd_calc_offset" STEERABLE=ALWAYS { *:* :: "" } 0 restricted: -CCTK_INT psis_calc_4th_calc_offset "psis_calc_4th_calc_offset" STEERABLE=ALWAYS +CCTK_INT WeylScal4_psis_calc_4th_calc_offset "WeylScal4_psis_calc_4th_calc_offset" STEERABLE=ALWAYS { *:* :: "" } 0 restricted: -CCTK_INT invars_calc_Nth_calc_offset "invars_calc_Nth_calc_offset" STEERABLE=ALWAYS +CCTK_INT WeylScal4_invars_calc_Nth_calc_offset "WeylScal4_invars_calc_Nth_calc_offset" STEERABLE=ALWAYS { *:* :: "" } 0 restricted: -CCTK_INT invars_calc_2nd_calc_offset "invars_calc_2nd_calc_offset" STEERABLE=ALWAYS +CCTK_INT WeylScal4_invars_calc_2nd_calc_offset "WeylScal4_invars_calc_2nd_calc_offset" STEERABLE=ALWAYS { *:* :: "" } 0 restricted: -CCTK_INT invars_calc_4th_calc_offset "invars_calc_4th_calc_offset" STEERABLE=ALWAYS +CCTK_INT WeylScal4_invars_calc_4th_calc_offset "WeylScal4_invars_calc_4th_calc_offset" STEERABLE=ALWAYS { *:* :: "" } 0 File [modified]: schedule.ccl Delta lines: +84 -243 =================================================================== --- trunk/schedule.ccl 2012-11-19 16:26:21 UTC (rev 125) +++ trunk/schedule.ccl 2012-11-19 16:26:28 UTC (rev 126) @@ -253,14 +253,14 @@ if (CCTK_EQUALS(fd_order, "Nth")) { - schedule group psi4_calc_Nth_group in MoL_PseudoEvolution after ADMBase_SetADMVars + schedule group WeylScal4_psi4_calc_Nth_group in MoL_PseudoEvolution after ADMBase_SetADMVars { # no language specified - } "psi4_calc_Nth" + } "WeylScal4_psi4_calc_Nth" } } -schedule psi4_calc_Nth in psi4_calc_Nth_group +schedule WeylScal4_psi4_calc_Nth in WeylScal4_psi4_calc_Nth_group { LANG: C READS: admbase::gxx @@ -280,20 +280,20 @@ READS: grid::z WRITES: WeylScal4::Psi4i WRITES: WeylScal4::Psi4r -} "psi4_calc_Nth" +} "WeylScal4_psi4_calc_Nth" -schedule psi4_calc_Nth_SelectBCs in psi4_calc_Nth_bc_group +schedule WeylScal4_psi4_calc_Nth_SelectBCs in WeylScal4_psi4_calc_Nth_bc_group { LANG: C OPTIONS: level SYNC: Psi4i_group SYNC: Psi4r_group -} "psi4_calc_Nth_SelectBCs" +} "WeylScal4_psi4_calc_Nth_SelectBCs" -schedule group ApplyBCs as psi4_calc_Nth_ApplyBCs in psi4_calc_Nth_bc_group after psi4_calc_Nth_SelectBCs +schedule group ApplyBCs as WeylScal4_psi4_calc_Nth_ApplyBCs in WeylScal4_psi4_calc_Nth_bc_group after WeylScal4_psi4_calc_Nth_SelectBCs { # no language specified -} "Apply BCs for groups set in psi4_calc_Nth" +} "Apply BCs for groups set in WeylScal4_psi4_calc_Nth" if (CCTK_EQUALS(calc_scalars, "psi4")) @@ -301,10 +301,10 @@ if (CCTK_EQUALS(fd_order, "Nth")) { - schedule group psi4_calc_Nth_bc_group in psi4_calc_Nth_group after psi4_calc_Nth + schedule group WeylScal4_psi4_calc_Nth_bc_group in WeylScal4_psi4_calc_Nth_group after WeylScal4_psi4_calc_Nth { # no language specified - } "psi4_calc_Nth" + } "WeylScal4_psi4_calc_Nth" } } @@ -314,10 +314,10 @@ if (CCTK_EQUALS(fd_order, "Nth")) { - schedule group psi4_calc_Nth_bc_group in MoL_PseudoEvolutionBoundaries after MoL_PostStep + schedule group WeylScal4_psi4_calc_Nth_bc_group in MoL_PseudoEvolutionBoundaries after MoL_PostStep { # no language specified - } "psi4_calc_Nth" + } "WeylScal4_psi4_calc_Nth" } } @@ -327,14 +327,14 @@ if (CCTK_EQUALS(fd_order, "2nd")) { - schedule group psi4_calc_2nd_group in MoL_PseudoEvolution after ADMBase_SetADMVars + schedule group WeylScal4_psi4_calc_2nd_group in MoL_PseudoEvolution after ADMBase_SetADMVars { # no language specified - } "psi4_calc_2nd" + } "WeylScal4_psi4_calc_2nd" } } -schedule psi4_calc_2nd in psi4_calc_2nd_group +schedule WeylScal4_psi4_calc_2nd in WeylScal4_psi4_calc_2nd_group { LANG: C READS: admbase::gxx @@ -354,20 +354,20 @@ READS: grid::z WRITES: WeylScal4::Psi4i WRITES: WeylScal4::Psi4r -} "psi4_calc_2nd" +} "WeylScal4_psi4_calc_2nd" -schedule psi4_calc_2nd_SelectBCs in psi4_calc_2nd_bc_group +schedule WeylScal4_psi4_calc_2nd_SelectBCs in WeylScal4_psi4_calc_2nd_bc_group { LANG: C OPTIONS: level SYNC: Psi4i_group SYNC: Psi4r_group -} "psi4_calc_2nd_SelectBCs" +} "WeylScal4_psi4_calc_2nd_SelectBCs" -schedule group ApplyBCs as psi4_calc_2nd_ApplyBCs in psi4_calc_2nd_bc_group after psi4_calc_2nd_SelectBCs +schedule group ApplyBCs as WeylScal4_psi4_calc_2nd_ApplyBCs in WeylScal4_psi4_calc_2nd_bc_group after WeylScal4_psi4_calc_2nd_SelectBCs { # no language specified -} "Apply BCs for groups set in psi4_calc_2nd" +} "Apply BCs for groups set in WeylScal4_psi4_calc_2nd" if (CCTK_EQUALS(calc_scalars, "psi4")) @@ -375,10 +375,10 @@ if (CCTK_EQUALS(fd_order, "2nd")) { - schedule group psi4_calc_2nd_bc_group in psi4_calc_2nd_group after psi4_calc_2nd + schedule group WeylScal4_psi4_calc_2nd_bc_group in WeylScal4_psi4_calc_2nd_group after WeylScal4_psi4_calc_2nd { # no language specified - } "psi4_calc_2nd" + } "WeylScal4_psi4_calc_2nd" } } @@ -388,10 +388,10 @@ if (CCTK_EQUALS(fd_order, "2nd")) { - schedule group psi4_calc_2nd_bc_group in MoL_PseudoEvolutionBoundaries after MoL_PostStep + schedule group WeylScal4_psi4_calc_2nd_bc_group in MoL_PseudoEvolutionBoundaries after MoL_PostStep { # no language specified - } "psi4_calc_2nd" + } "WeylScal4_psi4_calc_2nd" } } @@ -401,14 +401,14 @@ if (CCTK_EQUALS(fd_order, "4th")) { - schedule group psi4_calc_4th_group in MoL_PseudoEvolution after ADMBase_SetADMVars + schedule group WeylScal4_psi4_calc_4th_group in MoL_PseudoEvolution after ADMBase_SetADMVars { # no language specified - } "psi4_calc_4th" + } "WeylScal4_psi4_calc_4th" } } -schedule psi4_calc_4th in psi4_calc_4th_group +schedule WeylScal4_psi4_calc_4th in WeylScal4_psi4_calc_4th_group { LANG: C READS: admbase::gxx @@ -428,20 +428,20 @@ READS: grid::z WRITES: WeylScal4::Psi4i WRITES: WeylScal4::Psi4r -} "psi4_calc_4th" +} "WeylScal4_psi4_calc_4th" -schedule psi4_calc_4th_SelectBCs in psi4_calc_4th_bc_group +schedule WeylScal4_psi4_calc_4th_SelectBCs in WeylScal4_psi4_calc_4th_bc_group { LANG: C OPTIONS: level SYNC: Psi4i_group SYNC: Psi4r_group -} "psi4_calc_4th_SelectBCs" +} "WeylScal4_psi4_calc_4th_SelectBCs" -schedule group ApplyBCs as psi4_calc_4th_ApplyBCs in psi4_calc_4th_bc_group after psi4_calc_4th_SelectBCs +schedule group ApplyBCs as WeylScal4_psi4_calc_4th_ApplyBCs in WeylScal4_psi4_calc_4th_bc_group after WeylScal4_psi4_calc_4th_SelectBCs { # no language specified -} "Apply BCs for groups set in psi4_calc_4th" +} "Apply BCs for groups set in WeylScal4_psi4_calc_4th" if (CCTK_EQUALS(calc_scalars, "psi4")) @@ -449,10 +449,10 @@ if (CCTK_EQUALS(fd_order, "4th")) { - schedule group psi4_calc_4th_bc_group in psi4_calc_4th_group after psi4_calc_4th + schedule group WeylScal4_psi4_calc_4th_bc_group in WeylScal4_psi4_calc_4th_group after WeylScal4_psi4_calc_4th { # no language specified - } "psi4_calc_4th" + } "WeylScal4_psi4_calc_4th" } } @@ -462,10 +462,10 @@ if (CCTK_EQUALS(fd_order, "4th")) { - schedule group psi4_calc_4th_bc_group in MoL_PseudoEvolutionBoundaries after MoL_PostStep + schedule group WeylScal4_psi4_calc_4th_bc_group in MoL_PseudoEvolutionBoundaries after MoL_PostStep { # no language specified - } "psi4_calc_4th" + } "WeylScal4_psi4_calc_4th" } } @@ -475,14 +475,14 @@ if (CCTK_EQUALS(fd_order, "Nth")) { - schedule group psis_calc_Nth_group in MoL_PseudoEvolution after ADMBase_SetADMVars + schedule group WeylScal4_psis_calc_Nth_group in MoL_PseudoEvolution after ADMBase_SetADMVars { # no language specified - } "psis_calc_Nth" + } "WeylScal4_psis_calc_Nth" } } -schedule psis_calc_Nth in psis_calc_Nth_group +schedule WeylScal4_psis_calc_Nth in WeylScal4_psis_calc_Nth_group { LANG: C READS: admbase::gxx @@ -510,9 +510,9 @@ WRITES: WeylScal4::Psi3r WRITES: WeylScal4::Psi4i WRITES: WeylScal4::Psi4r -} "psis_calc_Nth" +} "WeylScal4_psis_calc_Nth" -schedule psis_calc_Nth_SelectBCs in psis_calc_Nth_bc_group +schedule WeylScal4_psis_calc_Nth_SelectBCs in WeylScal4_psis_calc_Nth_bc_group { LANG: C OPTIONS: level @@ -526,12 +526,12 @@ SYNC: Psi3r_group SYNC: Psi4i_group SYNC: Psi4r_group -} "psis_calc_Nth_SelectBCs" +} "WeylScal4_psis_calc_Nth_SelectBCs" -schedule group ApplyBCs as psis_calc_Nth_ApplyBCs in psis_calc_Nth_bc_group after psis_calc_Nth_SelectBCs +schedule group ApplyBCs as WeylScal4_psis_calc_Nth_ApplyBCs in WeylScal4_psis_calc_Nth_bc_group after WeylScal4_psis_calc_Nth_SelectBCs { # no language specified -} "Apply BCs for groups set in psis_calc_Nth" +} "Apply BCs for groups set in WeylScal4_psis_calc_Nth" if (CCTK_EQUALS(calc_scalars, "psis")) @@ -539,10 +539,10 @@ if (CCTK_EQUALS(fd_order, "Nth")) { - schedule group psis_calc_Nth_bc_group in psis_calc_Nth_group after psis_calc_Nth + schedule group WeylScal4_psis_calc_Nth_bc_group in WeylScal4_psis_calc_Nth_group after WeylScal4_psis_calc_Nth { # no language specified - } "psis_calc_Nth" + } "WeylScal4_psis_calc_Nth" } } @@ -552,10 +552,10 @@ if (CCTK_EQUALS(fd_order, "Nth")) { - schedule group psis_calc_Nth_bc_group in MoL_PseudoEvolutionBoundaries after MoL_PostStep + schedule group WeylScal4_psis_calc_Nth_bc_group in MoL_PseudoEvolutionBoundaries after MoL_PostStep { # no language specified - } "psis_calc_Nth" + } "WeylScal4_psis_calc_Nth" } } @@ -565,14 +565,14 @@ if (CCTK_EQUALS(fd_order, "2nd")) { - schedule group psis_calc_2nd_group in MoL_PseudoEvolution after ADMBase_SetADMVars + schedule group WeylScal4_psis_calc_2nd_group in MoL_PseudoEvolution after ADMBase_SetADMVars { # no language specified - } "psis_calc_2nd" + } "WeylScal4_psis_calc_2nd" } } -schedule psis_calc_2nd in psis_calc_2nd_group +schedule WeylScal4_psis_calc_2nd in WeylScal4_psis_calc_2nd_group { LANG: C READS: admbase::gxx @@ -600,9 +600,9 @@ WRITES: WeylScal4::Psi3r WRITES: WeylScal4::Psi4i WRITES: WeylScal4::Psi4r -} "psis_calc_2nd" +} "WeylScal4_psis_calc_2nd" -schedule psis_calc_2nd_SelectBCs in psis_calc_2nd_bc_group +schedule WeylScal4_psis_calc_2nd_SelectBCs in WeylScal4_psis_calc_2nd_bc_group { LANG: C OPTIONS: level @@ -616,12 +616,12 @@ SYNC: Psi3r_group SYNC: Psi4i_group SYNC: Psi4r_group -} "psis_calc_2nd_SelectBCs" +} "WeylScal4_psis_calc_2nd_SelectBCs" -schedule group ApplyBCs as psis_calc_2nd_ApplyBCs in psis_calc_2nd_bc_group after psis_calc_2nd_SelectBCs +schedule group ApplyBCs as WeylScal4_psis_calc_2nd_ApplyBCs in WeylScal4_psis_calc_2nd_bc_group after WeylScal4_psis_calc_2nd_SelectBCs { # no language specified -} "Apply BCs for groups set in psis_calc_2nd" +} "Apply BCs for groups set in WeylScal4_psis_calc_2nd" if (CCTK_EQUALS(calc_scalars, "psis")) @@ -629,10 +629,10 @@ if (CCTK_EQUALS(fd_order, "2nd")) { - schedule group psis_calc_2nd_bc_group in psis_calc_2nd_group after psis_calc_2nd + schedule group WeylScal4_psis_calc_2nd_bc_group in WeylScal4_psis_calc_2nd_group after WeylScal4_psis_calc_2nd { # no language specified - } "psis_calc_2nd" + } "WeylScal4_psis_calc_2nd" } } @@ -642,10 +642,10 @@ if (CCTK_EQUALS(fd_order, "2nd")) { - schedule group psis_calc_2nd_bc_group in MoL_PseudoEvolutionBoundaries after MoL_PostStep + schedule group WeylScal4_psis_calc_2nd_bc_group in MoL_PseudoEvolutionBoundaries after MoL_PostStep { # no language specified - } "psis_calc_2nd" + } "WeylScal4_psis_calc_2nd" } } @@ -655,14 +655,14 @@ if (CCTK_EQUALS(fd_order, "4th")) { - schedule group psis_calc_4th_group in MoL_PseudoEvolution after ADMBase_SetADMVars + schedule group WeylScal4_psis_calc_4th_group in MoL_PseudoEvolution after ADMBase_SetADMVars { # no language specified - } "psis_calc_4th" + } "WeylScal4_psis_calc_4th" } } -schedule psis_calc_4th in psis_calc_4th_group +schedule WeylScal4_psis_calc_4th in WeylScal4_psis_calc_4th_group { LANG: C READS: admbase::gxx @@ -690,9 +690,9 @@ WRITES: WeylScal4::Psi3r WRITES: WeylScal4::Psi4i WRITES: WeylScal4::Psi4r -} "psis_calc_4th" +} "WeylScal4_psis_calc_4th" -schedule psis_calc_4th_SelectBCs in psis_calc_4th_bc_group +schedule WeylScal4_psis_calc_4th_SelectBCs in WeylScal4_psis_calc_4th_bc_group { LANG: C OPTIONS: level @@ -706,12 +706,12 @@ SYNC: Psi3r_group SYNC: Psi4i_group SYNC: Psi4r_group -} "psis_calc_4th_SelectBCs" +} "WeylScal4_psis_calc_4th_SelectBCs" -schedule group ApplyBCs as psis_calc_4th_ApplyBCs in psis_calc_4th_bc_group after psis_calc_4th_SelectBCs +schedule group ApplyBCs as WeylScal4_psis_calc_4th_ApplyBCs in WeylScal4_psis_calc_4th_bc_group after WeylScal4_psis_calc_4th_SelectBCs { # no language specified -} "Apply BCs for groups set in psis_calc_4th" +} "Apply BCs for groups set in WeylScal4_psis_calc_4th" if (CCTK_EQUALS(calc_scalars, "psis")) @@ -719,10 +719,10 @@ if (CCTK_EQUALS(fd_order, "4th")) { - schedule group psis_calc_4th_bc_group in psis_calc_4th_group after psis_calc_4th + schedule group WeylScal4_psis_calc_4th_bc_group in WeylScal4_psis_calc_4th_group after WeylScal4_psis_calc_4th { # no language specified - } "psis_calc_4th" + } "WeylScal4_psis_calc_4th" } } @@ -732,10 +732,10 @@ if (CCTK_EQUALS(fd_order, "4th")) { - schedule group psis_calc_4th_bc_group in MoL_PseudoEvolutionBoundaries after MoL_PostStep + schedule group WeylScal4_psis_calc_4th_bc_group in MoL_PseudoEvolutionBoundaries after MoL_PostStep { # no language specified - } "psis_calc_4th" + } "WeylScal4_psis_calc_4th" } } @@ -748,15 +748,15 @@ if (CCTK_EQUALS(fd_order, "Nth")) { - schedule group invars_calc_Nth_group in MoL_PseudoEvolution after ADMBase_SetADMVars + schedule group WeylScal4_invars_calc_Nth_group in MoL_PseudoEvolution after WeylScal4_psis_calc_Nth_group { # no language specified - } "invars_calc_Nth" + } "WeylScal4_invars_calc_Nth" } } } -schedule invars_calc_Nth in invars_calc_Nth_group +schedule WeylScal4_invars_calc_Nth in WeylScal4_invars_calc_Nth_group { LANG: C READS: WeylScal4::Psi0i @@ -777,79 +777,26 @@ WRITES: WeylScal4::curvJ4 WRITES: WeylScal4::curvJi WRITES: WeylScal4::curvJr -} "invars_calc_Nth" +} "WeylScal4_invars_calc_Nth" -schedule invars_calc_Nth_SelectBCs in invars_calc_Nth_bc_group -{ - LANG: C - OPTIONS: level - SYNC: curvIi_group - SYNC: curvIr_group - SYNC: curvJ1_group - SYNC: curvJ2_group - SYNC: curvJ3_group - SYNC: curvJ4_group - SYNC: curvJi_group - SYNC: curvJr_group -} "invars_calc_Nth_SelectBCs" -schedule group ApplyBCs as invars_calc_Nth_ApplyBCs in invars_calc_Nth_bc_group after invars_calc_Nth_SelectBCs -{ - # no language specified -} "Apply BCs for groups set in invars_calc_Nth" - - if (CCTK_EQUALS(calc_invariants, "always")) { if (CCTK_EQUALS(calc_scalars, "psis")) { - if (CCTK_EQUALS(fd_order, "Nth")) - { - schedule group invars_calc_Nth_bc_group in invars_calc_Nth_group after invars_calc_Nth - { - # no language specified - } "invars_calc_Nth" - } - } -} - - -if (CCTK_EQUALS(calc_invariants, "always")) -{ - - if (CCTK_EQUALS(calc_scalars, "psis")) - { - - if (CCTK_EQUALS(fd_order, "Nth")) - { - schedule group invars_calc_Nth_bc_group in MoL_PseudoEvolutionBoundaries after MoL_PostStep - { - # no language specified - } "invars_calc_Nth" - } - } -} - - -if (CCTK_EQUALS(calc_invariants, "always")) -{ - - if (CCTK_EQUALS(calc_scalars, "psis")) - { - if (CCTK_EQUALS(fd_order, "2nd")) { - schedule group invars_calc_2nd_group in MoL_PseudoEvolution after ADMBase_SetADMVars + schedule group WeylScal4_invars_calc_2nd_group in MoL_PseudoEvolution after WeylScal4_psis_calc_2nd_group { # no language specified - } "invars_calc_2nd" + } "WeylScal4_invars_calc_2nd" } } } -schedule invars_calc_2nd in invars_calc_2nd_group +schedule WeylScal4_invars_calc_2nd in WeylScal4_invars_calc_2nd_group { LANG: C READS: WeylScal4::Psi0i @@ -870,79 +817,26 @@ WRITES: WeylScal4::curvJ4 WRITES: WeylScal4::curvJi WRITES: WeylScal4::curvJr -} "invars_calc_2nd" +} "WeylScal4_invars_calc_2nd" -schedule invars_calc_2nd_SelectBCs in invars_calc_2nd_bc_group -{ - LANG: C - OPTIONS: level - SYNC: curvIi_group - SYNC: curvIr_group - SYNC: curvJ1_group - SYNC: curvJ2_group - SYNC: curvJ3_group - SYNC: curvJ4_group - SYNC: curvJi_group - SYNC: curvJr_group -} "invars_calc_2nd_SelectBCs" -schedule group ApplyBCs as invars_calc_2nd_ApplyBCs in invars_calc_2nd_bc_group after invars_calc_2nd_SelectBCs -{ - # no language specified -} "Apply BCs for groups set in invars_calc_2nd" - - if (CCTK_EQUALS(calc_invariants, "always")) { if (CCTK_EQUALS(calc_scalars, "psis")) { - if (CCTK_EQUALS(fd_order, "2nd")) - { - schedule group invars_calc_2nd_bc_group in invars_calc_2nd_group after invars_calc_2nd - { - # no language specified - } "invars_calc_2nd" - } - } -} - - -if (CCTK_EQUALS(calc_invariants, "always")) -{ - - if (CCTK_EQUALS(calc_scalars, "psis")) - { - - if (CCTK_EQUALS(fd_order, "2nd")) - { - schedule group invars_calc_2nd_bc_group in MoL_PseudoEvolutionBoundaries after MoL_PostStep - { - # no language specified - } "invars_calc_2nd" - } - } -} - - -if (CCTK_EQUALS(calc_invariants, "always")) -{ - - if (CCTK_EQUALS(calc_scalars, "psis")) - { - if (CCTK_EQUALS(fd_order, "4th")) { - schedule group invars_calc_4th_group in MoL_PseudoEvolution after ADMBase_SetADMVars + schedule group WeylScal4_invars_calc_4th_group in MoL_PseudoEvolution after WeylScal4_psis_calc_4th_group { # no language specified - } "invars_calc_4th" + } "WeylScal4_invars_calc_4th" } } } -schedule invars_calc_4th in invars_calc_4th_group +schedule WeylScal4_invars_calc_4th in WeylScal4_invars_calc_4th_group { LANG: C READS: WeylScal4::Psi0i @@ -963,61 +857,8 @@ WRITES: WeylScal4::curvJ4 WRITES: WeylScal4::curvJi WRITES: WeylScal4::curvJr -} "invars_calc_4th" +} "WeylScal4_invars_calc_4th" -schedule invars_calc_4th_SelectBCs in invars_calc_4th_bc_group -{ - LANG: C - OPTIONS: level - SYNC: curvIi_group - SYNC: curvIr_group - SYNC: curvJ1_group - SYNC: curvJ2_group - SYNC: curvJ3_group - SYNC: curvJ4_group - SYNC: curvJi_group - SYNC: curvJr_group -} "invars_calc_4th_SelectBCs" - -schedule group ApplyBCs as invars_calc_4th_ApplyBCs in invars_calc_4th_bc_group after invars_calc_4th_SelectBCs -{ - # no language specified -} "Apply BCs for groups set in invars_calc_4th" - - -if (CCTK_EQUALS(calc_invariants, "always")) -{ - - if (CCTK_EQUALS(calc_scalars, "psis")) - { - - if (CCTK_EQUALS(fd_order, "4th")) - { - schedule group invars_calc_4th_bc_group in invars_calc_4th_group after invars_calc_4th - { - # no language specified - } "invars_calc_4th" - } - } -} - - -if (CCTK_EQUALS(calc_invariants, "always")) -{ - - if (CCTK_EQUALS(calc_scalars, "psis")) - { - - if (CCTK_EQUALS(fd_order, "4th")) - { - schedule group invars_calc_4th_bc_group in MoL_PseudoEvolutionBoundaries after MoL_PostStep - { - # no language specified - } "invars_calc_4th" - } - } -} - schedule WeylScal4_SelectBoundConds in MoL_PostStep { LANG: C

1 0

[svn:einsteintoolkit] WeylScal4/trunk/m/ (Rev. 125)
by schnetter＠cct.lsu.edu 19 Nov '12

19 Nov '12

User: eschnett Date: 2012/11/19 10:26 AM Modified: /trunk/m/ WeylScal4.m Log: Correct schedule order Correct schedule order. Add "WeylScal4_" prefix to all schedule items. File Changes: Directory: /trunk/m/ ==================== File [modified]: WeylScal4.m Delta lines: +5 -5 =================================================================== --- trunk/m/WeylScal4.m 2012-11-13 17:44:03 UTC (rev 124) +++ trunk/m/WeylScal4.m 2012-11-19 16:26:21 UTC (rev 125) @@ -302,7 +302,7 @@ Psi4Calc[fdOrder_, PD_] := { - Name -> "psi4_calc_" <> fdOrder, + Name -> "WeylScal4_psi4_calc_" <> fdOrder, Where -> Interior, After -> "ADMBase_SetADMVars", ConditionalOnKeywords -> {{"fd_order", fdOrder}, {"calc_scalars", "psi4"}}, @@ -312,7 +312,7 @@ PsisCalc[fdOrder_, PD_] := { - Name -> "psis_calc_" <> fdOrder, + Name -> "WeylScal4_psis_calc_" <> fdOrder, Where -> Interior, After -> "ADMBase_SetADMVars", ConditionalOnKeywords -> {{"fd_order", fdOrder}, {"calc_scalars", "psis"}}, @@ -322,9 +322,9 @@ InvariantsCalc[fdOrder_, PD_] := { - Name -> "invars_calc_" <> fdOrder, - Where -> Interior, - After -> "ADMBase_SetADMVars", + Name -> "WeylScal4_invars_calc_" <> fdOrder, + Where -> Everywhere, + After -> "WeylScal4_psis_calc_" <> fdOrder <> "_group", ConditionalOnKeywords -> {{"fd_order", fdOrder}, {"calc_scalars", "psis"}, {"calc_invariants", "always"}}, Equations -> invariantEqs };

1 0

[svn:einsteintoolkit] manifest/trunk/ (Rev. 200)
by schnetter＠cct.lsu.edu 18 Nov '12

18 Nov '12

User: eschnett Date: 2012/11/18 07:54 PM Modified: /trunk/ einsteintoolkit.th Log: Clarify comment File Changes: Directory: /trunk/ ================== File [modified]: einsteintoolkit.th Delta lines: +2 -2 =================================================================== --- trunk/einsteintoolkit.th 2012-11-08 16:03:58 UTC (rev 199) +++ trunk/einsteintoolkit.th 2012-11-19 01:54:37 UTC (rev 200) @@ -371,8 +371,8 @@ !TYPE = git !AUTH_URL = carpetgit@carpetcode.org:carpet !URL = git://carpetcode.org/carpet -# For the (old) hg version of Carpet, comment the previous three lines and uncomment -# the next three +# For the (old) hg version of Carpet, comment out the previous three +# lines, and uncomment the next three lines #!TYPE = hg #!AUTH_URL = ssh://carpetgit@carpetcode.org #!URL = http://www.carpetcode.org/carpet

1 0

[svn:einsteintoolkit] EOS_IdealFluid/trunk/src/ (Rev. 16)
by knarf＠cct.lsu.edu 16 Nov '12

16 Nov '12

User: knarf Date: 2012/11/16 12:47 PM Modified: /trunk/src/ EOS_Ideal_Fluid.F Log: use CCTK_DECLARE to silence compiler warnings File Changes: Directory: /trunk/src/ ====================== File [modified]: EOS_Ideal_Fluid.F Delta lines: +4 -2 =================================================================== --- trunk/src/EOS_Ideal_Fluid.F 2012-11-05 14:45:55 UTC (rev 15) +++ trunk/src/EOS_Ideal_Fluid.F 2012-11-16 18:47:52 UTC (rev 16) @@ -116,7 +116,8 @@ IMPLICIT NONE DECLARE_CCTK_PARAMETERS - CCTK_REAL rest_mass_density +c use CCTK_DECLARE to silence compiler warnings + CCTK_DECLARE(CCTK_REAL, rest_mass_density, ) CCTK_REAL specific_internal_energy EOS_Ideal_Fluid_DPressByDRho = (eos_ideal_fluid_gamma - 1.0d0) * @@ -146,7 +147,8 @@ DECLARE_CCTK_PARAMETERS CCTK_REAL rest_mass_density - CCTK_REAL specific_internal_energy +c use CCTK_DECLARE to silence compiler warnings + CCTK_DECLARE(CCTK_REAL, specific_internal_energy, ) EOS_Ideal_Fluid_DPressByDEps = (eos_ideal_fluid_gamma - 1.0d0) * . rest_mass_density

1 0

[svn:einsteintoolkit] EOS_Base/trunk/src/ (Rev. 21)
by knarf＠cct.lsu.edu 14 Nov '12

14 Nov '12

User: knarf Date: 2012/11/14 10:55 PM Modified: /trunk/src/ Register.c Log: silence compiler warnings about unused variables and missing function declarations File Changes: Directory: /trunk/src/ ====================== File [modified]: Register.c Delta lines: +17 -4 =================================================================== --- trunk/src/Register.c 2012-11-05 14:45:23 UTC (rev 20) +++ trunk/src/Register.c 2012-11-15 04:55:30 UTC (rev 21) @@ -7,8 +7,6 @@ @enddesc @@*/ -static const char *rcsid = "$Header$"; - #include <stdlib.h> #include "cctk.h" @@ -79,6 +77,7 @@ return handle; } +void CCTK_FCALL CCTK_FNAME(EOS_RegisterMethod)(int *handle, ONE_FORTSTRING_ARG); void CCTK_FCALL CCTK_FNAME(EOS_RegisterMethod)(int *handle, ONE_FORTSTRING_ARG) { ONE_FORTSTRING_CREATE(name) @@ -113,6 +112,7 @@ return handle; } +void CCTK_FCALL CCTK_FNAME(EOS_Handle)(int *handle, ONE_FORTSTRING_ARG); void CCTK_FCALL CCTK_FNAME(EOS_Handle)(int *handle, ONE_FORTSTRING_ARG) { ONE_FORTSTRING_CREATE(name) @@ -152,8 +152,10 @@ REGISTER_FUNCTION(DPressByDEps) +#define REGISTER_FORTRAN_FUNCTION_ARGS \ +(int *retval, int *handle, CCTK_REAL (*func)(CCTK_REAL *, CCTK_REAL *)) #define REGISTER_FORTRAN_FUNCTION(x)\ -(int *retval, int *handle, CCTK_REAL (*func)(CCTK_REAL *, CCTK_REAL *)) \ +REGISTER_FORTRAN_FUNCTION_ARGS \ { \ method_t *method; \ \ @@ -173,10 +175,15 @@ } /* Functions to register Fortran EOS functions */ +void CCTK_FCALL CCTK_FNAME(EOS_RegisterPressure) REGISTER_FORTRAN_FUNCTION_ARGS; void CCTK_FCALL CCTK_FNAME(EOS_RegisterPressure) REGISTER_FORTRAN_FUNCTION(Pressure) +void CCTK_FCALL CCTK_FNAME(EOS_RegisterSpecificIntEnergy) REGISTER_FORTRAN_FUNCTION_ARGS; void CCTK_FCALL CCTK_FNAME(EOS_RegisterSpecificIntEnergy) REGISTER_FORTRAN_FUNCTION(SpecificIntEnergy) +void CCTK_FCALL CCTK_FNAME(EOS_RegisterRestMassDens) REGISTER_FORTRAN_FUNCTION_ARGS; void CCTK_FCALL CCTK_FNAME(EOS_RegisterRestMassDens) REGISTER_FORTRAN_FUNCTION(RestMassDens) +void CCTK_FCALL CCTK_FNAME(EOS_RegisterDPressByDRho) REGISTER_FORTRAN_FUNCTION_ARGS; void CCTK_FCALL CCTK_FNAME(EOS_RegisterDPressByDRho) REGISTER_FORTRAN_FUNCTION(DPressByDRho) +void CCTK_FCALL CCTK_FNAME(EOS_RegisterDPressByDEps) REGISTER_FORTRAN_FUNCTION_ARGS; void CCTK_FCALL CCTK_FNAME(EOS_RegisterDPressByDEps) REGISTER_FORTRAN_FUNCTION(DPressByDEps) #define CALL_FUNC(x) \ @@ -212,8 +219,9 @@ CALL_FUNC(DPressByDRho) CALL_FUNC(DPressByDEps) +#define CALL_FORTRAN_FUNC_ARGS (int *handle, CCTK_REAL *a, CCTK_REAL *b) #define CALL_FORTRAN_FUNC(x) \ -(int *handle, CCTK_REAL *a, CCTK_REAL *b) \ +CALL_FORTRAN_FUNC_ARGS \ { \ CCTK_REAL retval; \ method_t *method; \ @@ -239,9 +247,14 @@ } /* Functions to call EOS functions from Fortran*/ +CCTK_REAL CCTK_FCALL CCTK_FNAME(EOS_Pressure) CALL_FORTRAN_FUNC_ARGS; CCTK_REAL CCTK_FCALL CCTK_FNAME(EOS_Pressure) CALL_FORTRAN_FUNC(Pressure) +CCTK_REAL CCTK_FCALL CCTK_FNAME(EOS_SpecificIntEnergy) CALL_FORTRAN_FUNC_ARGS; CCTK_REAL CCTK_FCALL CCTK_FNAME(EOS_SpecificIntEnergy) CALL_FORTRAN_FUNC(SpecificIntEnergy) +CCTK_REAL CCTK_FCALL CCTK_FNAME(EOS_RestMassDens) CALL_FORTRAN_FUNC_ARGS; CCTK_REAL CCTK_FCALL CCTK_FNAME(EOS_RestMassDens) CALL_FORTRAN_FUNC(RestMassDens) +CCTK_REAL CCTK_FCALL CCTK_FNAME(EOS_DPressByDRho) CALL_FORTRAN_FUNC_ARGS; CCTK_REAL CCTK_FCALL CCTK_FNAME(EOS_DPressByDRho) CALL_FORTRAN_FUNC(DPressByDRho) +CCTK_REAL CCTK_FCALL CCTK_FNAME(EOS_DPressByDEps) CALL_FORTRAN_FUNC_ARGS; CCTK_REAL CCTK_FCALL CCTK_FNAME(EOS_DPressByDEps) CALL_FORTRAN_FUNC(DPressByDEps)

1 0

[svn:einsteintoolkit] Hydro_InitExcision/trunk/src/ (Rev. 128)
by knarf＠cct.lsu.edu 14 Nov '12

14 Nov '12

User: knarf Date: 2012/11/14 10:35 PM Modified: /trunk/src/ Hydro_InitExcision.c Log: place parentheses better (and thus silence compiler warnings) File Changes: Directory: /trunk/src/ ====================== File [modified]: Hydro_InitExcision.c Delta lines: +4 -4 =================================================================== --- trunk/src/Hydro_InitExcision.c 2012-11-05 16:05:20 UTC (rev 127) +++ trunk/src/Hydro_InitExcision.c 2012-11-15 04:35:46 UTC (rev 128) @@ -118,8 +118,8 @@ { if (domain_val == full) { - if ( (hydro_initexcision_coordinate_length <= 0.0) && - ( ( x_frac > 0.5 - hydro_initexcision_fraction) && + if ( ( (hydro_initexcision_coordinate_length <= 0.0) && + ( x_frac > 0.5 - hydro_initexcision_fraction) && ( x_frac < 0.5 + hydro_initexcision_fraction) && ( y_frac > 0.5 - hydro_initexcision_fraction) && ( y_frac < 0.5 + hydro_initexcision_fraction) && @@ -227,8 +227,8 @@ } else if (hydro_initexcision_type_val == sphere) { - if ( (hydro_initexcision_coordinate_length <= 0.0) && - ( ( (x[point]-hydro_initexcision_position_x) * + if ( ( (hydro_initexcision_coordinate_length <= 0.0) && + ( (x[point]-hydro_initexcision_position_x) * (x[point]-hydro_initexcision_position_x) + (y[point]-hydro_initexcision_position_y) * (y[point]-hydro_initexcision_position_y) +

1 0

[Carpet] branch, master, updated. carpet-6-init-51-g4306806
by Carpet git repositories 14 Nov '12

14 Nov '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Carpet — Adaptive Mesh Refinement for the Cactus Framework <http://carpetcode.org/>". The branch, master has been updated via 4306806ad6d517f4e9b675d3cd541c95db3ea7fa (commit) from 17845edc3640298238c742a51509be2423cd6373 (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 4306806ad6d517f4e9b675d3cd541c95db3ea7fa Author: Erik Schnetter <schnetter(a)gmail.com> Date: Wed Nov 14 16:39:38 2012 -0500 CarpetLib: Define dh members tallying the size of refinement boundaries Define dh members tallying the size of refinement boundaries. This may be used to implement (2d) face grid functions at some point. ----------------------------------------------------------------------- Summary of changes: Carpet/CarpetLib/src/dh.cc | 40 +++++++++++++++++++++++++++++++++++++++- Carpet/CarpetLib/src/dh.hh | 4 ++++ 2 files changed, 43 insertions(+), 1 deletions(-) hooks/post-receive -- Carpet — Adaptive Mesh Refinement for the Cactus Framework <http://carpetcode.org/>

1 0

[svn:einsteintoolkit] pyGWAnalysis/trunk/DataAnalysis/ (Rev. 16)
by reisswig＠tapir.caltech.edu 14 Nov '12

14 Nov '12

User: reisswig Date: 2012/11/14 08:27 AM Modified: /trunk/DataAnalysis/ DataAnalysis.py Log: Fixed a bug in phase alignement procedure. File Changes: Directory: /trunk/DataAnalysis/ =============================== File [modified]: DataAnalysis.py Delta lines: +2 -1 =================================================================== --- trunk/DataAnalysis/DataAnalysis.py 2012-11-12 11:00:27 UTC (rev 15) +++ trunk/DataAnalysis/DataAnalysis.py 2012-11-14 14:27:38 UTC (rev 16) @@ -774,7 +774,8 @@ break x_off += accuracy*factor factor *= 0.1 - FirstTime = False + firstTime = False + #print factor return trueMinX, trueDeltaPhi print "ERROR! ...using brute force method!"

1 0

[svn:einsteintoolkit] WeylScal4/trunk/src/ (Rev. 124)
by schnetter＠cct.lsu.edu 13 Nov '12

13 Nov '12

User: eschnett Date: 2012/11/13 11:44 AM Modified: /trunk/src/ Differencing.h, invars_calc_2nd.cc, invars_calc_4th.cc, invars_calc_Nth.cc, psi4_calc_2nd.cc, psi4_calc_4th.cc, psi4_calc_Nth.cc, 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: <Unavailable> File [modified]: invars_calc_2nd.cc Delta lines: <Unavailable> File [modified]: invars_calc_4th.cc Delta lines: <Unavailable> File [modified]: invars_calc_Nth.cc Delta lines: <Unavailable> File [modified]: psi4_calc_2nd.cc Delta lines: <Unavailable> File [modified]: psi4_calc_4th.cc Delta lines: <Unavailable> File [modified]: psi4_calc_Nth.cc Delta lines: <Unavailable> File [modified]: psis_calc_2nd.cc Delta lines: <Unavailable> File [modified]: psis_calc_4th.cc Delta lines: <Unavailable> File [modified]: psis_calc_Nth.cc Delta lines: <Unavailable>

1 0

[svn:einsteintoolkit] pyGWAnalysis/trunk/ (Rev. 15)
by reisswig＠tapir.caltech.edu 12 Nov '12

12 Nov '12

User: reisswig Date: 2012/11/12 05:00 AM Modified: /trunk/DataAnalysis/ DataAnalysis.py, RadiatedQuantities.py /trunk/DiscreteFunction/ DiscreteFunction.py, WaveFunction.py Log: 1) Radiated energy flux from RWZM. 2) Some operators for DiscreteFunction 3) Load mode array by specifying file format. File Changes: Directory: /trunk/DataAnalysis/ =============================== File [modified]: DataAnalysis.py Delta lines: +21 -5 =================================================================== --- trunk/DataAnalysis/DataAnalysis.py 2012-05-11 00:23:43 UTC (rev 14) +++ trunk/DataAnalysis/DataAnalysis.py 2012-11-12 11:00:27 UTC (rev 15) @@ -427,20 +427,36 @@ res[-1].append([]) return res -def LoadModeArray(basename, lmax, col_time=1, col_re=2, col_im=3): +def LoadModeArray(basename, lmax, col_time=1, col_re=2, col_im=3, filenameformat="cce_conversionscript"): """Loads an array of modes up to lmax from disk. We assume that files begin with 'basename' and end with _l*m*.dat""" res = InitModeArray(lmax) for ll in range(2, lmax+1): for mm in range(-ll, ll+1): - res[ll][mm] = WaveFunction([], []) - res[ll][mm].Load(basename+"_l"+str(ll)+"m"+str(mm)+".dat", col_time, col_re, col_im) - + if (filenameformat == "cce_conversion_script"): + res[ll][mm] = WaveFunction([], []) + res[ll][mm].Load(basename+"_l"+str(ll)+"m"+str(mm)+".dat", col_time, col_re, col_im) + continue + if (filenameformat == "pittnull"): + res[ll][-mm] = WaveFunction([], []) + # Get spaces from Fortran outpout filenames right + tmp1 = "%02d" % ll + if mm < 0: + tmp2 = "m" + else: + tmp2 = "p" + tmp2 += "%02d" % abs(mm) + # Take into account that nullcode has a weird convention for psi4! + res[ll][-mm].Load(basename+".L"+tmp1+"M"+tmp2+".asc", col_time, col_re, col_im) + res[ll][-mm].f *= 2.0*(-1.0)**(mm+1) + res[ll][-mm].f = map(lambda x: x.conjugate(), res[ll][-mm].f) + continue + print("Error loading mode array: filenameformat not recognized!") + return res - def ReconFromsYlm(arrayWF, theta, phi, lmax): """Given an array of WF modes h_lm reconstruct h at angle theta, phi up to l=lmax""" res = WaveFunction(arrayWF[2][0].x, arrayWF[2][0].f*0.0) File [modified]: RadiatedQuantities.py Delta lines: +24 -0 =================================================================== --- trunk/DataAnalysis/RadiatedQuantities.py 2012-05-11 00:23:43 UTC (rev 14) +++ trunk/DataAnalysis/RadiatedQuantities.py 2012-11-12 11:00:27 UTC (rev 15) @@ -39,6 +39,30 @@ +def RadiatedEnergyFluxRWZM(Qeven, Qodd, lmax): + """ Given the time integral of rPsi4 (l,m) modes (a DiscreteFunction mode array), + this function computes the radiated energy flux + that is emitted as a function of time in units of [M].""" + + npoints = Qeven[2][0].Length() + Edot = DiscreteFunction(Qeven[2][0].x, zeros(npoints, float)) + + dtQeven = InitModeArray(2) + for l in range(2, lmax+1): + for m in range(-l, l+1): + dtQeven[l][m] = Qeven[l][m].DifferentiateFunction() + + for ii in range(Edot.Length()): + e = 0.0 + for l in range(2, lmax+1): + for m in range(-l, l+1): + e = e + abs(dtQeven[l][m].f[ii])**2 + abs(Qodd[l][m].f[ii])**2 + Edot.f[ii] = e/(32.*pi) + + return Edot + + + def RadiatedEnergyFlux(int_rPsi4_ModeArray, lmax): """ Given the time integral of rPsi4 (l,m) modes (a DiscreteFunction mode array), this function computes the radiated energy flux Directory: /trunk/DiscreteFunction/ =================================== File [modified]: DiscreteFunction.py Delta lines: +68 -2 =================================================================== --- trunk/DiscreteFunction/DiscreteFunction.py 2012-05-11 00:23:43 UTC (rev 14) +++ trunk/DiscreteFunction/DiscreteFunction.py 2012-11-12 11:00:27 UTC (rev 15) @@ -32,10 +32,13 @@ return False - def __init__(self, x_, f_): + def __init__(self, x_, f_, g_=None): """Initialise a 1D transformation function""" self.x = array(x_) - self.f = array(f_) + if g_ != None: + self.f = array(f_) + 1j*array(g_) + else: + self.f = array(f_) if self.HasUniformSpacing() == True: self.dx = self.x[1]-self.x[0] else: @@ -383,12 +386,31 @@ return xroot + def DifferentiateFunction(self): + """ Differentiate this function and return a function""" + + npoints = self.Length() + res = self.__class__(self.x, self.f*0.0) + + # TODO: fail if not uniform spacing + self.dx = self.x[1]-self.x[0] + res.dx = self.dx + + # Simple second order centred differentiation + + for ii in range (1, self.Length()-1): + res.f[ii] = (self.f[ii+1] - self.f[ii-1])/(2*res.dx) + + return res + + def IntegrateFunction(self): """ Integrate this function and return a function""" npoints = self.Length() res = self.__class__(self.x, self.f*0.0) + # TODO: fail if not uniform spacing self.dx = self.x[1]-self.x[0] res.dx = self.dx @@ -572,6 +594,12 @@ return res + def __add__(self, rval): + res = self.Union(rval) + for ii in range(0, res.Length()): + res.f[ii] = self.Interpolate(res.x[ii]) + rval.Interpolate(res.x[ii]) + return res + def __sub__(self, rval): res = self.Union(rval) for ii in range(0, res.Length()): @@ -591,7 +619,45 @@ res.f[ii] = self.Interpolate(res.x[ii]) / rval.Interpolate(res.x[ii]) return res + def __abs__(self): + npoints = len(self.x) + res = self.__class__(self.x, zeros(npoints, float)) + for ii in range(0, Length()): + res.f[ii] = abs(self.f[ii]) + return res + def __pos__(self): + npoints = len(self.x) + res = self.__class__(self.x, self.f) + return res + + def __neg__(self): + npoints = len(self.x) + res = self.__class__(self.x, -self.f) + return res + + def real(self): + npoints = len(self.x) + res = self.__class__(self.x, zeros(npoints, float)) + for ii in range(0, self.Length()): + res.f[ii] = self.f[ii].real + return res + + def imag(self): + npoints = len(self.x) + res = self.__class__(self.x, zeros(npoints, float)) + for ii in range(0, self.Length()): + res.f[ii] = self.f[ii].imag + return res + + def conjugate(self): + npoints = len(self.x) + res = self.__class__(self.x, zeros(npoints, type(self.f[0]))) + for ii in range(0, self.Length()): + res.f[ii] = self.f[ii].conjugate() + return res + + # implement iterator def __iter__(self): self.index = 0 File [modified]: WaveFunction.py Delta lines: +5 -2 =================================================================== --- trunk/DiscreteFunction/WaveFunction.py 2012-05-11 00:23:43 UTC (rev 14) +++ trunk/DiscreteFunction/WaveFunction.py 2012-11-12 11:00:27 UTC (rev 15) @@ -19,10 +19,13 @@ class WaveFunction(DiscreteFunction): """Class describing discrete 1d wave functions""" - def __init__(self, x_, f_): + def __init__(self, x_, f_, g_=None): """Initialise a 1D wave function""" self.x = array(x_) - self.f = array(f_) + if g_ != None: + self.f = array(f_) + 1j*array(g_) + else: + self.f = array(f_) if self.HasUniformSpacing() == True: self.dx = self.x[1]-self.x[0] else:

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Commits