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
[bos #41978][EDF] Edit table of density on wire discretization. Load properly the...
[modules/smesh.git]
/
src
/
StdMeshers
/
StdMeshers_MaxElementArea.cxx
diff --git
a/src/StdMeshers/StdMeshers_MaxElementArea.cxx
b/src/StdMeshers/StdMeshers_MaxElementArea.cxx
index e42dd783c5b83d6aec72b8322432cbdb6b2a5bd4..d0d178201bb9d15f2beb90e7f58b65b6ac388f5d 100644
(file)
--- a/
src/StdMeshers/StdMeshers_MaxElementArea.cxx
+++ b/
src/StdMeshers/StdMeshers_MaxElementArea.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
12 CEA/DEN, EDF R&D
, OPEN CASCADE
+// Copyright (C) 2007-20
24 CEA, EDF
, 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 SMESH : implementaion of SMESH idl descriptions
+// SMESH SMESH : implementa
t
ion of SMESH idl descriptions
// File : StdMeshers_MaxElementArea.cxx
// Moved here from SMESH_MaxElementArea.cxx
// Author : Paul RASCLE, EDF
// File : StdMeshers_MaxElementArea.cxx
// Moved here from SMESH_MaxElementArea.cxx
// Author : Paul RASCLE, EDF
@@
-28,9
+28,11
@@
//
#include "StdMeshers_MaxElementArea.hxx"
//
#include "StdMeshers_MaxElementArea.hxx"
-#include "SMESH_ControlsDef.hxx"
#include "SMDS_MeshElement.hxx"
#include "SMDS_MeshElement.hxx"
+#include "SMESHDS_Mesh.hxx"
+#include "SMESHDS_Mesh.hxx"
#include "SMESHDS_SubMesh.hxx"
#include "SMESHDS_SubMesh.hxx"
+#include "SMESH_ControlsDef.hxx"
#include "SMESH_Mesh.hxx"
#include <TopExp.hxx>
#include "SMESH_Mesh.hxx"
#include <TopExp.hxx>
@@
-46,8
+48,8
@@
using namespace std;
*/
//=============================================================================
*/
//=============================================================================
-StdMeshers_MaxElementArea::StdMeshers_MaxElementArea(int hypId,
int studyId,
SMESH_Gen* gen)
- : SMESH_Hypothesis(hypId,
studyId,
gen)
+StdMeshers_MaxElementArea::StdMeshers_MaxElementArea(int hypId, SMESH_Gen* gen)
+ : SMESH_Hypothesis(hypId, gen)
{
_maxArea =1.;
_name = "MaxElementArea";
{
_maxArea =1.;
_name = "MaxElementArea";
@@
-71,7
+73,6
@@
StdMeshers_MaxElementArea::~StdMeshers_MaxElementArea()
//=============================================================================
void StdMeshers_MaxElementArea::SetMaxArea(double maxArea)
//=============================================================================
void StdMeshers_MaxElementArea::SetMaxArea(double maxArea)
- throw (SALOME_Exception)
{
double oldArea = _maxArea;
if (maxArea <= 0)
{
double oldArea = _maxArea;
if (maxArea <= 0)
@@
-114,7
+115,7
@@
istream & StdMeshers_MaxElementArea::LoadFrom(istream & load)
{
bool isOK = true;
double a;
{
bool isOK = true;
double a;
- isOK = (load >> a);
+ isOK =
static_cast<bool>
(load >> a);
if (isOK)
this->_maxArea = a;
else
if (isOK)
this->_maxArea = a;
else