Skip to content

Commit 6737afa

Browse files
committed
Added call to PSE-n routine in sfed.py
1 parent 72f4ac1 commit 6737afa

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

sfed.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
parser.add_argument("-T", "--temperature", help="Temperature of system (default = 300)", type=float, nargs="?", default=300)
1919
parser.add_argument("-p", "--density", help="Density of system (default = 0.03342285869 [for water])", type=float, nargs="?", default=3.3422858685000001E-02)
2020
#parser.add_argument("-t", "--tags", help="Suffix tags for scanning the correct .dx files (default = [\"H\", \"C\", \"G\"])", nargs="+", default=["H", "C", "G"])
21+
parser.add_argument("-n", "--term", help="The values for n in the PSE-n closure", required=False)
2122
args = parser.parse_args()
2223

2324
def epilogue(output_sfed, sample_grid, fname):
@@ -36,9 +37,15 @@ def epilogue(output_sfed, sample_grid, fname):
3637
epilogue(output_sfed, grids.grids["HO"], args.output)
3738
elif args.closure == "GF":
3839
output_sfed = sfed_gf_3drism(grids.grids["HO"].grid, grids.grids["CO"].grid, grids.grids["HH1"].grid, grids.grids["CH1"].grid, rho=args.density, T=args.temperature)
39-
epilogue(output_sfed, grids.grids["HO"].grid, args.output)
40+
epilogue(output_sfed, grids.grids["HO"], args.output)
4041
elif args.closure == "HNC":
4142
output_sfed = sfed_hnc_3drism(grids.grids["HO"].grid, grids.grids["CO"].grid, grids.grids["HH1"].grid, grids.grids["CH1"].grid, rho=args.density, T=args.temperature)
42-
epilogue(output_sfed, grids.grids["HO"].grid, args.output)
43+
epilogue(output_sfed, grids.grids["HO"], args.output)
44+
elif args.closure.startswith("PSE"):
45+
if args.term is None:
46+
parser.error("PSE-n closure requires a value for -n")
47+
else:
48+
output_sfed = sfed_psen_3drism(grids.grids["HO"].grid, grids.grids["CO"].grid, grids.grids["HH1"].grid, grids.grids["CH1"].grid, grids.grids["UO"].grid,grids.grids["UH1"].grid, float(args.term), rho=args.density, T=args.temperature)
49+
epilogue(output_sfed, grids.grids["HO"], args.output)
4350
else:
4451
raise Exception("Unknown closure")

0 commit comments

Comments
 (0)