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
d88f3b20
Commit
d88f3b20
authored
16 years ago
by
Jean-François Remacle
Browse files
Options
Downloads
Patches
Plain Diff
*** empty log message ***
parent
8abfafbc
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
Geo/discreteEdge.cpp
+26
-29
26 additions, 29 deletions
Geo/discreteEdge.cpp
Geo/discreteFace.cpp
+1
-2
1 addition, 2 deletions
Geo/discreteFace.cpp
Mesh/meshGEdge.cpp
+3
-1
3 additions, 1 deletion
Mesh/meshGEdge.cpp
benchmarks/2d/square.geo
+3
-3
3 additions, 3 deletions
benchmarks/2d/square.geo
with
33 additions
and
35 deletions
Geo/discreteEdge.cpp
+
26
−
29
View file @
d88f3b20
...
@@ -214,6 +214,7 @@ void discreteEdge::parametrize()
...
@@ -214,6 +214,7 @@ void discreteEdge::parametrize()
printf
(
"dans discrete edge %d line.size =%d
\n
"
,
this
->
tag
(),
lines
.
size
());
printf
(
"dans discrete edge %d line.size =%d
\n
"
,
this
->
tag
(),
lines
.
size
());
// create new MEdge Vertices
// std::vector<MVertex*> new_mshv;
// std::vector<MVertex*> new_mshv;
// for(int i = 0; i < mesh_vertices.size(); i++){
// for(int i = 0; i < mesh_vertices.size(); i++){
// MVertex *v = mesh_vertices[i];
// MVertex *v = mesh_vertices[i];
...
@@ -225,16 +226,30 @@ void discreteEdge::parametrize()
...
@@ -225,16 +226,30 @@ void discreteEdge::parametrize()
// }
// }
// mesh_vertices = new_mshv;
// mesh_vertices = new_mshv;
// std::vector<MVertex*> new_mshv;
// we should loop over Mlines and MTrinagles to take those new MEdgeVertices into account
// for (int i = 0; i < mesh_vertices.size(); i++){
// for (int i = 0; i < mesh_vertices.size(); i++){
// MVertex *vi = mesh_vertices[i];
// double t1;
// MVertex *mev = new MEdgeVertex(vi->x(),vi->y(),vi->z(), this, i+1);
// mesh_vertices[i]->getParameter(0,t1);
// new_mshv.push_back(mev);
// printf("** AFTER v1=%d t1=%g\n", mesh_vertices[i]->getNum(),t1 );
// mev->setNum(vi->getNum());
// }
// for (int i = 0; i < lines.size(); i++){
// printf("** AFTER LINES v1=%d v2=%d\n", lines[i]->getVertex(0)->getIndex(), lines[i]->getVertex(1)->getIndex() );
// }
//exit(1)
// du brol ci-dessous ...
// std::vector<MLine*> newLines;
// newLines.push_back(new MLine(v1, newv));
// newLines.push_back(new MLine(v1, newv));
// newLines.push_back(new MLine(newv, v2));
// delete lines[i];
// delete ge->lines[i];
// lines = newLines;
// for(int i = 0; i < mesh_vertices.size(); i++){
// for(std::list<GFace*>::iterator it = l_faces.begin(); it != l_faces.end(); ++it){
// for(std::list<GFace*>::iterator it = l_faces.begin(); it != l_faces.end(); ++it){
// for (unsigned int i = 0; i < (*it)->triangles.size(); ++i){
// for (unsigned int i = 0; i < (*it)->triangles.size(); ++i){
// MTriangle *t = (*it)->triangles[i];
// MTriangle *t = (*it)->triangles[i];
...
@@ -244,29 +259,11 @@ void discreteEdge::parametrize()
...
@@ -244,29 +259,11 @@ void discreteEdge::parametrize()
// }
// }
// }
// }
// }
// }
// delete vi ;
// }
// }
// mesh_vertices = new_mshv;
// std::vector<MLine*> newLines;
// newLines.push_back(new MLine(v1, newv));
// delete lines[i];
// newLines.push_back(new MLine(newv, v2));
// lines = newLines;
// for (int i = 0; i < mesh_vertices.size(); i++){
// double t1;
// mesh_vertices[i]->getParameter(0,t1);
// printf("** AFTER v1=%d t1=%g\n", mesh_vertices[i]->getNum(),t1 );
// }
// for (int i = 0; i < lines.size(); i++){
// printf("** AFTER LINES v1=%d v2=%d\n", lines[i]->getVertex(0)->getIndex(), lines[i]->getVertex(1)->getIndex() );
// }
//exit(1)
;
;
}
}
...
...
This diff is collapsed.
Click to expand it.
Geo/discreteFace.cpp
+
1
−
2
View file @
d88f3b20
...
@@ -26,7 +26,6 @@ void discreteFace::setBoundEdges(std::vector<discreteEdge*> discr_edges)
...
@@ -26,7 +26,6 @@ void discreteFace::setBoundEdges(std::vector<discreteEdge*> discr_edges)
{
{
printf
(
"***** In discrete Face:
\n
"
);
printf
(
"***** In discrete Face:
\n
"
);
printf
(
"bound edges =%d
\n
"
,
edges
().
size
());
printf
(
"bound edges =%d
\n
"
,
edges
().
size
());
for
(
std
::
vector
<
discreteEdge
*>::
iterator
it
=
discr_edges
.
begin
();
it
!=
discr_edges
.
end
();
it
++
)
{
for
(
std
::
vector
<
discreteEdge
*>::
iterator
it
=
discr_edges
.
begin
();
it
!=
discr_edges
.
end
();
it
++
)
{
...
...
This diff is collapsed.
Click to expand it.
Mesh/meshGEdge.cpp
+
3
−
1
View file @
d88f3b20
...
@@ -207,6 +207,8 @@ static double Integration(GEdge *ge, double t1, double t2,
...
@@ -207,6 +207,8 @@ static double Integration(GEdge *ge, double t1, double t2,
double
(
*
f
)
(
GEdge
*
e
,
double
X
),
double
(
*
f
)
(
GEdge
*
e
,
double
X
),
std
::
vector
<
IntPoint
>
&
Points
,
double
Prec
)
std
::
vector
<
IntPoint
>
&
Points
,
double
Prec
)
{
{
IntPoint
from
,
to
;
IntPoint
from
,
to
;
int
depth
=
0
;
int
depth
=
0
;
...
@@ -249,7 +251,7 @@ void meshGEdge::operator() (GEdge *ge)
...
@@ -249,7 +251,7 @@ void meshGEdge::operator() (GEdge *ge)
if
(
MeshExtrudedCurve
(
ge
))
return
;
if
(
MeshExtrudedCurve
(
ge
))
return
;
Msg
::
Info
(
"Meshing curve %d (%s)"
,
ge
->
tag
(),
ge
->
getTypeString
().
c_str
());
Msg
::
Info
(
"
**
Meshing curve %d (%s)"
,
ge
->
tag
(),
ge
->
getTypeString
().
c_str
());
// compute bounds
// compute bounds
Range
<
double
>
bounds
=
ge
->
parBounds
(
0
);
Range
<
double
>
bounds
=
ge
->
parBounds
(
0
);
...
...
This diff is collapsed.
Click to expand it.
benchmarks/2d/square.geo
+
3
−
3
View file @
d88f3b20
...
@@ -11,7 +11,7 @@ Line(4) = {1, 2};
...
@@ -11,7 +11,7 @@ Line(4) = {1, 2};
Line
Loop
(
5
)
=
{
1
,
2
,
3
,
4
};
Line
Loop
(
5
)
=
{
1
,
2
,
3
,
4
};
Plane
Surface
(
10
)
=
{
5
};
Plane
Surface
(
10
)
=
{
5
};
Compound
Line
(
150
)
=
{
1
,
2
};
//
Compound Line(150)={1,2};
Compound
Line
(
160
)
=
{
3
,
4
};
//
Compound Line(160)={3,4};
Compound
Surface
(
170
)
=
{
10
}
Boundary
{{}};
//
Compound Surface(170)={10} Boundary {{}};
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