Skip to content

Commit 9963623

Browse files
committed
small fixes
1 parent c19aab7 commit 9963623

5 files changed

Lines changed: 47 additions & 15 deletions

File tree

0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

src/elec.c

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -96,60 +96,60 @@ mult_mult_energy(struct efp *efp, size_t fr_i_idx, size_t fr_j_idx,
9696
}
9797

9898
// charge - monopole
99-
//if (pt_i->if_znuc && pt_j->if_mon)
99+
if (pt_i->if_znuc && pt_j->if_mon)
100100
energy += ccdamp_j * efp_charge_charge_energy(pt_i->znuc, pt_j->monopole, &dr);
101101

102102
// monopole - charge
103-
//if (pt_j->if_znuc && pt_i->if_mon)
103+
if (pt_j->if_znuc && pt_i->if_mon)
104104
energy += ccdamp_i * efp_charge_charge_energy(pt_j->znuc, pt_i->monopole, &dr);
105105

106106
// charge-charge
107-
//if (pt_i->if_znuc && pt_j->if_znuc)
107+
if (pt_i->if_znuc && pt_j->if_znuc)
108108
energy += efp_charge_charge_energy(pt_i->znuc, pt_j->znuc, &dr);
109109

110110
// monopole - monopole
111-
//if (pt_i->if_mon && pt_j->if_mon)
111+
if (pt_i->if_mon && pt_j->if_mon)
112112
energy += ccdamp * efp_charge_charge_energy(pt_i->monopole,
113113
pt_j->monopole, &dr);
114114

115115
// monopole - dipole
116-
//if ((pt_i->if_znuc || pt_i->if_mon) && pt_j->if_dip)
116+
if ((pt_i->if_znuc || pt_i->if_mon) && pt_j->if_dip)
117117
energy += efp_charge_dipole_energy(qi, &pt_j->dipole, &dr);
118118

119119
// dipole - monopole
120-
//if ((pt_j->if_znuc || pt_j->if_mon) && pt_i->if_dip)
120+
if ((pt_j->if_znuc || pt_j->if_mon) && pt_i->if_dip)
121121
energy -= efp_charge_dipole_energy(qj, &pt_i->dipole, &dr);
122122

123123
// monopole - quadrupole
124-
//if ((pt_i->if_znuc || pt_i->if_mon) && pt_j->if_quad)
124+
if ((pt_i->if_znuc || pt_i->if_mon) && pt_j->if_quad)
125125
energy += efp_charge_quadrupole_energy(qi, pt_j->quadrupole, &dr);
126126

127127
// quadrupole - monopole
128-
//if ((pt_j->if_znuc || pt_j->if_mon) && pt_i->if_quad)
128+
if ((pt_j->if_znuc || pt_j->if_mon) && pt_i->if_quad)
129129
energy += efp_charge_quadrupole_energy(qj, pt_i->quadrupole, &dr);
130130

131131
// monopole - octupole
132-
//if ((pt_i->if_znuc || pt_i->if_mon) && pt_j->if_oct)
132+
if ((pt_i->if_znuc || pt_i->if_mon) && pt_j->if_oct)
133133
energy += efp_charge_octupole_energy(qi, pt_j->octupole, &dr);
134134

135135
// octupole - monopole
136-
//if ((pt_j->if_znuc || pt_j->if_mon) && pt_i->if_oct)
136+
if ((pt_j->if_znuc || pt_j->if_mon) && pt_i->if_oct)
137137
energy -= efp_charge_octupole_energy(qj, pt_i->octupole, &dr);
138138

139139
/* dipole - dipole */
140-
//if (pt_i->if_dip && pt_j->if_dip)
140+
if (pt_i->if_dip && pt_j->if_dip)
141141
energy += efp_dipole_dipole_energy(&pt_i->dipole, &pt_j->dipole, &dr);
142142

143143
/* dipole - quadrupole */
144-
//if (pt_i->if_dip && pt_j->if_quad)
144+
if (pt_i->if_dip && pt_j->if_quad)
145145
energy += efp_dipole_quadrupole_energy(&pt_i->dipole, pt_j->quadrupole, &dr);
146146

147147
/* quadrupole - dipole */
148-
//if (pt_j->if_dip && pt_i->if_dip)
148+
if (pt_j->if_dip && pt_i->if_dip)
149149
energy -= efp_dipole_quadrupole_energy(&pt_j->dipole, pt_i->quadrupole, &dr);
150150

151151
/* quadrupole - quadrupole */
152-
//if (pt_i->if_quad && pt_j->if_quad)
152+
if (pt_i->if_quad && pt_j->if_quad)
153153
energy += efp_quadrupole_quadrupole_energy(pt_i->quadrupole,
154154
pt_j->quadrupole, &dr);
155155

tests/pytests/test_efpefp2.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
FILES = [
88
'atom_coord.in', 'atom_coord_2.in', 'grad_1.in', 'lj_1.in', 'lj_2.in',
99
'pairwise_0.in', 'pairwise_1.in', 'pairwise_2.in', 'pairwise_x.in', 'pbc_1.in', 'pbc_2.in',
10-
'reduced.in', 'spec_frag_0.in', 'spec_frag_1.in', 'spec_frag_2.in', 'spec_frag_base.in', 'spec_frag_ref.in',
10+
'reduced.in', 'spec_frag_1.in', 'spec_frag_2.in', 'spec_frag_base.in',
1111
'symm_1.in', 'symm_2.in', 'symm_2full.in', 'symm_2pw.in'
1212
]
1313

tests/pytests/timer.dat

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,3 +94,35 @@ Libint2ERI::Libint2ERI : 0.000u 0.017s 0.006w 1
9494
Libint2ERI::Libint2ERI : 0.000u 0.017s 0.006w 1 calls
9595

9696
**************************************************************************************
97+
98+
Host: MacBook-Pro-5.local
99+
100+
Timers On : Mon Apr 20 20:30:41 2026
101+
Timers Off: Mon Apr 20 20:30:50 2026
102+
103+
Wall Time: 9.24 seconds
104+
105+
Time (seconds)
106+
Module User System Wall Calls
107+
Libint2ERI::Libint2ERI : 0.000u 0.000s 0.006w 1 calls
108+
109+
--------------------------------------------------------------------------------------
110+
Libint2ERI::Libint2ERI : 0.000u 0.000s 0.006w 1 calls
111+
112+
**************************************************************************************
113+
114+
Host: MacBook-Pro-5.local
115+
116+
Timers On : Mon Apr 20 20:32:58 2026
117+
Timers Off: Mon Apr 20 20:33:07 2026
118+
119+
Wall Time: 8.90 seconds
120+
121+
Time (seconds)
122+
Module User System Wall Calls
123+
Libint2ERI::Libint2ERI : 0.000u 0.000s 0.005w 1 calls
124+
125+
--------------------------------------------------------------------------------------
126+
Libint2ERI::Libint2ERI : 0.000u 0.000s 0.005w 1 calls
127+
128+
**************************************************************************************

0 commit comments

Comments
 (0)