@@ -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
0 commit comments