Fixed initial conditions generator and Notebook for Helio Swifter com…

…parison
MintonGroup · Sep 23, 2021 · e219e57 · e219e57
1 parent 64252b5
commit e219e57
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 46 deletions.
diff --git a/examples/helio_swifter_comparison/init_cond.py b/examples/helio_swifter_comparison/init_cond.py
@@ -32,10 +32,10 @@
    "Saturn": 6,
    "Uranus": 7,
    "Neptune": 8,
-   "Ceres":  101,
-   "Pallas": 102,
-   "Juno":  103,
-   "Vesta": 104
+   "Ceres":  9,
+   "Pallas": 10,
+   "Juno":  11,
+   "Vesta": 12
 }
 
 for name, id in bodyid.items():
@@ -44,7 +44,7 @@
 sim.param['PL_IN'] = "pl.swiftest.in"
 sim.param['TP_IN'] = "tp.swiftest.in"
 sim.param['CB_IN'] = "cb.swiftest.in"
-sim.param['BIN_OUT'] = "bin.swiftest.dat"
+sim.param['BIN_OUT'] = "bin.swiftest.nc"
 sim.param['ENC_OUT'] = "enc.swiftest.dat"
 sim.save("param.swiftest.in")
 sim.param['PL_IN'] = "pl.swifter.in"

diff --git a/examples/helio_swifter_comparison/param.swiftest.in b/examples/helio_swifter_comparison/param.swiftest.in
@@ -11,7 +11,7 @@ IN_TYPE          ASCII
 PL_IN            pl.swiftest.in
 TP_IN            tp.swiftest.in
 CB_IN            cb.swiftest.in
-BIN_OUT          bin.swiftest.dat
+BIN_OUT          bin.swiftest.nc
 CHK_QMIN         0.004650467260962157
 CHK_RMIN         0.004650467260962157
 CHK_RMAX         1000.0

diff --git a/examples/helio_swifter_comparison/swiftest_vs_swifter.ipynb b/examples/helio_swifter_comparison/swiftest_vs_swifter.ipynb
diff --git a/examples/helio_swifter_comparison/tp.swifter.in b/examples/helio_swifter_comparison/tp.swifter.in
@@ -1,13 +1,13 @@
 4
-101
+9
 1.7496059999633410964 2.170163391141847864 -0.2537726760879844834
 -3.0064589998644978604 2.1233488530690124423 0.6210068204130407379
-102
+10
 3.0772345391474851262 -0.5509101822792066283 0.11666058691376969547
 -0.08868603569822111026 2.7292630488987525612 -1.882742859645719835
-103
+11
 0.13917497353384339354 -3.081984978409241016 0.69426813140927812196
 3.105664664763373206 0.67090307556352112164 -0.2786153399455880027
-104
+12
 -1.5389664718057010084 -1.5223401530194009545 0.23276670506845731357
 3.2083305098906780644 -3.027143636331455024 -0.2998683055841925141