Skip to content

Commit 7b1d969

Browse files
authored
Remove svFSIplus from error messages (SimVascular#378)
* Change file name. * Change svFSIplus to svMultiPhysics in error messages.
1 parent 1b9cb72 commit 7b1d969

File tree

10 files changed

+16
-16
lines changed

10 files changed

+16
-16
lines changed

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/main.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
//
3333
// Usage:
3434
//
35-
// svFSIplus XML_FILE_NAME
35+
// svMultiPhysics XML_FILE_NAME
3636
//
3737
#include "Simulation.h"
3838

@@ -93,8 +93,8 @@ void read_files(Simulation* simulation, const std::string& file_name)
9393
read_files_ns::read_files(simulation, file_name);
9494
9595
} catch (const std::exception& exception) {
96-
std::cout << "[svFSIplus] ERROR The svFSIplus program has failed." << std::endl;
97-
std::cout << "[svFSIplus] ERROR " << exception.what() << std::endl;
96+
std::cout << "[svMultiPhysics] ERROR: The svMultiPhysics program has failed." << std::endl;
97+
std::cout << "[svMultiPhysics] ERROR: " << exception.what() << std::endl;
9898
exit(1);
9999
}
100100
*/
@@ -783,7 +783,7 @@ void run_simulation(Simulation* simulation)
783783
int main(int argc, char *argv[])
784784
{
785785
if (argc != 2) {
786-
std::cout << "[svFSIplus:ERROR] The svFSIplus program requires the solver input XML file name as an argument." << std::endl;
786+
std::cout << "[svMultiPhysics] ERROR: The svMultiPhysics program requires the solver input XML file name as an argument." << std::endl;
787787
exit(1);
788788
}
789789

Code/Source/solver/nn.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -606,7 +606,7 @@ void gnnb(const ComMod& com_mod, const faceType& lFa, const int e, const int g,
606606
}
607607

608608
if (!found_node) {
609-
throw std::runtime_error("[svFSIplus::gnnb] The '" + lFa.name + "' face node " + std::to_string(Ac) +
609+
throw std::runtime_error("[svMultiPhysics::gnnb] ERROR: The '" + lFa.name + "' face node " + std::to_string(Ac) +
610610
" could not be matched to a node in the '" + msh.name + "' volume mesh.");
611611
}
612612

Code/Source/solver/output.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,8 @@ void output_result(Simulation* simulation, std::array<double,3>& timeP, const i
172172

173173
// Print a warning message if the maximum number of nonlinear iterations has been exceeded.
174174
if (eq.itr > eq.maxItr) {
175-
auto msg = "[svFSIplus] WARNING The number of nonlinear iterations (" + std::to_string(eq.itr) +
176-
") has exceeded the maximum number set by the value of the Add_equation/Max_iterations parameter in the svFSIplus solver input file.";
175+
auto msg = "[svMultiPhysics] WARNING: The number of nonlinear iterations (" + std::to_string(eq.itr) +
176+
") has exceeded the maximum number set by the value of the Add_equation/Max_iterations parameter in the svMultiPhysics solver input file.";
177177
if (!eq.FSILS.RI.suc) {
178178
msg += " This may be due to the failure of the linear system solution to converge.";
179179
}

Code/Source/solver/petsc_impl.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,7 @@ PetscErrorCode petsc_create_lhs(const PetscInt nNo, const PetscInt mynNo, const
448448
plhs.mynNo = mynNo;
449449
plhs.created = PETSC_TRUE;
450450

451-
/* Fortran index to C index (NOT apply for svFSIplus) */
451+
/* Fortran index to C index (NOT apply for svMultiPhysics) */
452452
PetscCall(PetscMalloc2(nNo, &local2global, nNo, &local2local));
453453
for (i = 0; i < nNo; i++) {
454454
// local2global[i] = svFSI_ltg[i] - 1;

Code/Source/solver/read_files.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2048,7 +2048,7 @@ void read_ls(Simulation* simulation, EquationParameters* eq_params, consts::Solv
20482048
#endif
20492049

20502050
if (!linear_algebra.defined()) {
2051-
throw std::runtime_error("[svFSIplus] No <Linear_algebra> section has been defined for equation '" +
2051+
throw std::runtime_error("[svMultiPhysics] ERROR: No <Linear_algebra> section has been defined for equation '" +
20522052
eq_params->type() + ".");
20532053
}
20542054

0 commit comments

Comments
 (0)