Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
23566: EDF 17146 - Problem with viscous layer
[modules/smesh.git]
/
src
/
StdMeshers
/
StdMeshers_Deflection1D.cxx
diff --git
a/src/StdMeshers/StdMeshers_Deflection1D.cxx
b/src/StdMeshers/StdMeshers_Deflection1D.cxx
index be865e829f37e0148c5cb05233912e4fd28b9bd3..1e9227d9d3aa5c02f7ef35eaeb115e75e77c7aef 100644
(file)
--- a/
src/StdMeshers/StdMeshers_Deflection1D.cxx
+++ b/
src/StdMeshers/StdMeshers_Deflection1D.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
3
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-6,7
+6,7
@@
// 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
@@
-20,7
+20,7
@@
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
-// SMESH StdMeshers_Deflection1D : implementaion of SMESH idl descriptions
+// SMESH StdMeshers_Deflection1D : implementa
t
ion of SMESH idl descriptions
// File : StdMeshers_Deflection1D.cxx
// Module : SMESH
//
// File : StdMeshers_Deflection1D.cxx
// Module : SMESH
//
@@
-50,9
+50,8
@@
using namespace std;
//=============================================================================
StdMeshers_Deflection1D::StdMeshers_Deflection1D(int hypId,
//=============================================================================
StdMeshers_Deflection1D::StdMeshers_Deflection1D(int hypId,
- int studyId,
SMESH_Gen * gen)
SMESH_Gen * gen)
- :SMESH_Hypothesis(hypId,
studyId,
gen)
+ :SMESH_Hypothesis(hypId, gen)
{
_value = 1.;
_name = "Deflection1D";
{
_value = 1.;
_name = "Deflection1D";
@@
-119,7
+118,7
@@
ostream & StdMeshers_Deflection1D::SaveTo(ostream & save)
istream & StdMeshers_Deflection1D::LoadFrom(istream & load)
{
istream & StdMeshers_Deflection1D::LoadFrom(istream & load)
{
- bool isOK = (load >> _value);
+ bool isOK =
static_cast<bool>
(load >> _value);
if (!isOK)
load.clear(ios::badbit | load.rdstate());
return load;
if (!isOK)
load.clear(ios::badbit | load.rdstate());
return load;
@@
-212,7
+211,7
@@
bool StdMeshers_Deflection1D::SetParametersByMesh(const SMESH_Mesh* theMesh,
if ( SMESH_Algo::GetNodeParamOnEdge( aMeshDS, edge, params ))
{
nbEdges++;
if ( SMESH_Algo::GetNodeParamOnEdge( aMeshDS, edge, params ))
{
nbEdges++;
- for (
in
t i = 1; i < params.size(); ++i )
+ for (
size_
t i = 1; i < params.size(); ++i )
_value = Max( _value, deflection( AdaptCurve, params[ i-1 ], params[ i ]));
}
}
_value = Max( _value, deflection( AdaptCurve, params[ i-1 ], params[ i ]));
}
}