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

Reorganize material models with Eigen #318

Merged
merged 35 commits into from
Dec 28, 2024
Merged
Show file tree
Hide file tree
Changes from 29 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
5695bc8
Consolidate get_pk2cc and get_pk2cc_dev(). Use only mat_models.cpp
aabrown100-git Nov 5, 2024
8b9097d
Update material unit tests
aabrown100-git Nov 5, 2024
d1cf925
Add voigt_to_cc, fix undefined Ja bug, fix no pressure in HO-ma bug, …
aabrown100-git Nov 5, 2024
bf4e282
Fix Ja calculation bug leading to ustruct failures, remove get_pk2cc_dev
aabrown100-git Nov 5, 2024
6fcf1ac
Fix indexing bug for struct viscosity tangent terms
aabrown100-git Nov 5, 2024
efcfd7a
Remove mat_models_carray.h and commented code
aabrown100-git Nov 5, 2024
dccdc64
trying out eigen conversion
aabrown100-git Nov 8, 2024
30cb13e
Change from Matrix to Tensor
Nov 16, 2024
3a3d284
Adding/moving templated Eigen matrix/tensor function implementations …
aabrown100-git Nov 18, 2024
763b92a
Update eigen includes path
aabrown100-git Nov 18, 2024
2744b17
Consolidate volumetric stress and elasticity contributions
aabrown100-git Nov 22, 2024
a57187c
General function used by multiple models to project S_bar and CC_bar …
aabrown100-git Nov 23, 2024
86abc97
Bug fixes. 1) For some reason, code runs but is incorrect when using …
aabrown100-git Nov 26, 2024
51bf817
Replace some mat_fun loops with built in Eigen operations
aabrown100-git Nov 26, 2024
036ae7d
Add Eigen implementation for Mooney-Rivlin model
aabrown100-git Nov 26, 2024
df75bec
Adding Linear, StVK, and modified StVK. Compared to original implemen…
aabrown100-git Nov 26, 2024
9b9806f
Add HGO model. Passes ustruct/tensile_adventitia_HGO
aabrown100-git Nov 26, 2024
74bcf58
Add Guccione model Eigen implementation. Passes Guccione tests
aabrown100-git Nov 27, 2024
402f298
Add Holzapfel-Ogden model. Passes HO tests
aabrown100-git Nov 27, 2024
dfe941a
Add HO-ma model. Passes all struct/ustruct tests
aabrown100-git Nov 27, 2024
3364a32
Replacing auto with EigenMatrix<nsd>, since using auto is not recomme…
aabrown100-git Nov 27, 2024
44bdc58
Replacing Eigen operations with for loops for some tensor functions, …
aabrown100-git Dec 12, 2024
d830316
Merge branch 'main' of https://github.com/SimVascular/svMultiPhysics …
aabrown100-git Dec 13, 2024
cff0979
Update .gitignore genBC files to reflect renaming of svFSIplus to svM…
aabrown100-git Dec 16, 2024
c3d6f02
Merge branch 'SimVascular:main' into reorg_mat_models
aabrown100-git Dec 17, 2024
4776b6f
Merge branch 'SimVascular:main' into reorg_mat_models
aabrown100-git Dec 18, 2024
00e95b3
Add -march=native flag to CMAKE_C_FLAGS and CMAKE_CXX_FLAGS for optim…
aabrown100-git Dec 18, 2024
85f6504
Update CMakeLists.txt to clarify -march=native flag usage for Eigen p…
aabrown100-git Dec 18, 2024
c1fd61e
Merge branch 'SimVascular:main' into reorg_mat_models
aabrown100-git Dec 18, 2024
62a554d
Remove temporary mat_models_Dave_array.cpp
aabrown100-git Dec 18, 2024
ab8f2d1
Removing mat_fun_carray.h/cpp. Restructuring material unit tests to u…
aabrown100-git Dec 19, 2024
0e4869d
Comment out -march=native flag in CMakeLists.txt for C and C++ compil…
aabrown100-git Dec 19, 2024
3f3fc29
Cleaning up and renaming to address @ktbolt and @mrp089 comments
aabrown100-git Dec 19, 2024
6777aa5
Replace dyadic_product and symmetric_dyadic_product with algebraic ex…
aabrown100-git Dec 19, 2024
118ff6c
Addressing @ktbolt and @mrp089 comments round 2. Rename EigenMatrix a…
aabrown100-git Dec 22, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Documentation/html/

# genBC files
**/genBC/obj/
**/genBC_svFSIplus/obj/
**/genBC_svMultiPhysics/obj/
genBC.exe
AllData
GenBC.int
Expand Down
4 changes: 4 additions & 0 deletions CMakeLists.txt
aabrown100-git marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,10 @@ message(STATUS "SV_TOP: ${SV_TOP}")
# CMake module path inside of true simvascular source
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/Code/CMake"
"${CMAKE_MODULE_PATH}")

# Add -march=native to CMAKE_C_FLAGS and CMAKE_CXX_FLAGS for Eigen performance
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=native")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
#-----------------------------------------------------------------------------

#-----------------------------------------------------------------------------
Expand Down
6 changes: 1 addition & 5 deletions Code/Source/solver/mat_fun.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,8 @@

#include "mat_fun.h"

/*
#include <eigen3/Eigen/Core>
#include <eigen3/Eigen/Dense>
*/

#include "consts.h"

#include "utils.h"

#include <math.h>
Expand Down
341 changes: 341 additions & 0 deletions Code/Source/solver/mat_fun.h

Large diffs are not rendered by default.

Loading
Loading