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

cdpm2: parallel, thermal, damage compression #59

Merged
merged 9 commits into from
Nov 12, 2019

Conversation

githubgrasp
Copy link
Contributor

Changed cdpm2 to avoid problem with parallel computations.
Also introduced reduced strain so that thermal/shrinkage strains can be considered
Modified codes for tensile and compressive damage so that in the iterative approach the correct starting stress is considered.

@bpatzak
Copy link
Member

bpatzak commented Nov 8, 2019

Hi Peter, looks good, only one comment: is there any specific reason why you have replaced
inelasticStrainVector.subtract(plasticStrainVector);
by
for ( int i = 1; i <= inelasticStrainVector.giveSize(); ++i ) { inelasticStrainVector.at(i) -= plasticStrainVector.at(i); }
you made similar changes in different locations. I don't see much reason for this (except I overlooked one) and this just makes the generated code bigger.

@githubgrasp
Copy link
Contributor Author

githubgrasp commented Nov 8, 2019 via email

@codecov
Copy link

codecov bot commented Nov 8, 2019

Codecov Report

Merging #59 into master will increase coverage by 0.22%.
The diff coverage is 90.36%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master      #59      +/-   ##
==========================================
+ Coverage    39.6%   39.83%   +0.22%     
==========================================
  Files        1241     1241              
  Lines      125538   125544       +6     
==========================================
+ Hits        49720    50011     +291     
+ Misses      75818    75533     -285
Impacted Files Coverage Δ
src/sm/Materials/ConcreteMaterials/concretedpm2.h 93.33% <100%> (+7.28%) ⬆️
src/sm/Materials/ConcreteMaterials/concretedpm2.C 81.84% <90.2%> (+18.2%) ⬆️
src/oofemlib/calmls.C 57.67% <0%> (+0.31%) ⬆️
src/sm/Materials/structuralmaterial.C 63.04% <0%> (+0.31%) ⬆️
src/sm/EngineeringModels/nlinearstatic.C 64.57% <0%> (+1.75%) ⬆️

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 54566ad...4a405a0. Read the comment docs.

@bpatzak
Copy link
Member

bpatzak commented Nov 8, 2019

Hi Peter,
ok. So what about creating the state variables with correct size from the beginning? The CreateStatus has gp as parameter, which knows its material mode, so the size of state vectors can be determined. See MPlasticMaterial2 and MPlasticMaterial2Status for an example.
Borek

@githubgrasp
Copy link
Contributor Author

githubgrasp commented Nov 8, 2019 via email

@githubgrasp
Copy link
Contributor Author

Strange. On my system the code compiles without problems. Seems to be some unnecessary override's.

@githubgrasp
Copy link
Contributor Author

OK, it seems to be fine now. I still get a warning concerning the initialisation of the plasticStrain and tempReducedStrain, which I do not understand. However, the tests pass.

@bpatzak bpatzak merged commit 4e7d755 into oofem:master Nov 12, 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.

None yet

2 participants