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
6ccf1bb4
Commit
6ccf1bb4
authored
15 years ago
by
Christophe Geuzaine
Browse files
Options
Downloads
Patches
Plain Diff
fix msvc compile
parent
e278ca6b
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
Geo/GModelIO_Geo.cpp
+1
-1
1 addition, 1 deletion
Geo/GModelIO_Geo.cpp
Geo/GModelIO_Mesh.cpp
+3
-3
3 additions, 3 deletions
Geo/GModelIO_Mesh.cpp
Geo/MElement.cpp
+1
-1
1 addition, 1 deletion
Geo/MElement.cpp
with
5 additions
and
5 deletions
Geo/GModelIO_Geo.cpp
+
1
−
1
View file @
6ccf1bb4
...
@@ -170,7 +170,7 @@ int GModel::importGEOInternals()
...
@@ -170,7 +170,7 @@ int GModel::importGEOInternals()
}
}
std
::
list
<
GEdge
*>
b
[
4
];
std
::
list
<
GEdge
*>
b
[
4
];
for
(
int
j
=
0
;
j
<
4
;
j
++
){
for
(
int
j
=
0
;
j
<
4
;
j
++
){
for
(
int
k
=
0
;
k
<
s
->
compoundBoundary
[
j
].
size
();
k
++
){
for
(
unsigned
int
k
=
0
;
k
<
s
->
compoundBoundary
[
j
].
size
();
k
++
){
GEdge
*
ge
=
getEdgeByTag
(
s
->
compoundBoundary
[
j
][
k
]);
GEdge
*
ge
=
getEdgeByTag
(
s
->
compoundBoundary
[
j
][
k
]);
if
(
ge
)
b
[
j
].
push_back
(
ge
);
if
(
ge
)
b
[
j
].
push_back
(
ge
);
}
}
...
...
This diff is collapsed.
Click to expand it.
Geo/GModelIO_Mesh.cpp
+
3
−
3
View file @
6ccf1bb4
...
@@ -890,7 +890,7 @@ int GModel::writeDistanceMSH(const std::string &name, double version, bool binar
...
@@ -890,7 +890,7 @@ int GModel::writeDistanceMSH(const std::string &name, double version, bool binar
SPoint3
p3
(
v3
->
x
(),
v3
->
y
(),
v3
->
z
());
SPoint3
p3
(
v3
->
x
(),
v3
->
y
(),
v3
->
z
());
signedDistancesPointsTriangle
(
iDistances
,
iClosePts
,
pts
,
p1
,
p2
,
p3
);
signedDistancesPointsTriangle
(
iDistances
,
iClosePts
,
pts
,
p1
,
p2
,
p3
);
}
}
for
(
int
kk
=
0
;
kk
<
pts
.
size
();
kk
++
)
{
for
(
unsigned
int
kk
=
0
;
kk
<
pts
.
size
();
kk
++
)
{
if
(
std
::
abs
(
iDistances
[
kk
])
<
distances
[
kk
]
)
if
(
std
::
abs
(
iDistances
[
kk
])
<
distances
[
kk
]
)
distances
[
kk
]
=
std
::
abs
(
iDistances
[
kk
]);
distances
[
kk
]
=
std
::
abs
(
iDistances
[
kk
]);
}
}
...
@@ -1026,7 +1026,7 @@ int GModel::writeDistanceMSH(const std::string &name, double version, bool binar
...
@@ -1026,7 +1026,7 @@ int GModel::writeDistanceMSH(const std::string &name, double version, bool binar
dist
.
push_back
(
*
(
it
->
second
));
dist
.
push_back
(
*
(
it
->
second
));
}
}
fprintf
(
f3
,
"){"
);
fprintf
(
f3
,
"){"
);
for
(
int
i
=
0
;
i
<
dist
.
size
();
i
++
){
for
(
unsigned
int
i
=
0
;
i
<
dist
.
size
();
i
++
){
if
(
i
)
fprintf
(
f3
,
",%g"
,
dist
[
i
]);
if
(
i
)
fprintf
(
f3
,
",%g"
,
dist
[
i
]);
else
fprintf
(
f3
,
"%g"
,
dist
[
i
]);
else
fprintf
(
f3
,
"%g"
,
dist
[
i
]);
}
}
...
@@ -1056,7 +1056,7 @@ int GModel::writeDistanceMSH(const std::string &name, double version, bool binar
...
@@ -1056,7 +1056,7 @@ int GModel::writeDistanceMSH(const std::string &name, double version, bool binar
dist
.
push_back
(
it
->
second
);
dist
.
push_back
(
it
->
second
);
}
}
fprintf
(
f4
,
"){"
);
fprintf
(
f4
,
"){"
);
for
(
int
i
=
0
;
i
<
dist
.
size
();
i
++
){
for
(
unsigned
int
i
=
0
;
i
<
dist
.
size
();
i
++
){
if
(
i
)
fprintf
(
f4
,
",%g"
,
dist
[
i
]);
if
(
i
)
fprintf
(
f4
,
",%g"
,
dist
[
i
]);
else
fprintf
(
f4
,
"%g"
,
dist
[
i
]);
else
fprintf
(
f4
,
"%g"
,
dist
[
i
]);
}
}
...
...
This diff is collapsed.
Click to expand it.
Geo/MElement.cpp
+
1
−
1
View file @
6ccf1bb4
...
@@ -429,7 +429,7 @@ void MElement::writeMSH(FILE *fp, double version, bool binary, int num,
...
@@ -429,7 +429,7 @@ void MElement::writeMSH(FILE *fp, double version, bool binary, int num,
int
blob
[
60
]
=
{
type
,
1
,
numTags
,
num
?
num
:
_num
,
abs
(
physical
),
elementary
,
int
blob
[
60
]
=
{
type
,
1
,
numTags
,
num
?
num
:
_num
,
abs
(
physical
),
elementary
,
1
+
numGhosts
,
_partition
};
1
+
numGhosts
,
_partition
};
if
(
ghosts
)
if
(
ghosts
)
for
(
unsigned
int
i
=
0
;
i
<
numGhosts
;
i
++
)
blob
[
8
+
i
]
=
-
(
*
ghosts
)[
i
];
for
(
int
i
=
0
;
i
<
numGhosts
;
i
++
)
blob
[
8
+
i
]
=
-
(
*
ghosts
)[
i
];
fwrite
(
blob
,
sizeof
(
int
),
4
+
numTags
,
fp
);
fwrite
(
blob
,
sizeof
(
int
),
4
+
numTags
,
fp
);
}
}
...
...
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