Skip to content

Commit

Permalink
Merge pull request #40 from GazzolaLab/dev_contact_model
Browse files Browse the repository at this point in the history
Update contact model
  • Loading branch information
skim0119 committed Jan 9, 2022
2 parents d5c18c3 + 75b6351 commit e8e8eee
Show file tree
Hide file tree
Showing 9 changed files with 1,580 additions and 36 deletions.
24 changes: 24 additions & 0 deletions RELEASE.md
@@ -1,3 +1,27 @@
# Release Note (version 0.2.1)

## Developer Note

Contact model between two different rods and rod with itself is implemented.
Testing the contact model is done through simulations. These simulation scripts can be found under
[RodContactCase](./RodContactCase).
However, in future releases we have to add unit tests for contact model functions to test them and increase code coverage.

## Notable Changes
- #31: Merge contact model to master [PR #40 in public](https://github.com/GazzolaLab/PyElastica/pull/40)

### Release Note
<details>
<summary>Click to expand</summary>

- Rod-Rod contact and Rod self contact is added.
- Two example cases for rod-rod contact is added, i.e. two rods colliding to each other in space.
- Two example cases for rod self contact is added, i.e. plectonemes and solenoids.

</details>

---

# Release Note (version 0.2)

## Developer Note
Expand Down
9 changes: 8 additions & 1 deletion elastica/_elastica_numba/_joint.py
@@ -1,5 +1,12 @@
import warnings
from elastica.joint import ExternalContact

from elastica.joint import (
FreeJoint,
HingeJoint,
FixedJoint,
ExternalContact,
SelfContact,
)

warnings.warn(
"The numba-implementation is included in the default elastica module. Please import without _elastica_numba.",
Expand Down

0 comments on commit e8e8eee

Please sign in to comment.