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

Commit

Permalink
Merge branch 'OOPSymba' into OOPrestructure
Browse files Browse the repository at this point in the history
  • Loading branch information
@daminton
daminton committed Jul 13, 2021
2 parents 552edf3 + 1c8d750 commit a54a4ff
Show file tree
Hide file tree
Showing 135 changed files with 2,544 additions and 10,650 deletions.
8 changes: 7 additions & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ SWIFTEST_MODULES = swiftest_globals.f90 \
whm_classes.f90 \
rmvs_classes.f90 \
helio_classes.f90 \
util.f90 \
symba_classes.f90 \
module_nrutil.f90 \
swiftest.f90

Expand Down Expand Up @@ -151,6 +151,11 @@ lib:
ln -s $(SWIFTEST_HOME)/Makefile.Defines .; \
ln -s $(SWIFTEST_HOME)/Makefile .; \
make libdir
cd $(SWIFTEST_HOME)/src/symba; \
rm -f Makefile.Defines Makefile; \
ln -s $(SWIFTEST_HOME)/Makefile.Defines .; \
ln -s $(SWIFTEST_HOME)/Makefile .; \
make libdir
cd $(SWIFTEST_HOME)/src/user; \
rm -f Makefile.Defines Makefile; \
ln -s $(SWIFTEST_HOME)/Makefile.Defines .; \
Expand Down Expand Up @@ -196,6 +201,7 @@ clean:
cd $(SWIFTEST_HOME)/src/orbel; rm -f Makefile.Defines Makefile *.gc*
cd $(SWIFTEST_HOME)/src/rmvs; rm -f Makefile.Defines Makefile *.gc*
cd $(SWIFTEST_HOME)/src/setup; rm -f Makefile.Defines Makefile *.gc*
cd $(SWIFTEST_HOME)/src/symba; rm -f Makefile.Defines Makefile *.gc*
cd $(SWIFTEST_HOME)/src/user; rm -f Makefile.Defines Makefile *.gc*
cd $(SWIFTEST_HOME)/src/util; rm -f Makefile.Defines Makefile *.gc*
cd $(SWIFTEST_HOME)/src/whm; rm -f Makefile.Defines Makefile *.gc*
Expand Down
1 change: 1 addition & 0 deletions examples/helio_swifter_comparison/cb.swiftest.in
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
0
39.476926408897626
0.004650467260962157
4.7535806948127355e-12
Expand Down
6 changes: 1 addition & 5 deletions examples/helio_swifter_comparison/init_cond.py
100644 → 100755
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
#!/usr/bin/env python3
import swiftest
import numpy as np
import sys
from astroquery.jplhorizons import Horizons
import astropy.constants as const
from scipy.io import FortranFile

sim = swiftest.Simulation()

Expand Down
48 changes: 24 additions & 24 deletions examples/helio_swifter_comparison/pl.swifter.in
View file
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.0014751254963649625977
1 6.5537098095653139645e-06 0.0014751243077781048702
1.6306381826061645943e-05
0.359124056979876094 -0.1001978128323056938 -0.041130148620746292965
0.7664364270424182397 10.3592906410849091145 0.7762248217818495593
2 9.663313399581537916e-05 0.0067591139064765566703
0.33206272695596028566 0.07436707001147663254 -0.02438290851908785084
-4.2340114788918336805 10.486553514018327622 1.2453138107251555947
2 9.663313399581537916e-05 0.006759104275397271956
4.0453784346544178454e-05
-0.709853246614207567 0.109615461427968005625 0.042466530791895232277
-1.166834223638398553 -7.334297883841826485 -0.033323414543104576783
3 0.000120026935827952453094 0.010044751446422198828
-0.7188115337296047125 -0.0118554711069603201795 0.041316403191083782287
0.07826338813583945357 -7.419533988988633545 -0.10634201014368884618
3 0.000120026935827952453094 0.010044787321379672528
4.25875607065040958e-05
0.26014404284638581455 -0.9828537227999029069 4.5807148740206238052e-05
5.9724418390973225248 1.5843954077771575533 -9.4205748659356694786e-05
4 1.2739802010675941456e-05 0.0072467561525263839036
0.35677088372527121507 -0.95189300879814897627 4.4027442504036787155e-05
5.7819217550992820422 2.18192814489641851 -0.00012230072278352209966
4 1.2739802010675941456e-05 0.007246743835971885302
2.265740805092889601e-05
-1.4908630412685239808 0.7412277078494349247 0.052104480532706012874
-2.084278892390818102 -4.1405652065758745757 -0.035644761583621103612
5 0.037692251088985676735 0.35527141892920671874
-1.5233712071242269115 0.6723825347339112968 0.051459143378398922164
-1.8728417739956807141 -4.239719661832373223 -0.042909557750301418264
5 0.037692251088985676735 0.35527126534549128905
0.00046732617030490929307
4.0233930071159198505 -3.029555621945668964 -0.077433472926114965684
1.626590141045528945 2.3340622087669935288 -0.046085347207395002237
6 0.011285899820091272997 0.43765136932522125042
4.049944927347420176 -2.9910878677758190314 -0.078187280837353656526
1.6060801375519682711 2.349356876761497338 -0.045690062807172619064
6 0.011285899820091272997 0.4376527512949726007
0.00038925687730393611812
6.274810893232299236 -7.7275164380757708216 -0.115372736553069593635
1.4703000143673246375 1.2821134193800077011 -0.08078666716402813097
7 0.0017236589478267730203 0.469520070575212966
6.298929503477405767 -7.706413024510769816 -0.11669919842191249504
1.4661378456572359413 1.2872251175075805794 -0.08070991686100478242
7 0.0017236589478267730203 0.4695362423191493196
0.00016953449859497231466
14.871766666738729157 12.9908875920566391216 -0.14444232402201501175
-0.9541590491729433116 1.0172543087941671172 0.016087073469786578863
8 0.0020336100526728302319 0.78126715446178621345
14.856082147529010129 13.007589275314199284 -0.14417795763685259391
-0.9554310497290159123 1.0161753499437922057 0.016099529164307530124
8 0.0020336100526728302319 0.7812870996943599397
0.000164587904124493665
29.554624389819270647 -4.648140925388063671 -0.5854586034520335991
0.1723572655485145611 1.1421549698170996955 -0.027459964210413734165
29.55744967800954015 -4.629377558152945049 -0.58590957207831262377
0.17162147939801157335 1.1422848961108499101 -0.027445465472921385952
32 changes: 16 additions & 16 deletions examples/helio_swifter_comparison/pl.swiftest.in
View file
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
8
1 6.5537098095653139645e-06
1.6306381826061645943e-05
0.359124056979876094 -0.1001978128323056938 -0.041130148620746292965
0.7664364270424182397 10.3592906410849091145 0.7762248217818495593
0.33206272695596028566 0.07436707001147663254 -0.02438290851908785084
-4.2340114788918336805 10.486553514018327622 1.2453138107251555947
2 9.663313399581537916e-05
4.0453784346544178454e-05
-0.709853246614207567 0.109615461427968005625 0.042466530791895232277
-1.166834223638398553 -7.334297883841826485 -0.033323414543104576783
-0.7188115337296047125 -0.0118554711069603201795 0.041316403191083782287
0.07826338813583945357 -7.419533988988633545 -0.10634201014368884618
3 0.000120026935827952453094
4.25875607065040958e-05
0.26014404284638581455 -0.9828537227999029069 4.5807148740206238052e-05
5.9724418390973225248 1.5843954077771575533 -9.4205748659356694786e-05
0.35677088372527121507 -0.95189300879814897627 4.4027442504036787155e-05
5.7819217550992820422 2.18192814489641851 -0.00012230072278352209966
4 1.2739802010675941456e-05
2.265740805092889601e-05
-1.4908630412685239808 0.7412277078494349247 0.052104480532706012874
-2.084278892390818102 -4.1405652065758745757 -0.035644761583621103612
-1.5233712071242269115 0.6723825347339112968 0.051459143378398922164
-1.8728417739956807141 -4.239719661832373223 -0.042909557750301418264
5 0.037692251088985676735
0.00046732617030490929307
4.0233930071159198505 -3.029555621945668964 -0.077433472926114965684
1.626590141045528945 2.3340622087669935288 -0.046085347207395002237
4.049944927347420176 -2.9910878677758190314 -0.078187280837353656526
1.6060801375519682711 2.349356876761497338 -0.045690062807172619064
6 0.011285899820091272997
0.00038925687730393611812
6.274810893232299236 -7.7275164380757708216 -0.115372736553069593635
1.4703000143673246375 1.2821134193800077011 -0.08078666716402813097
6.298929503477405767 -7.706413024510769816 -0.11669919842191249504
1.4661378456572359413 1.2872251175075805794 -0.08070991686100478242
7 0.0017236589478267730203
0.00016953449859497231466
14.871766666738729157 12.9908875920566391216 -0.14444232402201501175
-0.9541590491729433116 1.0172543087941671172 0.016087073469786578863
14.856082147529010129 13.007589275314199284 -0.14417795763685259391
-0.9554310497290159123 1.0161753499437922057 0.016099529164307530124
8 0.0020336100526728302319
0.000164587904124493665
29.554624389819270647 -4.648140925388063671 -0.5854586034520335991
0.1723572655485145611 1.1421549698170996955 -0.027459964210413734165
29.55744967800954015 -4.629377558152945049 -0.58590957207831262377
0.17162147939801157335 1.1422848961108499101 -0.027445465472921385952
Loading

0 comments on commit a54a4ff

Please sign in to comment.