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

Fix dp3m ifdefs; dawaanr-and-bh-gpu testcase requirements #2477

Merged
merged 2 commits into from
Jan 29, 2019

Conversation

pkreissl
Copy link
Contributor

1.) Due to wrong #ifdefs, ESPResSo build failed when trying to build with DIPOLES and without ELECTROSTATICS feature:

In file included from /tikhome/pkreissl/git/espresso/src/core/initialize.cpp:40:0:
/tikhome/pkreissl/git/espresso/src/core/electrostatics_magnetostatics/p3m-dipolar.hpp:102:3: error: ‘fft_data_struct’ does not name a type; did you mean ‘MPI_Type_struct’?
   fft_data_struct fft;
   ^~~~~~~~~~~~~~~
   MPI_Type_struct

This issue was introduced in PR #2455.

2.) The testcase dawaanr-and-bh-gpu.py requires both DIPOLES and PARTIAL_PERIODIC feature. However, as it didn't check for the latter, the testcase failed when building with DIPOLES and without PARTIAL_PERIODIC feature.

Description of changes:

  • Described issues are fixed by this PR

@pkreissl pkreissl changed the title Fix dp3m ifdefs; dawaanr-and-bh-gpu requirements Fix dp3m ifdefs; dawaanr-and-bh-gpu testcase requirements Jan 29, 2019
@codecov
Copy link

codecov bot commented Jan 29, 2019

Codecov Report

Merging #2477 into python will decrease coverage by 1%.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff            @@
##           python   #2477     +/-   ##
========================================
- Coverage      71%     69%     -2%     
========================================
  Files         486     423     -63     
  Lines       30366   23701   -6665     
========================================
- Hits        21610   16478   -5132     
+ Misses       8756    7223   -1533
Impacted Files Coverage Δ
src/core/electrostatics_magnetostatics/fft.cpp 89% <ø> (ø) ⬆️
src/core/observables/ParticleAngularVelocities.hpp 0% <0%> (-100%) ⬇️
...core/observables/ParticleBodyAngularVelocities.hpp 0% <0%> (-100%) ⬇️
src/core/object-in-fluid/oif_local_forces.cpp 0% <0%> (-100%) ⬇️
src/core/observables/ParticleBodyVelocities.hpp 0% <0%> (-100%) ⬇️
src/core/observables/MagneticDipoleMoment.hpp 0% <0%> (-100%) ⬇️
src/core/utils/math/triangle_functions.hpp 0% <0%> (-92%) ⬇️
src/core/actor/ActorList.cpp 0% <0%> (-80%) ⬇️
src/core/constraints/HomogeneousMagneticField.cpp 0% <0%> (-80%) ⬇️
src/core/object-in-fluid/oif_global_forces.cpp <1% <0%> (-73%) ⬇️
... and 217 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 2cd97e6...da46ca6. Read the comment docs.

@fweik fweik merged commit 71d657d into espressomd:python Jan 29, 2019
@pkreissl pkreissl deleted the fix_dp3m_ifdefs branch January 29, 2019 16:43
@RudolfWeeber RudolfWeeber added this to the Espresso 4.0.2 milestone Mar 5, 2019
RudolfWeeber pushed a commit to RudolfWeeber/espresso that referenced this pull request Mar 13, 2019
Fix dp3m ifdefs; dawaanr-and-bh-gpu testcase requirements
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants