Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
gmsh
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Larry Price
gmsh
Commits
708d1ff8
Commit
708d1ff8
authored
13 years ago
by
Gauthier Becker
Browse files
Options
Downloads
Patches
Plain Diff
Fix bugs
Fragmentation in progress
parent
4961ef50
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Geo/MElement.cpp
+7
-7
7 additions, 7 deletions
Geo/MElement.cpp
Geo/MElement.h
+3
-3
3 additions, 3 deletions
Geo/MElement.h
with
10 additions
and
10 deletions
Geo/MElement.cpp
+
7
−
7
View file @
708d1ff8
...
...
@@ -166,7 +166,7 @@ double MElement::getVolume()
double
vol
=
0.
;
for
(
int
i
=
0
;
i
<
npts
;
i
++
){
vol
+=
getJacobianDeterminant
(
pts
[
i
].
pt
[
0
],
pts
[
i
].
pt
[
1
],
pts
[
i
].
pt
[
2
])
*
pts
[
i
].
weight
;
*
pts
[
i
].
weight
;
}
return
vol
;
}
...
...
@@ -547,19 +547,19 @@ double MElement::integrateCirc(double val[], int edge, int pOrder, int order)
Msg
::
Error
(
"No edge %d for this element"
,
edge
);
return
0
;
}
std
::
vector
<
MVertex
*>
v
;
getEdgeVertices
(
edge
,
v
);
MElementFactory
f
;
int
type
=
getLineType
(
getPolynomialOrder
());
MElement
*
ee
=
f
.
create
(
type
,
v
);
double
intv
[
3
];
for
(
int
i
=
0
;
i
<
3
;
i
++
){
intv
[
i
]
=
ee
->
integrate
(
&
val
[
i
],
pOrder
,
3
,
order
);
}
}
delete
ee
;
double
t
[
3
]
=
{
v
[
1
]
->
x
()
-
v
[
0
]
->
x
(),
v
[
1
]
->
y
()
-
v
[
0
]
->
y
(),
v
[
1
]
->
z
()
-
v
[
0
]
->
z
()};
norme
(
t
);
double
result
;
...
...
@@ -582,7 +582,7 @@ double MElement::integrateFlux(double val[], int face, int pOrder, int order)
case
TYPE_TET
:
type
=
getTriangleType
(
getPolynomialOrder
());
break
;
case
TYPE_QUA
:
type
=
getQuadType
(
getPolynomialOrder
());
break
;
case
TYPE_HEX
:
type
=
getQuadType
(
getPolynomialOrder
());
break
;
case
TYPE_PYR
:
case
TYPE_PYR
:
if
(
face
<
4
)
type
=
getTriangleType
(
getPolynomialOrder
());
else
type
=
getQuadType
(
getPolynomialOrder
());
break
;
...
...
@@ -1131,7 +1131,7 @@ MElement *MElement::copy(std::map<int, MVertex*> &vertexMap,
newParent
=
it
->
second
;
parent
=
newParent
;
}
MElementFactory
factory
;
MElement
*
newEl
=
factory
.
create
(
eType
,
vmv
,
getNum
(),
_partition
,
ownsParent
(),
parent
);
...
...
This diff is collapsed.
Click to expand it.
Geo/MElement.h
+
3
−
3
View file @
708d1ff8
...
...
@@ -80,13 +80,13 @@ class MElement
verts
.
resize
(
N
);
for
(
int
i
=
0
;
i
<
N
;
i
++
)
verts
[
i
]
=
getVertex
(
i
);
}
virtual
void
setVertex
(
int
num
,
MVertex
*
v
)
virtual
void
setVertex
(
int
num
,
MVertex
*
v
)
{
Msg
::
Error
(
"Vertex set not supported for this element"
);
}
// give an MVertex as input and get its local number
virtual
void
getVertexInfo
(
const
MVertex
*
vertex
,
int
&
ithVertex
)
const
virtual
void
getVertexInfo
(
const
MVertex
*
vertex
,
int
&
ithVertex
)
const
{
Msg
::
Error
(
"Vertex information not available for this element"
);
}
...
...
@@ -188,7 +188,7 @@ class MElement
// otherwise get the minimum radius of all the circles/spheres
// tangent to the most boundaries of the element.
virtual
double
getInnerRadius
(){
return
0.
;
}
// get the radius of the circumscribed circle/sphere if it exists,
// otherwise get the maximum radius of all the circles/spheres
// tangent to the most boundaries of the element.
...
...
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