Salome HOME
projects
/
modules
/
hexablock.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add license
[modules/hexablock.git]
/
src
/
HEXABLOCK
/
HexElements_check.cxx
diff --git
a/src/HEXABLOCK/HexElements_check.cxx
b/src/HEXABLOCK/HexElements_check.cxx
old mode 100755
(executable)
new mode 100644
(file)
index
dfb7574
..
d73fd11
--- a/
src/HEXABLOCK/HexElements_check.cxx
+++ b/
src/HEXABLOCK/HexElements_check.cxx
@@
-1,7
+1,7
@@
// C++ : Controle arguments
// C++ : Controle arguments
-// Copyright (C) 2009-20
14 CEA/DEN, EDF R&D
+// Copyright (C) 2009-20
24 CEA, EDF
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@
-304,7
+304,7
@@
void Elements::checkSense (int nro, Vertex* v1, Vertex* v2, Quad* quad)
cpchar where = nro < 4 ? "start" : "target";
setError (HERR);
Mess << "Arguments nr " << nro << " and " << nro+2
cpchar where = nro < 4 ? "start" : "target";
setError (HERR);
Mess << "Arguments nr " << nro << " and " << nro+2
- << " : these vertices do
ens
t define an edge of the "
+ << " : these vertices do
no
t define an edge of the "
<< where << " quad";
}
// ======================================================== checkPhi
<< where << " quad";
}
// ======================================================== checkPhi
@@
-551,7
+551,7
@@
void Elements::checkContour (Quads& tquad, Vertex* v1, Vertex* v2, bool target,
{
tedge.clear ();
cpchar who = target ? "Target" : "Pattern";
{
tedge.clear ();
cpchar who = target ? "Target" : "Pattern";
- string nmedge = target ? "Vertices of target (args 5 and 6)"
+ st
d::st
ring nmedge = target ? "Vertices of target (args 5 and 6)"
: "Vertices of pattern (args 3 and 4)" ;
nmedge += "don't define an edge" ;
: "Vertices of pattern (args 3 and 4)" ;
nmedge += "don't define an edge" ;
@@
-563,8
+563,8
@@
void Elements::checkContour (Quads& tquad, Vertex* v1, Vertex* v2, bool target,
return;
}
return;
}
- map <Edge*, int> edge_count;
- map <Edge*, int> :: iterator iter;
+
std::
map <Edge*, int> edge_count;
+
std::
map <Edge*, int> :: iterator iter;
int nbre = tquad.size();
for (int nq=0 ; nq<nbre ; ++nq)
{
int nbre = tquad.size();
for (int nq=0 ; nq<nbre ; ++nq)
{
@@
-634,7
+634,7
@@
void Elements::checkContour (Quads& tquad, Vertex* v1, Vertex* v2, bool target,
{
tvertex.clear ();
cpchar who = target ? "Target" : "Pattern";
{
tvertex.clear ();
cpchar who = target ? "Target" : "Pattern";
- string nmedge = target ? "Vertices of target (args 4 and 6)"
+ st
d::st
ring nmedge = target ? "Vertices of target (args 4 and 6)"
: "Vertices of pattern (args 3 and 5)" ;
nmedge += "don't define an edge" ;
: "Vertices of pattern (args 3 and 5)" ;
nmedge += "don't define an edge" ;
@@
-646,8
+646,8
@@
void Elements::checkContour (Quads& tquad, Vertex* v1, Vertex* v2, bool target,
return;
}
return;
}
- map <Edge*, int> edge_count;
- map <Edge*, int> :: iterator iter;
+
std::
map <Edge*, int> edge_count;
+
std::
map <Edge*, int> :: iterator iter;
int nbre = tquad.size();
for (int nq=0 ; nq<nbre ; ++nq)
{
int nbre = tquad.size();
for (int nq=0 ; nq<nbre ; ++nq)
{