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
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
Yuhao Liu
ogs
Commits
dad59045
Commit
dad59045
authored
9 years ago
by
Dmitry Yu. Naumov
Browse files
Options
Downloads
Patches
Plain Diff
[MeL] Consistent mesh property types; signedness.
parent
4a922463
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
MeshLib/ElementStatus.cpp
+1
-1
1 addition, 1 deletion
MeshLib/ElementStatus.cpp
MeshLib/ElementStatus.h
+2
-1
2 additions, 1 deletion
MeshLib/ElementStatus.h
Tests/MeshLib/TestElementStatus.cpp
+2
-2
2 additions, 2 deletions
Tests/MeshLib/TestElementStatus.cpp
with
5 additions
and
4 deletions
MeshLib/ElementStatus.cpp
+
1
−
1
View file @
dad59045
...
...
@@ -31,7 +31,7 @@ ElementStatus::ElementStatus(Mesh const* const mesh, bool hasAnyInactive)
}
ElementStatus
::
ElementStatus
(
Mesh
const
*
const
mesh
,
std
::
vector
<
unsigned
>
const
&
vec_inactive_matIDs
)
std
::
vector
<
int
>
const
&
vec_inactive_matIDs
)
:
ElementStatus
(
mesh
,
!
vec_inactive_matIDs
.
empty
())
{
auto
materialIds
=
mesh
->
getProperties
().
getPropertyVector
<
int
>
(
"MaterialIDs"
);
...
...
This diff is collapsed.
Click to expand it.
MeshLib/ElementStatus.h
+
2
−
1
View file @
dad59045
...
...
@@ -31,7 +31,8 @@ public:
bool
hasAnyInactive
=
false
);
/// Constructor taking a vector of inactive material IDs
ElementStatus
(
MeshLib
::
Mesh
const
*
const
mesh
,
std
::
vector
<
unsigned
>
const
&
vec_inactive_matIDs
);
ElementStatus
(
MeshLib
::
Mesh
const
*
const
mesh
,
std
::
vector
<
int
>
const
&
vec_inactive_matIDs
);
/// Returns a vector of active element IDs
std
::
vector
<
MeshLib
::
Element
*>
const
&
getActiveElements
()
const
;
...
...
This diff is collapsed.
Click to expand it.
Tests/MeshLib/TestElementStatus.cpp
+
2
−
2
View file @
dad59045
...
...
@@ -53,14 +53,14 @@ TEST(MeshLib, ElementStatus)
{
// set material 1 to false
std
::
vector
<
unsigned
>
inactiveMat
{
1
};
std
::
vector
<
int
>
inactiveMat
{
1
};
MeshLib
::
ElementStatus
status
(
mesh
.
get
(),
inactiveMat
);
ASSERT_EQ
(
elements
.
size
()
-
elements_per_side
,
status
.
getNActiveElements
());
}
{
// set material 0 and 1 to false
std
::
vector
<
unsigned
>
inactiveMat
{
0
,
1
};
std
::
vector
<
int
>
inactiveMat
{
0
,
1
};
MeshLib
::
ElementStatus
status
(
mesh
.
get
(),
inactiveMat
);
ASSERT_EQ
(
elements
.
size
()
-
(
2
*
elements_per_side
),
status
.
getNActiveElements
());
...
...
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