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

Unify handling of Field and FieldMixed #229

Merged
merged 60 commits into from
Aug 5, 2022
Merged

Unify handling of Field and FieldMixed #229

merged 60 commits into from
Aug 5, 2022

Conversation

adtzlr
Copy link
Owner

@adtzlr adtzlr commented Aug 4, 2022

Warning: This breaks backward compatibility.

Motivation

Due to different handlings of a default Field and a mixed Field, the code is unnecessary complex and hard to read. The idea is to unify both kind of Fields, using a FieldContainer (which is basically just a renamed FieldMixed). Beside a cleaner source code, the user interface improves by a unified field handling inside the forms and tools.

Furthermore, the current IntegralForm class should be hidden in the global namespace and be replaced by IntegralFormMixed as new IntegralForm.

This also improves the interface to matADi by avoiding the wrapper MatadiMaterial due to identical API.

Tasks

  • Rename FieldMixed to FieldContainer d14c740
  • Adopt SolidBody to use the new FieldContainer d14c740
  • Deactivate Basis and Forms until finished 098cbab
  • Adopt dof module to use FieldContainer aec3f2e
  • Change constitution module for FieldContainer fd356e2
  • Adopt tools 4445810
  • Fix value extraction of a field caf9104
  • Allow IntegralForm with one field a62bfe7
  • Modernize solve (rename u0ext to ext0 e0087ec
  • Import only one IntegralForm to the global namespace b125568
  • Adopt test_readme.py 0c56754## Tasks

...and a lot of small fixes...

Removed

  • Remove wrapper for matADi materials fe1d292

fixes #228
fixes #230

@adtzlr adtzlr linked an issue Aug 5, 2022 that may be closed by this pull request
@codecov-commenter
Copy link

Codecov Report

Merging #229 (460614e) into main (b6a30cf) will decrease coverage by 1.69%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##             main     #229      +/-   ##
==========================================
- Coverage   98.28%   96.59%   -1.70%     
==========================================
  Files          67       66       -1     
  Lines        2865     2760     -105     
==========================================
- Hits         2816     2666     -150     
- Misses         49       94      +45     
Impacted Files Coverage Δ
felupe/__init__.py 92.59% <ø> (ø)
felupe/_assembly/_mixed.py 96.96% <ø> (+1.38%) ⬆️
felupe/_basis/_basis.py 85.71% <ø> (ø)
felupe/constitution/__init__.py 100.00% <ø> (ø)
felupe/_assembly/_form.py 74.85% <100.00%> (-24.61%) ⬇️
felupe/_field/__init__.py 100.00% <100.00%> (ø)
felupe/_field/_container.py 100.00% <100.00%> (ø)
felupe/_field/_fields.py 100.00% <100.00%> (ø)
felupe/constitution/_kinematics.py 95.08% <100.00%> (+0.53%) ⬆️
felupe/constitution/_mixed.py 100.00% <100.00%> (ø)
... and 16 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@adtzlr adtzlr merged commit a1e03e5 into main Aug 5, 2022
@adtzlr adtzlr deleted the unify-fields branch August 5, 2022 10:35
@adtzlr adtzlr linked an issue Aug 5, 2022 that may be closed by this pull request
@adtzlr adtzlr linked an issue Aug 5, 2022 that may be closed by this pull request
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add offsets attribute to FieldContainer Unify handling of Field and FieldMixed
2 participants