diff --git a/.gitignore b/.gitignore index 8f2237e27..7f85d3df2 100644 --- a/.gitignore +++ b/.gitignore @@ -56,3 +56,21 @@ docs/ #!docs/*/* #!docs/*/*/* + +python/swiftest/tests/convert_code_type/swift2swifter/pl.swift2swifter.in + +python/swiftest/tests/convert_code_type/swift2swifter/tp.swift2swifter.in + +python/swiftest/tests/convert_code_type/swift2swiftest/cb.swift2swiftest.in + +python/swiftest/tests/convert_code_type/swift2swiftest/pl.swift2swiftest.in + +python/swiftest/tests/convert_code_type/swift2swiftest/tp.swift2swiftest.in + +python/swiftest/tests/convert_code_type/swifter2swiftest/cb.swifter2swiftest.in + +python/swiftest/tests/convert_code_type/cb.swifter2swiftest.in + +python/swiftest/tests/convert_code_type/swifter2swiftest/pl.swifter2swiftest.in + +python/swiftest/tests/convert_code_type/swifter2swiftest/tp.swifter2swiftest.in diff --git a/python/swiftest/swiftest/simulation_class.py b/python/swiftest/swiftest/simulation_class.py index 349e17e64..d50318656 100644 --- a/python/swiftest/swiftest/simulation_class.py +++ b/python/swiftest/swiftest/simulation_class.py @@ -89,10 +89,24 @@ def convert(self, param_file_name, newcodename="Swiftest", plname="pl.swiftest.i if newcodename != "Swift" and newcodename != "Swifter" and newcodename != "Swiftest": print(f'{newcodename} is an invalid code type. Valid options are "Swiftest", "Swifter", or "Swift".') return oldparam + goodconversion = True if self.codename == "Swifter": if newcodename == "Swiftest": self.param = swiftestio.swifter2swiftest(self.param, plname, tpname, cbname) - self.write_param(param_file_name) + else: + goodconversion = False + elif self.codename == "Swift": + if newcodename == "Swifter": + self.param = swiftestio.swift2swifter(self.param, plname, tpname) + elif newcodename == "Swiftest": + self.param = swiftestio.swift2swiftest(self.param, plname, tpname, cbname) + else: + goodconversion = False + + if goodconversion: + self.write_param(param_file_name) + else: + print(f"Conversion from {self.codename} to {newcodename} is not supported.") return oldparam def bin2xr(self): diff --git a/python/swiftest/swiftest/swiftestio.py b/python/swiftest/swiftest/swiftestio.py index ea195d8c6..aeae68908 100644 --- a/python/swiftest/swiftest/swiftestio.py +++ b/python/swiftest/swiftest/swiftestio.py @@ -5,6 +5,7 @@ from astroquery.jplhorizons import Horizons import datetime import sys +import tempfile def real2float(realstr): """ @@ -46,12 +47,12 @@ def read_swiftest_param(param_file_name): 'TP_IN': "", 'CB_IN': "", 'IN_TYPE': "ASCII", - 'ISTEP_OUT': "-1", 'BIN_OUT': "bin.dat", + 'ISTEP_OUT': "-1", + 'ISTEP_DUMP': "-1", 'OUT_TYPE': 'REAL8', 'OUT_FORM': "XV", 'OUT_STAT': "NEW", - 'ISTEP_DUMP': "-1", 'J2': "0.0", 'J4': "0.0", 'CHK_RMIN': "-1.0", @@ -145,11 +146,11 @@ def read_swifter_param(param_file_name): 'TP_IN': "", 'IN_TYPE': "ASCII", 'ISTEP_OUT': "-1", + 'ISTEP_DUMP': "-1", 'BIN_OUT': "bin.dat", 'OUT_TYPE': "REAL8", 'OUT_FORM': "XV", 'OUT_STAT': "NEW", - 'ISTEP_DUMP': "-1", 'J2': "0.0", 'J4': "0.0", 'CHK_CLOSE': 'NO', @@ -205,7 +206,7 @@ def read_swifter_param(param_file_name): return param -def read_swift_param(param_file_name): +def read_swift_param(param_file_name, startfile="swift.in"): """ Reads in a Swift param.in file and saves it as a dictionary @@ -233,17 +234,26 @@ def read_swift_param(param_file_name): 'L4': "F", 'L5': "F", 'L6': "F", - 'RMIN': 0.0, - 'RMAX': 0.0, - 'RMAXU': 0.0, - 'QMIN': 0.0, + 'RMIN': -1, + 'RMAX': -1, + 'RMAXU': -1, + 'QMIN': -1, 'LCLOSE': "F", 'BINARY_OUTPUTFILE': "bin.dat", 'STATUS_FLAG_FOR_OPEN_STATEMENTS': "NEW", - 'PL_IN' : "pl.in", - 'TP_IN' : "tp.in" } + try: + with open(startfile, 'r') as f: + line = f.readline() + plname = f.readline().split()[0] + tpname = f.readline().split()[0] + except: + plname = "pl.in" + tpname = "tp.in" + param['PL_IN'] = plname + param['TP_IN'] = tpname + # Read param.in file print(f'Reading Swift file {param_file_name}') try: @@ -854,22 +864,98 @@ def swiftest_xr2_infile(ds, param, framenum=-1): else: print(f"{param['IN_TYPE']} is an unknown file type") -def swift2swifter(swift_param, plname="pl.swifter.in", tpname="tp.swiftest.in", cbname="cb.swiftest.in"): +def swift2swifter(swift_param, plname="", tpname=""): swifter_param = {} - swifter_param['PL_IN'] = plname - swifter_param['TP_IN'] = tpname - print(f"Swifter massive body file : {swifter_param['PL_IN']}") - print(f"Swifter test particle file: {swifter_param['TP_IN']}") + intxt = input("Is this a SyMBA input file with RHILL values in pl.in? (y/N)> ") + if intxt.upper() == 'Y': + isSyMBA = True + swifter_param['RHILL_PRESENT'] = 'YES' + else: + isSyMBA = False + swifter_param['RHILL_PRESENT'] = 'NO' + + intxt = input("OUT_FORM: Output in cartesian (XV) or orbital elements (EL)? [XV]> ") + if intxt.upper() == 'EL': + swifter_param['OUT_FORM'] = 'EL' + else: + swifter_param['OUT_FORM'] = 'XV' + + print("Use single precision or double precision for real outputs?") + print(" 1) Single (real*4)") + print("*2) Double (real*8)") + intxt = input("> ") + if intxt == '1': + isDouble = False + else: + isDouble = True + # Convert the parameter file values swifter_param['T0'] = swift_param['T0'] swifter_param['TSTOP'] = swift_param['TSTOP'] swifter_param['DT'] = swift_param['DT'] + swifter_param['ISTEP_OUT'] = int(swift_param['DTOUT'] / swift_param['DT']) + swifter_param['ISTEP_DUMP'] = int(swift_param['DTDUMP'] / swift_param['DT']) + swifter_param['BIN_OUT'] = swift_param['BINARY_OUTPUTFILE'] + swifter_param['OUT_STAT'] = swift_param['STATUS_FLAG_FOR_OPEN_STATEMENTS'] if swift_param['LCLOSE'] == "T": swifter_param['CHK_CLOSE'] = "YES" else: swifter_param['CHK_CLOSE'] = "NO" + + if swift_param['L6'] == "T": + print("Warning: Use of XDR is discouraged. Consider changing this to F") + if isDouble: + swifter_param['OUT_TYPE'] = 'XDR8' + else: + swifter_param['OUT_TYPE'] = 'XDR4' + else: + if isDouble: + swifter_param['OUT_TYPE'] = 'REAL8' + else: + swifter_param['OUT_TYPE'] = 'REAL4' + swifter_param['CHK_RMIN'] = swift_param['RMIN'] + swifter_param['CHK_RMAX'] = swift_param['RMAX'] + swifter_param['CHK_QMIN'] = swift_param['QMIN'] + if swift_param['QMIN'] != '-1': + print("CHK_QMIN_COORD value:") + print("*1) HELIO") + print(" 2) BARY") + intxt = input("> ") + if intxt == '2': + swifter_param['CHK_QMIN_COORD'] = 'BARY' + else: + swifter_param['CHK_QMIN_COORD'] = 'HELIO' + alo = input(f"Lower bound on CHK_QMIN_RANGE [{swift_param['RMIN']}]: ") + if alo == '': + alo = swift_param['RMIN'] + ahi = input(f"Upper bound on CHK_QMIN_RANGE: [{swift_param['RMAXU']}]: ") + if ahi == '': + ahi = swift_param['RMAXU'] + swifter_param['CHK_QMIN_RANGE'] = f"{alo} {ahi}" + swifter_param['ENC_OUT'] = input("ENC_OUT: Encounter file name: [enc.dat]> ") + if swifter_param['ENC_OUT'] == '': + swifter_param['ENC_OUT'] = "enc.dat" + + intxt = input("EXTRA_FORCE: Use additional user-specified force routines? (y/N)> ") + if intxt.upper() == 'Y': + swifter_param['EXTRA_FORCE'] = 'YES' + else: + swifter_param['EXTRA_FORCE'] = 'NO' + + intxt = input("BIG_DISCARD: include data for all bodies > MTINY for each discard record? (y/N)> ") + if intxt.upper() == 'Y': + swifter_param['BIG_DISCARD'] = 'YES' + else: + swifter_param['BIG_DISCARD'] = 'NO' + + # Convert the PL file + if plname == '': + plname = input("PL_IN: Name of new planet input file: [pl.swifter.in]> ") + if plname == '': + plname = "pl.swifter.in" + swifter_param['PL_IN'] = plname try: plnew = open(swifter_param['PL_IN'], 'w') except IOError: @@ -901,13 +987,18 @@ def swift2swifter(swift_param, plname="pl.swifter.in", tpname="tp.swiftest.in", line = plold.readline() i_list = [i for i in line.split(" ") if i.strip()] GMpl = real2float(i_list[0]) - if swift_param['LCLOSE'] == "T" - Rpl = real2float(i_list[1]) - print(name, GMpl, file=plnew) + if isSyMBA: + Rhill = real2float(i_list[1]) + if swift_param['LCLOSE'] == "T": + plrad = real2float(i_list[2]) + else: + if swift_param['LCLOSE'] == "T": + plrad = real2float(i_list[1]) + if swifter_param['RHILL_PRESENT'] == 'YES': + print(n + 1, GMpl, Rhill, file=plnew) + else: + print(n + 1, GMpl, file=plnew) if swifter_param['CHK_CLOSE'] == 'YES': - line = plold.readline() - i_list = [i for i in line.split(" ") if i.strip()] - plrad = real2float(i_list[0]) print(plrad, file=plnew) line = plold.readline() i_list = [i for i in line.split(" ") if i.strip()] @@ -925,15 +1016,59 @@ def swift2swifter(swift_param, plname="pl.swifter.in", tpname="tp.swiftest.in", plold.close() except IOError: print(f"Error converting PL file") + + # Convert the TP file + if tpname == '': + tpname = input("TP_IN: Name of new test particle input file: [tp.swifter.in]> ") + if tpname == '': + tpname = "tp.swifter.in" + swifter_param['TP_IN'] = tpname + + try: + tpnew = open(swifter_param['TP_IN'], 'w') + except IOError: + print(f"Cannot write to file {swifter_param['TP_IN']}") -def swifter2swiftest(swifter_param, plname="pl.swiftest.in", tpname="tp.swiftest.in", cbname="cb.swiftest.in"): + print(f"Converting TP file: {swift_param['TP_IN']} -> {swifter_param['TP_IN']}") + try: + print(f'Writing out new TP file: {swifter_param["TP_IN"]}') + with open(swift_param['TP_IN'], 'r') as tpold: + line = tpold.readline() + i_list = [i for i in line.split(" ") if i.strip()] + ntp = int(i_list[0]) + print(ntp, file=tpnew) + for n in range(0, ntp): # Loop over test particles + print(npl + n + 1, file=tpnew) + line = tpold.readline() + i_list = [i for i in line.split(" ") if i.strip()] + xh = real2float(i_list[0]) + yh = real2float(i_list[1]) + zh = real2float(i_list[2]) + print(xh, yh, zh, file=tpnew) + line = tpold.readline() + i_list = [i for i in line.split(" ") if i.strip()] + vx = real2float(i_list[0]) + vy = real2float(i_list[1]) + vz = real2float(i_list[2]) + print(vx, vy, vz, file=tpnew) + # Ignore STAT lines + line = tpold.readline() + line = tpold.readline() + except IOError: + print(f"Error converting TP file") + swifter_param['! VERSION'] = "Swifter parameter file converted from Swift" + + return swifter_param + +def swifter2swiftest(swifter_param, plname="", tpname="", cbname=""): swiftest_param = swifter_param.copy() + + # Convert the PL file + if plname == '': + plname = input("PL_IN: Name of new planet input file: [pl.swiftest.in]> ") + if plname == '': + plname = "pl.swiftest.in" swiftest_param['PL_IN'] = plname - swiftest_param['TP_IN'] = tpname - swiftest_param['CB_IN'] = cbname - print(f"Swiftest massive body file : {swiftest_param['PL_IN']}") - print(f"Swiftest test particle file: {swiftest_param['TP_IN']}") - print(f"Swiftest central body file : {swiftest_param['CB_IN']}") try: plnew = open(swiftest_param['PL_IN'], 'w') @@ -981,6 +1116,13 @@ def swifter2swiftest(swifter_param, plname="pl.swiftest.in", tpname="tp.swiftest plold.close() except IOError: print(f"Error converting PL file") + + # Convert the TP file + if tpname == '': + tpname = input("TP_IN: Name of new planet input file: [tp.swiftest.in]> ") + if tpname == '': + tpname = "tp.swiftest.in" + swiftest_param['TP_IN'] = tpname try: tpnew = open(swiftest_param['TP_IN'], 'w') @@ -1018,6 +1160,13 @@ def swifter2swiftest(swifter_param, plname="pl.swiftest.in", tpname="tp.swiftest tpnew.close() except IOError: print(f"Error converting TP file") + + # Create the CB file + if cbname == '': + cbname = input("CB_IN: Name of new planet input file: [cb.swiftest.in]> ") + if cbname == '': + cbname = "cb.swiftest.in" + swiftest_param['CB_IN'] = cbname print(f"\nCentral body G*M = {GMcb}\n") print("Select the unit system to use:") @@ -1082,6 +1231,7 @@ def swifter2swiftest(swifter_param, plname="pl.swiftest.in", tpname="tp.swiftest cbrad = swifter_param['CHK_RMIN'] elif cbrad_type == 2: cbrad = input("Enter radius of central body in simulation Distance Units: ") + cbrad = real2float(cbrad.strip()) print(f'Writing out new CB file: {swiftest_param["CB_IN"]}') # Write out new central body file @@ -1108,3 +1258,29 @@ def swifter2swiftest(swifter_param, plname="pl.swiftest.in", tpname="tp.swiftest swiftest_param.pop('RHILL_PRESENT', None) swiftest_param['! VERSION'] = "Swiftest parameter file converted from Swifter" return swiftest_param + +def swift2swiftest(swift_param, plname="", tpname="", cbname=""): + if plname == '': + plname = input("PL_IN: Name of new planet input file: [pl.swiftest.in]> ") + if plname == '': + plname = "pl.swiftest.in" + pltmp = tempfile.NamedTemporaryFile() + pltmpname = pltmp.name + + if tpname == '': + tpname = input("TP_IN: Name of new planet input file: [tp.swiftest.in]> ") + if tpname == '': + tpname = "tp.swiftest.in" + tptmp = tempfile.NamedTemporaryFile() + tptmpname = tptmp.name + + # Create the CB file + if cbname == '': + cbname = input("CB_IN: Name of new planet input file: [cb.swiftest.in]> ") + if cbname == '': + cbname = "cb.swiftest.in" + swifter_param = swift2swifter(swift_param, pltmpname, tptmpname) + swiftest_param = swifter2swiftest(swifter_param, plname, tpname, cbname) + swiftest_param['! VERSION'] = "Swiftest parameter file converted from Swift" + return swiftest_param + \ No newline at end of file diff --git a/python/swiftest/tests/convert_code_type/cb.swifter2swiftest.in b/python/swiftest/tests/convert_code_type/cb.swifter2swiftest.in deleted file mode 100644 index c33aa2b5c..000000000 --- a/python/swiftest/tests/convert_code_type/cb.swifter2swiftest.in +++ /dev/null @@ -1,4 +0,0 @@ -0.00029591220819207774 -0.004650467260962157 -4.7535806948127355e-12 --2.2473967953572827e-18 diff --git a/python/swiftest/tests/convert_code_type/pl.swifter2swiftest.in b/python/swiftest/tests/convert_code_type/pl.swifter2swiftest.in deleted file mode 100644 index 6e41f04b7..000000000 --- a/python/swiftest/tests/convert_code_type/pl.swifter2swiftest.in +++ /dev/null @@ -1,37 +0,0 @@ -9 -2 4.9125474498983625e-11 -1.6306381826061646e-05 -0.008059842448018334 -0.4616051037329109 -0.03846017738329229 -0.02248719132054853 0.001934639213990692 -0.001904656977422976 -3 7.243452483873647e-10 -4.0453784346544176e-05 --0.5115875215389065 0.5030818749037324 0.03642547299277956 --0.01425515725454357 -0.01452868630179309 0.0006232072038298823 -4 8.997011382166019e-10 -4.25875607065041e-05 --0.1090020607540907 -1.009893805009766 4.823302918632528e-05 -0.01682491922568941 -0.001910549762056979 3.992660742687128e-08 -5 9.549535102761465e-11 -2.2657408050928896e-05 --1.342897929331636 0.9778655112682739 0.05343398538723887 --0.007712315645393206 -0.01011917844182223 -2.287744801261131e-05 -6 2.8253459086313547e-07 -0.0004673261703049093 -3.923184193414315 -3.168419770483168 -0.0746147877972047 -0.004655552638985802 0.006232623300954468 -0.0001300429201057457 -7 8.459715183006416e-08 -0.00038925687730393614 -6.185794462795267 -7.804174837804826 -0.110498432926239 -0.004066833203985018 0.003458637040736611 -0.0002219310939327014 -8 1.2920249163736674e-08 -0.00016953449859497232 -14.9290976575471 12.92949673572929 -0.1454099139559955 --0.002599557960646664 0.002795888198858545 4.391864857782088e-05 -9 1.5243589003230834e-08 -0.00016458790412449367 -29.54416169025338 -4.716921603714237 -0.5838030174427992 -0.0004792636209523189 0.00312573757291745 -7.53264045199501e-05 -10 2.1919422829042796e-12 -7.943294877391593e-06 -14.54448346259197 -31.05223519593471 -0.8828000265625595 -0.002923077617691739 0.0006625916902153526 -0.0009142553677224461 diff --git a/python/swiftest/tests/convert_code_type/swift2swifter/param.swift.in b/python/swiftest/tests/convert_code_type/swift2swifter/param.swift.in new file mode 100644 index 000000000..3f9822a58 --- /dev/null +++ b/python/swiftest/tests/convert_code_type/swift2swifter/param.swift.in @@ -0,0 +1,6 @@ +.0d0 365.25d9 5.0d0 +365.25d5 365.25d5 +F T F F T F +4.68d-03 100.0 -1.0 4.68d-03 T +bin.dat +unknown diff --git a/python/swiftest/tests/convert_code_type/swift2swifter/pl.swift.in b/python/swiftest/tests/convert_code_type/swift2swifter/pl.swift.in new file mode 100644 index 000000000..4d479d3cf --- /dev/null +++ b/python/swiftest/tests/convert_code_type/swift2swifter/pl.swift.in @@ -0,0 +1,28 @@ + 8 + 2.9592338592955439E-004 + 0.0000000000000000 0.0000000000000000 0.0000000000000000 + 0.0000000000000000 0.0000000000000000 0.0000000000000000 + 4.9127330156310911E-011 1.6308387199999999E-005 + -0.15273942296363005 -0.44077188683118762 -2.1987973899201478E-002 + 2.0924205227543746E-002 -7.6522013575130771E-003 -2.5455577585009612E-003 + 7.2437260968171072E-010 4.0454452799999999E-005 + -0.68052645343902751 -0.21255610959625498 3.6375571604128076E-002 + 5.7676478402592110E-003 -1.9654618148759011E-002 -6.0150804827979417E-004 + 8.9973512337453730E-010 4.2635232500000000E-005 + 0.21153912017632401 0.96910814953928759 -1.5976841060778844E-006 + -1.6944135164995145E-002 3.6911953785631699E-003 1.4525071481945407E-008 + 9.5498958252779674E-011 2.2707542499999999E-005 + 1.4232971230754801 0.21815483859431103 -3.0416153305576600E-002 + -1.9274688569975952E-003 1.4590108763912674E-002 3.5304139123317309E-004 + 2.8254526327676804E-007 4.7789450300000003E-004 + 4.0036874054921974 2.9350393270474617 -0.10182563723380476 + -4.5629876169643530E-003 6.4471059617920590E-003 7.5448856044019538E-005 + 8.4600347388504292E-008 4.0286669700000002E-004 + 6.4083018390909805 6.5682871940009111 -0.36911425745370574 + -4.2912688970106801E-003 3.8914184987695602E-003 1.0289743699759401E-004 + 1.2920737211033427E-008 1.7085136200000001E-004 + 14.430329793174279 -13.735823636348456 -0.23812543891764848 + 2.6784223946886604E-003 2.6724061291222238E-003 -2.4777620883141212E-005 + 1.5244164811971947E-008 1.6553711599999999E-004 + 16.808300160620913 -24.994308693440338 0.12729909149223279 + 2.5795430409598025E-003 1.7765162604947151E-003 -9.5908529499802122E-005 diff --git a/python/swiftest/tests/convert_code_type/swift2swifter/swift.in b/python/swiftest/tests/convert_code_type/swift2swifter/swift.in new file mode 100644 index 000000000..fd99232cf --- /dev/null +++ b/python/swiftest/tests/convert_code_type/swift2swifter/swift.in @@ -0,0 +1,3 @@ +param.swift.in +pl.swift.in +tp.swift.in diff --git a/python/swiftest/tests/convert_code_type/swift2swifter/swift2swifter.py b/python/swiftest/tests/convert_code_type/swift2swifter/swift2swifter.py new file mode 100644 index 000000000..bd765d90f --- /dev/null +++ b/python/swiftest/tests/convert_code_type/swift2swifter/swift2swifter.py @@ -0,0 +1,14 @@ +import swiftest +""" + Reads in an example parameter file for each of the codes (Swift, Swifter, and Swiftest) and outputs an equivalent + parameter file in another code type. + + Input files are param.swift[er|est].in and output files are param.[src]2[dest].new, where [src] is the original file type + and [dest] is the new one. The user may be prompted to answer questions regarding how to convert between the different + simulation types. + """ +inparam = "param.swift.in" +outparam = "param.swift2swifter.new" +print(f"Reading Swift parameter {inparam} and saving it to {outparam}") +sim = swiftest.Simulation(source=inparam, codename="Swift") +oldparam = sim.convert(outparam, newcodename="Swifter", plname="pl.swift2swifter.in", tpname="tp.swift2swifter.in") \ No newline at end of file diff --git a/python/swiftest/tests/convert_code_type/swift2swifter/tp.swift.in b/python/swiftest/tests/convert_code_type/swift2swifter/tp.swift.in new file mode 100644 index 000000000..c63ce7f13 --- /dev/null +++ b/python/swiftest/tests/convert_code_type/swift2swifter/tp.swift.in @@ -0,0 +1,201 @@ + 50 + 1.75536839836414 -0.397301559901775 -2.886320950191011E-002 + 2.828957660824792E-003 1.250539366801959E-002 -8.833159624221525E-005 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.75462547108338 -0.397439253344038 -5.771762699017597E-002 + 2.826684041441025E-003 1.250497227754510E-002 -1.766362858232247E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.75338751027446 -0.397668695834012 -8.655446554537932E-002 + 2.822895444946565E-003 1.250427010264027E-002 -2.648871776719500E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.75165489340570 -0.397989817412071 -0.115364933939178 + 2.817593026527604E-003 1.250328735740620E-002 -3.530573675304868E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.74942814808290 -0.398402520292259 -0.144140261060723 + 2.810778400843813E-003 1.250202434110241E-002 -4.411200127075503E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.74670795159950 -0.398906678945642 -0.172871691292285 + 2.802453640651961E-003 1.250048143789167E-002 -5.290483179262686E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.74349513437761 -0.399502139462572 -0.201550453497502 + 2.792621287336390E-003 1.249865911879178E-002 -6.168154404172742E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.73979067424302 -0.400188720613739 -0.230167821489439 + 2.781284333388745E-003 1.249655793842830E-002 -7.043946749723006E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.73559569961003 -0.400966213259897 -0.258715078141622 + 2.768446232154610E-003 1.249417853684106E-002 -7.917593441112837E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.73091148830840 -0.401834380569283 -0.287183527684168 + 2.754110894243519E-003 1.249152163881874E-002 -8.788828357128555E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.72026103118157 -0.389355528881347 -2.828594532477477E-002 + 2.886114093303328E-003 1.275805340156797E-002 -9.011625318008804E-005 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.71953296244609 -0.389490468454826 -5.656327447617424E-002 + 2.883794537575375E-003 1.275762349729473E-002 -1.802050560751523E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.71831976085279 -0.389715322095103 -8.482337627316461E-002 + 2.879929396047131E-003 1.275690713560546E-002 -2.702389743052803E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.71662179632064 -0.390030021241745 -0.113057635311967 + 2.874519847244236E-003 1.275590453492696E-002 -3.601905600373064E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.71443958590329 -0.390434470064514 -0.141257455903944 + 2.867567538449044E-003 1.275461600056502E-002 -4.500324282485798E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.71177379334835 -0.390928545545054 -0.169414257543719 + 2.859074584296430E-003 1.275304192444406E-002 -5.397372422888266E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.70862523246946 -0.391512096851912 -0.197519444517652 + 2.849043577517016E-003 1.275118278709834E-002 -6.292776170557357E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.70499486153590 -0.392184946380362 -0.225564465162543 + 2.837477571062932E-003 1.274903915435912E-002 -7.186263077873903E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.70088378639370 -0.392946889173945 -0.253540776694444 + 2.824380088051367E-003 1.274661167919763E-002 -8.077560980102980E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.69629325931601 -0.393797693137531 -0.281439857258866 + 2.809755118102047E-003 1.274390110104623E-002 -8.966398379301735E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.68515366399900 -0.381409497860919 -2.770868114763943E-002 + 2.944472485597326E-003 1.301602639267184E-002 -9.193844020566386E-005 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.68444045380880 -0.381541683565614 -5.540892196217252E-002 + 2.942106027515987E-003 1.301558779556061E-002 -1.838488750704571E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.68325201143113 -0.381761948356195 -8.309228700094988E-002 + 2.938162731265411E-003 1.301485694874873E-002 -2.757033154802284E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.68158869923558 -0.382070225071419 -0.110750336684755 + 2.932643799201507E-003 1.301383407507970E-002 -3.674737585955427E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.67945102372369 -0.382466419836768 -0.138374650747165 + 2.925550911915339E-003 1.301251948603269E-002 -4.591322656575339E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.67683963509720 -0.382950412144466 -0.165956823795153 + 2.916886226800555E-003 1.301091358145700E-002 -5.506509472578220E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.67375533056131 -0.383522054241252 -0.193488435537802 + 2.906652389013839E-003 1.300901685160348E-002 -6.420018645562698E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.67019904882879 -0.384181172146986 -0.220961108835647 + 2.894852513239243E-003 1.300682987374474E-002 -7.331572218908740E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.66617187317737 -0.384927565087993 -0.248366475247266 + 2.881490193832806E-003 1.300435331405534E-002 -8.240892524600587E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.66167503032362 -0.385761005705779 -0.275696186833564 + 2.866569501085982E-003 1.300158792691927E-002 -9.147702574897361E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.65004629681643 -0.373463466840492 -2.713141697050409E-002 + 3.004107385165185E-003 1.327964217801076E-002 -9.380048499464011E-005 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.64934794517152 -0.373592898676403 -5.425456944817078E-002 + 3.001692998807830E-003 1.327919469791802E-002 -1.875723974515014E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.64818426200946 -0.373808574617286 -8.136119772873515E-002 + 2.997669838310936E-003 1.327844904914197E-002 -2.812871813881668E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.64655560215051 -0.374110428901093 -0.108443038057544 + 2.992039130381927E-003 1.327740545903941E-002 -3.749162668189549E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.64446246154409 -0.374498369609023 -0.135491845590387 + 2.984802589649166E-003 1.327606424539795E-002 -4.684311491365882E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.64190547684605 -0.374972278743879 -0.162499390046587 + 2.975962417200357E-003 1.327442581616511E-002 -5.618033740837786E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.63888542865316 -0.375532011630592 -0.189457426557952 + 2.965521311764990E-003 1.327249067152087E-002 -6.550044369703316E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.63540323612168 -0.376177397913609 -0.216357752508752 + 2.953482451109342E-003 1.327025940042943E-002 -7.480059791839970E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.63145995996104 -0.376908241002040 -0.243192173800089 + 2.939849502386553E-003 1.326773268255752E-002 -8.407796715574675E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.62705680133123 -0.377724318274027 -0.269952516408261 + 2.924626618324377E-003 1.326491128756776E-002 -9.332972543286958E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.61493892963385 -0.365517435820064 -2.655415279336874E-002 + 3.065098326561108E-003 1.354925233969722E-002 -9.570487094018532E-005 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.61425543653423 -0.365644113787191 -5.310021693416905E-002 + 3.062634922083575E-003 1.354879577463227E-002 -1.913805892481565E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.61311651258780 -0.365855200878378 -7.963010845652042E-002 + 3.058530081302113E-003 1.354803498730923E-002 -2.869980191831766E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.61152250506545 -0.366150632730767 -0.106135739430332 + 3.052785055829394E-003 1.354697020970083E-002 -3.825280107169432E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.60947389936449 -0.366530319381278 -0.132609040433608 + 3.045401595105050E-003 1.354560176604655E-002 -4.779414805269034E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.60697131859490 -0.366994145343291 -0.159041956298021 + 3.036381944904408E-003 1.354393007257628E-002 -5.732093966627254E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.60401552674501 -0.367541969019932 -0.185426417578102 + 3.025728858747958E-003 1.354195563962491E-002 -6.683026757172563E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.60060742341456 -0.368173623680233 -0.211754396181856 + 3.013445578918633E-003 1.353967906811411E-002 -7.631923833270372E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.59674804674471 -0.368888916916088 -0.238017872352911 + 2.999535847022010E-003 1.353710105150953E-002 -8.578496151713587E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.59243857233884 -0.369687630842276 -0.264208845982959 + 2.984003900096668E-003 1.353422237509990E-002 -9.522455377438729E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 diff --git a/python/swiftest/tests/convert_code_type/swift2swiftest/param.swift.in b/python/swiftest/tests/convert_code_type/swift2swiftest/param.swift.in new file mode 100644 index 000000000..3f9822a58 --- /dev/null +++ b/python/swiftest/tests/convert_code_type/swift2swiftest/param.swift.in @@ -0,0 +1,6 @@ +.0d0 365.25d9 5.0d0 +365.25d5 365.25d5 +F T F F T F +4.68d-03 100.0 -1.0 4.68d-03 T +bin.dat +unknown diff --git a/python/swiftest/tests/convert_code_type/swift2swiftest/pl.swift.in b/python/swiftest/tests/convert_code_type/swift2swiftest/pl.swift.in new file mode 100644 index 000000000..4d479d3cf --- /dev/null +++ b/python/swiftest/tests/convert_code_type/swift2swiftest/pl.swift.in @@ -0,0 +1,28 @@ + 8 + 2.9592338592955439E-004 + 0.0000000000000000 0.0000000000000000 0.0000000000000000 + 0.0000000000000000 0.0000000000000000 0.0000000000000000 + 4.9127330156310911E-011 1.6308387199999999E-005 + -0.15273942296363005 -0.44077188683118762 -2.1987973899201478E-002 + 2.0924205227543746E-002 -7.6522013575130771E-003 -2.5455577585009612E-003 + 7.2437260968171072E-010 4.0454452799999999E-005 + -0.68052645343902751 -0.21255610959625498 3.6375571604128076E-002 + 5.7676478402592110E-003 -1.9654618148759011E-002 -6.0150804827979417E-004 + 8.9973512337453730E-010 4.2635232500000000E-005 + 0.21153912017632401 0.96910814953928759 -1.5976841060778844E-006 + -1.6944135164995145E-002 3.6911953785631699E-003 1.4525071481945407E-008 + 9.5498958252779674E-011 2.2707542499999999E-005 + 1.4232971230754801 0.21815483859431103 -3.0416153305576600E-002 + -1.9274688569975952E-003 1.4590108763912674E-002 3.5304139123317309E-004 + 2.8254526327676804E-007 4.7789450300000003E-004 + 4.0036874054921974 2.9350393270474617 -0.10182563723380476 + -4.5629876169643530E-003 6.4471059617920590E-003 7.5448856044019538E-005 + 8.4600347388504292E-008 4.0286669700000002E-004 + 6.4083018390909805 6.5682871940009111 -0.36911425745370574 + -4.2912688970106801E-003 3.8914184987695602E-003 1.0289743699759401E-004 + 1.2920737211033427E-008 1.7085136200000001E-004 + 14.430329793174279 -13.735823636348456 -0.23812543891764848 + 2.6784223946886604E-003 2.6724061291222238E-003 -2.4777620883141212E-005 + 1.5244164811971947E-008 1.6553711599999999E-004 + 16.808300160620913 -24.994308693440338 0.12729909149223279 + 2.5795430409598025E-003 1.7765162604947151E-003 -9.5908529499802122E-005 diff --git a/python/swiftest/tests/convert_code_type/swift2swiftest/swift.in b/python/swiftest/tests/convert_code_type/swift2swiftest/swift.in new file mode 100644 index 000000000..fd99232cf --- /dev/null +++ b/python/swiftest/tests/convert_code_type/swift2swiftest/swift.in @@ -0,0 +1,3 @@ +param.swift.in +pl.swift.in +tp.swift.in diff --git a/python/swiftest/tests/convert_code_type/swift2swiftest/swift2swiftest.py b/python/swiftest/tests/convert_code_type/swift2swiftest/swift2swiftest.py new file mode 100644 index 000000000..6234dc61a --- /dev/null +++ b/python/swiftest/tests/convert_code_type/swift2swiftest/swift2swiftest.py @@ -0,0 +1,14 @@ +import swiftest +""" + Reads in an example parameter file for each of the codes (Swift, Swifter, and Swiftest) and outputs an equivalent + parameter file in another code type. + + Input files are param.swift[er|est].in and output files are param.[src]2[dest].new, where [src] is the original file type + and [dest] is the new one. The user may be prompted to answer questions regarding how to convert between the different + simulation types. + """ +inparam = "param.swift.in" +outparam = "param.swift2swiftest.new" +print(f"Reading Swift parameter {inparam} and saving it to {outparam}") +sim = swiftest.Simulation(source=inparam, codename="Swift") +oldparam = sim.convert(outparam, newcodename="Swiftest", plname="pl.swift2swiftest.in", tpname="tp.swift2swiftest.in", cbname="cb.swift2swiftest.in") \ No newline at end of file diff --git a/python/swiftest/tests/convert_code_type/swift2swiftest/tp.swift.in b/python/swiftest/tests/convert_code_type/swift2swiftest/tp.swift.in new file mode 100644 index 000000000..c63ce7f13 --- /dev/null +++ b/python/swiftest/tests/convert_code_type/swift2swiftest/tp.swift.in @@ -0,0 +1,201 @@ + 50 + 1.75536839836414 -0.397301559901775 -2.886320950191011E-002 + 2.828957660824792E-003 1.250539366801959E-002 -8.833159624221525E-005 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.75462547108338 -0.397439253344038 -5.771762699017597E-002 + 2.826684041441025E-003 1.250497227754510E-002 -1.766362858232247E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.75338751027446 -0.397668695834012 -8.655446554537932E-002 + 2.822895444946565E-003 1.250427010264027E-002 -2.648871776719500E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.75165489340570 -0.397989817412071 -0.115364933939178 + 2.817593026527604E-003 1.250328735740620E-002 -3.530573675304868E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.74942814808290 -0.398402520292259 -0.144140261060723 + 2.810778400843813E-003 1.250202434110241E-002 -4.411200127075503E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.74670795159950 -0.398906678945642 -0.172871691292285 + 2.802453640651961E-003 1.250048143789167E-002 -5.290483179262686E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.74349513437761 -0.399502139462572 -0.201550453497502 + 2.792621287336390E-003 1.249865911879178E-002 -6.168154404172742E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.73979067424302 -0.400188720613739 -0.230167821489439 + 2.781284333388745E-003 1.249655793842830E-002 -7.043946749723006E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.73559569961003 -0.400966213259897 -0.258715078141622 + 2.768446232154610E-003 1.249417853684106E-002 -7.917593441112837E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.73091148830840 -0.401834380569283 -0.287183527684168 + 2.754110894243519E-003 1.249152163881874E-002 -8.788828357128555E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.72026103118157 -0.389355528881347 -2.828594532477477E-002 + 2.886114093303328E-003 1.275805340156797E-002 -9.011625318008804E-005 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.71953296244609 -0.389490468454826 -5.656327447617424E-002 + 2.883794537575375E-003 1.275762349729473E-002 -1.802050560751523E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.71831976085279 -0.389715322095103 -8.482337627316461E-002 + 2.879929396047131E-003 1.275690713560546E-002 -2.702389743052803E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.71662179632064 -0.390030021241745 -0.113057635311967 + 2.874519847244236E-003 1.275590453492696E-002 -3.601905600373064E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.71443958590329 -0.390434470064514 -0.141257455903944 + 2.867567538449044E-003 1.275461600056502E-002 -4.500324282485798E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.71177379334835 -0.390928545545054 -0.169414257543719 + 2.859074584296430E-003 1.275304192444406E-002 -5.397372422888266E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.70862523246946 -0.391512096851912 -0.197519444517652 + 2.849043577517016E-003 1.275118278709834E-002 -6.292776170557357E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.70499486153590 -0.392184946380362 -0.225564465162543 + 2.837477571062932E-003 1.274903915435912E-002 -7.186263077873903E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.70088378639370 -0.392946889173945 -0.253540776694444 + 2.824380088051367E-003 1.274661167919763E-002 -8.077560980102980E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.69629325931601 -0.393797693137531 -0.281439857258866 + 2.809755118102047E-003 1.274390110104623E-002 -8.966398379301735E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.68515366399900 -0.381409497860919 -2.770868114763943E-002 + 2.944472485597326E-003 1.301602639267184E-002 -9.193844020566386E-005 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.68444045380880 -0.381541683565614 -5.540892196217252E-002 + 2.942106027515987E-003 1.301558779556061E-002 -1.838488750704571E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.68325201143113 -0.381761948356195 -8.309228700094988E-002 + 2.938162731265411E-003 1.301485694874873E-002 -2.757033154802284E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.68158869923558 -0.382070225071419 -0.110750336684755 + 2.932643799201507E-003 1.301383407507970E-002 -3.674737585955427E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.67945102372369 -0.382466419836768 -0.138374650747165 + 2.925550911915339E-003 1.301251948603269E-002 -4.591322656575339E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.67683963509720 -0.382950412144466 -0.165956823795153 + 2.916886226800555E-003 1.301091358145700E-002 -5.506509472578220E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.67375533056131 -0.383522054241252 -0.193488435537802 + 2.906652389013839E-003 1.300901685160348E-002 -6.420018645562698E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.67019904882879 -0.384181172146986 -0.220961108835647 + 2.894852513239243E-003 1.300682987374474E-002 -7.331572218908740E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.66617187317737 -0.384927565087993 -0.248366475247266 + 2.881490193832806E-003 1.300435331405534E-002 -8.240892524600587E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.66167503032362 -0.385761005705779 -0.275696186833564 + 2.866569501085982E-003 1.300158792691927E-002 -9.147702574897361E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.65004629681643 -0.373463466840492 -2.713141697050409E-002 + 3.004107385165185E-003 1.327964217801076E-002 -9.380048499464011E-005 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.64934794517152 -0.373592898676403 -5.425456944817078E-002 + 3.001692998807830E-003 1.327919469791802E-002 -1.875723974515014E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.64818426200946 -0.373808574617286 -8.136119772873515E-002 + 2.997669838310936E-003 1.327844904914197E-002 -2.812871813881668E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.64655560215051 -0.374110428901093 -0.108443038057544 + 2.992039130381927E-003 1.327740545903941E-002 -3.749162668189549E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.64446246154409 -0.374498369609023 -0.135491845590387 + 2.984802589649166E-003 1.327606424539795E-002 -4.684311491365882E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.64190547684605 -0.374972278743879 -0.162499390046587 + 2.975962417200357E-003 1.327442581616511E-002 -5.618033740837786E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.63888542865316 -0.375532011630592 -0.189457426557952 + 2.965521311764990E-003 1.327249067152087E-002 -6.550044369703316E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.63540323612168 -0.376177397913609 -0.216357752508752 + 2.953482451109342E-003 1.327025940042943E-002 -7.480059791839970E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.63145995996104 -0.376908241002040 -0.243192173800089 + 2.939849502386553E-003 1.326773268255752E-002 -8.407796715574675E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.62705680133123 -0.377724318274027 -0.269952516408261 + 2.924626618324377E-003 1.326491128756776E-002 -9.332972543286958E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.61493892963385 -0.365517435820064 -2.655415279336874E-002 + 3.065098326561108E-003 1.354925233969722E-002 -9.570487094018532E-005 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.61425543653423 -0.365644113787191 -5.310021693416905E-002 + 3.062634922083575E-003 1.354879577463227E-002 -1.913805892481565E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.61311651258780 -0.365855200878378 -7.963010845652042E-002 + 3.058530081302113E-003 1.354803498730923E-002 -2.869980191831766E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.61152250506545 -0.366150632730767 -0.106135739430332 + 3.052785055829394E-003 1.354697020970083E-002 -3.825280107169432E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.60947389936449 -0.366530319381278 -0.132609040433608 + 3.045401595105050E-003 1.354560176604655E-002 -4.779414805269034E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.60697131859490 -0.366994145343291 -0.159041956298021 + 3.036381944904408E-003 1.354393007257628E-002 -5.732093966627254E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.60401552674501 -0.367541969019932 -0.185426417578102 + 3.025728858747958E-003 1.354195563962491E-002 -6.683026757172563E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.60060742341456 -0.368173623680233 -0.211754396181856 + 3.013445578918633E-003 1.353967906811411E-002 -7.631923833270372E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.59674804674471 -0.368888916916088 -0.238017872352911 + 2.999535847022010E-003 1.353710105150953E-002 -8.578496151713587E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 + 1.59243857233884 -0.369687630842276 -0.264208845982959 + 2.984003900096668E-003 1.353422237509990E-002 -9.522455377438729E-004 + 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 diff --git a/python/swiftest/tests/convert_code_type/param.swifter.in b/python/swiftest/tests/convert_code_type/swifter2swiftest/param.swifter.in similarity index 100% rename from python/swiftest/tests/convert_code_type/param.swifter.in rename to python/swiftest/tests/convert_code_type/swifter2swiftest/param.swifter.in diff --git a/python/swiftest/tests/convert_code_type/pl.swifter.in b/python/swiftest/tests/convert_code_type/swifter2swiftest/pl.swifter.in similarity index 100% rename from python/swiftest/tests/convert_code_type/pl.swifter.in rename to python/swiftest/tests/convert_code_type/swifter2swiftest/pl.swifter.in diff --git a/python/swiftest/tests/convert_code_type/swifter2swiftest.py b/python/swiftest/tests/convert_code_type/swifter2swiftest/swifter2swiftest.py similarity index 100% rename from python/swiftest/tests/convert_code_type/swifter2swiftest.py rename to python/swiftest/tests/convert_code_type/swifter2swiftest/swifter2swiftest.py diff --git a/python/swiftest/tests/convert_code_type/tp.swifter.in b/python/swiftest/tests/convert_code_type/swifter2swiftest/tp.swifter.in similarity index 100% rename from python/swiftest/tests/convert_code_type/tp.swifter.in rename to python/swiftest/tests/convert_code_type/swifter2swiftest/tp.swifter.in diff --git a/python/swiftest/tests/convert_code_type/tp.swifter2swiftest.in b/python/swiftest/tests/convert_code_type/tp.swifter2swiftest.in deleted file mode 100644 index 9c026369e..000000000 --- a/python/swiftest/tests/convert_code_type/tp.swifter2swiftest.in +++ /dev/null @@ -1,4 +0,0 @@ -1 -100 -1.01 0.0 0.0 -0.0 6.252003053624663 0.0