Skip to content

Commit 308330b

Browse files
lwJilwJi
authored
Merge pull request #37 from EinsteinToolkit/Multipole
Multipole: remove dependence on WeylScal4
2 parents 07afde0 + 8fcfadd commit 308330b

24 files changed

+107
-108
lines changed

‎Multipole/interface.ccl

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#interface.ccl for thorn Multipole
22
implements: Multipole
3-
inherits: WeylScal4
43

54
USES INCLUDE HEADER: loop_device.hxx
65

‎Multipole/schedule.ccl

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ SCHEDULE Multipole_Setup AT wragh
66
OPTIONS: GLOBAL
77
} "Set up for Calculating Multipoles"
88

9-
SCHEDULE Multipole_Calc AT analysis AFTER WeylScal4_psi4_calc_4th
9+
SCHEDULE Multipole_Calc AT analysis
1010
{
1111
LANG: C
1212
OPTIONS: GLOBAL

‎Multipole/test/q1/mp_Psi4_l2_m-1_r5.00.tsv

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
0.000000 -0.0002368732253810762359 6.666401494014248521e-07
2-
0.208333 -0.0001289797748577268773 2.102924179915139854e-06
3-
0.416667 -6.99056635630417424e-05 1.82040992987463975e-06
4-
0.625000 -2.95883330816814263e-05 1.288648603488281516e-06
5-
0.833333 4.008593741221636013e-07 8.015421082316829264e-07
1+
0.000000 0 0
2+
0.208333 -0.0001289797748577336807 2.102924179913225136e-06
3+
0.416667 -6.990566356301622299e-05 1.820409929874480084e-06
4+
0.625000 -2.958833308169631714e-05 1.288648603502214784e-06
5+
0.833333 4.008593741438614619e-07 8.015421082085758676e-07

‎Multipole/test/q1/mp_Psi4_l2_m-2_r5.00.tsv

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
0.000000 0.1633544727512866446 -0.0008959502916950184666
2-
0.208333 0.05187591059391045284 -0.001506529272075974321
3-
0.416667 0.02048718320800371751 -0.001699256881890817651
4-
0.625000 0.007879247982423086272 -0.001808077160743260014
5-
0.833333 0.001874578347650216132 -0.001894464640262648238
1+
0.000000 0 0
2+
0.208333 0.05187591059391045284 -0.001506529272075977357
3+
0.416667 0.02048718320800371751 -0.001699256881890813748
4+
0.625000 0.007879247982423074129 -0.001808077160743253942
5+
0.833333 0.001874578347650231744 -0.001894464640262645203

‎Multipole/test/q1/mp_Psi4_l2_m0_r5.00.tsv

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
0.000000 0.2419469528117654256 -7.653091856789566293e-18
2-
0.208333 0.0921389906304476286 -5.043750959596491283e-18
3-
0.416667 0.04906407004441366848 -2.700338942999849206e-18
4-
0.625000 0.03135805551077842229 -1.727804024349172077e-18
5-
0.833333 0.02267445892134434954 -1.715567552377175364e-18
1+
0.000000 0 0
2+
0.208333 0.09213899063044755922 -6.086458867391705984e-18
3+
0.416667 0.0490640700444136546 -2.314675169647340639e-18
4+
0.625000 0.03135805551077845005 -1.012993194209994118e-18
5+
0.833333 0.02267445892134433913 -1.908561427833277906e-18

‎Multipole/test/q1/mp_Psi4_l2_m1_r5.00.tsv

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
0.000000 -0.0002368732253810240586 -6.666401494140695717e-07
2-
0.208333 -0.0001289797748577293981 -2.102924179922938487e-06
3-
0.416667 -6.990566356304339581e-05 -1.820409929876746109e-06
4-
0.625000 -2.958833308167532089e-05 -1.288648603495160482e-06
5-
0.833333 4.008593741266087243e-07 -8.015421082332442199e-07
1+
0.000000 0 0
2+
0.208333 -0.0001289797748577395896 -2.102924179912833807e-06
3+
0.416667 -6.990566356301105948e-05 -1.820409929874353029e-06
4+
0.625000 -2.958833308169233947e-05 -1.288648603511859525e-06
5+
0.833333 4.008593741410740353e-07 -8.015421082186460305e-07

‎Multipole/test/q1/mp_Psi4_l2_m2_r5.00.tsv

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
0.000000 0.1633544727512867278 0.0008959502916950186835
2-
0.208333 0.05187591059391045284 0.001506529272075971719
3-
0.416667 0.02048718320800372097 0.001699256881890811146
4-
0.625000 0.007879247982423079333 0.001808077160743254159
5-
0.833333 0.001874578347650211144 0.001894464640262648672
1+
0.000000 0 0
2+
0.208333 0.05187591059391043896 0.001506529272075983646
3+
0.416667 0.02048718320800372097 0.001699256881890812013
4+
0.625000 0.007879247982423068924 0.001808077160743256761
5+
0.833333 0.00187457834765022654 0.00189446464026265084

‎Multipole/test/q1/mp_Psi4_l3_m-1_r5.00.tsv

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
0.000000 0.0002019370196407539362 3.338113721378047715e-06
2-
0.208333 2.823361978887846928e-05 3.234097578951005802e-06
3-
0.416667 3.670170726551539926e-06 2.669602061496836481e-06
4-
0.625000 7.426222331165671122e-06 1.984516668154453197e-06
5-
0.833333 1.768464560466985811e-05 1.316431616045588083e-06
1+
0.000000 0 0
2+
0.208333 2.82336197888793197e-05 3.234097578918565287e-06
3+
0.416667 3.670170726580470337e-06 2.669602061501889032e-06
4+
0.625000 7.426222331167160206e-06 1.98451666816461124e-06
5+
0.833333 1.768464560467624135e-05 1.316431616041439527e-06

‎Multipole/test/q1/mp_Psi4_l3_m-2_r5.00.tsv

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
0.000000 0.1355126235035146731 -0.0009011010393264041844
2-
0.208333 0.04915961729455798485 -0.001330725778100331829
3-
0.416667 0.02460624583466450993 -0.001361150329112784541
4-
0.625000 0.01465651357767516934 -0.001293270580079792587
5-
0.833333 0.009867770220573061218 -0.001186883926944995492
1+
0.000000 0 0
2+
0.208333 0.04915961729455799178 -0.001330725778100339636
3+
0.416667 0.02460624583466452381 -0.001361150329112788011
4+
0.625000 0.01465651357767515199 -0.001293270580079782395
5+
0.833333 0.009867770220573071627 -0.00118688392694498053

‎Multipole/test/q1/mp_Psi4_l3_m-3_r5.00.tsv

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
0.000000 -0.000524357053400254197 -2.905545537781715144e-07
2-
0.208333 -0.0002068048233001305923 3.385973869275712014e-06
3-
0.416667 -9.568916449580917047e-05 3.076569659169643819e-06
4-
0.625000 -3.820646180675378709e-05 2.193026390520618873e-06
5-
0.833333 -2.516145623380480787e-06 1.377342834350929013e-06
1+
0.000000 0 0
2+
0.208333 -0.0002068048233001373957 3.385973869285922996e-06
3+
0.416667 -9.568916449577683414e-05 3.076569659165388749e-06
4+
0.625000 -3.820646180675421399e-05 2.193026390525511759e-06
5+
0.833333 -2.516145623364952132e-06 1.377342834356513501e-06

‎Multipole/test/q1/mp_Psi4_l3_m0_r5.00.tsv

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
0.000000 1.173183009079013832e-16 -0.003708940845691018062
2-
0.208333 3.612773071929700893e-17 -0.002700739358774666837
3-
0.416667 1.689594942853659686e-17 -0.002438308156062374971
4-
0.625000 8.725325447410604674e-18 -0.002281124460109713176
5-
0.833333 4.947400725637692999e-18 -0.002112719973495174545
1+
0.000000 0 0
2+
0.208333 3.593098023708727153e-17 -0.002700739358774686787
3+
0.416667 1.685695935083445115e-17 -0.002438308156062394486
4+
0.625000 9.427289108860410485e-18 -0.002281124460109731824
5+
0.833333 4.411714370426447075e-18 -0.002112719973495171509

‎Multipole/test/q1/mp_Psi4_l3_m1_r5.00.tsv

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
0.000000 -0.0002019370196406217177 3.338113721355847405e-06
2-
0.208333 -2.823361978883721877e-05 3.234097578956347615e-06
3-
0.416667 -3.670170726530925686e-06 2.669602061511847175e-06
4-
0.625000 -7.426222331161553694e-06 1.984516668150198127e-06
5-
0.833333 -1.768464560466112689e-05 1.316431616035589494e-06
1+
0.000000 0 0
2+
0.208333 -2.823361978884062046e-05 3.234097578930926886e-06
3+
0.416667 -3.670170726554751028e-06 2.66960206150892237e-06
4+
0.625000 -7.426222331164106652e-06 1.984516668168173437e-06
5+
0.833333 -1.768464560467197569e-05 1.316431616031228545e-06

‎Multipole/test/q1/mp_Psi4_l3_m2_r5.00.tsv

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
0.000000 -0.1355126235035146454 -0.0009011010393263925835
2-
0.208333 -0.04915961729455795015 -0.00133072577810032836
3-
0.416667 -0.0246062458346645134 -0.001361150329112780638
4-
0.625000 -0.01465651357767517281 -0.001293270580079786949
5-
0.833333 -0.009867770220573068157 -0.00118688392694498877
1+
0.000000 0 0
2+
0.208333 -0.04915961729455795015 -0.0013307257781003366
3+
0.416667 -0.02460624583466450646 -0.001361150329112782807
4+
0.625000 -0.0146565135776751624 -0.001293270580079776974
5+
0.833333 -0.009867770220573082035 -0.00118688392694497641

‎Multipole/test/q1/mp_Psi4_l3_m3_r5.00.tsv

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
0.000000 0.0005243570534002215625 -2.905545537575414976e-07
2-
0.208333 0.0002068048233001066043 3.385973869288278171e-06
3-
0.416667 9.568916449579526558e-05 3.076569659178769752e-06
4-
0.625000 3.820646180675535918e-05 2.193026390517246835e-06
5-
0.833333 2.516145623378072249e-06 1.377342834343111958e-06
1+
0.000000 0 0
2+
0.208333 0.0002068048233001049238 3.385973869290830705e-06
3+
0.416667 9.568916449576889236e-05 3.076569659175472676e-06
4+
0.625000 3.820646180675365156e-05 2.193026390517672469e-06
5+
0.833333 2.516145623364670917e-06 1.377342834353694999e-06

‎Multipole/test/q1/mp_Psi4_l4_m-1_r5.00.tsv

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
0.000000 -0.0004808878783879486324 2.659573018956380746e-06
2-
0.208333 -0.0001689615685434156045 8.598184120614649351e-07
3-
0.416667 -8.510788167757491255e-05 5.27597492921416569e-07
4-
0.625000 -5.377490823044495013e-05 4.010258073272546419e-07
5-
0.833333 -3.995616627310076508e-05 2.778043066035421718e-07
1+
0.000000 0 0
2+
0.208333 -0.0001689615685434096685 8.598184120427451893e-07
3+
0.416667 -8.510788167756938311e-05 5.275974929263086078e-07
4+
0.625000 -5.377490823043516521e-05 4.010258073229463147e-07
5+
0.833333 -3.995616627310257435e-05 2.778043065897688337e-07

‎Multipole/test/q1/mp_Psi4_l4_m-2_r5.00.tsv

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
0.000000 -0.005055289978713480188 -0.003559185609643274965
2-
0.208333 0.01089000545440615107 -0.002594981265614003992
3-
0.416667 0.01356998917891903168 -0.002180666671946857038
4-
0.625000 0.01377036834596706387 -0.001844098367820397799
5-
0.833333 0.01330299276988774863 -0.001498137151786593357
1+
0.000000 0 0
2+
0.208333 0.01089000545440613373 -0.002594981265614012232
3+
0.416667 0.01356998917891903862 -0.002180666671946852701
4+
0.625000 0.01377036834596706734 -0.001844098367820397148
5+
0.833333 0.01330299276988775731 -0.001498137151786583382

‎Multipole/test/q1/mp_Psi4_l4_m-3_r5.00.tsv

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
0.000000 -0.0001112179228977126273 3.297291987686076374e-06
2-
0.208333 -9.445093615843288366e-05 7.098706433870589192e-06
3-
0.416667 -5.225283428483387172e-05 6.024583840007271485e-06
4-
0.625000 -1.435991113858665491e-05 4.288140272588161093e-06
5-
0.833333 1.65152966566533104e-05 2.707553508581170099e-06
1+
0.000000 0 0
2+
0.208333 -9.445093615842437267e-05 7.098706433870589192e-06
3+
0.416667 -5.225283428481430187e-05 6.024583840000996665e-06
4+
0.625000 -1.435991113859218604e-05 4.28814027259250976e-06
5+
0.833333 1.651529665665713899e-05 2.70755350858580591e-06

‎Multipole/test/q1/mp_Psi4_l4_m-4_r5.00.tsv

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
0.000000 0.2019000457910152535 -0.00155690148251388244
2-
0.208333 0.05813059682722451771 -0.002991099114221208548
3-
0.416667 0.01896909511980245447 -0.003483609055083728735
4-
0.625000 0.003845387487827126808 -0.00373774486256966661
5-
0.833333 -0.002986614977032532852 -0.003886954563552280986
1+
0.000000 0 0
2+
0.208333 0.05813059682722451771 -0.002991099114221236303
3+
0.416667 0.01896909511980244753 -0.003483609055083713123
4+
0.625000 0.003845387487827130711 -0.003737744862569668345
5+
0.833333 -0.002986614977032538056 -0.00388695456355226494

‎Multipole/test/q1/mp_Psi4_l4_m0_r5.00.tsv

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
0.000000 0.2402589475282120857 -4.684142277767433322e-18
2-
0.208333 0.0792265656685756936 -3.260032908360952642e-18
3-
0.416667 0.03272551247039224426 -1.897343035198238761e-18
4-
0.625000 0.01334720352328728349 -1.385613610595292847e-18
5-
0.833333 0.003641225904460531314 -1.64021094129658464e-18
1+
0.000000 0 0
2+
0.208333 0.0792265656685756936 -2.966112462970136887e-18
3+
0.416667 0.03272551247039224426 -1.817011054903714884e-18
4+
0.625000 0.01334720352328728175 -1.42507711154554376e-18
5+
0.833333 0.003641225904460527844 -9.979249822494536864e-19

‎Multipole/test/q1/mp_Psi4_l4_m1_r5.00.tsv

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
0.000000 -0.0004808878783880827482 -2.6595730189469016e-06
2-
0.208333 -0.0001689615685434536329 -8.598184120579221139e-07
3-
0.416667 -8.510788167758786876e-05 -5.275974929355635016e-07
4-
0.625000 -5.377490823045591412e-05 -4.010258073169980788e-07
5-
0.833333 -3.995616627310614544e-05 -2.778043066050909715e-07
1+
0.000000 0 0
2+
0.208333 -0.0001689615685434545003 -8.598184120474986323e-07
3+
0.416667 -8.51078816775829763e-05 -5.275974929272672373e-07
4+
0.625000 -5.377490823044942924e-05 -4.010258073148176572e-07
5+
0.833333 -3.995616627310827318e-05 -2.778043065895620518e-07

‎Multipole/test/q1/mp_Psi4_l4_m2_r5.00.tsv

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
0.000000 -0.005055289978713600751 0.003559185609643275832
2-
0.208333 0.01089000545440612679 0.002594981265613983176
3-
0.416667 0.01356998917891901954 0.002180666671946848365
4-
0.625000 0.01377036834596706387 0.001844098367820382837
5-
0.833333 0.01330299276988774863 0.001498137151786592272
1+
0.000000 0 0
2+
0.208333 0.0108900054544061025 0.002594981265613987946
3+
0.416667 0.01356998917891901954 0.002180666671946846196
4+
0.625000 0.01377036834596706387 0.001844098367820393896
5+
0.833333 0.01330299276988774169 0.001498137151786589454

‎Multipole/test/q1/mp_Psi4_l4_m3_r5.00.tsv

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
0.000000 -0.0001112179228977765139 -3.297291987690220482e-06
2-
0.208333 -9.445093615845425599e-05 -7.098706433863187818e-06
3-
0.416667 -5.225283428483734117e-05 -6.02458384001644824e-06
4-
0.625000 -1.435991113858803219e-05 -4.288140272590694569e-06
5-
0.833333 1.65152966566460022e-05 -2.707553508582060754e-06
1+
0.000000 0 0
2+
0.208333 -9.445093615845596361e-05 -7.098706433868612217e-06
3+
0.416667 -5.225283428481521667e-05 -6.024583840005173385e-06
4+
0.625000 -1.435991113859441373e-05 -4.288140272593487236e-06
5+
0.833333 1.651529665665015266e-05 -2.707553508588383855e-06

‎Multipole/test/q1/mp_Psi4_l4_m4_r5.00.tsv

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
0.000000 0.2019000457910155033 0.001556901482513865526
2-
0.208333 0.05813059682722451077 0.002991099114221219823
3-
0.416667 0.01896909511980245447 0.003483609055083721363
4-
0.625000 0.003845387487827117267 0.003737744862569664008
5-
0.833333 -0.002986614977032534153 0.003886954563552282721
1+
0.000000 0 0
2+
0.208333 0.05813059682722448995 0.002991099114221237171
3+
0.416667 0.01896909511980243365 0.003483609055083709653
4+
0.625000 0.003845387487827119869 0.003737744862569670513
5+
0.833333 -0.002986614977032544128 0.003886954563552264073

‎WeylScal4/schedule.ccl

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
STORAGE: Psi4r_group
44
STORAGE: Psi4i_group
55

6-
SCHEDULE WeylScal4_psi4_calc_4th AT analysis
6+
SCHEDULE WeylScal4_psi4_calc_4th AT evol AFTER ODESolvers_Solve
77
{
88
LANG: C
99
READS: ADMBaseX::metric(everywhere)

0 commit comments

Comments
 (0)