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
Merge V9_dev branch into master
[modules/smesh.git]
/
src
/
SMESH_I
/
SMESH_Gen_i_1.cxx
diff --git
a/src/SMESH_I/SMESH_Gen_i_1.cxx
b/src/SMESH_I/SMESH_Gen_i_1.cxx
index 6b3da78a1efcc5e3c0909a379c9bd534f64de8b7..e1499f8a7ccc4e05c2221cb710382efe092d0c7f 100644
(file)
--- a/
src/SMESH_I/SMESH_Gen_i_1.cxx
+++ b/
src/SMESH_I/SMESH_Gen_i_1.cxx
@@
-308,10
+308,10
@@
static SALOMEDS::SObject_ptr publish(CORBA::Object_ptr theIOR,
if ( !sameIOR )
{
iorAttr->SetValue( objStr.in() );
if ( !sameIOR )
{
iorAttr->SetValue( objStr.in() );
- // UnRegister() !!!
- SALOME::GenericObj_var genObj = SALOME::GenericObj::_narrow( theIOR );
- if ( !genObj->_is_nil() )
- genObj->UnRegister();
+ // UnRegister() !!!
--> No: random problems when meshing in parallel (yacs foreach) in distributed python scripts
+
//
SALOME::GenericObj_var genObj = SALOME::GenericObj::_narrow( theIOR );
+
//
if ( !genObj->_is_nil() )
+
//
genObj->UnRegister();
}
}
}
}
@@
-499,7
+499,7
@@
SALOMEDS::SObject_ptr SMESH_Gen_i::PublishInStudy(SALOMEDS::SObject_ptr theSObje
// Publishing a hypothesis or algorithm
SMESH::SMESH_Hypothesis_var aHyp = SMESH::SMESH_Hypothesis::_narrow( theIOR );
if ( aSO->_is_nil() && !aHyp->_is_nil() )
// Publishing a hypothesis or algorithm
SMESH::SMESH_Hypothesis_var aHyp = SMESH::SMESH_Hypothesis::_narrow( theIOR );
if ( aSO->_is_nil() && !aHyp->_is_nil() )
- aSO = PublishHypothesis( aHyp );
+ aSO = PublishHypothesis( aHyp
, theName
);
// Publishing a group
SMESH::SMESH_GroupBase_var aGroup = SMESH::SMESH_GroupBase::_narrow(theIOR);
// Publishing a group
SMESH::SMESH_GroupBase_var aGroup = SMESH::SMESH_GroupBase::_narrow(theIOR);
@@
-1013,7
+1013,7
@@
void SMESH_Gen_i::UpdateParameters(CORBA::Object_ptr theObject, const char* theP
myLastObj.clear();
myLastParameters.clear();
myLastParamIndex.clear(); /* vector holding indices of virables within the string
myLastObj.clear();
myLastParameters.clear();
myLastParamIndex.clear(); /* vector holding indices of virables within the string
- of all varibles used for theObject */
+ of all vari
a
bles used for theObject */
int nbVars = 0;
int pos = 0, prevPos = 0, len = strlen( theParameters );
if ( len == 0 ) return;
int nbVars = 0;
int pos = 0, prevPos = 0, len = strlen( theParameters );
if ( len == 0 ) return;
@@
-1042,7
+1042,7
@@
void SMESH_Gen_i::UpdateParameters(CORBA::Object_ptr theObject, const char* theP
return;
// store
return;
// store
- // (1) variable names in the string of all varibles used for theObject and
+ // (1) variable names in the string of all vari
a
bles used for theObject and
// (2) indices of found variables in myLastParamIndex.
// remember theObject
// (2) indices of found variables in myLastParamIndex.
// remember theObject