Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Gaussian nuclear model with fractional charges #92

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions include/cint.h.in
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,8 @@
#define PTR_COORD 1
#define NUC_MOD_OF 2
#define PTR_ZETA 3
#define PTR_FRAC_CHARGE 3
#define RESERVE_ATMLOT1 4
#define RESERVE_ATMLOT2 5
#define PTR_FRAC_CHARGE 4
#define RESERVE_ATMLOT 5
#define ATM_SLOTS 6


Expand Down Expand Up @@ -131,6 +130,7 @@
#define POINT_NUC 1
#define GAUSSIAN_NUC 2
#define FRAC_CHARGE_NUC 3
#define FRAC_GAUSS_NUC 4

#define bas(SLOT,I) bas[BAS_SLOTS * (I) + (SLOT)]
#define atm(SLOT,I) atm[ATM_SLOTS * (I) + (SLOT)]
Expand Down
4 changes: 2 additions & 2 deletions src/g1e.c
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ double CINTnuc_mod(double aij, FINT nuc_id, FINT *atm, double *env)
double zeta;
if (nuc_id < 0) {
zeta = env[PTR_RINV_ZETA];
} else if (atm(NUC_MOD_OF, nuc_id) == GAUSSIAN_NUC) {
} else if ((atm(NUC_MOD_OF, nuc_id)-1) & (GAUSSIAN_NUC-1)) {
zeta = env[atm(PTR_ZETA, nuc_id)];
} else {
zeta = 0;
Expand Down Expand Up @@ -225,7 +225,7 @@ FINT CINTg1e_nuc(double *g, CINTEnvVars *envs, FINT nuc_id)
if (nuc_id < 0) {
fac1 = 2*M_PI * envs->fac[0] * tau / aij;
cr = env + PTR_RINV_ORIG;
} else if (atm(NUC_MOD_OF, nuc_id) == FRAC_CHARGE_NUC) {
} else if ((atm(NUC_MOD_OF, nuc_id)-1) & (FRAC_CHARGE_NUC-1)) {
fac1 = 2*M_PI * -env[atm[PTR_FRAC_CHARGE+nuc_id*ATM_SLOTS]] * envs->fac[0] * tau / aij;
cr = env + atm(PTR_COORD, nuc_id);
} else {
Expand Down