Skip to content
This repository was archived by the owner on Aug 28, 2024. It is now read-only.

Commit

Permalink
Fixed WHM gr sim initial conditions
Browse files Browse the repository at this point in the history
  • Loading branch information
daminton committed Aug 6, 2021
1 parent 42909d4 commit a0c0858
Show file tree
Hide file tree
Showing 6 changed files with 55 additions and 53 deletions.
1 change: 1 addition & 0 deletions examples/whm_gr_test/init_cond.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
sim.param['CHK_EJECT'] = 1000.0
sim.param['OUT_FORM'] = "EL"
sim.param['OUT_STAT'] = "UNKNOWN"
sim.param['RHILL_PRESENT'] = "YES"
sim.param['GR'] = 'YES'

bodyid = {
Expand Down
2 changes: 1 addition & 1 deletion examples/whm_gr_test/param.swifter.in
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ CHK_QMIN_RANGE 0.004650467260962157 1000.0
EXTRA_FORCE NO
BIG_DISCARD NO
CHK_CLOSE YES
RHILL_PRESENT YES
C 63241.07708426628
J2 4.7535806948127355e-12
J4 -2.2473967953572827e-18
RHILL_PRESENT YES
1 change: 1 addition & 0 deletions examples/whm_gr_test/param.swiftest.in
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ DU2M 149597870700.0
EXTRA_FORCE NO
BIG_DISCARD NO
CHK_CLOSE YES
RHILL_PRESENT YES
FRAGMENTATION NO
ROTATION NO
TIDES NO
Expand Down
48 changes: 24 additions & 24 deletions examples/whm_gr_test/pl.swifter.in
Original file line number Diff line number Diff line change
Expand Up @@ -2,35 +2,35 @@
0 39.476926408897625196
0.0 0.0 0.0
0.0 0.0 0.0
1 6.5537098095653139645e-06 0.0014751234419554511911
1 6.5537098095653139645e-06 0.001475124456355905224
1.6306381826061645943e-05
0.13267502226188271353 0.2786606257975073886 0.010601098875389479426
-11.331978934667442676 4.8184460126705647045 1.4332264599878684131
2 9.663313399581537916e-05 0.00675908960945781479
-0.30949970210807342674 0.1619004125820537876 0.041620272188990829754
-6.8742992150644793847 -8.672423996611946485 -0.078109307586001638286
2 9.663313399581537916e-05 0.006759069616556246028
4.0453784346544178454e-05
-0.69398700025820403425 -0.19235393648106968723 0.03740673057980103272
1.9245789988923785786 -7.1528261190002948057 -0.20922405362759749996
3 0.000120026935827952453094 0.010044837538502923644
-0.5567137338251560985 -0.46074173273652380134 0.02580196630219121906
4.6580776303108450487 -5.726444072926637749 -0.3473859047161406309
3 0.000120026935827952453094 0.010044908171483009529
4.25875607065040958e-05
0.49463573470256239073 -0.8874896493821613497 4.051630875713834232e-05
5.386704768180099809 3.0357508899436080915 -0.00016218409216515533796
4 1.2739802010675941456e-05 0.0072467236860282326973
0.6978790186886838498 -0.73607603319120218366 3.261671020506711323e-05
4.4579240279134950613 4.300011122687349501 -0.00022055769049333364448
4 1.2739802010675941456e-05 0.0072466797341124641736
2.265740805092889601e-05
-1.5655322071100350456 0.56626121192188216824 0.050269397991054412533
-1.5477080637857006753 -4.370087697214287981 -0.05361768768801557225
5 0.037692251088985676735 0.35527094075555771578
-1.617661473167097963 0.38314370807747849534 0.04771055403546069218
-0.98751874613118001086 -4.5371239937302254657 -0.07086074102213555221
5 0.037692251088985676735 0.35527079166215922855
0.00046732617030490929307
4.0891378954287338487 -2.9329188614380639066 -0.07930573161132697946
1.575024788882753283 2.3719591091996699917 -0.045089307261129988257
6 0.011285899820091272997 0.43765464106459166412
4.1527454588897487753 -2.8347492039446908763 -0.081136554176388195336
1.5225069137843642898 2.4087104911325327961 -0.044067446366273183833
6 0.011285899820091272997 0.43765832419088212185
0.00038925687730393611812
6.3349788609660162564 -7.674600716671800882 -0.11868650931385750502
1.4598618704191345578 1.2948691245181617393 -0.080593167691228835176
7 0.0017236589478267730203 0.46956055286931676728
6.39471595410062843 -7.621162747287802297 -0.121992225877669294154
1.4493167787574136286 1.3075474785896286071 -0.08039429377859412155
7 0.0017236589478267730203 0.46960112247450473807
0.00016953449859497231466
14.832516206189200858 13.032608531076540714 -0.14378102535616668622
-0.9573374666934839659 1.014553546383260322 0.016118112341773867214
8 0.0020336100526728302319 0.7813163071687303693
14.793135356927480828 13.074218343364380601 -0.14311846037737518955
-0.9605086875596024784 1.0118431725941020164 0.016148779866732710198
8 0.0020336100526728302319 0.78136567314580814177
0.000164587904124493665
29.561664938083289655 -4.6012285192418387325 -0.586585578731106283
0.17051705220469790965 1.1424784769020628332 -0.027423757798549895085
29.568629894896030663 -4.5543028991960081697 -0.58771107137394917874
0.16867624969736024011 1.1427992197933557251 -0.027387722828706092838
48 changes: 24 additions & 24 deletions examples/whm_gr_test/pl.swiftest.in
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
8
1 6.5537098095653139645e-06
1 6.5537098095653139645e-06 0.001475124456355905224
1.6306381826061645943e-05
0.13267502226188271353 0.2786606257975073886 0.010601098875389479426
-11.331978934667442676 4.8184460126705647045 1.4332264599878684131
2 9.663313399581537916e-05
-0.30949970210807342674 0.1619004125820537876 0.041620272188990829754
-6.8742992150644793847 -8.672423996611946485 -0.078109307586001638286
2 9.663313399581537916e-05 0.006759069616556246028
4.0453784346544178454e-05
-0.69398700025820403425 -0.19235393648106968723 0.03740673057980103272
1.9245789988923785786 -7.1528261190002948057 -0.20922405362759749996
3 0.000120026935827952453094
-0.5567137338251560985 -0.46074173273652380134 0.02580196630219121906
4.6580776303108450487 -5.726444072926637749 -0.3473859047161406309
3 0.000120026935827952453094 0.010044908171483009529
4.25875607065040958e-05
0.49463573470256239073 -0.8874896493821613497 4.051630875713834232e-05
5.386704768180099809 3.0357508899436080915 -0.00016218409216515533796
4 1.2739802010675941456e-05
0.6978790186886838498 -0.73607603319120218366 3.261671020506711323e-05
4.4579240279134950613 4.300011122687349501 -0.00022055769049333364448
4 1.2739802010675941456e-05 0.0072466797341124641736
2.265740805092889601e-05
-1.5655322071100350456 0.56626121192188216824 0.050269397991054412533
-1.5477080637857006753 -4.370087697214287981 -0.05361768768801557225
5 0.037692251088985676735
-1.617661473167097963 0.38314370807747849534 0.04771055403546069218
-0.98751874613118001086 -4.5371239937302254657 -0.07086074102213555221
5 0.037692251088985676735 0.35527079166215922855
0.00046732617030490929307
4.0891378954287338487 -2.9329188614380639066 -0.07930573161132697946
1.575024788882753283 2.3719591091996699917 -0.045089307261129988257
6 0.011285899820091272997
4.1527454588897487753 -2.8347492039446908763 -0.081136554176388195336
1.5225069137843642898 2.4087104911325327961 -0.044067446366273183833
6 0.011285899820091272997 0.43765832419088212185
0.00038925687730393611812
6.3349788609660162564 -7.674600716671800882 -0.11868650931385750502
1.4598618704191345578 1.2948691245181617393 -0.080593167691228835176
7 0.0017236589478267730203
6.39471595410062843 -7.621162747287802297 -0.121992225877669294154
1.4493167787574136286 1.3075474785896286071 -0.08039429377859412155
7 0.0017236589478267730203 0.46960112247450473807
0.00016953449859497231466
14.832516206189200858 13.032608531076540714 -0.14378102535616668622
-0.9573374666934839659 1.014553546383260322 0.016118112341773867214
8 0.0020336100526728302319
14.793135356927480828 13.074218343364380601 -0.14311846037737518955
-0.9605086875596024784 1.0118431725941020164 0.016148779866732710198
8 0.0020336100526728302319 0.78136567314580814177
0.000164587904124493665
29.561664938083289655 -4.6012285192418387325 -0.586585578731106283
0.17051705220469790965 1.1424784769020628332 -0.027423757798549895085
29.568629894896030663 -4.5543028991960081697 -0.58771107137394917874
0.16867624969736024011 1.1427992197933557251 -0.027387722828706092838
8 changes: 4 additions & 4 deletions examples/whm_gr_test/swiftest_relativity.ipynb

Large diffs are not rendered by default.

0 comments on commit a0c0858

Please sign in to comment.