Skip to content

Commit

Permalink
Merge pull request multi-ego#519 from carlocamilloni/new_sigma_prior
Browse files Browse the repository at this point in the history
short H-O sigma
  • Loading branch information
carlocamilloni authored Dec 18, 2024
2 parents 12ec8eb + 587421f commit 28034cd
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions src/multiego/ensemble.py
Original file line number Diff line number Diff line change
Expand Up @@ -862,11 +862,13 @@ def generate_OO_LJ(meGO_ensemble):
HH_LJ["mg_sigma"] = HH_LJ["c12"] ** (1 / 12)
HH_LJ["mg_epsilon"] = -HH_LJ["c12"]
HO_LJ = pd.DataFrame(full_matrix, columns=["ai", "aj"])
HO_LJ["c12"] = 1.153070e-08 * type_definitions.mg_eps
HO_LJ["c6"] = 2.147622e-04 * type_definitions.mg_eps
# HO_LJ["c12"] = 1.153070e-08 * type_definitions.mg_eps
# HO_LJ["c6"] = 2.147622e-04 * type_definitions.mg_eps
HO_LJ["c12"] = 2.249554e-09 * type_definitions.mg_eps
HO_LJ["c6"] = 9.485893e-05 * type_definitions.mg_eps
HO_LJ["epsilon"] = type_definitions.mg_eps
HO_LJ["sigma"] = (HO_LJ["c12"] / HO_LJ["c6"])**(1/6)
HO_LJ["mg_sigma"] = (HO_LJ["c12"] / HO_LJ["c6"])**(1/6)
HO_LJ["sigma"] = (HO_LJ["c12"] / HO_LJ["c6"]) ** (1 / 6)
HO_LJ["mg_sigma"] = (HO_LJ["c12"] / HO_LJ["c6"]) ** (1 / 6)
HO_LJ["mg_epsilon"] = type_definitions.mg_eps
rc_LJ = pd.concat([OO_LJ, HO_LJ, HH_LJ], axis=0)
rc_LJ["type"] = 1
Expand Down

0 comments on commit 28034cd

Please sign in to comment.