@@ -35,9 +35,9 @@ def _ff_angle_on(lamb, model, bparam, sparam):
3535 alpha_lj = sparam ["alpha_lj" ]
3636 rcut = sparam ["rcut" ]
3737 epsilon = sparam ["epsilon" ]
38- sigma_oo = sparam [ "sigma_oo" ]
39- sigma_oh = sparam [ "sigma_oh" ]
40- sigma_hh = sparam [ "sigma_hh" ]
38+ sigma_oo = sparam . get ( "sigma_oo" , None ) or sparam [ "sigma_0_0 " ]
39+ sigma_oh = sparam . get ( "sigma_oh" , None ) or sparam [ "sigma_0_1 " ]
40+ sigma_hh = sparam . get ( "sigma_hh" , None ) or sparam [ "sigma_1_1 " ]
4141 activation = sparam ["activation" ]
4242 ret = ""
4343 ret += f"variable EPSILON equal { epsilon :f} \n "
@@ -94,9 +94,9 @@ def _ff_bond_angle_off(lamb, model, bparam, sparam):
9494 alpha_lj = sparam ["alpha_lj" ]
9595 rcut = sparam ["rcut" ]
9696 epsilon = sparam ["epsilon" ]
97- sigma_oo = sparam [ "sigma_oo" ]
98- sigma_oh = sparam [ "sigma_oh" ]
99- sigma_hh = sparam [ "sigma_hh" ]
97+ sigma_oo = sparam . get ( "sigma_oo" , None ) or sparam [ "sigma_0_0 " ]
98+ sigma_oh = sparam . get ( "sigma_oh" , None ) or sparam [ "sigma_0_1 " ]
99+ sigma_hh = sparam . get ( "sigma_hh" , None ) or sparam [ "sigma_1_1 " ]
100100 activation = sparam ["activation" ]
101101 ret = ""
102102 ret += "variable INV_LAMBDA equal 1-${LAMBDA}\n "
0 commit comments