-
Notifications
You must be signed in to change notification settings - Fork 97
feat: plastic strain output #3384
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
Merged
Merged
Changes from all commits
Commits
Show all changes
61 commits
Select commit
Hold shift + click to select a range
d5de7f3
Update SolidMechanicsLagrangianFEM.cpp
ryar9534 662836f
Update StrainHelper.hpp
ryar9534 df505c2
Update SolidMechanicsFields.hpp
ryar9534 3b0bd7b
Update SolidMechanicsLagrangianFEM.cpp
ryar9534 78e4db4
Update StrainHelper.hpp
ryar9534 a23f26f
Update StrainHelper.hpp
ryar9534 c2325c3
Update StrainHelper.hpp
ryar9534 27a4801
Update StrainHelper.hpp
ryar9534 18a94b2
Update StrainHelper.hpp
ryar9534 c7e03b9
Update SolidMechanicsLagrangianFEM.cpp
ryar9534 2f4e691
Update SolidMechanicsLagrangianFEM.cpp
ryar9534 3cf18ca
Update StrainHelper.hpp
ryar9534 4284d71
Update SolidMechanicsLagrangianFEM.cpp
ryar9534 cd42322
Update SolidMechanicsLagrangianFEM.cpp
ryar9534 6700051
Update SolidMechanicsLagrangianFEM.cpp
ryar9534 5c8f164
Update SolidMechanicsLagrangianFEM.cpp
ryar9534 7a51c30
Update StrainHelper.hpp
ryar9534 ca89c99
Update StrainHelper.hpp
ryar9534 0e72772
Merge branch 'develop' into feature/aronson/plasticStrainOutput
ryar9534 4f21e46
Merge branch 'develop' into feature/aronson/plasticStrainOutput
ryar9534 cf6fe98
initial implementation, behavior is almost right but need to debug in…
ryar9534 8fda259
remove extraneous file
ryar9534 f5f1fa7
initial proposal for handling prescribed displacements and sign diffe…
ryar9534 d192712
Merge branch 'develop' into feature/aronson/plasticStrainOutput
ryar9534 1de0c2c
Merge branch 'develop' into feature/aronson/plasticStrainOutput
ryar9534 48db73d
simple method for handling BCs, may want to put in a disclaimer
ryar9534 583e7de
Update SolidMechanicsStateReset.cpp
ryar9534 e9bd953
Update StrainHelper.hpp
ryar9534 9abd3da
Merge branch 'develop' into feature/aronson/plasticStrainOutput
ryar9534 25ddb6a
Update SolidMechanicsStateReset.cpp
ryar9534 ccc1b0d
uncrustify
ryar9534 913a1a0
Merge branch 'develop' into feature/aronson/plasticStrainOutput
ryar9534 179e4fd
Apply suggestions from code review
ryar9534 834bba6
Apply suggestions from code review
ryar9534 3b9372e
Update ElasticIsotropicPressureDependent.hpp
ryar9534 136fe65
Update ElasticIsotropicPressureDependent.hpp
ryar9534 dbf7497
Merge branch 'develop' into feature/aronson/plasticStrainOutput
ryar9534 246dbc8
Update ElasticIsotropicPressureDependent.hpp
ryar9534 bb4dfc8
uncrustify
ryar9534 ee9d389
Merge branch 'develop' into feature/aronson/plasticStrainOutput
ryar9534 4e6c411
Update .integrated_tests.yaml
ryar9534 ce59c54
Update BASELINE_NOTES.md
ryar9534 beae829
add elastic strain functions to ElasticOrthotropic
ryar9534 a5164dc
Update ElasticOrthotropic.hpp
ryar9534 d403991
Add elastic strain functions to ElasticTransverseIsotropic
ryar9534 b04133d
Update .integrated_tests.yaml
ryar9534 d8a1680
uncrustify
ryar9534 bb8efc1
Merge branch 'develop' into feature/aronson/plasticStrainOutput
ryar9534 01cce1e
Update .integrated_tests.yaml
ryar9534 cfe31b2
Merge branch 'develop' into feature/aronson/plasticStrainOutput
rrsettgast caef37b
Update .integrated_tests.yaml
ryar9534 69ade8d
restructure elasticIsotropic
ryar9534 576e7bb
restructure elasticOrthotropic
ryar9534 54f91fc
restructure elasticTransverseIsotropic
ryar9534 93b5268
uncrustify
ryar9534 592b991
Update StrainHelper.hpp to output tensor strain not engineering
ryar9534 381d6ba
Merge branch 'develop' into feature/aronson/plasticStrainOutput
paveltomin 2c13f68
Update .integrated_tests.yaml
ryar9534 74c7226
Merge branch 'develop' into feature/aronson/plasticStrainOutput
paveltomin 4e0f693
Merge branch 'develop' into feature/aronson/plasticStrainOutput
paveltomin 0ce3b32
Update .integrated_tests.yaml
paveltomin File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| baselines: | ||
| bucket: geosx | ||
| baseline: integratedTests/baseline_integratedTests-pr3486-9492-f0c817c | ||
| baseline: integratedTests/baseline_integratedTests-pr3384-9542-4e0f693 | ||
| allow_fail: | ||
| all: '' | ||
| streak: '' |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -135,6 +135,11 @@ | |||||
| localIndex const q, | ||||||
| real64 ( &elasticStrain )[6] ) const override final; | ||||||
|
|
||||||
| GEOS_HOST_DEVICE | ||||||
| virtual void getElasticStrainInc( localIndex const k, | ||||||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
Since this isn't really a "getter" |
||||||
| localIndex const q, | ||||||
| real64 ( &elasticStrainInc )[6] ) const override final; | ||||||
|
|
||||||
| GEOS_HOST_DEVICE | ||||||
| virtual real64 getBulkModulus( localIndex const k ) const override final | ||||||
| { | ||||||
|
|
@@ -171,6 +176,13 @@ | |||||
|
|
||||||
| protected: | ||||||
|
|
||||||
| GEOS_HOST_DEVICE | ||||||
| virtual void computeElasticStrain( localIndex const k, | ||||||
| localIndex const q, | ||||||
| real64 const ( &stress )[6], | ||||||
| real64 ( &elasticStrainInc )[6] ) const; | ||||||
|
|
||||||
|
|
||||||
| /// A reference to the ArrayView holding the bulk modulus for each element. | ||||||
| arrayView1d< real64 const > const m_bulkModulus; | ||||||
|
|
||||||
|
|
@@ -210,24 +222,53 @@ | |||||
| } | ||||||
|
|
||||||
|
|
||||||
| GEOS_HOST_DEVICE | ||||||
| inline | ||||||
| void ElasticIsotropicUpdates::computeElasticStrain( localIndex const k, | ||||||
| localIndex const q, | ||||||
| real64 const ( &stress )[6], | ||||||
| real64 ( & elasticStrain)[6] ) const | ||||||
| { | ||||||
| GEOS_UNUSED_VAR( q ); | ||||||
| real64 const E = conversions::bulkModAndShearMod::toYoungMod( m_bulkModulus[k], m_shearModulus[k] ); | ||||||
| real64 const nu = conversions::bulkModAndShearMod::toPoissonRatio( m_bulkModulus[k], m_shearModulus[k] ); | ||||||
|
|
||||||
| elasticStrain[0] = ( stress[0] - nu*stress[1] - nu*stress[2])/E; | ||||||
| elasticStrain[1] = (-nu*stress[0] + stress[1] - nu*stress[2])/E; | ||||||
| elasticStrain[2] = (-nu*stress[0] - nu*stress[1] + stress[2])/E; | ||||||
|
|
||||||
| elasticStrain[3] = stress[3] / m_shearModulus[k]; | ||||||
| elasticStrain[4] = stress[4] / m_shearModulus[k]; | ||||||
| elasticStrain[5] = stress[5] / m_shearModulus[k]; | ||||||
| } | ||||||
|
|
||||||
| GEOS_HOST_DEVICE | ||||||
| inline | ||||||
| void ElasticIsotropicUpdates::getElasticStrain( localIndex const k, | ||||||
| localIndex const q, | ||||||
| real64 ( & elasticStrain)[6] ) const | ||||||
| { | ||||||
| real64 const E = conversions::bulkModAndShearMod::toYoungMod( m_bulkModulus[k], m_shearModulus[k] ); | ||||||
| real64 const nu = conversions::bulkModAndShearMod::toPoissonRatio( m_bulkModulus[k], m_shearModulus[k] ); | ||||||
|
|
||||||
| elasticStrain[0] = ( m_newStress[k][q][0] - nu*m_newStress[k][q][1] - nu*m_newStress[k][q][2])/E; | ||||||
| elasticStrain[1] = (-nu*m_newStress[k][q][0] + m_newStress[k][q][1] - nu*m_newStress[k][q][2])/E; | ||||||
| elasticStrain[2] = (-nu*m_newStress[k][q][0] - nu*m_newStress[k][q][1] + m_newStress[k][q][2])/E; | ||||||
| real64 stress[6] = {m_newStress[k][q][0], m_newStress[k][q][1], m_newStress[k][q][2], m_newStress[k][q][3], m_newStress[k][q][4], m_newStress[k][q][5]}; | ||||||
|
|
||||||
| computeElasticStrain( k, q, stress, elasticStrain ); | ||||||
|
|
||||||
| elasticStrain[3] = m_newStress[k][q][3] / m_shearModulus[k]; | ||||||
| elasticStrain[4] = m_newStress[k][q][4] / m_shearModulus[k]; | ||||||
| elasticStrain[5] = m_newStress[k][q][5] / m_shearModulus[k]; | ||||||
| } | ||||||
|
|
||||||
| GEOS_HOST_DEVICE | ||||||
| inline | ||||||
| void ElasticIsotropicUpdates::getElasticStrainInc( localIndex const k, | ||||||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
| localIndex const q, | ||||||
| real64 ( & elasticStrainInc)[6] ) const | ||||||
| { | ||||||
|
|
||||||
| real64 stress[6] = | ||||||
| {m_newStress[k][q][0] - m_oldStress[k][q][0], m_newStress[k][q][1] - m_oldStress[k][q][1], m_newStress[k][q][2] - m_oldStress[k][q][2], m_newStress[k][q][3] - m_oldStress[k][q][3], | ||||||
| m_newStress[k][q][4] - m_oldStress[k][q][4], m_newStress[k][q][5] - m_oldStress[k][q][5]}; | ||||||
|
|
||||||
| computeElasticStrain( k, q, stress, elasticStrainInc ); | ||||||
|
|
||||||
| } | ||||||
|
|
||||||
| GEOS_HOST_DEVICE | ||||||
| inline | ||||||
|
|
||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.