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
Merge V9_dev branch into master
[modules/hexablock.git]
/
src
/
HEXABLOCK
/
HexElements_ter.cxx
diff --git
a/src/HEXABLOCK/HexElements_ter.cxx
b/src/HEXABLOCK/HexElements_ter.cxx
index e3f2aa41d5e984f48ee41d318f9caa1a67a5029a..3b4a17b26ba30c4e85ea8cb2a0b1278989eaca14 100755
(executable)
--- a/
src/HEXABLOCK/HexElements_ter.cxx
+++ b/
src/HEXABLOCK/HexElements_ter.cxx
@@
-1,11
+1,11
@@
// C++ : Table d'hexaedres (Evol Versions 3)
// C++ : Table d'hexaedres (Evol Versions 3)
-// Copyright (C) 2009-201
3
CEA/DEN, EDF R&D
+// Copyright (C) 2009-201
6
CEA/DEN, EDF R&D
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License
, or (at your option) any later version
.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-37,7
+37,7
@@
BEGIN_NAMESPACE_HEXA
BEGIN_NAMESPACE_HEXA
-
//
static bool db=false;
+static bool db=false;
// ====================================================== getCylPoint
int Elements::getCylPoint (int nr, int na, int nh, double& px, double& py,
// ====================================================== getCylPoint
int Elements::getCylPoint (int nr, int na, int nh, double& px, double& py,
@@
-203,8
+203,9
@@
void Elements::assoCylinders (double* ori, double* vk, double angle,
double pmax = t_angles [ny+1]/360;
Edge* edge = getEdgeJ (nx, ny, nz);
geom->addAssociation (edge, subid, pmin, pmax);
double pmax = t_angles [ny+1]/360;
Edge* edge = getEdgeJ (nx, ny, nz);
geom->addAssociation (edge, subid, pmin, pmax);
- cout << " assoCylinders : ny= " << ny << ", nz= " << nz
- << " param = (" << pmin << ", " << pmax << ")\n";
+ if (db) cout << " assoCylinders : ny= " << ny
+ << ", nz= " << nz << " param = ("
+ << pmin << ", " << pmax << ")\n";
}
}
}
}
}
}