Commit f4445d2
Adding CANN material model framework (SimVascular#406)
* Moving changes from my CANN branch to this updated branch with eigen etc - modified a few files
* Fix bug with coupled BCs in FSI simulation (SimVascular#333)
* add fsi/pipe_RCR_3d. With multiprocs, fails at end of timestep 13 with [set_bc_cpl] Follow pressure load ... error
* In set_bc_cpl, use eq.phys instead of eq.dmn[cDmn].phys. For FSI sims, eq.phys = phys_FSI, while eq.dmn[:].phys = [phys_fluid, phys_struct]. Using eq.dmn[:].phys causes issues when cDmn suddenly changes due to likely undefined behavior related to MPI.
* Add pipe_RCR_3d test to pytest suite, update test parameters and solution
* v3 -> v4 (SimVascular#335)
* v3 -> v4
* actions/upload-artifact v4 -> v3, codecov/codecov-action v4 -> v5
* run coverage only on ubuntu22
* Added a check on the flux profile type name. If a match is not found, a runtime error is given. (SimVascular#325)
Co-authored-by: Dave Parker <[email protected]>
Co-authored-by: Martin R. Pfaller <[email protected]>
* Update precomputed dye ad readme (SimVascular#331)
* Update test LV Guccione active (SimVascular#337)
Reduce momentum and continuity stabilization coefficients, update reference solution, and add README.md and animations.
* Check spatial dimension (SimVascular#339)
* Change file name.
* Add setting the mesh element type from vtk cell type and a check for spatial dimension consistent with mesh element type.
* Change to check using element dimension.
* Add check for fiber mesh.
* Add setting mesh element type for vtp files, reorganize checks.
* Only test ubuntu-latest (SimVascular#344)
* only test ubuntu-latest
* run ubuntu-latest on ubuntu-22.04 container
* fix container name
* Fixed spatial dimension bug in bw_fluid_3d and index error in set_bc_dir_wl (SimVascular#342)
Co-authored-by: Martin Pfaller <[email protected]>
* Some more changes
* still working on converting CANN func in mat_models to eigen
* Copied everything except integrated tests from old branch to here. Still need to resolve some compilation errors
* changes migrated from old branch and build is successful
* Unit tests for S pass, but CC fail
* All unit tests pass
* v3 -> v4 (SimVascular#335)
* v3 -> v4
* actions/upload-artifact v4 -> v3, codecov/codecov-action v4 -> v5
* run coverage only on ubuntu22
* Only test ubuntu-latest (SimVascular#344)
* only test ubuntu-latest
* run ubuntu-latest on ubuntu-22.04 container
* fix container name
* Cleaning up the code
* Changing how the xml elements are structured for CANN. Made changes to parameters cpp and h - still need to update set_values function for CANNParameters. Need to modify set_material_props and ComMod.
* v3 -> v4 (SimVascular#335)
* v3 -> v4
* actions/upload-artifact v4 -> v3, codecov/codecov-action v4 -> v5
* run coverage only on ubuntu22
* Only test ubuntu-latest (SimVascular#344)
* only test ubuntu-latest
* run ubuntu-latest on ubuntu-22.04 container
* fix container name
* Fixed set_values. Modified set_material_props and ComMod, but now CANNTable uses CANNRow, so need to change uaniso_hyper functions to accomodate it
* Made changes to uaniso_hyper function to accomodate CANNRow type. Need to make similar changes to test.h and cpp
* Made changes to test.h and cpp. Code builds but unit tests fail.
* Unit tests now pass. Need to remove all the debugging comments
* The integrated tests are running but the xml file values are being appended to the 1 row CANN table. Not sure if it happens in set_material_props or ComMod. The value of psi is also wrong - goes to nan and other garbage values
* The problem is in set_values in Parameters.cpp. It appends to the vectors instead of rewriting them. particularly, set_parameter_value function - write a new one for CANN perhaps in Parameters.h
* changed the reference config for 2 invariants, was wrong before
* Integrated test passes for CANN NH now
* Cleaned up extra comments
* Added unit tests for CANN HO. Fixed an issue with printing activation functions.
* fiber directions are read correctly now but the S and CC values are still wrong
* The only reason some unit tests are failing is that S_ref = sym(S). Figure out why this is
* CC values are wrong, All S and convergence unit tests pass
* All unit tests pass now!
* Integration LV test cases added for HO with k=0. All tests pass.
* Added licence lines to new code files
* Fixed parameter value in block compression CANN test
* Corrected parameters in struct LV HO test case
* Cleaning up the code
* Cleaning up the code
* ran multiplle proc tests
* Replaced the result file that tests check against to be the same as the result from 1 proc test for CANN integrated struct tests
* Changed CANNTable to new class in ComMod and tests. Distributed new class among procs. Unit tests pass. Integrated tests with multiple procs fail because no output produced (check mpi on local machine)
* Integration tests pass! Just need to clena up the code now
* Cleaned up code. Still need to change names of UAnisoHyper just to be consistent with what this model is called
* Added citation
* Made changes suggested by Dave to ComMod.h and cpp (and the downstream files)
* Made changes suggested to UAnisoHyper and consts - renamed all AnisoHyper for consistency
* Made code more readable in mat_models.cpp
* set_material_props - added for loop
* Moved class definition from ComMod and put all external functions in class. Still need to move calc from compute_pk2cc to class for CANN
* Moved the calculation to the class. It compiles but the anisotropic unit tests don't pass.
* Fixed bug. All tests pass. Just need to clean up code
* Cleaned up code
* Move svzerodinterface file into solver xml (SimVascular#396)
* Change file name.
* Add the svZeroDSolver_interface XML element to set the information used to interface to the svZeroDSolver.
* Add checking for new and old formats.
* Remove processing svZeroD_interface.dat file.
* Change giving an integer surface ID in the Block_to_surface_map to a surface name.
* Add the svZeroDSolver_block parameter under Add_BC.
* Convert missed tests using svZeroDSolver.
* Change parameter name to conform.
* Stability convergence issue restarting simulation (SimVascular#398)
* Change file name.
* Remove reading Dn array twice.
* Fix yaml ignore md (SimVascular#400)
* Change file name.
* Update test_macos.yml
* Update test_ubuntu.yml
* Updating yml files to run test actions only when files in Code and tests are modified. (SimVascular#394)
Co-authored-by: Aaron Brown <[email protected]>
Co-authored-by: Dave Parker <[email protected]>
* Remove checked on the first gmres iteration (SimVascular#405)
check on the absolute tolerance for the first gmres iteration is removed. At least one linear iteration is allowed to be completed.
* Changed some names
* Add check to make sure paramTable is initialized before distributing
* If CANN is not used (paramTable is empty) don't broadcast it
* Put it inside the if condition instead of having a return
* added if statement for material model becasue nrows is also not defined for other materials
---------
Co-authored-by: Aaron Brown <[email protected]>
Co-authored-by: Martin R. Pfaller <[email protected]>
Co-authored-by: dcodoni <[email protected]>
Co-authored-by: Dave Parker <[email protected]>
Co-authored-by: Han Zhao <[email protected]>1 parent bf76a32 commit f4445d2
File tree
48 files changed
+2458
-3
lines changed- Code/Source/solver
- tests
- cases/struct
- LV_HolzapfelOgden_passive_CANN
- mesh
- mesh-surfaces
- LV_HolzapfelOgden_passive_k0
- mesh
- mesh-surfaces
- block_compression_CANN
- mesh/P1
- mesh-surfaces
- unitTests
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
48 files changed
+2458
-3
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
| 168 | + | |
| 169 | + | |
| 170 | + | |
| 171 | + | |
| 172 | + | |
| 173 | + | |
| 174 | + | |
| 175 | + | |
| 176 | + | |
| 177 | + | |
| 178 | + | |
| 179 | + | |
| 180 | + | |
| 181 | + | |
| 182 | + | |
| 183 | + | |
| 184 | + | |
| 185 | + | |
| 186 | + | |
| 187 | + | |
| 188 | + | |
| 189 | + | |
| 190 | + | |
| 191 | + | |
| 192 | + | |
| 193 | + | |
| 194 | + | |
| 195 | + | |
| 196 | + | |
| 197 | + | |
| 198 | + | |
| 199 | + | |
| 200 | + | |
| 201 | + | |
| 202 | + | |
| 203 | + | |
| 204 | + | |
| 205 | + | |
| 206 | + | |
| 207 | + | |
| 208 | + | |
| 209 | + | |
| 210 | + | |
| 211 | + | |
| 212 | + | |
| 213 | + | |
| 214 | + | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
217 | 217 | | |
218 | 218 | | |
219 | 219 | | |
220 | | - | |
| 220 | + | |
| 221 | + | |
221 | 222 | | |
222 | 223 | | |
223 | 224 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
153 | 153 | | |
154 | 154 | | |
155 | 155 | | |
156 | | - | |
| 156 | + | |
157 | 157 | | |
158 | 158 | | |
159 | 159 | | |
160 | 160 | | |
161 | 161 | | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
110 | 110 | | |
111 | 111 | | |
112 | 112 | | |
| 113 | + | |
| 114 | + | |
113 | 115 | | |
114 | 116 | | |
115 | 117 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
119 | 119 | | |
120 | 120 | | |
121 | 121 | | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
122 | 130 | | |
123 | 131 | | |
124 | 132 | | |
| |||
0 commit comments