Skip to content
Snippets Groups Projects
Unverified Commit 577ba8c6 authored by Dmitri Naumov's avatar Dmitri Naumov Committed by GitHub
Browse files

Merge pull request #2838 from wenqing/fixing

Two corrections in MPI and vtk stuffs.
parents f0ebe2e5 94009d57
No related branches found
No related tags found
No related merge requests found
...@@ -32,6 +32,7 @@ struct LinearSolverLibrarySetup final ...@@ -32,6 +32,7 @@ struct LinearSolverLibrarySetup final
MPI_Init(&argc, &argv); MPI_Init(&argc, &argv);
char help[] = "ogs6 with PETSc \n"; char help[] = "ogs6 with PETSc \n";
PetscInitialize(&argc, &argv, nullptr, help); PetscInitialize(&argc, &argv, nullptr, help);
MPI_Comm_set_errhandler(PETSC_COMM_WORLD, MPI_ERRORS_RETURN);
} }
~LinearSolverLibrarySetup() ~LinearSolverLibrarySetup()
......
...@@ -144,35 +144,43 @@ int VtkMappedMeshSource::RequestData(vtkInformation* /*request*/, ...@@ -144,35 +144,43 @@ int VtkMappedMeshSource::RequestData(vtkInformation* /*request*/,
std::vector<std::string> const& propertyNames = std::vector<std::string> const& propertyNames =
properties.getPropertyVectorNames(); properties.getPropertyVectorNames();
for (auto name = propertyNames.cbegin(); name != propertyNames.cend(); for (auto const& name : propertyNames)
++name)
{ {
if (addProperty<double>(properties, *name)) if (addProperty<double>(properties, name))
{ {
continue; continue;
} }
if (addProperty<float>(properties, *name)) if (addProperty<float>(properties, name))
{ {
continue; continue;
} }
if (addProperty<int>(properties, *name)) if (addProperty<int>(properties, name))
{ {
continue; continue;
} }
if (addProperty<unsigned>(properties, *name)) if (addProperty<unsigned>(properties, name))
{ {
continue; continue;
} }
if (addProperty<std::size_t>(properties, *name)) if (addProperty<std::size_t>(properties, name))
{ {
continue; continue;
} }
if (addProperty<char>(properties, *name)) if (addProperty<char>(properties, name))
{ {
continue; continue;
} }
DBUG("Mesh property '%s' with unknown data type.", *name->c_str()); OGS_FATAL(
"Mesh property '%s' with unknown data type. Please check the data "
"type of the mesh properties. The available data types are:"
"\n\t double,"
"\n\t float,"
"\n\t int,"
"\n\t unsigned,"
"\n\t size_t,"
"\n\t char.",
name.data());
} }
output->GetPointData()->ShallowCopy(this->PointData.GetPointer()); output->GetPointData()->ShallowCopy(this->PointData.GetPointer());
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment