Updated several of the example inputs

MintonGroup · Sep 9, 2021 · aaf708c · aaf708c
1 parent 8df8847
commit aaf708c
Show file tree

Hide file tree

Showing 16 changed files with 239 additions and 164 deletions.
diff --git a/examples/helio_gr_test/cb.swiftest.in b/examples/helio_gr_test/cb.swiftest.in
@@ -1,4 +1,4 @@
-0
+Sun
 39.476926408897626
 0.004650467260962157
 4.7535806948127355e-12

diff --git a/examples/helio_gr_test/init_cond.py b/examples/helio_gr_test/init_cond.py
@@ -5,8 +5,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['ENC_OUT'] = "enc.swiftest.dat"
+sim.param['BIN_OUT'] = "bin.swiftest.nc"
 
 sim.param['MU2KG'] = swiftest.MSun
 sim.param['TU2S'] = swiftest.YR2S
@@ -22,9 +21,11 @@
 sim.param['CHK_RMIN'] = swiftest.RSun / swiftest.AU2M
 sim.param['CHK_RMAX'] = 1000.0
 sim.param['CHK_EJECT'] = 1000.0
-sim.param['OUT_FORM'] = "EL"
 sim.param['OUT_STAT'] = "UNKNOWN"
-sim.param['RHILL_PRESENT'] = "NO"
+sim.param['IN_FORM'] = "EL"
+sim.param['OUT_FORM'] = "XVEL"
+sim.param['OUT_TYPE'] = "NETCDF_DOUBLE"
+sim.param['RHILL_PRESENT'] = "YES"
 sim.param['GR'] = 'YES'
 
 bodyid = {

diff --git a/examples/helio_gr_test/param.swifter.in b/examples/helio_gr_test/param.swifter.in
@@ -4,24 +4,24 @@ TSTOP            1000.0
 DT               0.0006844626967830253
 ISTEP_OUT        1461
 ISTEP_DUMP       1461
-OUT_FORM         EL
-OUT_TYPE         REAL8
+OUT_FORM         XVEL
+OUT_TYPE         NETCDF_DOUBLE
 OUT_STAT         UNKNOWN
 IN_TYPE          ASCII
 PL_IN            pl.swifter.in
 TP_IN            tp.swifter.in
 BIN_OUT          bin.swifter.dat
-ENC_OUT          enc.swifter.dat
 CHK_QMIN         0.004650467260962157
 CHK_RMIN         0.004650467260962157
 CHK_RMAX         1000.0
 CHK_EJECT        1000.0
 CHK_QMIN_COORD   HELIO
 CHK_QMIN_RANGE   0.004650467260962157 1000.0
+ENC_OUT          enc.swifter.dat
 EXTRA_FORCE      NO
 BIG_DISCARD      NO
 CHK_CLOSE        YES
-RHILL_PRESENT    NO
+RHILL_PRESENT    YES
 C                63241.07708426628
 J2               4.7535806948127355e-12
 J4               -2.2473967953572827e-18
diff --git a/examples/helio_gr_test/param.swiftest.in b/examples/helio_gr_test/param.swiftest.in
@@ -4,15 +4,14 @@ TSTOP            1000.0
 DT               0.0006844626967830253
 ISTEP_OUT        1461
 ISTEP_DUMP       1461
-OUT_FORM         EL
-OUT_TYPE         REAL8
+OUT_FORM         XVEL
+OUT_TYPE         NETCDF_DOUBLE
 OUT_STAT         UNKNOWN
 IN_TYPE          ASCII
 PL_IN            pl.swiftest.in
 TP_IN            tp.swiftest.in
 CB_IN            cb.swiftest.in
-BIN_OUT          bin.swiftest.dat
-ENC_OUT          enc.swiftest.dat
+BIN_OUT          bin.swiftest.nc
 CHK_QMIN         0.004650467260962157
 CHK_RMIN         0.004650467260962157
 CHK_RMAX         1000.0
@@ -22,15 +21,15 @@ CHK_QMIN_RANGE   0.004650467260962157 1000.0
 MU2KG            1.988409870698051e+30
 TU2S             31557600.0
 DU2M             149597870700.0
+IN_FORM          EL
+ENC_OUT          enc.dat
 EXTRA_FORCE      NO
+DISCARD_OUT      discard.out
 BIG_DISCARD      NO
 CHK_CLOSE        YES
-RHILL_PRESENT    NO
+RHILL_PRESENT    YES
 FRAGMENTATION    NO
 ROTATION         NO
 TIDES            NO
 ENERGY           NO
 GR               YES
-YARKOVSKY        NO
-YORP             NO
-MTINY            0.0
diff --git a/examples/helio_gr_test/pl.swifter.in b/examples/helio_gr_test/pl.swifter.in
@@ -1,36 +1,36 @@
 9
-0 39.476926408897625196
+0 39.476926408897626
 0.0 0.0 0.0
 0.0 0.0 0.0
-1 6.5537098095653139645e-06
+1 6.5537098095653139645e-06 0.001475131156288637831
 1.6306381826061645943e-05
--0.30949970210807342674 0.1619004125820537876 0.041620272188990829754
--6.8742992150644793847 -8.672423996611946485 -0.078109307586001638286
-2 9.663313399581537916e-05
+-0.0361820239646683528 -0.46276010580341980782 -0.034496398006472611675
+8.183688458560222766 -0.27616682338432374386 -0.7732476400340904169
+2 9.663313399581537916e-05 0.0067590747715647875607
 4.0453784346544178454e-05
--0.5567137338251560985 -0.46074173273652380134 0.02580196630219121906
-4.6580776303108450487 -5.726444072926637749 -0.3473859047161406309
-3 0.000120026935827952453094
+0.04707194870345993154 -0.7255425078625500346 -0.012673782840571969424
+7.3226765098927520106 0.45143529808423807744 -0.4163607714267330732
+3 0.000120026935827952453094 0.01004493295891520948
 4.25875607065040958e-05
-0.6978790186886838498 -0.73607603319120218366 3.261671020506711323e-05
-4.4579240279134950613 4.300011122687349501 -0.00022055769049333364448
-4 1.2739802010675941456e-05
+0.9784182446151709067 -0.2394545623617302943 7.8432240502479141865e-06
+1.3916805835822199726 6.0802455505175572043 -0.00029695052429473289775
+4 1.2739802010675941456e-05 0.007246527815634877893
 2.265740805092889601e-05
--1.617661473167097963 0.38314370807747849534 0.04771055403546069218
--0.98751874613118001086 -4.5371239937302254657 -0.07086074102213555221
-5 0.037692251088985676735
+-1.64827450584581503 -0.04818173529735803734 0.039422108862210397673
+0.3393812176064170994 -4.672429323734897043 -0.1062469093563351878
+5 0.037692251088985676735 0.3552712221482522291
 0.00046732617030490929307
-4.1527454588897487753 -2.8347492039446908763 -0.081136554176388195336
-1.5225069137843642898 2.4087104911325327961 -0.044067446366273183833
-6 0.011285899820091272997
+4.2888079225575648223 -2.6068082746690541818 -0.08512743586621877856
+1.4000629754656241179 2.4876377693334669565 -0.04165606656604725836
+6 0.011285899820091272997 0.4376655756331854547
 0.00038925687730393611812
-6.39471595410062843 -7.621162747287802297 -0.121992225877669294154
-1.4493167787574136286 1.3075474785896286071 -0.08039429377859412155
-7 0.0017236589478267730203
+6.528501376442308768 -7.4981197287393284157 -0.12945412016904539465
+1.4250071771025915456 1.33599992135721594 -0.07992159012428249671
+7 0.0017236589478267730203 0.46970222329693796102
 0.00016953449859497231466
-14.793135356927480828 13.074218343364380601 -0.14311846037737518955
--0.9605086875596024784 1.0118431725941020164 0.016148779866732710198
-8 0.0020336100526728302319
+14.703390521074780395 13.168120788311910019 -0.14161196287363458923
+-0.96768368440931795183 1.0056701102995595347 0.01621895610074016891
+8 0.0020336100526728302319 0.78148373992374883156
 0.000164587904124493665
-29.568629894896030663 -4.5543028991960081697 -0.58771107137394917874
-0.16867624969736024011 1.1427992197933557251 -0.027387722828706092838
+29.584136736556288838 -4.4478894754775319953 -0.5902566603324214123
+0.16448791459483679965 1.1435219564135608914 -0.027304639012640681262
diff --git a/examples/helio_gr_test/pl.swiftest.in b/examples/helio_gr_test/pl.swiftest.in
@@ -1,33 +1,33 @@
 8
-1 6.5537098095653139645e-06
+Mercury 6.5537098095653139645e-06 0.001475131156288637831
 1.6306381826061645943e-05
--0.30949970210807342674 0.1619004125820537876 0.041620272188990829754
--6.8742992150644793847 -8.672423996611946485 -0.078109307586001638286
-2 9.663313399581537916e-05
+0.38709993253896590737 0.20562614632859010921 7.0036272314159866426
+48.303648911363737284 29.187750438580689405 192.22398026813181104
+Venus 9.663313399581537916e-05 0.0067590747715647875607
 4.0453784346544178454e-05
--0.5567137338251560985 -0.46074173273652380134 0.02580196630219121906
-4.6580776303108450487 -5.726444072926637749 -0.3473859047161406309
-3 0.000120026935827952453094
+0.7233249152313999675 0.006782779674600277614 3.3945084679511872139
+76.62172192899298295 55.11871576732421829 141.51944714681908977
+Earth 0.000120026935827952453094 0.01004493295891520948
 4.25875607065040958e-05
-0.6978790186886838498 -0.73607603319120218366 3.261671020506711323e-05
-4.4579240279134950613 4.300011122687349501 -0.00022055769049333364448
-4 1.2739802010675941456e-05
+1.0000207198983319667 0.01667731166077134064 0.0027576432734417160447
+175.55813761562768605 287.40166532678227895 245.00485341438161413
+Mars 1.2739802010675941456e-05 0.007246527815634877893
 2.265740805092889601e-05
--1.617661473167097963 0.38314370807747849534 0.04771055403546069218
--0.98751874613118001086 -4.5371239937302254657 -0.07086074102213555221
-5 0.037692251088985676735
+1.5236922769560579116 0.093361659829406723476 1.8479133359077690724
+49.490611477105659333 286.70751815915190264 210.36775515565921069
+Jupiter 0.037692251088985676735 0.3552712221482522291
 0.00046732617030490929307
-4.1527454588897487753 -2.8347492039446908763 -0.081136554176388195336
-1.5225069137843642898 2.4087104911325327961 -0.044067446366273183833
-6 0.011285899820091272997
+5.203523661489898977 0.04851833897394460665 1.3035686835324369337
+100.51671881401649955 273.38319313278452682 318.65986979714938343
+Saturn 0.011285899820091272997 0.4376655756331854547
 0.00038925687730393611812
-6.39471595410062843 -7.621162747287802297 -0.121992225877669294154
-1.4493167787574136286 1.3075474785896286071 -0.08039429377859412155
-7 0.0017236589478267730203
+9.581904852310625387 0.052236260603057811658 2.486258128114103183
+113.595257336893098454 335.64742317800698856 225.92836894588160135
+Uranus 0.0017236589478267730203 0.46970222329693796102
 0.00016953449859497231466
-14.793135356927480828 13.074218343364380601 -0.14311846037737518955
--0.9605086875596024784 1.0118431725941020164 0.016148779866732710198
-8 0.0020336100526728302319
+19.238019712529130345 0.0442880601027018303 0.770350326736000679
+74.09520891350530292 95.7524345508490029 236.07863258800219342
+Neptune 0.0020336100526728302319 0.78148373992374883156
 0.000164587904124493665
-29.568629894896030663 -4.5543028991960081697 -0.58771107137394917874
-0.16867624969736024011 1.1427992197933557251 -0.027387722828706092838
+30.291369954344219195 0.013531244039650480379 1.7689741418447819665
+131.74449502957048708 245.89296040993210113 334.5035290478779757
diff --git a/examples/symba_energy_momentum/param.disruption_off_axis.in b/examples/symba_energy_momentum/param.disruption_off_axis.in
@@ -22,8 +22,8 @@ DISCARD_OUT    discard.disruption_off_axis.out
 EXTRA_FORCE    no                ! no extra user-defined forces
 BIG_DISCARD    no                ! output all planets if anything discarded
 RHILL_PRESENT  yes               ! Hill's sphere radii in input file
-GMTINY         1.0e-16
-MIN_GMFRAG     1.0e-12
+GMTINY         1.0e-11
+MIN_GMFRAG     1.0e-11
 FRAGMENTATION  yes
 MU2KG          1.98908e30
 TU2S           3.1556925e7

diff --git a/examples/symba_mars_disk/param.in b/examples/symba_mars_disk/param.in
@@ -6,8 +6,8 @@ CB_IN          cb.in
 PL_IN          mars.in
 TP_IN          tp.in
 IN_TYPE        ASCII
-ISTEP_OUT      100
-ISTEP_DUMP     100
+ISTEP_OUT      1
+ISTEP_DUMP     1
 BIN_OUT        bin.nc 
 PARTICLE_OUT   particle.dat
 OUT_TYPE       NETCDF_DOUBLE

diff --git a/examples/symba_mars_disk/timetest.sh b/examples/symba_mars_disk/timetest.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+outname="timetest.csv"
+echo "N cores, wall time (s)" > $outname
+for value in {1..12}
+do
+   export OMP_NUM_THREADS=$value
+   walltime="$(/usr/bin/time -f %e ./swiftest_driver symba param.in 2>&1 > /dev/null)"
+   echo "$value,$walltime" >> $outname
+done
diff --git a/examples/whm_gr_test/init_cond.py b/examples/whm_gr_test/init_cond.py
@@ -13,12 +13,9 @@
 sim.param['DU2M'] = swiftest.AU2M
 sim.param['T0'] = 0.0
 sim.param['DT'] = 0.25 * swiftest.JD2S / swiftest.YR2S
-#sim.param['TSTOP'] = 1000.0
-#sim.param['ISTEP_OUT']  = 1461
-#sim.param['ISTEP_DUMP'] = 1461
-sim.param['TSTOP'] = 2*sim.param['DT']
-sim.param['ISTEP_OUT']  = 1
-sim.param['ISTEP_DUMP'] = 1
+sim.param['TSTOP'] = 1000.0
+sim.param['ISTEP_OUT']  = 1461
+sim.param['ISTEP_DUMP'] = 1461
 
 sim.param['CHK_QMIN_COORD'] = "HELIO"
 sim.param['CHK_QMIN'] = swiftest.RSun / swiftest.AU2M

diff --git a/examples/whm_gr_test/param.swifter.in b/examples/whm_gr_test/param.swifter.in
@@ -1,9 +1,9 @@
 ! VERSION        Swifter parameter file converted from Swiftest
 T0               0.0
-TSTOP            0.0013689253935660506
+TSTOP            1000.0
 DT               0.0006844626967830253
-ISTEP_OUT        1
-ISTEP_DUMP       1
+ISTEP_OUT        1461
+ISTEP_DUMP       1461
 OUT_FORM         EL
 OUT_TYPE         REAL8
 OUT_STAT         UNKNOWN

diff --git a/examples/whm_gr_test/param.swiftest.in b/examples/whm_gr_test/param.swiftest.in
@@ -1,9 +1,9 @@
 ! VERSION        Swiftest parameter input
 T0               0.0
-TSTOP            0.0013689253935660506
+TSTOP            1000.0
 DT               0.0006844626967830253
-ISTEP_OUT        1
-ISTEP_DUMP       1
+ISTEP_OUT        1461
+ISTEP_DUMP       1461
 OUT_FORM         XVEL
 OUT_TYPE         NETCDF_DOUBLE
 OUT_STAT         UNKNOWN

diff --git a/examples/whm_gr_test/param.swiftest.nogr.in b/examples/whm_gr_test/param.swiftest.nogr.in
@@ -0,0 +1,33 @@
+! VERSION        Swiftest parameter input
+T0               0.0
+TSTOP            1000.0
+DT               0.0006844626967830253
+ISTEP_OUT        1461
+ISTEP_DUMP       1461
+OUT_FORM         XVEL
+OUT_TYPE         NETCDF_DOUBLE
+OUT_STAT         UNKNOWN
+IN_TYPE          ASCII
+PL_IN            pl.swiftest.in
+TP_IN            tp.swiftest.in
+CB_IN            cb.swiftest.in
+BIN_OUT          bin.swiftest.nogr.nc
+CHK_QMIN         0.004650467260962157
+CHK_RMIN         0.004650467260962157
+CHK_RMAX         1000.0
+CHK_EJECT        1000.0
+CHK_QMIN_COORD   HELIO
+CHK_QMIN_RANGE   0.004650467260962157 1000.0
+MU2KG            1.988409870698051e+30
+TU2S             31557600.0
+DU2M             149597870700.0
+IN_FORM          EL
+EXTRA_FORCE      NO
+BIG_DISCARD      NO
+CHK_CLOSE        YES
+RHILL_PRESENT    YES
+FRAGMENTATION    NO
+ROTATION         NO
+TIDES            NO
+ENERGY           NO
+GR               NO 
diff --git a/examples/whm_gr_test/pl.swifter.in b/examples/whm_gr_test/pl.swifter.in
@@ -2,35 +2,35 @@
 0 39.476926408897626
 0.0 0.0 0.0
 0.0 0.0 0.0
-1 6.553709809565314146e-06 0.0014751261514880139061
+1 6.5537098095653139645e-06 0.001475131156288637831
 1.6306381826061645943e-05
--0.29510017042975300594 -0.34346884022084378518 -0.000997917547895216684
-5.709185893355676925 -6.2220892824670268354 -1.0321515701207669188
-2 9.6633133995815381836e-05 0.006759061578633710828
+-0.0361820239646683528 -0.46276010580341980782 -0.034496398006472611675
+8.183688458560222766 -0.27616682338432374386 -0.7732476400340904169
+2 9.663313399581537916e-05 0.0067590747715647875607
 4.0453784346544178454e-05
--0.21096294566811030213 -0.6945147553261317164 0.0026420019351886940041
-7.0187176732445560167 -2.1783670470162428854 -0.43491289164169576724
-3 0.000120026935827952456416 0.010044949983771724966
+0.04707194870345993154 -0.7255425078625500346 -0.012673782840571969424
+7.3226765098927520106 0.45143529808423807744 -0.4163607714267330732
+3 0.000120026935827952453094 0.01004493295891520948
 4.25875607065040958e-05
-0.905522725638602366 -0.44829515638659761523 1.8122901980659660508e-05
-2.685845700565266851 5.6080546137104218133 -0.00027833838024725729542
-4 1.2739802010675941808e-05 0.0072465915674003790445
+0.9784182446151709067 -0.2394545623617302943 7.8432240502479141865e-06
+1.3916805835822199726 6.0802455505175572043 -0.00029695052429473289775
+4 1.2739802010675941456e-05 0.007246527815634877893
 2.265740805092889601e-05
--1.6511945936824949932 0.1180803833522415941 0.042978148735422203042
--0.17443328105136805607 -4.661619009141641736 -0.09341597039948347882
-5 0.03769225108898567778 0.3552713110772063853
+-1.64827450584581503 -0.04818173529735803734 0.039422108862210397673
+0.3393812176064170994 -4.672429323734897043 -0.1062469093563351878
+5 0.037692251088985676735 0.3552712221482522291
 0.00046732617030490929307
-4.2381319671740662614 -2.694827110197309139 -0.08362807329786287047
-1.44742540330701551 2.4581907268113588696 -0.042593445938391914576
-6 0.01128589982009127331 0.4376635990332856823
+4.2888079225575648223 -2.6068082746690541818 -0.08512743586621877856
+1.4000629754656241179 2.4876377693334669565 -0.04165606656604725836
+6 0.011285899820091272997 0.4376655756331854547
 0.00038925687730393611812
-6.4776155764849425722 -7.5454781609219372385 -0.12660625214421539209
-1.4343694668413992401 1.3251694474665614901 -0.08010594537316981756
-7 0.001723658947826773068 0.46966224198242572768
+6.528501376442308768 -7.4981197287393284157 -0.12945412016904539465
+1.4250071771025915456 1.33599992135721594 -0.07992159012428249671
+7 0.0017236589478267730203 0.46970222329693796102
 0.00016953449859497231466
-14.737783583010530819 13.132284780084109599 -0.14218874866247160904
--0.96494157148906816704 1.0080364706941240677 0.016191990849809560611
-8 0.0020336100526728302882 0.7814394516095526881
+14.703390521074780395 13.168120788311910019 -0.14161196287363458923
+-0.96768368440931795183 1.0056701102995595347 0.01621895610074016891
+8 0.0020336100526728302319 0.78148373992374883156
 0.000164587904124493665
-29.578253698940308425 -4.488584904681241383 -0.58928426126360722304
-0.16609282485651713797 1.143247554888599065 -0.027336661118935745503
+29.584136736556288838 -4.4478894754775319953 -0.5902566603324214123
+0.16448791459483679965 1.1435219564135608914 -0.027304639012640681262