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

clang-tidy: fix for empty config. #3202

Merged
merged 3 commits into from
Oct 12, 2019
Merged
Show file tree
Hide file tree
Changes from 2 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
1 change: 0 additions & 1 deletion .clang-tidy
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ Checks: |
readability-redundant-control-flow,
readability-simplify-boolean-expr,
readability-simplify-subscript-expr,
readability-static-accessed-through-instance,
readability-static-definition-in-anonymous-namespace,
readability-string-compare,
readability-uniqueptr-delete-release,
Expand Down
9 changes: 4 additions & 5 deletions src/core/constraints/ShapeBasedConstraint.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -70,25 +70,24 @@ ParticleForce ShapeBasedConstraint::force(Particle const &p,

if (dist > 0) {
outer_normal_vec = -dist_vec / dist;
auto const dist2 = dist * dist;
force1 = calc_non_bonded_pair_force(p, part_rep, ia_params, dist_vec,
dist, &torque1, &torque2);
#ifdef DPD
if (thermo_switch & THERMO_DPD) {
force1 += dpd_pair_force(p, part_rep, ia_params, dist_vec, dist, dist2);
force1 +=
dpd_pair_force(p, part_rep, ia_params, dist_vec, dist, dist * dist);
// Additional use of DPD here requires counter increase
dpd_rng_counter_increment();
}
#endif
} else if (m_penetrable && (dist <= 0)) {
if ((!m_only_positive) && (dist < 0)) {
auto const dist2 = dist * dist;
force1 = calc_non_bonded_pair_force(p, part_rep, ia_params, dist_vec,
-dist, &torque1, &torque2);
#ifdef DPD
if (thermo_switch & THERMO_DPD) {
force1 +=
dpd_pair_force(p, part_rep, ia_params, dist_vec, dist, dist2);
force1 += dpd_pair_force(p, part_rep, ia_params, dist_vec, dist,
dist * dist);
// Additional use of DPD here requires counter increase
dpd_rng_counter_increment();
}
Expand Down
4 changes: 2 additions & 2 deletions src/core/observables/Current.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@ class Current : public PidObservable {
int n_values() const override { return 3; };
std::vector<double> evaluate(PartCfg &partCfg) const override {
std::vector<double> res(n_values());
for (int i : ids()) {
#ifdef ELECTROSTATICS
for (int i : ids()) {
double charge = partCfg[i].p.q;
res[0] += charge * partCfg[i].m.v[0];
res[1] += charge * partCfg[i].m.v[1];
res[2] += charge * partCfg[i].m.v[2];
#endif
};
#endif
return res;
};
};
Expand Down
4 changes: 2 additions & 2 deletions src/core/observables/DipoleMoment.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,15 @@ class DipoleMoment : public PidObservable {
int n_values() const override { return 3; };
std::vector<double> evaluate(PartCfg &partCfg) const override {
std::vector<double> res(n_values(), 0.0);
for (int i : ids()) {
#ifdef ELECTROSTATICS
for (int i : ids()) {
double charge = partCfg[i].p.q;

res[0] += charge * partCfg[i].r.p[0];
res[1] += charge * partCfg[i].r.p[1];
res[2] += charge * partCfg[i].r.p[2];
#endif // ELECTROSTATICS
}
#endif // ELECTROSTATICS
return res;
}
};
Expand Down
4 changes: 2 additions & 2 deletions src/core/observables/MagneticDipoleMoment.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ class MagneticDipoleMoment : public PidObservable {
int n_values() const override { return 3; };
std::vector<double> evaluate(PartCfg &partCfg) const override {
std::vector<double> res(n_values(), 0.0);
for (int i : ids()) {
#ifdef DIPOLES
for (int i : ids()) {
res[0] += partCfg[i].calc_dip()[0];
res[1] += partCfg[i].calc_dip()[1];
res[2] += partCfg[i].calc_dip()[2];
#endif
}
#endif
return res;
}
};
Expand Down