ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-11-15 18:18:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

0021208: Performance issue when loading SMESH with an hdf file containing a big mesh

Browse Source 
reimplement after making all member fields of SMESH_subMesh_i private
This commit is contained in:
eap 2012-02-24 10:49:18 +00:00
parent f2e2182b74
commit 9b54dd0f44
3 changed files with 42 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/SMESH_I/SMESH_MEDFamily_i.cxx
View File

@ -102,7 +102,7 @@ SMESH_MEDFamily_i::SMESH_MEDFamily_i(int identifier, SMESH_subMesh_i* sm,
CORBA::Long SMESH_MEDFamily_i::getIdentifier() CORBA::Long SMESH_MEDFamily_i::getIdentifier()
throw (SALOME::SALOME_Exception) throw (SALOME::SALOME_Exception)
{ {
if (_subMeshDS==NULL) if (_subMesh==NULL)
THROW_SALOME_CORBA_EXCEPTION("No associated Family",\ THROW_SALOME_CORBA_EXCEPTION("No associated Family",\
SALOME::INTERNAL_ERROR); SALOME::INTERNAL_ERROR);
return _identifier; return _identifier;
@ -116,7 +116,7 @@ throw (SALOME::SALOME_Exception)
CORBA::Long SMESH_MEDFamily_i::getNumberOfAttributes() CORBA::Long SMESH_MEDFamily_i::getNumberOfAttributes()
throw (SALOME::SALOME_Exception) throw (SALOME::SALOME_Exception)
{ {
if (_subMeshDS==NULL) if (_subMesh==NULL)
THROW_SALOME_CORBA_EXCEPTION("No associated Family",\ THROW_SALOME_CORBA_EXCEPTION("No associated Family",\
SALOME::INTERNAL_ERROR); SALOME::INTERNAL_ERROR);
return _numberOfAttribute; return _numberOfAttribute;
@ -129,7 +129,7 @@ throw (SALOME::SALOME_Exception)
SALOME_TYPES::ListOfLong* SMESH_MEDFamily_i::getAttributesIdentifiers() SALOME_TYPES::ListOfLong* SMESH_MEDFamily_i::getAttributesIdentifiers()
throw (SALOME::SALOME_Exception) throw (SALOME::SALOME_Exception)
{ {
if (_subMeshDS==NULL) if (_subMesh==NULL)
THROW_SALOME_CORBA_EXCEPTION("No associated Family",\ THROW_SALOME_CORBA_EXCEPTION("No associated Family",\
SALOME::INTERNAL_ERROR); SALOME::INTERNAL_ERROR);
if (_numberOfAttribute == 0) if (_numberOfAttribute == 0)
@ -156,7 +156,7 @@ throw (SALOME::SALOME_Exception)
CORBA::Long SMESH_MEDFamily_i::getAttributeIdentifier(CORBA::Long i) CORBA::Long SMESH_MEDFamily_i::getAttributeIdentifier(CORBA::Long i)
throw (SALOME::SALOME_Exception) throw (SALOME::SALOME_Exception)
{ {
if (_subMeshDS==NULL) if (_subMesh==NULL)
THROW_SALOME_CORBA_EXCEPTION("No associated Family",\ THROW_SALOME_CORBA_EXCEPTION("No associated Family",\
SALOME::INTERNAL_ERROR); SALOME::INTERNAL_ERROR);
MESSAGE("Les familles SMESH n ont pas d attribut"); MESSAGE("Les familles SMESH n ont pas d attribut");
@ -179,7 +179,7 @@ CORBA::Long SMESH_MEDFamily_i::getAttributeIdentifier(CORBA::Long i)
SALOME_TYPES::ListOfLong* SMESH_MEDFamily_i::getAttributesValues() SALOME_TYPES::ListOfLong* SMESH_MEDFamily_i::getAttributesValues()
throw (SALOME::SALOME_Exception) throw (SALOME::SALOME_Exception)
{ {
if (_subMeshDS==NULL) if (_subMesh==NULL)
THROW_SALOME_CORBA_EXCEPTION("No associated Family",\ THROW_SALOME_CORBA_EXCEPTION("No associated Family",\
SALOME::INTERNAL_ERROR); SALOME::INTERNAL_ERROR);
@ -206,7 +206,7 @@ SALOME_TYPES::ListOfLong* SMESH_MEDFamily_i::getAttributesValues()
CORBA::Long SMESH_MEDFamily_i::getAttributeValue(CORBA::Long i) CORBA::Long SMESH_MEDFamily_i::getAttributeValue(CORBA::Long i)
throw (SALOME::SALOME_Exception) throw (SALOME::SALOME_Exception)
{ {
if (_subMeshDS==NULL) if (_subMesh==NULL)
THROW_SALOME_CORBA_EXCEPTION("No associated Family",\ THROW_SALOME_CORBA_EXCEPTION("No associated Family",\
SALOME::INTERNAL_ERROR); SALOME::INTERNAL_ERROR);
if (_numberOfAttribute == 0) if (_numberOfAttribute == 0)
@ -227,7 +227,7 @@ CORBA::Long SMESH_MEDFamily_i::getAttributeValue(CORBA::Long i)
SALOME_TYPES::ListOfString * SMESH_MEDFamily_i::getAttributesDescriptions() SALOME_TYPES::ListOfString * SMESH_MEDFamily_i::getAttributesDescriptions()
throw (SALOME::SALOME_Exception) throw (SALOME::SALOME_Exception)
{ {
if (_subMeshDS==NULL) if (_subMesh==NULL)
THROW_SALOME_CORBA_EXCEPTION("No associated Family",\ THROW_SALOME_CORBA_EXCEPTION("No associated Family",\
SALOME::INTERNAL_ERROR); SALOME::INTERNAL_ERROR);
if (_numberOfAttribute == 0) if (_numberOfAttribute == 0)
@ -251,7 +251,7 @@ SALOME_TYPES::ListOfString * SMESH_MEDFamily_i::getAttributesDescriptions()
char * SMESH_MEDFamily_i::getAttributeDescription( CORBA::Long i) char * SMESH_MEDFamily_i::getAttributeDescription( CORBA::Long i)
throw (SALOME::SALOME_Exception) throw (SALOME::SALOME_Exception)
{ {
if (_subMeshDS==NULL) if (_subMesh==NULL)
THROW_SALOME_CORBA_EXCEPTION("No associated Family",\ THROW_SALOME_CORBA_EXCEPTION("No associated Family",\
SALOME::INTERNAL_ERROR); SALOME::INTERNAL_ERROR);
if (_numberOfAttribute == 0) if (_numberOfAttribute == 0)

73
src/SMESH_I/SMESH_MEDSupport_i.cxx
View File

@ -29,12 +29,14 @@
#include "Utils_CorbaException.hxx" #include "Utils_CorbaException.hxx"
#include "Utils_ExceptHandlers.hxx" #include "Utils_ExceptHandlers.hxx"
#include <TopoDS_Iterator.hxx>
#include "SMESHDS_Mesh.hxx" #include "SMESHDS_Mesh.hxx"
#include "SMESH_subMesh.hxx" #include "SMESH_subMesh.hxx"
#include "SMESH_Mesh_i.hxx" #include "SMESH_Mesh_i.hxx"
#include "SMESH_subMesh_i.hxx" #include "SMESH_subMesh_i.hxx"
#include "SMESH_Gen_i.hxx"
#include <TopoDS_Iterator.hxx>
using namespace std; using namespace std;
@ -57,23 +59,17 @@ SMESH_MEDSupport_i::SMESH_MEDSupport_i()
//============================================================================= //=============================================================================
SMESH_MEDSupport_i::SMESH_MEDSupport_i(SMESH_subMesh_i * sm, string name, SMESH_MEDSupport_i::SMESH_MEDSupport_i(SMESH_subMesh_i * sm, string name,
string description, SALOME_MED::medEntityMesh entity) string description, SALOME_MED::medEntityMesh entity)
:_subMesh_i(sm), _name(name), _description(description), _entity(entity), :_subMesh_i(sm), _name(name), _description(description), _entity(entity),
_seqNumber(false), _seqLength(0) _seqNumber(false), _seqLength(0)
{ {
BEGIN_OF("Constructor SMESH_MEDSupport_i"); BEGIN_OF("Constructor SMESH_MEDSupport_i");
_meshDS = _subMesh_i->_mesh_i->GetImpl().GetMeshDS(); int subMeshId = sm->GetId();
int subMeshId = _subMesh_i->GetId(); MESSAGE(" subMeshId " << subMeshId);
MESSAGE(" subMeshId " << subMeshId) SMESH_Mesh_i* mesh_i = SMESH::DownCast<SMESH_Mesh_i*>( sm->GetMesh() );
_subMesh = mesh_i->GetImpl().GetSubMeshContaining( subMeshId );
if (_subMesh_i->_mesh_i->_mapSubMesh.find(subMeshId) !=
_subMesh_i->_mesh_i->_mapSubMesh.end())
{
::SMESH_subMesh * subMesh = _subMesh_i->_mesh_i->_mapSubMesh[subMeshId];
_subMeshDS = subMesh->GetSubMeshDS();
}
if (_entity == SALOME_MED::MED_NODE) if (_entity == SALOME_MED::MED_NODE)
{ {
@ -98,22 +94,12 @@ SMESH_MEDSupport_i::SMESH_MEDSupport_i(SMESH_subMesh_i * sm, string name,
*/ */
//============================================================================= //=============================================================================
SMESH_MEDSupport_i:: SMESH_MEDSupport_i::
SMESH_MEDSupport_i(const SMESH_MEDSupport_i & s):_subMesh_i(s._subMesh_i), SMESH_MEDSupport_i(const SMESH_MEDSupport_i & s):_subMesh(s._subMesh),
_name(s._name), _description(s._description), _entity(s._entity), _name(s._name), _description(s._description), _entity(s._entity),
_seqNumber(false), _seqLength(0) _seqNumber(false), _seqLength(0)
{ {
BEGIN_OF("Constructor SMESH_MEDSupport_i"); BEGIN_OF("Constructor SMESH_MEDSupport_i");
_meshDS = _subMesh_i->_mesh_i->GetImpl().GetMeshDS();
int subMeshId = _subMesh_i->GetId();
if (_subMesh_i->_mesh_i->_mapSubMesh.find(subMeshId) !=
_subMesh_i->_mesh_i->_mapSubMesh.end())
{
::SMESH_subMesh * subMesh = _subMesh_i->_mesh_i->_mapSubMesh[subMeshId];
_subMeshDS = subMesh->GetSubMeshDS();
}
END_OF("Constructor SMESH_MEDSupport_i"); END_OF("Constructor SMESH_MEDSupport_i");
} }
@ -135,7 +121,7 @@ SMESH_MEDSupport_i::~SMESH_MEDSupport_i()
CORBA::Long SMESH_MEDSupport_i::getCorbaIndex()throw(SALOME::SALOME_Exception) CORBA::Long SMESH_MEDSupport_i::getCorbaIndex()throw(SALOME::SALOME_Exception)
{ {
if (_subMeshDS == NULL) if (_subMesh == NULL)
THROW_SALOME_CORBA_EXCEPTION("No associated Support", THROW_SALOME_CORBA_EXCEPTION("No associated Support",
SALOME::INTERNAL_ERROR); SALOME::INTERNAL_ERROR);
MESSAGE("Not implemented for SMESH_i"); MESSAGE("Not implemented for SMESH_i");
@ -151,7 +137,7 @@ CORBA::Long SMESH_MEDSupport_i::getCorbaIndex()throw(SALOME::SALOME_Exception)
char *SMESH_MEDSupport_i::getName() throw(SALOME::SALOME_Exception) char *SMESH_MEDSupport_i::getName() throw(SALOME::SALOME_Exception)
{ {
if (_subMeshDS==NULL) if (_subMesh==NULL)
THROW_SALOME_CORBA_EXCEPTION("No associated Support", THROW_SALOME_CORBA_EXCEPTION("No associated Support",
SALOME::INTERNAL_ERROR); SALOME::INTERNAL_ERROR);
return CORBA::string_dup(_name.c_str()); return CORBA::string_dup(_name.c_str());
@ -166,7 +152,7 @@ char *SMESH_MEDSupport_i::getName() throw(SALOME::SALOME_Exception)
char *SMESH_MEDSupport_i::getDescription() throw(SALOME::SALOME_Exception) char *SMESH_MEDSupport_i::getDescription() throw(SALOME::SALOME_Exception)
{ {
if (_subMeshDS==NULL) if (_subMesh==NULL)
THROW_SALOME_CORBA_EXCEPTION("No associated Support", THROW_SALOME_CORBA_EXCEPTION("No associated Support",
SALOME::INTERNAL_ERROR); SALOME::INTERNAL_ERROR);
return CORBA::string_dup(_description.c_str()); return CORBA::string_dup(_description.c_str());
@ -181,11 +167,11 @@ char *SMESH_MEDSupport_i::getDescription() throw(SALOME::SALOME_Exception)
SALOME_MED::GMESH_ptr SMESH_MEDSupport_i::getMesh()throw(SALOME:: SALOME_MED::GMESH_ptr SMESH_MEDSupport_i::getMesh()throw(SALOME::
SALOME_Exception) SALOME_Exception)
{ {
if (_subMeshDS==NULL) if (_subMesh==NULL)
THROW_SALOME_CORBA_EXCEPTION("No associated Support", THROW_SALOME_CORBA_EXCEPTION("No associated Support",
SALOME::INTERNAL_ERROR); SALOME::INTERNAL_ERROR);
return _subMesh_i->_mesh_i->GetMEDMesh(); return _subMesh_i->GetMesh()->GetMEDMesh();
} }
//============================================================================= //=============================================================================
@ -197,14 +183,14 @@ SALOME_MED::GMESH_ptr SMESH_MEDSupport_i::getMesh()throw(SALOME::
CORBA::Boolean SMESH_MEDSupport_i::isOnAllElements()throw(SALOME:: CORBA::Boolean SMESH_MEDSupport_i::isOnAllElements()throw(SALOME::
SALOME_Exception) SALOME_Exception)
{ {
if (_subMeshDS==NULL) if (_subMesh==NULL)
THROW_SALOME_CORBA_EXCEPTION("No associated Support", THROW_SALOME_CORBA_EXCEPTION("No associated Support",
SALOME::INTERNAL_ERROR); SALOME::INTERNAL_ERROR);
if (_seqNumber == false) if (_seqNumber == false)
{ {
if (_entity != SALOME_MED::MED_NONE) if (_entity != SALOME_MED::MED_NONE)
{ {
_seqLength = _subMeshDS->NbNodes(); _seqLength = _subMesh_i->GetNumberOfNodes(/*all=*/false);
_seqNumber = true; _seqNumber = true;
} }
else else
@ -216,7 +202,7 @@ CORBA::Boolean SMESH_MEDSupport_i::isOnAllElements()throw(SALOME::
} }
try try
{ {
_isOnAllElements = (_seqLength == _meshDS->NbNodes()); _isOnAllElements = (_seqLength == _subMesh->GetFather()->NbNodes());
} }
catch(...) catch(...)
{ {
@ -236,7 +222,7 @@ CORBA::Boolean SMESH_MEDSupport_i::isOnAllElements()throw(SALOME::
SALOME_MED::medEntityMesh SMESH_MEDSupport_i::getEntity()throw(SALOME:: SALOME_MED::medEntityMesh SMESH_MEDSupport_i::getEntity()throw(SALOME::
SALOME_Exception) SALOME_Exception)
{ {
if (_subMeshDS==NULL) if (_subMesh==NULL)
THROW_SALOME_CORBA_EXCEPTION("No associated Support", THROW_SALOME_CORBA_EXCEPTION("No associated Support",
SALOME::INTERNAL_ERROR); SALOME::INTERNAL_ERROR);
return _entity; return _entity;
@ -251,7 +237,7 @@ SALOME_MED::medEntityMesh SMESH_MEDSupport_i::getEntity()throw(SALOME::
SALOME_MED::medGeometryElement_array * SALOME_MED::medGeometryElement_array *
SMESH_MEDSupport_i::getTypes()throw(SALOME::SALOME_Exception) SMESH_MEDSupport_i::getTypes()throw(SALOME::SALOME_Exception)
{ {
if (_subMeshDS==NULL) if (_subMesh==NULL)
THROW_SALOME_CORBA_EXCEPTION("No associated Support", THROW_SALOME_CORBA_EXCEPTION("No associated Support",
SALOME::INTERNAL_ERROR); SALOME::INTERNAL_ERROR);
SALOME_MED::medGeometryElement_array_var myseq = SALOME_MED::medGeometryElement_array_var myseq =
@ -283,7 +269,7 @@ SALOME_MED::medGeometryElement_array *
CORBA::Long SMESH_MEDSupport_i::getNumberOfElements(SALOME_MED:: CORBA::Long SMESH_MEDSupport_i::getNumberOfElements(SALOME_MED::
medGeometryElement geomElement) throw(SALOME::SALOME_Exception) medGeometryElement geomElement) throw(SALOME::SALOME_Exception)
{ {
if (_subMeshDS==NULL) if (_subMesh==NULL)
THROW_SALOME_CORBA_EXCEPTION("No associated Support", THROW_SALOME_CORBA_EXCEPTION("No associated Support",
SALOME::INTERNAL_ERROR); SALOME::INTERNAL_ERROR);
return _numberOfGeometricType; return _numberOfGeometricType;
@ -300,7 +286,7 @@ SALOME_TYPES::ListOfLong * SMESH_MEDSupport_i::getNumber(
SALOME_MED::medGeometryElement geomElement) throw(SALOME::SALOME_Exception) SALOME_MED::medGeometryElement geomElement) throw(SALOME::SALOME_Exception)
{ {
Unexpect aCatch(SALOME_SalomeException); Unexpect aCatch(SALOME_SalomeException);
if (_subMeshDS==NULL) if (_subMesh==NULL)
THROW_SALOME_CORBA_EXCEPTION("No associated Support", THROW_SALOME_CORBA_EXCEPTION("No associated Support",
SALOME::INTERNAL_ERROR); SALOME::INTERNAL_ERROR);
@ -311,14 +297,17 @@ SALOME_TYPES::ListOfLong * SMESH_MEDSupport_i::getNumber(
SALOME_TYPES::ListOfLong_var myseq = new SALOME_TYPES::ListOfLong; SALOME_TYPES::ListOfLong_var myseq = new SALOME_TYPES::ListOfLong;
int i = 0; int i = 0;
myseq->length(_subMeshDS->NbNodes()); myseq->length(_subMesh_i->GetNumberOfNodes(/*all=*/false));
SMDS_NodeIteratorPtr it = _subMeshDS->GetNodes(); if ( _subMesh->GetSubMeshDS() )
while(it->more())
{ {
myseq[i] = it->next()->GetID(); SMDS_NodeIteratorPtr it = _subMesh->GetSubMeshDS()->GetNodes();
i++; while(it->more())
}; {
myseq[i] = it->next()->GetID();
i++;
};
}
SCRUTE(myseq->length()); SCRUTE(myseq->length());
MESSAGE("End of SMESH_MEDSupport_i::getNumber"); MESSAGE("End of SMESH_MEDSupport_i::getNumber");

6
src/SMESH_I/SMESH_MEDSupport_i.hxx
View File

@ -40,6 +40,7 @@
#include "SMESH_MEDSupport_i.hxx" #include "SMESH_MEDSupport_i.hxx"
#include "SALOME_GenericObj_i.hh" #include "SALOME_GenericObj_i.hh"
class SMESH_subMesh;
class SMESH_subMesh_i; class SMESH_subMesh_i;
class SMESH_I_EXPORT SMESH_MEDSupport_i: class SMESH_I_EXPORT SMESH_MEDSupport_i:
@ -98,10 +99,9 @@ class SMESH_I_EXPORT SMESH_MEDSupport_i:
void createSeq() throw(SALOME::SALOME_Exception); void createSeq() throw(SALOME::SALOME_Exception);
public: //public field public: //public field
const SMESHDS_SubMesh * _subMeshDS; SMESH_subMesh_i * _subMesh_i;
::SMESH_subMesh_i * _subMesh_i; ::SMESH_subMesh * _subMesh;
SMESHDS_Mesh * _meshDS;
std::string _name; std::string _name;
std::string _description; std::string _description;
bool _isOnAllElements; bool _isOnAllElements;