Skip to content

Commit 632d086

Browse files
aabrown100-gitaabrown100-git
authored
Merge branch 'SimVascular:main' into trilinos_multiple_resistance_bug
2 parents ae0fb0b + 7b1d969 commit 632d086

File tree

24 files changed

+695
-103
lines changed

24 files changed

+695
-103
lines changed

‎CMakeLists.txt‎

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -33,24 +33,7 @@
3333
#-----------------------------------------------------------------------------
3434

3535
#-----------------------------------------------------------------------------
36-
cmake_minimum_required(VERSION 2.8.12)
37-
38-
if (POLICY CMP0040)
39-
cmake_policy(SET CMP0040 OLD)
40-
endif()
41-
if (POLICY CMP0046)
42-
cmake_policy(SET CMP0046 OLD)
43-
endif()
44-
if (POLICY CMP0053)
45-
cmake_policy(SET CMP0053 OLD)
46-
endif()
47-
if (POLICY CMP0054)
48-
cmake_policy(SET CMP0054 OLD)
49-
endif()
50-
if (POLICY CMP0025) # Compiler ID when using clang set to clang not appleclang
51-
cmake_policy(SET CMP0025 OLD)
52-
endif()
53-
#-----------------------------------------------------------------------------
36+
cmake_minimum_required(VERSION 3.20)
5437

5538
#-----------------------------------------------------------------------------
5639
Project(SV_TOP)

‎Code/CMakeLists.txt‎

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -26,24 +26,7 @@
2626

2727

2828
#-----------------------------------------------------------------------------
29-
cmake_minimum_required(VERSION 3.3.0)
30-
31-
if (POLICY CMP0040)
32-
cmake_policy(SET CMP0040 OLD)
33-
endif()
34-
if (POLICY CMP0046)
35-
cmake_policy(SET CMP0046 OLD)
36-
endif()
37-
if (POLICY CMP0053)
38-
cmake_policy(SET CMP0053 OLD)
39-
endif()
40-
if (POLICY CMP0054)
41-
cmake_policy(SET CMP0054 OLD)
42-
endif()
43-
if (POLICY CMP0025) # Compiler ID when using clang set to clang not appleclang
44-
cmake_policy(SET CMP0025 OLD)
45-
endif()
46-
#-----------------------------------------------------------------------------
29+
cmake_minimum_required(VERSION 3.20)
4730

4831
#-----------------------------------------------------------------------------
4932
Project(SV)

‎Code/Source/solver/FsilsLinearAlgebra.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ void FsilsLinearAlgebra::check_options(const consts::PreconditionerType prec_con
9696
}
9797

9898
if (error_msg != "") {
99-
throw std::runtime_error("[svFSIplus] ERROR: " + error_msg);
99+
throw std::runtime_error("[svMultiPhysics] ERROR: " + error_msg);
100100
}
101101
}
102102

‎Code/Source/solver/LinearAlgebra.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ void LinearAlgebra::check_equation_compatibility(const consts::EquationType eq_p
5959
if (eq_physics == EquationType::phys_ustruct) {
6060
if ((lin_alg_type == LinearAlgebraType::trilinos) &&
6161
(assembly_type != LinearAlgebraType::fsils)) {
62-
throw std::runtime_error("[svFSIplus] Equations with ustruct physics must use fsils for assembly.");
62+
throw std::runtime_error("[svMultiPhysics] Equations with ustruct physics must use fsils for assembly.");
6363
}
6464
}
6565
}

‎Code/Source/solver/Parameters.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
*/
3030

3131
//
32-
// The class methods defined here are used to process svFSIplus simulation parameters
32+
// The class methods defined here are used to process svMultiPhysics simulation parameters
3333
// read in from an XML-format file.
3434
//
3535
// XML files are parsed using tinyxml2 (https://github.com/leethomason/tinyxml2).

‎Code/Source/solver/PetscLinearAlgebra.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ std::set<consts::LinearAlgebraType> PetscLinearAlgebra::valid_assemblers = {
6262
PetscLinearAlgebra::PetscLinearAlgebra()
6363
{
6464
#ifndef USE_PETSC
65-
throw std::runtime_error("[PetscLinearAlgebra] svFSIplus hase not been built with the PETSc package.");
65+
throw std::runtime_error("[PetscLinearAlgebra] svMultiPhysics hase not been built with the PETSc package.");
6666
#else
6767
impl = new PetscLinearAlgebra::PetscImpl();
6868
interface_type = consts::LinearAlgebraType::petsc;
@@ -107,7 +107,7 @@ void PetscLinearAlgebra::check_options(const consts::PreconditionerType prec_con
107107
}
108108

109109
if (error_msg != "") {
110-
throw std::runtime_error("[svFSIplus] ERROR: " + error_msg);
110+
throw std::runtime_error("[svMultiPhysics] ERROR: " + error_msg);
111111
}
112112
}
113113

‎Code/Source/solver/TrilinosLinearAlgebra.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ std::set<consts::LinearAlgebraType> TrilinosLinearAlgebra::valid_assemblers = {
6666
TrilinosLinearAlgebra::TrilinosLinearAlgebra()
6767
{
6868
#ifndef WITH_TRILINOS
69-
throw std::runtime_error("[TrilinosLinearAlgebra] svFSIplus has not been built with Trilinos.");
69+
throw std::runtime_error("[TrilinosLinearAlgebra] svMultiPhysics has not been built with Trilinos.");
7070
#else
7171
impl = new TrilinosLinearAlgebra::TrilinosImpl();
7272
interface_type = consts::LinearAlgebraType::trilinos;
@@ -130,7 +130,7 @@ void TrilinosLinearAlgebra::check_options(const consts::PreconditionerType prec_
130130
}
131131

132132
if (error_msg != "") {
133-
throw std::runtime_error("[svFSIplus] ERROR: " + error_msg);
133+
throw std::runtime_error("[svMultiPhysics] ERROR: " + error_msg);
134134
}
135135
}
136136

‎Code/Source/solver/cmm.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ void cmm_3d(ComMod& com_mod, const int eNoN, const double w, const Vector<double
5757

5858
int cEq = com_mod.cEq;
5959
auto& eq = com_mod.eq[cEq];
60-
int cDmn = com_mod.cDmn;
60+
const auto cDmn = com_mod.cDmn;
6161
auto& dmn = eq.dmn[cDmn];
6262
const double dt = com_mod.dt;
6363

@@ -450,7 +450,7 @@ void cmm_mass(ComMod& com_mod, const double w, const Vector<double>& N, const Ar
450450
const int cEq = com_mod.cEq;
451451
const auto& eq = com_mod.eq[cEq];
452452
const double dt = com_mod.dt;
453-
const int cDmn = com_mod.cDmn;
453+
const auto cDmn = com_mod.cDmn;
454454
#ifdef debug_cmm_mass
455455
dmsg << "nsd: " << nsd;
456456
dmsg << "dof: " << dof;
@@ -523,7 +523,7 @@ void cmm_stiffness(ComMod& com_mod, const Array<double>& Nxi, const Array<double
523523
const int cEq = com_mod.cEq;
524524
const auto& eq = com_mod.eq[cEq];
525525
const double dt = com_mod.dt;
526-
const int cDmn = com_mod.cDmn;
526+
const auto cDmn = com_mod.cDmn;
527527

528528
double nu = eq.dmn[cDmn].prop.at(PhysicalProperyType::poisson_ratio);
529529
double ht, elM;
@@ -797,7 +797,7 @@ void construct_cmm(ComMod& com_mod, const mshType& lM, const Array<double>& Ag,
797797
const int dof = com_mod.dof;
798798
const int cEq = com_mod.cEq;
799799
const auto& eq = com_mod.eq[cEq];
800-
auto cDmn = com_mod.cDmn;
800+
auto& cDmn = com_mod.cDmn;
801801
const int nsymd = com_mod.nsymd;
802802
auto& pS0 = com_mod.pS0;
803803
auto& pSn = com_mod.pSn;
@@ -827,7 +827,7 @@ void construct_cmm(ComMod& com_mod, const mshType& lM, const Array<double>& Ag,
827827

828828

829829
for (int e = 0; e < lM.nEl; e++) {
830-
// Update domain and proceed if domain phys and eqn phys match
830+
// Change the current domain which will be used in later function calls.
831831
cDmn = all_fun::domain(com_mod, lM, cEq, e);
832832
auto cPhys = eq.dmn[cDmn].phys;
833833
if (cPhys != EquationType::phys_CMM) {

0 commit comments

Comments
 (0)