-
Notifications
You must be signed in to change notification settings - Fork 42
Different material models for ChamberSphere #243
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
Open
KatrinKoesler
wants to merge
38
commits into
SimVascular:master
Choose a base branch
from
KatrinKoesler:material_choice
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
38 commits
Select commit
Hold shift + click to select a range
dfa28f7
Added new chamber sphere block with prescribed kinematic growth; chan…
KatrinKoesler 5b79e49
added test case file for ChamberSphere_growth block
KatrinKoesler c36981a
added test case, correcte O->0 mistake in ChamberSphere.h
KatrinKoesler 29025ff
Added more test cases, changed the integrator to only throw error whe…
KatrinKoesler 5ac3746
Added exponential material without growth, including test case as ori…
KatrinKoesler 0173799
added growth files, check for .yaml files and simple test case
KatrinKoesler f312cf1
codeformat
KatrinKoesler 79ef76e
Small correction to growth files
KatrinKoesler 71af813
added closed loop test case
KatrinKoesler 16f9bdb
codeformat
KatrinKoesler 97b9b47
ventricle parameters adjusted to Caruel
KatrinKoesler 8569d58
Adjust contraction mechanics parameters for closed loop test case.
KatrinKoesler 99818ae
Added closed loop growth test case
KatrinKoesler 12ad5d5
Changed values in input file for closed loop to optimized parameters …
KatrinKoesler 7ca2160
Changed chamber_sphere_closed_loop.json with optimized parameters
KatrinKoesler 7ee34d3
Codeformat
KatrinKoesler b9f2ff3
Added test case for closed loop circulation with chamber sphere
KatrinKoesler 57b92ac
Added test case for closed loop circulation with chamber sphere
KatrinKoesler ff4c6e0
Add test case for closed loop circulation with ventricle sphere
KatrinKoesler 178a74f
added result_chamber_sphere_closed_loop.json
KatrinKoesler 871d6cf
Added test case and results for closed loop circulation with spherica…
KatrinKoesler c794e8c
Added closed loop test case with piecewise valve instead of tanh valve
KatrinKoesler 6bb601a
Delete growth files
KatrinKoesler e4e9cdf
Delete unnecessary input files
KatrinKoesler 84558ec
delete unnecessary .yaml file
KatrinKoesler ca12cd8
Merge remote-tracking branch 'upstream/master' into material_choice
KatrinKoesler 789ea24
Made new SphereMaterial class to set the stress response based on mat…
KatrinKoesler c391419
deleted unnecessary test case
KatrinKoesler d6527f0
Fix Test Visualization (exclude closed loop, add file for chamber_sph…
KatrinKoesler e9b832a
Adjusted documentation for ChamberSphere to reflect how to set materi…
KatrinKoesler ac0b9a1
Documentation fix
KatrinKoesler 3f0e52c
Deleted unnecessary input file (exponential material for chamber sphe…
KatrinKoesler 58f56a2
delete unnecessary dirgraph output
KatrinKoesler ff1883b
Fix GUI Test (load cytoscape from local file that was already availab…
KatrinKoesler 439519e
fix description in closed loop test case
KatrinKoesler 8a11d05
Merge branch 'master' into material_choice
KatrinKoesler 4b9da22
Add max_iter_error_to_warning = true to closed loop test case
KatrinKoesler 3caba33
delete unnecessary scripts
KatrinKoesler 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
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 |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| variables: | ||
| - Pin | ||
| - Qin | ||
| - Pout | ||
| - Qout | ||
| - radius | ||
| - velo | ||
| - stress | ||
| - tau | ||
| - volume | ||
|
|
||
| derivatives: | ||
| - dPin_dt | ||
| - dQin_dt | ||
| - dPout_dt | ||
| - dQout_dt | ||
| - dradius_dt | ||
| - dvelo_dt | ||
| - dstress_dt | ||
| - dtau_dt | ||
| - dvolume_dt | ||
|
|
||
| constants: | ||
| - rho | ||
| - thick0 | ||
| - radius0 | ||
| - C0 | ||
| - C1 | ||
| - C2 | ||
| - C3 | ||
| - eta | ||
| - act | ||
| - act_plus | ||
| - sigma_max | ||
|
|
||
| time_dependent: | ||
| - act | ||
| - act_plus | ||
|
|
||
| helper_functions: | | ||
| def CG(radius): | ||
| return (1 + (radius / radius0)) ** 2 | ||
|
|
||
| def dCG(radius, dradius_dt): | ||
| return 2 * (1 + (radius / radius0)) * (1 / radius0) * dradius_dt | ||
|
|
||
| def dW1(radius): | ||
| return C0 * exp(C1 * (((1 + (radius / radius0))**(-4) + 2*(1 + (radius / radius0))**2) - 3)**2) * 2 * C1 * (((1 + (radius / radius0))**(-4) + 2*(1 + (radius / radius0))**2) - 3) | ||
|
|
||
| def dW4(radius): | ||
| return C2 * exp(C3 * ((((1 + (radius / radius0)) ** 2)-1)**2)) * 2 * C3 * (((1 + (radius / radius0)) ** 2) - 1) | ||
|
|
||
|
|
||
| residuals: | ||
| - rho * thick0 * dvelo_dt + (thick0 / radius0) * (1 + (radius / radius0)) * stress - Pout * CG(radius) | ||
| - -stress + 4 * dW1(radius) *(1 - CG(radius)**(-3)) + 2 * dW4(radius) + eta * dCG(radius,dradius_dt) * (1 + 2 * (CG(radius)**(-6))) + tau | ||
| - 4 * pi * radius0 ** 2 * CG(radius) * velo - dvolume_dt | ||
| - dtau_dt + act * tau - sigma_max * act_plus | ||
| - dradius_dt - velo | ||
| - Qin - Qout - dvolume_dt | ||
| - Pin - Pout |
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Remove all material models from ChamberSphere and use only the stress
S. ReferenceSphereMaterial.