diff --git a/python/swiftestio/requirements.txt b/python/swiftestio/requirements.txt index b19b25ce8..5b1195b1e 100644 --- a/python/swiftestio/requirements.txt +++ b/python/swiftestio/requirements.txt @@ -35,9 +35,7 @@ keyring==23.0.1 kiwisolver @ file:///tmp/build/80754af9/kiwisolver_1612282414123/work MarkupSafe @ file:///tmp/build/80754af9/markupsafe_1621528142364/work matplotlib==3.4.2 -mimeparse==0.1.3 mistune @ file:///tmp/build/80754af9/mistune_1594373098390/work -mkl-fft==1.3.0 mkl-random @ file:///tmp/build/80754af9/mkl_random_1618853974840/work mkl-service==2.3.0 nbclient @ file:///tmp/build/80754af9/nbclient_1614364831625/work @@ -70,7 +68,6 @@ qtconsole @ file:///tmp/build/80754af9/qtconsole_1623278325812/work QtPy==1.9.0 requests==2.25.1 scipy==1.6.3 -SecretStorage==3.3.1 Send2Trash @ file:///tmp/build/80754af9/send2trash_1607525499227/work six @ file:///tmp/build/80754af9/six_1623709665295/work soupsieve==2.2.1 diff --git a/python/swiftestio/swiftestio.py b/python/swiftestio/swiftestio.py index c97af9792..513d63665 100644 --- a/python/swiftestio/swiftestio.py +++ b/python/swiftestio/swiftestio.py @@ -759,6 +759,7 @@ def swiftest_xr2_infile(ds, param, framenum=-1): tpfile.write_record(v_tp[2]) else: print(f"{param['IN_TYPE']} is an unknown file type") + if __name__ == '__main__': workingdir = '/Users/daminton/git/swiftest/examples/rmvs_swifter_comparison/9pl_18tp_encounters/' diff --git a/python/swiftestreader.py b/python/swiftestreader.py deleted file mode 100644 index daa350d8e..000000000 --- a/python/swiftestreader.py +++ /dev/null @@ -1,32 +0,0 @@ -import numpy as np -from matplotlib import pyplot as plt -import os -import sys -from scipy.io import FortranFile - -binfilename = "bin.swiftest.dat" - -with FortranFile(binfilename, 'r') as f: - while True: # Loop until you read the end of file - try: - t = f.read_reals(np.float64) # Try first part of the header - print(t) - except: - break - if t[0] > tstop: break - npl = f.read_ints() - ntp = f.read_ints() - iout_form = f.read_ints() - name = f.read_ints() - px = f.read_reals(np.float64) - py = f.read_reals(np.float64) - pz = f.read_reals(np.float64) - vx = f.read_reals(np.float64) - vy = f.read_reals(np.float64) - vz = f.read_reals(np.float64) - mass = f.read_reals(np.float64) - radius = f.read_reals(np.float64) - a = f.read_reals(np.float64) - e = f.read_reals(np.float64) - inc = f.read_reals(np.float64) - yield t, name, mass, radius, np.c_[a, e] \ No newline at end of file