Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
O
ogs
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Dmitri Naumov
ogs
Commits
577ba8c6
Unverified
Commit
577ba8c6
authored
5 years ago
by
Dmitri Naumov
Committed by
GitHub
5 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #2838 from wenqing/fixing
Two corrections in MPI and vtk stuffs.
parents
f0ebe2e5
94009d57
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Applications/ApplicationsLib/LinearSolverLibrarySetup.h
+1
-0
1 addition, 0 deletions
Applications/ApplicationsLib/LinearSolverLibrarySetup.h
MeshLib/Vtk/VtkMappedMeshSource.cpp
+17
-9
17 additions, 9 deletions
MeshLib/Vtk/VtkMappedMeshSource.cpp
with
18 additions
and
9 deletions
Applications/ApplicationsLib/LinearSolverLibrarySetup.h
+
1
−
0
View file @
577ba8c6
...
@@ -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
()
...
...
This diff is collapsed.
Click to expand it.
MeshLib/Vtk/VtkMappedMeshSource.cpp
+
17
−
9
View file @
577ba8c6
...
@@ -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
());
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment