eap 2017-10-09 15:28:05 +03:00 committed by vsr
parent 09d1bbfd30
commit 678b908f16
19 changed files with 36 additions and 35 deletions

View File

@ -90,7 +90,7 @@ MARK_AS_ADVANCED(SALOME_BUILD_GUI SALOME_SMESH_USE_CGNS SALOME_SMESH_USE_TBB)
# Prerequisites
# =============
# Find "big" prerequisites first - they reference themselves many others
# -> this can help finding the smaller prerequisites and detect conficts.
# -> this can help finding the smaller prerequisites and detect conflicts.
# In our case KERNEL has already loaded many prereq:
##

View File

@ -37,7 +37,7 @@
2004-01-05 16:14 Jerome Robert <jerome.robert@eads.net>
* adm_local/unix/config_files/check_Netgen.m4: Fix a mispelled
* adm_local/unix/config_files/check_Netgen.m4: Fix a misspelled
environment variable for idl python
2004-01-05 14:28 tag V1_3_1
@ -59,7 +59,7 @@
2004-01-05 09:05 Jerome Robert <jerome.robert@eads.net>
* src/: SMDS/SMDS_Mesh.cxx, SMESHDS/SMESHDS_Document.cxx: [Bug
SMESH4830] bug in instal with gcc 2.95. Bug fixed. Note: SGI say
SMESH4830] bug in install with gcc 2.95. Bug fixed. Note: SGI say
that <algorithm> is requiered to use set_intersection (see
http://www.sgi.com/tech/stl/set_intersection.html).
@ -73,7 +73,7 @@
2003-12-15 13:15 Nadir Bouhamou <nadir.bouhamou@cea.fr>
* src/SMESHDS/SMESHDS_Script.cxx: correct a small bug found by the
EDF developpement team (PN and AT) : AddVolume in the case of a
EDF development team (PN and AT) : AddVolume in the case of a
Tetrahedron.
2003-12-11 09:51 Jerome Robert <jerome.robert@eads.net>
@ -1194,7 +1194,7 @@
* idl/Makefile.in, adm_local/unix/make_commence.in,
adm_local/unix/make_omniorb.in, build_configure,
configure.in.base: NRI : Update IDL Dependancies.
configure.in.base: NRI : Update IDL Dependencies.
2003-05-28 07:20 Nicolas Rejneri <nicolas.rejneri@opencascade.com>

2
README
View File

@ -41,7 +41,7 @@ Installation
Pre-requisites
--------------
SALOME platform relies on a set of third-party softwares; some of them are needed
SALOME platform relies on a set of third-party software; some of them are needed
at build time only, while other ones are needed in runtime also.
For more information about the pre-requisites please visit SALOME platform web

View File

@ -1,6 +1,6 @@
# - Config file for the @PROJECT_NAME@ package
# It defines the following variables.
# Specific to the pacakge @PROJECT_NAME@ itself:
# Specific to the package @PROJECT_NAME@ itself:
# @PROJECT_NAME_UC@_ROOT_DIR_EXP - the root path of the installation providing this CMake file
#

View File

@ -149,7 +149,7 @@ module SMESH
SALOMEDS::Study GetCurrentStudy();
/*!
* Create a hypothesis that can be shared by differents parts of the mesh.
* Create a hypothesis that can be shared by different parts of the mesh.
* An hypothesis is either:
* - a method used to generate or modify a part of the mesh (algorithm).
* - a parameter or a law used by an algorithm.

View File

@ -1696,10 +1696,10 @@ const SMDS_MeshNode * SMDS_Mesh::FindNodeVtk(int vtkId) const
return (const SMDS_MeshNode *)myNodes[vtkId+1];
}
///////////////////////////////////////////////////////////////////////////////
///Create a triangle and add it to the current mesh. This method do not bind an
///ID to the create triangle.
///////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
///Create a triangle and add it to the current mesh. This method does not bind
///an ID to the create triangle.
//////////////////////////////////////////////////////////////////////////////
SMDS_MeshFace * SMDS_Mesh::createTriangle(const SMDS_MeshNode * node1,
const SMDS_MeshNode * node2,
const SMDS_MeshNode * node3,
@ -1746,10 +1746,10 @@ SMDS_MeshFace * SMDS_Mesh::createTriangle(const SMDS_MeshNode * node1,
}
}
///////////////////////////////////////////////////////////////////////////////
///Create a quadrangle and add it to the current mesh. This methode do not bind
///a ID to the create triangle.
///////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
///Create a quadrangle and add it to the current mesh. This method does not bind
///an ID to the create triangle.
////////////////////////////////////////////////////////////////////////////////
SMDS_MeshFace * SMDS_Mesh::createQuadrangle(const SMDS_MeshNode * node1,
const SMDS_MeshNode * node2,
const SMDS_MeshNode * node3,

View File

@ -1232,7 +1232,7 @@ void SMESHGUI_BaseComputeOp::showComputeResult( const bool theMemoryLack,
currentCellChanged(); // to update buttons
}
}
// show dialog and wait, becase Compute can be invoked from Preview operation
// show dialog and wait, because Compute can be invoked from Preview operation
//aCompDlg->exec(); // this way it becomes modal - impossible to rotate model in the Viewer
aCompDlg->show();
}
@ -2389,7 +2389,7 @@ void SMESHGUI_BaseComputeOp::showEvaluateResult(const SMESH::long_array& theRes,
currentCellChanged(); // to update buttons
}
}
// show dialog and wait, becase Compute can be invoked from Preview operation
// show dialog and wait, because Compute can be invoked from Preview operation
//aCompDlg->exec(); // this way it becomes modal - impossible to rotate model in the Viewer
aCompDlg->show();
}

View File

@ -1118,14 +1118,14 @@ bool SMESHGUI_GroupDlg::onApply()
{
if ( myFilter->_is_nil() ) return false;
if (CORBA::is_nil(myGroupOnFilter)) { // creation
if (CORBA::is_nil(myGroupOnFilter)) // creation
{
if (myMesh->_is_nil())
return false;
myGroupOnFilter = myMesh->CreateGroupFromFilter(aType,
SMESH::toUtf8(myName->text()),
myFilter);
resultGroup = SMESH::SMESH_GroupBase::_narrow( myGroupOnFilter );
isCreation = true;
}
@ -1139,7 +1139,7 @@ bool SMESHGUI_GroupDlg::onApply()
anIsOk = true;
}
if( anIsOk )
if ( anIsOk )
{
SALOMEDS::Color aColor = getGroupColor();
resultGroup->SetColor(aColor);

View File

@ -435,7 +435,7 @@ void SMESHGUI_MultiEditDlg::onOk()
//=======================================================================
// name : SMESHGUI_MultiEditDlg::getIds
// Purpose : Retrive identifiers from list box or the whole object
// Purpose : Retrieve identifiers from list box or the whole object
//=======================================================================
SMESH::long_array_var SMESHGUI_MultiEditDlg::getIds(SMESH::SMESH_IDSource_var& obj)

View File

@ -792,7 +792,7 @@ std::ostream & StdMeshers_CartesianParameters3D::SaveTo(std::ostream & save)
//=======================================================================
//function : LoadFrom
//purpose : resore my parameters from a stream
//purpose : restore my parameters from a stream
//=======================================================================
std::istream & StdMeshers_CartesianParameters3D::LoadFrom(std::istream & load)

View File

@ -111,6 +111,7 @@ namespace {
algo->myProxyMesh.reset( new SMESH_ProxyMesh( *helper->GetMesh() ));
algo->myQuadList.clear();
algo->myHelper = 0;
if ( helper )
algo->_quadraticMesh = helper->GetIsQuadratic();
@ -2589,7 +2590,7 @@ double StdMeshers_Prism_3D::getSweepTolerance( const Prism_3D::TPrismTopo& thePr
//=======================================================================
//function : isSimpleQuad
//purpose : check if the bottom FACE is meshable with nice qudrangles,
//purpose : check if the bottom FACE is meshable with nice quadrangles,
// if so the block aproach can work rather fast.
// This is a temporary mean caused by problems in StdMeshers_Sweeper
//=======================================================================

View File

@ -701,7 +701,7 @@ bool StdMeshers_ProjectionUtils::FindSubShapeAssociation(const TopoDS_Shape& the
RETURN_BAD_RESULT("edge2 does not belong to theShape2");
}
//
// Look for 2 corresponing faces:
// Look for 2 corresponding faces:
//
TopoDS_Shape F1, F2;

View File

@ -669,7 +669,7 @@ public:
return true;
}
// -----------------------------------------------------------------------------
//! Make mesh on an adge using assigned 1d hyp or defaut nb of segments
//! Make mesh on an adge using assigned 1d hyp or default nb of segments
bool ComputeCircularEdge( SMESH_Mesh& aMesh,
const StdMeshers_FaceSidePtr& aSide )
{
@ -697,7 +697,7 @@ public:
return ok;
}
// -----------------------------------------------------------------------------
//! Make mesh on an adge using assigned 1d hyp or defaut nb of segments
//! Make mesh on an adge using assigned 1d hyp or default nb of segments
bool EvaluateCircularEdge(SMESH_Mesh& aMesh,
const StdMeshers_FaceSidePtr aSide,
MapShapeNbElems& aResMap)

View File

@ -1139,7 +1139,7 @@ bool StdMeshers_Regular_1D::Compute(SMESH_Mesh & theMesh, const TopoDS_Shape & t
if ( !nFirst || !nLast )
return error( COMPERR_BAD_INPUT_MESH, "No node on vertex");
// remove elements created by e.g. patern mapping (PAL21999)
// remove elements created by e.g. pattern mapping (PAL21999)
// CLEAN event is incorrectly ptopagated seemingly due to Propagation hyp
// so TEMPORARY solution is to clean the submesh manually
if (SMESHDS_SubMesh * subMeshDS = meshDS->MeshElements(theShape))

View File

@ -5144,7 +5144,7 @@ bool _ViscousBuilder::smoothAndCheck(_SolidData& data,
{
#ifdef __myDEBUG
SMDS_MeshElement::iterator nIt = closestFace->begin_nodes();
cout << "Shortest distance: _LayerEdge nodes: tgt " << le->_nodes.back()->GetID()
cout << "#Shortest distance: _LayerEdge nodes: tgt " << le->_nodes.back()->GetID()
<< " src " << le->_nodes[0]->GetID()<< ", intersection with face ("
<< (*nIt++)->GetID()<<" "<< (*nIt++)->GetID()<<" "<< (*nIt++)->GetID()
<< ") distance = " << distToIntersection<< endl;

View File

@ -8,7 +8,7 @@ Advanced Remeshing Options
- **Ridge detection**
if not set (ridge detection disabled ), MeshGems-SurfOpt will not try to detect any new ridge edge by its own mechanism :
it will consider as ridge only the ridges given in the mesh. All non-ridge edges that would have been detected as ridge by the Ridge angle paramaeter (see below split edge) will be considered as part of the same continuous patch. This option should not be checked when all the known ridges of the mesh are given and when all other possible ridges are not geometric ridges to take into account.
it will consider as ridge only the ridges given in the mesh. All non-ridge edges that would have been detected as ridge by the Ridge angle parameter (see below split edge) will be considered as part of the same continuous patch. This option should not be checked when all the known ridges of the mesh are given and when all other possible ridges are not geometric ridges to take into account.
- **Point smoothing**
When not set (point smoothing is disabled), MeshGems-SurfOpt will not try to move the initial given vertices (along an edge, a ridge or onto the surface), hence MeshGems-SurfOpt will only swap edges, remove vertices or add vertices (refines) to change the mesh.
@ -34,8 +34,8 @@ These two parameters allow the user to prescribe a Maximal/Minimal size for the
- **Mesh gradation**
This paramater P controls the element size variation : MeshGems-SurfOpt will avoid having two adjacent egdes which sizes vary more than th given gradation. a size correction is applied to the size map : if two adjacent edges are respectively e1 and e2 long and e2 > Pxe1, then, the new size for the second edge will be set to P x e1.
**This procedure is desactived if P=-1**
This parameter P controls the element size variation : MeshGems-SurfOpt will avoid having two adjacent egdes which sizes vary more than th given gradation. A size correction is applied to the size map : if two adjacent edges are respectively e1 and e2 long and e2 > Pxe1, then, the new size for the second edge will be set to P x e1.
**This procedure is deactived if P=-1**

View File

@ -98,7 +98,7 @@ it can be :
- relative : the maximal chordal deviation - epsilon max - is set to *s x the parameter* where *s* is the size
of the bounding box longest diagonal.
By default, the parameter is set to 0.001 and the maximum deviation is then set to 0.001 x s,
which is equivalent to say that, for a bouding box of 1 meter, the maximal deviation is 1 mm.
which is equivalent to say that, for a bounding box of 1 meter, the maximal deviation is 1 mm.
- absolute : the maximal chordal deviation is the parameter itself. eg if the parameter equals 2, the maximal chordal deviation will be 2 (mm if the point coordonates are given in mm).
Following that criterion:

View File

@ -567,7 +567,7 @@
<item row="2" column="0">
<widget class="QLabel" name="txtExtractLength">
<property name="toolTip">
<string>Extraction length (optionnal)</string>
<string>Extraction length (optional)</string>
</property>
<property name="text">
<string>Extraction length</string>

View File

@ -371,7 +371,7 @@ CORBA::Long MeshJobManager_i::initialize(const MESHJOB::MeshJobFileList & meshJo
// Specification of the working spaces:
//
// - local_directory: can be used to specify where to find the input
// files on the local resource. It's optionnal if you specify the
// files on the local resource. It's optional if you specify the
// absolute path name of input files.
//
// - result_directory: must be used to specify where to download the