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

Removed ENGINE shear torque calculation #3277

Merged
merged 6 commits into from
Oct 28, 2019
Merged

Removed ENGINE shear torque calculation #3277

merged 6 commits into from
Oct 28, 2019

Conversation

fweik
Copy link
Contributor

@fweik fweik commented Oct 24, 2019

@RudolfWeeber @christophlohrmann is this what you had in mind?
If so the simplification is quite significant because all of the custom
communication code for ENGINE can be removed. Also the LB coupling
should now work in parallel.

Description of changes:

  • Removed ENGINE shear torque calculation
  • Moved swimmer parameters into ParticleProperties
  • Removed custom communiication code for ENGINE
  • Adaped docs

@codecov
Copy link

codecov bot commented Oct 24, 2019

Codecov Report

Merging #3277 into python will decrease coverage by <1%.
The diff coverage is 100%.

Impacted file tree graph

@@          Coverage Diff           @@
##           python   #3277   +/-   ##
======================================
- Coverage      86%     85%   -1%     
======================================
  Files         533     533           
  Lines       25577   25522   -55     
======================================
- Hits        22002   21945   -57     
- Misses       3575    3577    +2
Impacted Files Coverage Δ
src/core/communication.cpp 94% <ø> (ø) ⬆️
src/core/rotation.cpp 100% <ø> (ø) ⬆️
src/core/ghosts.hpp 100% <ø> (ø) ⬆️
src/core/ghosts.cpp 100% <ø> (ø) ⬆️
...ore/grid_based_algorithms/lb_particle_coupling.cpp 98% <100%> (-1%) ⬇️
src/core/cuda_interface.cpp 100% <100%> (ø) ⬆️
src/core/thermostat.hpp 97% <100%> (ø) ⬆️
src/core/Particle.hpp 97% <100%> (-1%) ⬇️
src/core/particle_data.cpp 96% <100%> (-1%) ⬇️
src/core/forces_inline.hpp 85% <100%> (ø) ⬆️
... and 2 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 e7e2f29...dc9202d. Read the comment docs.

@christophlohrmann
Copy link
Contributor

Yes that's the one, thank you.
The engine_lb.py test has two occurrences of rotational_friction which can be removed, too:
test_rotfric_exception() in line 137 and
test_particle_torques() in line 164

@fweik
Copy link
Contributor Author

fweik commented Oct 25, 2019

Oh, then why did the test pass?

@fweik fweik changed the title Removed ENGINE shear torque calculation WIP: Removed ENGINE shear torque calculation Oct 25, 2019
@fweik fweik changed the title WIP: Removed ENGINE shear torque calculation Removed ENGINE shear torque calculation Oct 25, 2019
@fweik fweik changed the title Removed ENGINE shear torque calculation WIP: Removed ENGINE shear torque calculation Oct 25, 2019
        core/testsuite: engine_lb test fix from christophlohrmann
@fweik fweik changed the title WIP: Removed ENGINE shear torque calculation Removed ENGINE shear torque calculation Oct 25, 2019
@fweik
Copy link
Contributor Author

fweik commented Oct 28, 2019

bors r=RudolfWeeber

bors bot added a commit that referenced this pull request Oct 28, 2019
3277: Removed ENGINE shear torque calculation r=RudolfWeeber a=fweik

@RudolfWeeber @christophlohrmann is this what you had in mind?
If so the simplification is quite significant because all of the custom
communication code for ENGINE can be removed. Also the LB coupling
should now work in parallel.

Description of changes:
 - Removed ENGINE shear torque calculation
 - Moved swimmer parameters into ParticleProperties
 - Removed custom communiication code for ENGINE
 - Adaped docs


Co-authored-by: Florian Weik <fweik@icp.uni-stuttgart.de>
@bors
Copy link
Contributor

bors bot commented Oct 28, 2019

Build succeeded

@bors bors bot merged commit dc9202d into espressomd:python Oct 28, 2019
jngrad added a commit to jngrad/espresso that referenced this pull request Nov 4, 2019
3277: Removed ENGINE shear torque calculation

Description of the partial merge:
 - Removed rotational_friction
 - Fixed engine_lb test
 - Adaped docs

Co-authored-by: Florian Weik <fweik@icp.uni-stuttgart.de>
@jngrad jngrad added this to the Espresso 4.2 milestone Nov 22, 2019
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.

4 participants