Added Swift parameter parser and improved handling of Fortran double precision formatted text input with the d/D characters

MintonGroup · Jun 25, 2021 · eb6d08c · eb6d08c
1 parent a9cd994
commit eb6d08c
Show file tree

Hide file tree

Showing 7 changed files with 571 additions and 185 deletions.
diff --git a/examples/swift_conversion/param.in b/examples/swift_conversion/param.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/examples/swift_conversion/pl.in b/examples/swift_conversion/pl.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/examples/swift_conversion/swift.in b/examples/swift_conversion/swift.in
@@ -0,0 +1,3 @@
+param.in
+pl.in
+tp.in
diff --git a/examples/swift_conversion/tp.in b/examples/swift_conversion/tp.in
diff --git a/examples/swifter_conversion/param.swiftest.in b/examples/swifter_conversion/param.swiftest.in
@@ -1,4 +1,5 @@
 ! File generated by swifter2swiftest.py
+VERSION          ! Swifter parameter input file
 T0               0.0
 TSTOP            80.0
 DT               1.0

diff --git a/examples/swifter_conversion/swifter2swiftest.py b/examples/swifter_conversion/swifter2swiftest.py
@@ -7,18 +7,18 @@
 """
 
 if __name__ == '__main__':
-   ap = argparse.ArgumentParser()
-   ap.add_argument("-i", "--input_swifter_param", required=True, help="Input Swifter parameter file to convert")
-   ap.add_argument("-o", "--output_swiftest_param", required=True, help="Converted Swiftest parameter file")
-   args = vars(ap.parse_args())
-   inparam = args['input_swifter_param']
-   outparam = args['output_swiftest_param']
-   print(f"Swifter parameter is {inparam}")
-   print(f"Swiftest parameter file is {outparam}")
-   swifter_param = swio.read_swifter_param(inparam)
-   swiftest_param = swio.swifter2swiftest(swifter_param, outparam)
-   outfile = open(outparam, 'w')
-   print("! File generated by swifter2swiftest.py", file=outfile)
-   for key,val in swiftest_param.items():
-      print(f"{key:<16} {val}",file=outfile)
-   outfile.close()
+    ap = argparse.ArgumentParser()
+    ap.add_argument("-i", "--input_swifter_param", required=True, help="Input Swifter parameter file to convert")
+    ap.add_argument("-o", "--output_swiftest_param", required=True, help="Converted Swiftest parameter file")
+    args = vars(ap.parse_args())
+    inparam = args['input_swifter_param']
+    outparam = args['output_swiftest_param']
+    print(f"Swifter parameter is {inparam}")
+    print(f"Swiftest parameter file is {outparam}")
+    swifter_param = swio.read_swifter_param(inparam)
+    swiftest_param = swio.swifter2swiftest(swifter_param, outparam)
+    outfile = open(outparam, 'w')
+    print("! File generated by swifter2swiftest.py", file=outfile)
+    for key,val in swiftest_param.items():
+        print(f"{key:<16} {val}",file=outfile)
+    outfile.close()