From d63323d239ced8a90310b0dbbed0c1ca10311856 Mon Sep 17 00:00:00 2001 From: David A Minton Date: Tue, 14 Dec 2021 11:39:06 -0500 Subject: [PATCH] Updated symba_gr_test and helio_gr_test initial condition generator to match --- examples/helio_gr_test/init_cond.py | 5 ---- examples/helio_gr_test/param.swifter.in | 27 ------------------ examples/helio_gr_test/pl.swifter.in | 36 ------------------------ examples/helio_gr_test/tp.swifter.in | 1 - examples/symba_gr_test/init_cond.py | 6 ++-- examples/symba_gr_test/param.swiftest.in | 6 ++-- 6 files changed, 6 insertions(+), 75 deletions(-) delete mode 100644 examples/helio_gr_test/param.swifter.in delete mode 100644 examples/helio_gr_test/pl.swifter.in delete mode 100644 examples/helio_gr_test/tp.swifter.in diff --git a/examples/helio_gr_test/init_cond.py b/examples/helio_gr_test/init_cond.py index 31f5a9eda..9e89dc358 100755 --- a/examples/helio_gr_test/init_cond.py +++ b/examples/helio_gr_test/init_cond.py @@ -44,10 +44,5 @@ sim.add(name, idval=id, date="2027-04-30") sim.save("param.swiftest.in") -sim.param['PL_IN'] = "pl.swifter.in" -sim.param['TP_IN'] = "tp.swifter.in" -sim.param['BIN_OUT'] = "bin.swifter.dat" -sim.param['ENC_OUT'] = "enc.swifter.dat" -sim.save("param.swifter.in", codename="Swifter") diff --git a/examples/helio_gr_test/param.swifter.in b/examples/helio_gr_test/param.swifter.in deleted file mode 100644 index 5e59a5a8d..000000000 --- a/examples/helio_gr_test/param.swifter.in +++ /dev/null @@ -1,27 +0,0 @@ -! VERSION Swifter parameter file converted from Swiftest -T0 0.0 -TSTOP 1000.0 -DT 0.0006844626967830253 -ISTEP_OUT 1461 -ISTEP_DUMP 1461 -OUT_FORM XV -OUT_TYPE REAL8 -OUT_STAT UNKNOWN -IN_TYPE ASCII -PL_IN pl.swifter.in -TP_IN tp.swifter.in -BIN_OUT bin.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 YES -C 63241.07708426628 -J2 4.7535806948127355e-12 -J4 -2.2473967953572827e-18 diff --git a/examples/helio_gr_test/pl.swifter.in b/examples/helio_gr_test/pl.swifter.in deleted file mode 100644 index dffe532c6..000000000 --- a/examples/helio_gr_test/pl.swifter.in +++ /dev/null @@ -1,36 +0,0 @@ -9 -0 39.476926408897626 -0.0 0.0 0.0 -0.0 0.0 0.0 -1 6.5537098095653139645e-06 0.0014751260185578720416 -1.6306381826061645943e-05 -0.22527006614756858727 0.22185515636479818946 -0.0025292250509892700606 --9.2410583833491193135 7.7546860001024244665 1.481285384055779404 -2 9.663313399581537916e-05 0.006759120024335718617 -4.0453784346544178454e-05 -0.6401338616632904488 -0.3439628247287493945 -0.041662537354174501714 -3.4536908505004217623 6.4771489080253446934 -0.110257596056190005656 -3 0.000120026935827952453094 0.0100446292823340959596 -4.25875607065040958e-05 --0.7819504386201725499 -0.6346854491951327004 4.4451463454996458186e-05 -3.8578491980751480153 -4.9026737310919641898 0.0002888700847309900442 -4 1.2739802010675941456e-05 0.0072466212625671651507 -2.265740805092889601e-05 --1.6500171831673979828 -0.023341429362091121319 0.039964339661466272147 -0.2624112744618213919 -4.673688782463607376 -0.10439239110136837694 -5 0.037692251088985676735 0.35521688466465032753 -0.00046732617030490929307 --4.540785007788180394 2.8642873711036669349 0.08969619001756239107 --1.5037012644183387769 -2.204631616790602934 0.042803317383791750652 -6 0.011285899820091272997 0.43538665458575465117 -0.00038925687730393611812 -8.9010680046292307566 2.902848867584423953 -0.40487415052930197934 --0.7439396408265333407 1.9316851317225221362 -0.004029214768814220126 -7 0.0017236589478267730203 0.46987236554736915505 -0.00016953449859497231466 -8.1785533453299539275 17.594789418581910923 -0.04069518248189726156 --1.3149276792509819067 0.53722869521767089375 0.019051745273498437594 -8 0.0020336100526728302319 0.7749718408665498732 -0.000164587904124493665 -29.794198627119580891 2.0446309861539178065 -0.7287194786837880578 --0.08754730406665780868 1.1492225523523839664 -0.021678684633280679721 diff --git a/examples/helio_gr_test/tp.swifter.in b/examples/helio_gr_test/tp.swifter.in deleted file mode 100644 index 573541ac9..000000000 --- a/examples/helio_gr_test/tp.swifter.in +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/examples/symba_gr_test/init_cond.py b/examples/symba_gr_test/init_cond.py index fd9ac6f5d..ca9e6726a 100755 --- a/examples/symba_gr_test/init_cond.py +++ b/examples/symba_gr_test/init_cond.py @@ -13,10 +13,10 @@ sim.param['TU2S'] = swiftest.YR2S sim.param['DU2M'] = swiftest.AU2M sim.param['T0'] = 0.0 -sim.param['DT'] = 0.125 * swiftest.JD2S / swiftest.YR2S +sim.param['DT'] = 0.25 * swiftest.JD2S / swiftest.YR2S sim.param['TSTOP'] = 1000.0 -sim.param['ISTEP_OUT'] = 2922 -sim.param['ISTEP_DUMP'] = 2922 +sim.param['ISTEP_OUT'] = 1461 +sim.param['ISTEP_DUMP'] = 1461 sim.param['CHK_QMIN_COORD'] = "HELIO" sim.param['CHK_QMIN'] = swiftest.RSun / swiftest.AU2M sim.param['CHK_QMIN_RANGE'] = f"{swiftest.RSun / swiftest.AU2M} 1000.0" diff --git a/examples/symba_gr_test/param.swiftest.in b/examples/symba_gr_test/param.swiftest.in index 86f00adb5..5a8aacd25 100644 --- a/examples/symba_gr_test/param.swiftest.in +++ b/examples/symba_gr_test/param.swiftest.in @@ -1,9 +1,9 @@ ! VERSION Swiftest parameter input T0 0.0 TSTOP 1000.0 -DT 0.00034223134839151266 -ISTEP_OUT 2922 -ISTEP_DUMP 2922 +DT 0.0006844626967830253 +ISTEP_OUT 1461 +ISTEP_DUMP 1461 OUT_FORM XVEL OUT_TYPE NETCDF_DOUBLE OUT_STAT UNKNOWN