mirror of
https://git.salome-platform.org/gitpub/modules/smesh.git
synced 2024-12-26 01:10:35 +05:00
[bos #32517][EDF] Dynamic log messages switched on and off by SALOME_VERBOSE environment variable
This commit is contained in:
parent
9ec3f92f47
commit
fa95110a3b
@ -4425,9 +4425,10 @@ Predicate* ElementsOnShape::clone() const
|
|||||||
size += sizeof( myWorkClassifiers[0] ) * myWorkClassifiers.size();
|
size += sizeof( myWorkClassifiers[0] ) * myWorkClassifiers.size();
|
||||||
if ( size > 1e+9 ) // 1G
|
if ( size > 1e+9 ) // 1G
|
||||||
{
|
{
|
||||||
#ifdef _DEBUG_
|
|
||||||
|
if (SALOME::VerbosityActivated())
|
||||||
std::cout << "Avoid ElementsOnShape::clone(), too large: " << size << " bytes " << std::endl;
|
std::cout << "Avoid ElementsOnShape::clone(), too large: " << size << " bytes " << std::endl;
|
||||||
#endif
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -28,7 +28,6 @@
|
|||||||
|
|
||||||
#include "SMESH_Comment.hxx"
|
#include "SMESH_Comment.hxx"
|
||||||
|
|
||||||
//#define _DEBUG_
|
|
||||||
#include <utilities.h>
|
#include <utilities.h>
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
@ -79,9 +78,7 @@ Driver_Mesh::Status Driver_Mesh::addMessage(const std::string& msg,
|
|||||||
myErrorMessages.push_back( msg );
|
myErrorMessages.push_back( msg );
|
||||||
|
|
||||||
MESSAGE(msg);
|
MESSAGE(msg);
|
||||||
#ifdef _DEBUG_
|
|
||||||
cout << msg << endl;
|
|
||||||
#endif
|
|
||||||
return ( myStatus = isFatal ? DRS_FAIL : DRS_WARN_SKIP_ELEM );
|
return ( myStatus = isFatal ? DRS_FAIL : DRS_WARN_SKIP_ELEM );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -22,7 +22,7 @@
|
|||||||
// File : DriverCGNS_Read.cxx
|
// File : DriverCGNS_Read.cxx
|
||||||
// Created : Thu Jun 30 10:33:31 2011
|
// Created : Thu Jun 30 10:33:31 2011
|
||||||
// Author : Edward AGAPOV (eap)
|
// Author : Edward AGAPOV (eap)
|
||||||
//#define _DEBUG_
|
|
||||||
#include <utilities.h>
|
#include <utilities.h>
|
||||||
|
|
||||||
#include "DriverCGNS_Read.hxx"
|
#include "DriverCGNS_Read.hxx"
|
||||||
|
@ -42,13 +42,6 @@
|
|||||||
|
|
||||||
//#include <stdlib.h>
|
//#include <stdlib.h>
|
||||||
|
|
||||||
#ifdef _DEBUG_
|
|
||||||
static int MYDEBUG = 0;
|
|
||||||
//#define _DEXCEPT_
|
|
||||||
#else
|
|
||||||
static int MYDEBUG = 0;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define _EDF_NODE_IDS_
|
#define _EDF_NODE_IDS_
|
||||||
|
|
||||||
using namespace MED;
|
using namespace MED;
|
||||||
@ -110,7 +103,7 @@ Driver_Mesh::Status DriverMED_R_SMESHDS_Mesh::Perform()
|
|||||||
try {
|
try {
|
||||||
#endif
|
#endif
|
||||||
myFamilies.clear();
|
myFamilies.clear();
|
||||||
if(MYDEBUG) MESSAGE("Perform - myFile : "<<myFile);
|
MESSAGE("Perform - myFile : "<<myFile);
|
||||||
PWrapper aMed = CrWrapperR(myFile);
|
PWrapper aMed = CrWrapperR(myFile);
|
||||||
|
|
||||||
aResult = DRS_EMPTY;
|
aResult = DRS_EMPTY;
|
||||||
@ -125,7 +118,7 @@ Driver_Mesh::Status DriverMED_R_SMESHDS_Mesh::Perform()
|
|||||||
if (myMeshId != -1) aMeshName = SMESH_Comment( myMeshId );
|
if (myMeshId != -1) aMeshName = SMESH_Comment( myMeshId );
|
||||||
else aMeshName = myMeshName;
|
else aMeshName = myMeshName;
|
||||||
|
|
||||||
if(MYDEBUG) MESSAGE("Perform - aMeshName : "<<aMeshName<<"; "<<aMeshInfo->GetName());
|
MESSAGE("Perform - aMeshName : "<<aMeshName<<"; "<<aMeshInfo->GetName());
|
||||||
if ( aMeshName != aMeshInfo->GetName() ) continue;
|
if ( aMeshName != aMeshInfo->GetName() ) continue;
|
||||||
aResult = DRS_OK;
|
aResult = DRS_OK;
|
||||||
|
|
||||||
@ -133,18 +126,18 @@ Driver_Mesh::Status DriverMED_R_SMESHDS_Mesh::Perform()
|
|||||||
//------------------------------------------------
|
//------------------------------------------------
|
||||||
TErr anErr;
|
TErr anErr;
|
||||||
TInt aNbFams = aMed->GetNbFamilies(aMeshInfo);
|
TInt aNbFams = aMed->GetNbFamilies(aMeshInfo);
|
||||||
if(MYDEBUG) MESSAGE("Read " << aNbFams << " families");
|
MESSAGE("Read " << aNbFams << " families");
|
||||||
for (TInt iFam = 0; iFam < aNbFams; iFam++)
|
for (TInt iFam = 0; iFam < aNbFams; iFam++)
|
||||||
{
|
{
|
||||||
PFamilyInfo aFamilyInfo = aMed->GetPFamilyInfo(aMeshInfo,iFam+1,&anErr);
|
PFamilyInfo aFamilyInfo = aMed->GetPFamilyInfo(aMeshInfo,iFam+1,&anErr);
|
||||||
if(anErr >= 0){
|
if(anErr >= 0){
|
||||||
TInt aFamId = aFamilyInfo->GetId();
|
TInt aFamId = aFamilyInfo->GetId();
|
||||||
if(MYDEBUG) MESSAGE("Family " << aFamId << " :");
|
MESSAGE("Family " << aFamId << " :");
|
||||||
|
|
||||||
DriverMED_FamilyPtr aFamily (new DriverMED_Family);
|
DriverMED_FamilyPtr aFamily (new DriverMED_Family);
|
||||||
|
|
||||||
TInt aNbGrp = aFamilyInfo->GetNbGroup();
|
TInt aNbGrp = aFamilyInfo->GetNbGroup();
|
||||||
if(MYDEBUG) MESSAGE("belong to " << aNbGrp << " groups");
|
MESSAGE("belong to " << aNbGrp << " groups");
|
||||||
bool isAttrOk = false;
|
bool isAttrOk = false;
|
||||||
if(aFamilyInfo->GetNbAttr() == aNbGrp)
|
if(aFamilyInfo->GetNbAttr() == aNbGrp)
|
||||||
isAttrOk = true;
|
isAttrOk = true;
|
||||||
@ -155,7 +148,7 @@ Driver_Mesh::Status DriverMED_R_SMESHDS_Mesh::Perform()
|
|||||||
TInt anAttrVal = aFamilyInfo->GetAttrVal(iGr);
|
TInt anAttrVal = aFamilyInfo->GetAttrVal(iGr);
|
||||||
aFamily->SetGroupAttributVal(anAttrVal);
|
aFamily->SetGroupAttributVal(anAttrVal);
|
||||||
}
|
}
|
||||||
if(MYDEBUG) MESSAGE(aGroupName);
|
MESSAGE(aGroupName);
|
||||||
if ( strncmp( aGroupName.c_str(), NIG_GROUP_PREFIX, strlen(NIG_GROUP_PREFIX) ) != 0 )
|
if ( strncmp( aGroupName.c_str(), NIG_GROUP_PREFIX, strlen(NIG_GROUP_PREFIX) ) != 0 )
|
||||||
aFamily->AddGroupName( fixUTF8( aGroupName ));
|
aFamily->AddGroupName( fixUTF8( aGroupName ));
|
||||||
}
|
}
|
||||||
@ -182,7 +175,7 @@ Driver_Mesh::Status DriverMED_R_SMESHDS_Mesh::Perform()
|
|||||||
|
|
||||||
EBooleen anIsNodeNum = aNodeInfo->IsElemNum();
|
EBooleen anIsNodeNum = aNodeInfo->IsElemNum();
|
||||||
TInt aNbElems = aNodeInfo->GetNbElem();
|
TInt aNbElems = aNodeInfo->GetNbElem();
|
||||||
if(MYDEBUG) MESSAGE("Perform - aNodeInfo->GetNbElem() = "<<aNbElems<<"; anIsNodeNum = "<<anIsNodeNum);
|
MESSAGE("Perform - aNodeInfo->GetNbElem() = "<<aNbElems<<"; anIsNodeNum = "<<anIsNodeNum);
|
||||||
DriverMED_FamilyPtr aFamily;
|
DriverMED_FamilyPtr aFamily;
|
||||||
for ( TInt iElem = 0; iElem < aNbElems; iElem++ )
|
for ( TInt iElem = 0; iElem < aNbElems; iElem++ )
|
||||||
{
|
{
|
||||||
@ -475,8 +468,8 @@ Driver_Mesh::Status DriverMED_R_SMESHDS_Mesh::Perform()
|
|||||||
PCellInfo aCellInfo = aMed->GetPCellInfo(aMeshInfo,anEntity,aGeom);
|
PCellInfo aCellInfo = aMed->GetPCellInfo(aMeshInfo,anEntity,aGeom);
|
||||||
EBooleen anIsElemNum = takeNumbers ? aCellInfo->IsElemNum() : eFAUX;
|
EBooleen anIsElemNum = takeNumbers ? aCellInfo->IsElemNum() : eFAUX;
|
||||||
TInt aNbElems = aCellInfo->GetNbElem();
|
TInt aNbElems = aCellInfo->GetNbElem();
|
||||||
if(MYDEBUG) MESSAGE("Perform - anEntity = "<<anEntity<<"; anIsElemNum = "<<anIsElemNum);
|
MESSAGE("Perform - anEntity = "<<anEntity<<"; anIsElemNum = "<<anIsElemNum);
|
||||||
if(MYDEBUG) MESSAGE("Perform - aGeom = "<<aGeom<<"; aNbElems = "<<aNbElems);
|
MESSAGE("Perform - aGeom = "<<aGeom<<"; aNbElems = "<<aNbElems);
|
||||||
|
|
||||||
TInt aNbNodes = -1;
|
TInt aNbNodes = -1;
|
||||||
switch(aGeom){
|
switch(aGeom){
|
||||||
@ -1046,7 +1039,7 @@ Driver_Mesh::Status DriverMED_R_SMESHDS_Mesh::Perform()
|
|||||||
aResult = DRS_WARN_DESCENDING;
|
aResult = DRS_WARN_DESCENDING;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(MYDEBUG) MESSAGE("Perform - aResult status = "<<aResult);
|
MESSAGE("Perform - aResult status = "<<aResult);
|
||||||
return aResult;
|
return aResult;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1055,7 +1048,7 @@ list<string> DriverMED_R_SMESHDS_Mesh::GetMeshNames(Status& theStatus)
|
|||||||
list<string> aMeshNames;
|
list<string> aMeshNames;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
if(MYDEBUG) MESSAGE("GetMeshNames - myFile : " << myFile);
|
MESSAGE("GetMeshNames - myFile : " << myFile);
|
||||||
theStatus = DRS_OK;
|
theStatus = DRS_OK;
|
||||||
PWrapper aMed = CrWrapperR(myFile);
|
PWrapper aMed = CrWrapperR(myFile);
|
||||||
|
|
||||||
@ -1132,7 +1125,7 @@ void DriverMED_R_SMESHDS_Mesh::GetGroup(SMESHDS_Group* theGroup)
|
|||||||
}
|
}
|
||||||
|
|
||||||
const char* aGroupName = theGroup->GetStoreName();
|
const char* aGroupName = theGroup->GetStoreName();
|
||||||
if(MYDEBUG) MESSAGE("Get Group " << aGroupName);
|
MESSAGE("Get Group " << aGroupName);
|
||||||
|
|
||||||
if (( famVecPtr = myGroups2FamiliesMap.ChangeSeek( aGroupName )))
|
if (( famVecPtr = myGroups2FamiliesMap.ChangeSeek( aGroupName )))
|
||||||
{
|
{
|
||||||
|
@ -37,13 +37,6 @@
|
|||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
||||||
|
|
||||||
#ifdef _DEBUG_
|
|
||||||
static int MYDEBUG = 0;
|
|
||||||
#else
|
|
||||||
static int MYDEBUG = 0;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
namespace
|
namespace
|
||||||
{
|
{
|
||||||
/*!
|
/*!
|
||||||
@ -123,7 +116,7 @@ Driver_Mesh::Status DriverUNV_R_SMDS_Mesh::Perform()
|
|||||||
using namespace UNV2411;
|
using namespace UNV2411;
|
||||||
TDataSet aDataSet2411;
|
TDataSet aDataSet2411;
|
||||||
UNV2411::Read(in_stream,aDataSet2411);
|
UNV2411::Read(in_stream,aDataSet2411);
|
||||||
if(MYDEBUG) MESSAGE("Perform - aDataSet2411.size() = "<<aDataSet2411.size());
|
MESSAGE("Perform - aDataSet2411.size() = "<<aDataSet2411.size());
|
||||||
|
|
||||||
// Move nodes in a global CS
|
// Move nodes in a global CS
|
||||||
if ( !aCoordSysDataSet.empty() )
|
if ( !aCoordSysDataSet.empty() )
|
||||||
@ -168,7 +161,7 @@ Driver_Mesh::Status DriverUNV_R_SMDS_Mesh::Perform()
|
|||||||
TDataSet aDataSet2412;
|
TDataSet aDataSet2412;
|
||||||
UNV2412::Read(in_stream,aDataSet2412);
|
UNV2412::Read(in_stream,aDataSet2412);
|
||||||
TDataSet::const_iterator anIter = aDataSet2412.begin();
|
TDataSet::const_iterator anIter = aDataSet2412.begin();
|
||||||
if(MYDEBUG) MESSAGE("Perform - aDataSet2412.size() = "<<aDataSet2412.size());
|
MESSAGE("Perform - aDataSet2412.size() = "<<aDataSet2412.size());
|
||||||
for(; anIter != aDataSet2412.end(); anIter++)
|
for(; anIter != aDataSet2412.end(); anIter++)
|
||||||
{
|
{
|
||||||
SMDS_MeshElement* anElement = NULL;
|
SMDS_MeshElement* anElement = NULL;
|
||||||
@ -404,7 +397,7 @@ Driver_Mesh::Status DriverUNV_R_SMDS_Mesh::Perform()
|
|||||||
using namespace UNV2417;
|
using namespace UNV2417;
|
||||||
TDataSet aDataSet2417;
|
TDataSet aDataSet2417;
|
||||||
UNV2417::Read(in_stream,aDataSet2417);
|
UNV2417::Read(in_stream,aDataSet2417);
|
||||||
if(MYDEBUG) MESSAGE("Perform - aDataSet2417.size() = "<<aDataSet2417.size());
|
MESSAGE("Perform - aDataSet2417.size() = "<<aDataSet2417.size());
|
||||||
if (aDataSet2417.size() > 0)
|
if (aDataSet2417.size() > 0)
|
||||||
{
|
{
|
||||||
TDataSet::const_iterator anIter = aDataSet2417.begin();
|
TDataSet::const_iterator anIter = aDataSet2417.begin();
|
||||||
|
@ -24,14 +24,6 @@
|
|||||||
#include "MED_Wrapper.hxx"
|
#include "MED_Wrapper.hxx"
|
||||||
#include "MED_Utilities.hxx"
|
#include "MED_Utilities.hxx"
|
||||||
|
|
||||||
#ifdef _DEBUG_
|
|
||||||
static int MYDEBUG = 0;
|
|
||||||
static int MYVALUEDEBUG = 0;
|
|
||||||
#else
|
|
||||||
// static int MYDEBUG = 0;
|
|
||||||
// static int MYVALUEDEBUG = 0;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
namespace MED
|
namespace MED
|
||||||
{
|
{
|
||||||
//---------------------------------------------------------------
|
//---------------------------------------------------------------
|
||||||
@ -40,7 +32,7 @@ namespace MED
|
|||||||
const PMeshInfo& theMeshInfo,
|
const PMeshInfo& theMeshInfo,
|
||||||
const MED::TEntityInfo& theEntityInfo)
|
const MED::TEntityInfo& theEntityInfo)
|
||||||
{
|
{
|
||||||
MSG(MYDEBUG,"GetElemsByEntity(...)");
|
MSG("GetElemsByEntity(...)");
|
||||||
TEntity2TGeom2ElemInfo anEntity2TGeom2ElemInfo;
|
TEntity2TGeom2ElemInfo anEntity2TGeom2ElemInfo;
|
||||||
MED::TEntityInfo::const_iterator anIter = theEntityInfo.begin();
|
MED::TEntityInfo::const_iterator anIter = theEntityInfo.begin();
|
||||||
PElemInfo anElemInfo;
|
PElemInfo anElemInfo;
|
||||||
@ -61,7 +53,7 @@ namespace MED
|
|||||||
aGeom2ElemInfo[aGeom] = theWrapper->GetPElemInfo(theMeshInfo,anEntity,aGeom,MED::eNOD,&anErr);
|
aGeom2ElemInfo[aGeom] = theWrapper->GetPElemInfo(theMeshInfo,anEntity,aGeom,MED::eNOD,&anErr);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
ADDMSG(MYDEBUG,"\n");
|
ADDMSG("\n");
|
||||||
return anEntity2TGeom2ElemInfo;
|
return anEntity2TGeom2ElemInfo;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -70,17 +62,17 @@ namespace MED
|
|||||||
GetFamilyInfoSet(const PWrapper& theWrapper,
|
GetFamilyInfoSet(const PWrapper& theWrapper,
|
||||||
const PMeshInfo& theMeshInfo)
|
const PMeshInfo& theMeshInfo)
|
||||||
{
|
{
|
||||||
MSG(MYDEBUG,"GetFamilies(...)");
|
MSG("GetFamilies(...)");
|
||||||
TErr anErr;
|
TErr anErr;
|
||||||
TFamilyInfoSet aFamilyInfoSet;
|
TFamilyInfoSet aFamilyInfoSet;
|
||||||
TInt aNbFam = theWrapper->GetNbFamilies(*theMeshInfo);
|
TInt aNbFam = theWrapper->GetNbFamilies(*theMeshInfo);
|
||||||
INITMSG(MYDEBUG,"GetNbFamilies() = "<<aNbFam<<"\n");
|
INITMSG("GetNbFamilies() = "<<aNbFam<<"\n");
|
||||||
for(TInt iFam = 1; iFam <= aNbFam; iFam++){
|
for(TInt iFam = 1; iFam <= aNbFam; iFam++){
|
||||||
PFamilyInfo aFamilyInfo = theWrapper->GetPFamilyInfo(theMeshInfo,iFam,&anErr);
|
PFamilyInfo aFamilyInfo = theWrapper->GetPFamilyInfo(theMeshInfo,iFam,&anErr);
|
||||||
if(anErr >= 0)
|
if(anErr >= 0)
|
||||||
aFamilyInfoSet.insert(aFamilyInfo);
|
aFamilyInfoSet.insert(aFamilyInfo);
|
||||||
}
|
}
|
||||||
ADDMSG(MYDEBUG,"\n");
|
ADDMSG("\n");
|
||||||
return aFamilyInfoSet;
|
return aFamilyInfoSet;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -88,7 +80,7 @@ namespace MED
|
|||||||
TGroupInfo
|
TGroupInfo
|
||||||
GetGroupInfo(const TFamilyInfoSet& theFamilyInfoSet)
|
GetGroupInfo(const TFamilyInfoSet& theFamilyInfoSet)
|
||||||
{
|
{
|
||||||
MSG(MYDEBUG,"GetFamiliesByGroup(...)");
|
MSG("GetFamiliesByGroup(...)");
|
||||||
TGroupInfo aGroup;
|
TGroupInfo aGroup;
|
||||||
TFamilyInfoSet::const_iterator anIter = theFamilyInfoSet.begin();
|
TFamilyInfoSet::const_iterator anIter = theFamilyInfoSet.begin();
|
||||||
for(; anIter != theFamilyInfoSet.end(); anIter++){
|
for(; anIter != theFamilyInfoSet.end(); anIter++){
|
||||||
@ -99,22 +91,20 @@ namespace MED
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef _DEBUG_
|
if(SALOME::VerbosityActivated()){
|
||||||
if(MYDEBUG){
|
|
||||||
TGroupInfo::const_iterator anIter = aGroup.begin();
|
TGroupInfo::const_iterator anIter = aGroup.begin();
|
||||||
for(; anIter != aGroup.end(); anIter++){
|
for(; anIter != aGroup.end(); anIter++){
|
||||||
const std::string& aName = anIter->first;
|
const std::string& aName = anIter->first;
|
||||||
INITMSG(MYDEBUG,"aGroupName = '"<<aName<<"'\n");
|
INITMSG("aGroupName = '"<<aName<<"'\n");
|
||||||
const TFamilyInfoSet& aFamilyInfoSet = anIter->second;
|
const TFamilyInfoSet& aFamilyInfoSet = anIter->second;
|
||||||
TFamilyInfoSet::const_iterator anFamIter = aFamilyInfoSet.begin();
|
TFamilyInfoSet::const_iterator anFamIter = aFamilyInfoSet.begin();
|
||||||
for(; anFamIter != aFamilyInfoSet.end(); anFamIter++){
|
for(; anFamIter != aFamilyInfoSet.end(); anFamIter++){
|
||||||
const PFamilyInfo& aFamilyInfo = *anFamIter;
|
const PFamilyInfo& aFamilyInfo = *anFamIter;
|
||||||
INITMSG(MYDEBUG,"aFamilyName = '"<<aFamilyInfo->GetName()<<"'\n");
|
INITMSG("aFamilyName = '"<<aFamilyInfo->GetName()<<"'\n");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
ADDMSG(MYDEBUG,"\n");
|
ADDMSG("\n");
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
return aGroup;
|
return aGroup;
|
||||||
}
|
}
|
||||||
@ -125,28 +115,26 @@ namespace MED
|
|||||||
const PMeshInfo& theMeshInfo,
|
const PMeshInfo& theMeshInfo,
|
||||||
const MED::TEntityInfo& theEntityInfo)
|
const MED::TEntityInfo& theEntityInfo)
|
||||||
{
|
{
|
||||||
MSG(MYDEBUG,"GetFieldsByEntity(...)");
|
MSG("GetFieldsByEntity(...)");
|
||||||
TFieldInfo2TimeStampInfoSet aFieldInfo2TimeStampInfoSet;
|
TFieldInfo2TimeStampInfoSet aFieldInfo2TimeStampInfoSet;
|
||||||
TInt aNbFields = theWrapper->GetNbFields();
|
TInt aNbFields = theWrapper->GetNbFields();
|
||||||
INITMSG(MYDEBUG,"GetNbFields() = "<<aNbFields<<"\n");
|
INITMSG("GetNbFields() = "<<aNbFields<<"\n");
|
||||||
for(TInt iField = 1; iField <= aNbFields; iField++){
|
for(TInt iField = 1; iField <= aNbFields; iField++){
|
||||||
PFieldInfo aFieldInfo = theWrapper->GetPFieldInfo(theMeshInfo,iField);
|
PFieldInfo aFieldInfo = theWrapper->GetPFieldInfo(theMeshInfo,iField);
|
||||||
INITMSG(MYDEBUG,"aFieldName = '"<<aFieldInfo->GetName()<<
|
INITMSG("aFieldName = '"<<aFieldInfo->GetName()<<
|
||||||
"'; aNbComp = "<<aFieldInfo->GetNbComp()<<"; ");
|
"'; aNbComp = "<<aFieldInfo->GetNbComp()<<"; ");
|
||||||
TGeom2Size aGeom2Size;
|
TGeom2Size aGeom2Size;
|
||||||
EEntiteMaillage anEntity = EEntiteMaillage(-1);
|
EEntiteMaillage anEntity = EEntiteMaillage(-1);
|
||||||
TInt aNbTimeStamps = theWrapper->GetNbTimeStamps(aFieldInfo,theEntityInfo,anEntity,aGeom2Size);
|
TInt aNbTimeStamps = theWrapper->GetNbTimeStamps(aFieldInfo,theEntityInfo,anEntity,aGeom2Size);
|
||||||
ADDMSG(MYDEBUG,"anEntity = "<<anEntity<<"; GetNbTimeStamps = "<<aNbTimeStamps<<"\n");
|
ADDMSG("anEntity = "<<anEntity<<"; GetNbTimeStamps = "<<aNbTimeStamps<<"\n");
|
||||||
for(TInt iTimeStamp = 1; iTimeStamp <= aNbTimeStamps; iTimeStamp++){
|
for(TInt iTimeStamp = 1; iTimeStamp <= aNbTimeStamps; iTimeStamp++){
|
||||||
PTimeStampInfo aTimeStamp =
|
PTimeStampInfo aTimeStamp =
|
||||||
theWrapper->GetPTimeStampInfo(aFieldInfo,anEntity,aGeom2Size,iTimeStamp);
|
theWrapper->GetPTimeStampInfo(aFieldInfo,anEntity,aGeom2Size,iTimeStamp);
|
||||||
aFieldInfo2TimeStampInfoSet[aFieldInfo].insert(aTimeStamp);
|
aFieldInfo2TimeStampInfoSet[aFieldInfo].insert(aTimeStamp);
|
||||||
INITMSG(MYDEBUG,
|
INITMSG("aDt = "<<aTimeStamp->GetDt()<<", Unit = \'"<<aTimeStamp->GetUnitDt()<<"\n");
|
||||||
"aDt = "<<aTimeStamp->GetDt()<<
|
|
||||||
", Unit = \'"<<aTimeStamp->GetUnitDt()<<"\n");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
ADDMSG(MYDEBUG,"\n");
|
ADDMSG("\n");
|
||||||
return aFieldInfo2TimeStampInfoSet;
|
return aFieldInfo2TimeStampInfoSet;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -182,7 +170,7 @@ namespace MED
|
|||||||
const TEntity2TGeom2ElemInfo& theEntity2TGeom2ElemInfo,
|
const TEntity2TGeom2ElemInfo& theEntity2TGeom2ElemInfo,
|
||||||
const TFamilyInfoSet& theFamilyInfoSet)
|
const TFamilyInfoSet& theFamilyInfoSet)
|
||||||
{
|
{
|
||||||
MSG(MYDEBUG,"GetFamiliesByEntity(...)");
|
MSG("GetFamiliesByEntity(...)");
|
||||||
TEntity2FamilySet anEntity2FamilySet;
|
TEntity2FamilySet anEntity2FamilySet;
|
||||||
|
|
||||||
typedef std::map<TInt,PFamilyInfo> TId2Family;
|
typedef std::map<TInt,PFamilyInfo> TId2Family;
|
||||||
@ -220,7 +208,7 @@ namespace MED
|
|||||||
TEntity2FamilyID::const_iterator anIter = anEntity2FamilyID.begin();
|
TEntity2FamilyID::const_iterator anIter = anEntity2FamilyID.begin();
|
||||||
for(; anIter != anEntity2FamilyID.end(); anIter++){
|
for(; anIter != anEntity2FamilyID.end(); anIter++){
|
||||||
const EEntiteMaillage& anEntity = anIter->first;
|
const EEntiteMaillage& anEntity = anIter->first;
|
||||||
INITMSG(MYDEBUG,"anEntity = "<<anEntity<<":\n");
|
INITMSG("anEntity = "<<anEntity<<":\n");
|
||||||
const TFamilyID2Size& aFamilyID2Size = anIter->second;
|
const TFamilyID2Size& aFamilyID2Size = anIter->second;
|
||||||
TFamilyID2Size::const_iterator anIter2 = aFamilyID2Size.begin();
|
TFamilyID2Size::const_iterator anIter2 = aFamilyID2Size.begin();
|
||||||
for(; anIter2 != aFamilyID2Size.end(); anIter2++){
|
for(; anIter2 != aFamilyID2Size.end(); anIter2++){
|
||||||
@ -230,15 +218,14 @@ namespace MED
|
|||||||
if(anIter3 != anId2Family.end()){
|
if(anIter3 != anId2Family.end()){
|
||||||
const PFamilyInfo& aFamilyInfo = anIter3->second;
|
const PFamilyInfo& aFamilyInfo = anIter3->second;
|
||||||
anEntity2FamilySet[anEntity].insert(TFamilyTSize(aFamilyInfo,aSize));
|
anEntity2FamilySet[anEntity].insert(TFamilyTSize(aFamilyInfo,aSize));
|
||||||
INITMSG(MYDEBUG,
|
INITMSG("aFamilyName = '"<<aFamilyInfo->GetName()<<
|
||||||
"aFamilyName = '"<<aFamilyInfo->GetName()<<
|
|
||||||
"' anId = "<<aFamilyInfo->GetId()<<"\n");
|
"' anId = "<<aFamilyInfo->GetId()<<"\n");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
ADDMSG(MYDEBUG,"\n");
|
ADDMSG("\n");
|
||||||
return anEntity2FamilySet;
|
return anEntity2FamilySet;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -248,7 +235,7 @@ namespace MED
|
|||||||
TErr* theErr,
|
TErr* theErr,
|
||||||
EModeSwitch theMode)
|
EModeSwitch theMode)
|
||||||
{
|
{
|
||||||
INITMSG(MYDEBUG,"GetKey2Gauss - theMode = "<<theMode<<std::endl);
|
INITMSG("GetKey2Gauss - theMode = "<<theMode<<std::endl);
|
||||||
TKey2Gauss aKey2Gauss;
|
TKey2Gauss aKey2Gauss;
|
||||||
TInt aNbGauss = theWrapper->GetNbGauss(theErr);
|
TInt aNbGauss = theWrapper->GetNbGauss(theErr);
|
||||||
for(TInt anId = 1; anId <= aNbGauss; anId++){
|
for(TInt anId = 1; anId <= aNbGauss; anId++){
|
||||||
@ -258,16 +245,14 @@ namespace MED
|
|||||||
TGaussInfo::TKey aKey = boost::get<0>(aPreInfo);
|
TGaussInfo::TKey aKey = boost::get<0>(aPreInfo);
|
||||||
aKey2Gauss[aKey] = anInfo;
|
aKey2Gauss[aKey] = anInfo;
|
||||||
|
|
||||||
#ifdef _DEBUG_
|
if (SALOME::VerbosityActivated())
|
||||||
|
{
|
||||||
const EGeometrieElement& aGeom = boost::get<0>(aKey);
|
const EGeometrieElement& aGeom = boost::get<0>(aKey);
|
||||||
const std::string& aName = boost::get<1>(aKey);
|
const std::string& aName = boost::get<1>(aKey);
|
||||||
INITMSG(MYDEBUG,
|
INITMSG("- aGeom = "<<aGeom<<"; aName = '"<<aName<<"'"<<std::endl);
|
||||||
"- aGeom = "<<aGeom<<
|
|
||||||
"; aName = '"<<aName<<"'"<<
|
|
||||||
std::endl);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return aKey2Gauss;
|
return aKey2Gauss;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -295,7 +280,7 @@ namespace MED
|
|||||||
TErr* theErr,
|
TErr* theErr,
|
||||||
EModeProfil theMode)
|
EModeProfil theMode)
|
||||||
{
|
{
|
||||||
INITMSG(MYDEBUG,"GetMKey2Profile - theMode = "<<theMode<<std::endl);
|
INITMSG("GetMKey2Profile - theMode = "<<theMode<<std::endl);
|
||||||
TKey2Profile aKey2Profile;
|
TKey2Profile aKey2Profile;
|
||||||
TInt aNbProfiles = theWrapper->GetNbProfiles(theErr);
|
TInt aNbProfiles = theWrapper->GetNbProfiles(theErr);
|
||||||
for(TInt anId = 1; anId <= aNbProfiles; anId++){
|
for(TInt anId = 1; anId <= aNbProfiles; anId++){
|
||||||
@ -304,18 +289,16 @@ namespace MED
|
|||||||
const std::string& aName = boost::get<0>(aPreInfo);
|
const std::string& aName = boost::get<0>(aPreInfo);
|
||||||
aKey2Profile[aName] = anInfo;
|
aKey2Profile[aName] = anInfo;
|
||||||
|
|
||||||
#ifdef _DEBUG_
|
if(SALOME::VerbosityActivated()){
|
||||||
INITMSG(MYDEBUG,
|
INITMSG("- aName = '"<<aName<<"'"<<" : "<<std::endl);
|
||||||
"- aName = '"<<aName<<"'"<<
|
|
||||||
" : "<<
|
|
||||||
std::endl);
|
|
||||||
TInt aNbElem = anInfo->GetSize();
|
TInt aNbElem = anInfo->GetSize();
|
||||||
for(TInt iElem = 0; iElem < aNbElem; iElem++){
|
|
||||||
ADDMSG(MYVALUEDEBUG,anInfo->GetElemNum(iElem)<<", ");
|
|
||||||
}
|
|
||||||
ADDMSG(MYVALUEDEBUG, std::endl);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
for(TInt iElem = 0; iElem < aNbElem; iElem++){
|
||||||
|
ADDMSG(anInfo->GetElemNum(iElem)<<", ");
|
||||||
|
}
|
||||||
|
|
||||||
|
ADDMSG(std::endl);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return TMKey2Profile(theMode,aKey2Profile);
|
return TMKey2Profile(theMode,aKey2Profile);
|
||||||
}
|
}
|
||||||
|
@ -23,14 +23,6 @@
|
|||||||
#include "MED_GaussUtils.hxx"
|
#include "MED_GaussUtils.hxx"
|
||||||
#include "MED_Utilities.hxx"
|
#include "MED_Utilities.hxx"
|
||||||
|
|
||||||
#ifdef _DEBUG_
|
|
||||||
static int MYDEBUG = 0;
|
|
||||||
static int MYVALUEDEBUG = 0;
|
|
||||||
#else
|
|
||||||
// static int MYDEBUG = 0; // unused in release mode
|
|
||||||
// static int MYVALUEDEBUG = 0; // unused in release mode
|
|
||||||
#endif
|
|
||||||
|
|
||||||
namespace MED
|
namespace MED
|
||||||
{
|
{
|
||||||
//---------------------------------------------------------------
|
//---------------------------------------------------------------
|
||||||
@ -209,7 +201,7 @@ namespace MED
|
|||||||
{
|
{
|
||||||
TInt aNbRef = theRefCoord.size();
|
TInt aNbRef = theRefCoord.size();
|
||||||
TInt aNbRef2 = GetNbRef();
|
TInt aNbRef2 = GetNbRef();
|
||||||
INITMSG(MYDEBUG,"TShapeFun::IsSatisfy "<<
|
INITMSG("TShapeFun::IsSatisfy "<<
|
||||||
"- aNbRef("<<aNbRef<<")"<<
|
"- aNbRef("<<aNbRef<<")"<<
|
||||||
"; aNbRef2("<<aNbRef2<<")\n");
|
"; aNbRef2("<<aNbRef2<<")\n");
|
||||||
bool anIsSatisfy = (aNbRef == aNbRef2);
|
bool anIsSatisfy = (aNbRef == aNbRef2);
|
||||||
@ -227,27 +219,26 @@ namespace MED
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(!anIsEqual){
|
if(!anIsEqual){
|
||||||
#ifdef _DEBUG_
|
if(SALOME::VerbosityActivated()){
|
||||||
TCCoordSlice aCoord = GetCoord(aRefId);
|
TCCoordSlice aCoord = GetCoord(aRefId);
|
||||||
INITMSG(MYDEBUG,aRefId + 1<<": aCoord = {");
|
INITMSG(aRefId + 1<<": aCoord = {");
|
||||||
TInt aDim = aCoord.size();
|
TInt aDim = aCoord.size();
|
||||||
for(TInt anId = 0; anId < aDim; anId++)
|
for(TInt anId = 0; anId < aDim; anId++)
|
||||||
ADDMSG(MYDEBUG,"\t"<<aCoord[anId]);
|
ADDMSG("\t"<<aCoord[anId]);
|
||||||
const TCCoordSlice& aCoord2 = theRefCoord[aRefId];
|
const TCCoordSlice& aCoord2 = theRefCoord[aRefId];
|
||||||
ADDMSG(MYDEBUG,"}\t!=\taCoord2 = {");
|
ADDMSG("}\t!=\taCoord2 = {");
|
||||||
for(TInt anId = 0; anId < aDim; anId++)
|
for(TInt anId = 0; anId < aDim; anId++)
|
||||||
ADDMSG(MYDEBUG,"\t"<<aCoord2[anId]);
|
ADDMSG("\t"<<aCoord2[anId]);
|
||||||
ADDMSG(MYDEBUG,"}\n");
|
ADDMSG("}\n");
|
||||||
#endif
|
}
|
||||||
#ifndef _DEBUG_
|
|
||||||
BEGMSG(MYDEBUG,"anIsSatisfy = "<<anIsSatisfy<<"\n");
|
BEGMSG("anIsSatisfy = "<<anIsSatisfy<<"\n");
|
||||||
return anIsSatisfy;
|
return anIsSatisfy;
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
BEGMSG(MYDEBUG,"anIsSatisfy = "<<anIsSatisfy<<"\n");
|
BEGMSG("anIsSatisfy = "<<anIsSatisfy<<"\n");
|
||||||
return anIsSatisfy;
|
return anIsSatisfy;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -260,7 +251,7 @@ namespace MED
|
|||||||
TGaussCoord& theGaussCoord,
|
TGaussCoord& theGaussCoord,
|
||||||
EModeSwitch theMode)
|
EModeSwitch theMode)
|
||||||
{
|
{
|
||||||
INITMSG(MYDEBUG,"TShapeFun::Eval"<<std::endl);
|
INITMSG("TShapeFun::Eval"<<std::endl);
|
||||||
|
|
||||||
if(IsSatisfy(theRef)){
|
if(IsSatisfy(theRef)){
|
||||||
const PMeshInfo& aMeshInfo = theCellInfo.GetMeshInfo();
|
const PMeshInfo& aMeshInfo = theCellInfo.GetMeshInfo();
|
||||||
@ -280,7 +271,7 @@ namespace MED
|
|||||||
InitFun(theRef,theGauss,aFun);
|
InitFun(theRef,theGauss,aFun);
|
||||||
TInt aConnDim = theCellInfo.GetConnDim();
|
TInt aConnDim = theCellInfo.GetConnDim();
|
||||||
|
|
||||||
INITMSG(MYDEBUG,"aDim = "<<aDim<<
|
INITMSG("aDim = "<<aDim<<
|
||||||
"; aNbGauss = "<<aNbGauss<<
|
"; aNbGauss = "<<aNbGauss<<
|
||||||
"; aNbElem = "<<aNbElem<<
|
"; aNbElem = "<<aNbElem<<
|
||||||
"; aNbNodes = "<<theNodeInfo.GetNbElem()<<
|
"; aNbNodes = "<<theNodeInfo.GetNbElem()<<
|
||||||
@ -306,33 +297,34 @@ namespace MED
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef _DEBUG_
|
if (SALOME::VerbosityActivated())
|
||||||
{
|
{
|
||||||
INITMSG(MYVALUEDEBUG,"theGauss: ");
|
INITMSG("theGauss: ");
|
||||||
for(TInt aGaussId = 0; aGaussId < aNbGauss; aGaussId++){
|
for(TInt aGaussId = 0; aGaussId < aNbGauss; aGaussId++){
|
||||||
TCCoordSlice aCoordSlice = theGauss[aGaussId];
|
TCCoordSlice aCoordSlice = theGauss[aGaussId];
|
||||||
ADDMSG(MYVALUEDEBUG,"{");
|
ADDMSG("{");
|
||||||
for(TInt aDimId = 0; aDimId < aDim; aDimId++){
|
for(TInt aDimId = 0; aDimId < aDim; aDimId++){
|
||||||
ADDMSG(MYVALUEDEBUG,aCoordSlice[aDimId]<<" ");
|
ADDMSG(aCoordSlice[aDimId]<<" ");
|
||||||
}
|
}
|
||||||
ADDMSG(MYVALUEDEBUG,"} ");
|
ADDMSG("} ");
|
||||||
}
|
|
||||||
ADDMSG(MYVALUEDEBUG,std::endl);
|
|
||||||
}
|
}
|
||||||
|
ADDMSG(std::endl);
|
||||||
|
|
||||||
for(TInt anElemId = 0; anElemId < aNbElem; anElemId++){
|
for(TInt anElemId = 0; anElemId < aNbElem; anElemId++){
|
||||||
TCCoordSliceArr aCoordSliceArr = theGaussCoord.GetCoordSliceArr(anElemId);
|
TCCoordSliceArr aCoordSliceArr = theGaussCoord.GetCoordSliceArr(anElemId);
|
||||||
INITMSG(MYVALUEDEBUG,"");
|
INITMSG("");
|
||||||
for(TInt aGaussId = 0; aGaussId < aNbGauss; aGaussId++){
|
for(TInt aGaussId = 0; aGaussId < aNbGauss; aGaussId++){
|
||||||
TCCoordSlice aCoordSlice = aCoordSliceArr[aGaussId];
|
TCCoordSlice aCoordSlice = aCoordSliceArr[aGaussId];
|
||||||
ADDMSG(MYVALUEDEBUG,"{");
|
ADDMSG("{");
|
||||||
for(TInt aDimId = 0; aDimId < aDim; aDimId++){
|
for(TInt aDimId = 0; aDimId < aDim; aDimId++){
|
||||||
ADDMSG(MYVALUEDEBUG,aCoordSlice[aDimId]<<" ");
|
ADDMSG(aCoordSlice[aDimId]<<" ");
|
||||||
}
|
}
|
||||||
ADDMSG(MYVALUEDEBUG,"} ");
|
ADDMSG("} ");
|
||||||
}
|
}
|
||||||
ADDMSG(MYVALUEDEBUG,std::endl);
|
ADDMSG(std::endl);
|
||||||
}
|
}
|
||||||
#endif
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1727,7 +1719,7 @@ namespace MED
|
|||||||
const TElemNum& theElemNum,
|
const TElemNum& theElemNum,
|
||||||
EModeSwitch theMode)
|
EModeSwitch theMode)
|
||||||
{
|
{
|
||||||
INITMSG(MYDEBUG,"GetGaussCoord3D\n");
|
INITMSG("GetGaussCoord3D\n");
|
||||||
|
|
||||||
if(theGaussInfo.myGeom == theCellInfo.myGeom){
|
if(theGaussInfo.myGeom == theCellInfo.myGeom){
|
||||||
EGeometrieElement aGeom = theGaussInfo.myGeom;
|
EGeometrieElement aGeom = theGaussInfo.myGeom;
|
||||||
@ -1744,7 +1736,7 @@ namespace MED
|
|||||||
|
|
||||||
switch(aGeom){
|
switch(aGeom){
|
||||||
case eSEG2: {
|
case eSEG2: {
|
||||||
INITMSG(MYDEBUG,"eSEG2"<<std::endl);
|
INITMSG("eSEG2"<<std::endl);
|
||||||
|
|
||||||
if(TSeg2a().Eval(theCellInfo,theNodeInfo,theElemNum,aRefSlice,aGaussSlice,theGaussCoord,theMode))
|
if(TSeg2a().Eval(theCellInfo,theNodeInfo,theElemNum,aRefSlice,aGaussSlice,theGaussCoord,theMode))
|
||||||
return true;
|
return true;
|
||||||
@ -1752,7 +1744,7 @@ namespace MED
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case eSEG3: {
|
case eSEG3: {
|
||||||
INITMSG(MYDEBUG,"eSEG3"<<std::endl);
|
INITMSG("eSEG3"<<std::endl);
|
||||||
|
|
||||||
if(TSeg3a().Eval(theCellInfo,theNodeInfo,theElemNum,aRefSlice,aGaussSlice,theGaussCoord,theMode))
|
if(TSeg3a().Eval(theCellInfo,theNodeInfo,theElemNum,aRefSlice,aGaussSlice,theGaussCoord,theMode))
|
||||||
return true;
|
return true;
|
||||||
@ -1760,7 +1752,7 @@ namespace MED
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case eTRIA3: {
|
case eTRIA3: {
|
||||||
INITMSG(MYDEBUG,"eTRIA3"<<std::endl);
|
INITMSG("eTRIA3"<<std::endl);
|
||||||
|
|
||||||
if(TTria3a().Eval(theCellInfo,theNodeInfo,theElemNum,aRefSlice,aGaussSlice,theGaussCoord,theMode))
|
if(TTria3a().Eval(theCellInfo,theNodeInfo,theElemNum,aRefSlice,aGaussSlice,theGaussCoord,theMode))
|
||||||
return true;
|
return true;
|
||||||
@ -1771,7 +1763,7 @@ namespace MED
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case eTRIA6: {
|
case eTRIA6: {
|
||||||
INITMSG(MYDEBUG,"eTRIA6"<<std::endl);
|
INITMSG("eTRIA6"<<std::endl);
|
||||||
|
|
||||||
if(TTria6a().Eval(theCellInfo,theNodeInfo,theElemNum,aRefSlice,aGaussSlice,theGaussCoord,theMode))
|
if(TTria6a().Eval(theCellInfo,theNodeInfo,theElemNum,aRefSlice,aGaussSlice,theGaussCoord,theMode))
|
||||||
return true;
|
return true;
|
||||||
@ -1782,7 +1774,7 @@ namespace MED
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case eQUAD4: {
|
case eQUAD4: {
|
||||||
INITMSG(MYDEBUG,"eQUAD4"<<std::endl);
|
INITMSG("eQUAD4"<<std::endl);
|
||||||
|
|
||||||
if(TQuad4a().Eval(theCellInfo,theNodeInfo,theElemNum,aRefSlice,aGaussSlice,theGaussCoord,theMode))
|
if(TQuad4a().Eval(theCellInfo,theNodeInfo,theElemNum,aRefSlice,aGaussSlice,theGaussCoord,theMode))
|
||||||
return true;
|
return true;
|
||||||
@ -1793,7 +1785,7 @@ namespace MED
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case eQUAD8: {
|
case eQUAD8: {
|
||||||
INITMSG(MYDEBUG,"eQUAD8"<<std::endl);
|
INITMSG("eQUAD8"<<std::endl);
|
||||||
|
|
||||||
if(TQuad8a().Eval(theCellInfo,theNodeInfo,theElemNum,aRefSlice,aGaussSlice,theGaussCoord,theMode))
|
if(TQuad8a().Eval(theCellInfo,theNodeInfo,theElemNum,aRefSlice,aGaussSlice,theGaussCoord,theMode))
|
||||||
return true;
|
return true;
|
||||||
@ -1804,7 +1796,7 @@ namespace MED
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case eQUAD9: {
|
case eQUAD9: {
|
||||||
INITMSG(MYDEBUG,"eQUAD9"<<std::endl);
|
INITMSG("eQUAD9"<<std::endl);
|
||||||
|
|
||||||
if(TQuad9a().Eval(theCellInfo,theNodeInfo,theElemNum,aRefSlice,aGaussSlice,theGaussCoord,theMode))
|
if(TQuad9a().Eval(theCellInfo,theNodeInfo,theElemNum,aRefSlice,aGaussSlice,theGaussCoord,theMode))
|
||||||
return true;
|
return true;
|
||||||
@ -1815,7 +1807,7 @@ namespace MED
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case eTETRA4: {
|
case eTETRA4: {
|
||||||
INITMSG(MYDEBUG,"eTETRA4"<<std::endl);
|
INITMSG("eTETRA4"<<std::endl);
|
||||||
|
|
||||||
if(TTetra4a().Eval(theCellInfo,theNodeInfo,theElemNum,aRefSlice,aGaussSlice,theGaussCoord,theMode))
|
if(TTetra4a().Eval(theCellInfo,theNodeInfo,theElemNum,aRefSlice,aGaussSlice,theGaussCoord,theMode))
|
||||||
return true;
|
return true;
|
||||||
@ -1826,7 +1818,7 @@ namespace MED
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case ePYRA5: {
|
case ePYRA5: {
|
||||||
INITMSG(MYDEBUG,"ePYRA5"<<std::endl);
|
INITMSG("ePYRA5"<<std::endl);
|
||||||
|
|
||||||
if(TPyra5a().Eval(theCellInfo,theNodeInfo,theElemNum,aRefSlice,aGaussSlice,theGaussCoord,theMode))
|
if(TPyra5a().Eval(theCellInfo,theNodeInfo,theElemNum,aRefSlice,aGaussSlice,theGaussCoord,theMode))
|
||||||
return true;
|
return true;
|
||||||
@ -1837,7 +1829,7 @@ namespace MED
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case ePENTA6: {
|
case ePENTA6: {
|
||||||
INITMSG(MYDEBUG,"ePENTA6"<<std::endl);
|
INITMSG("ePENTA6"<<std::endl);
|
||||||
|
|
||||||
if(TPenta6a().Eval(theCellInfo,theNodeInfo,theElemNum,aRefSlice,aGaussSlice,theGaussCoord,theMode))
|
if(TPenta6a().Eval(theCellInfo,theNodeInfo,theElemNum,aRefSlice,aGaussSlice,theGaussCoord,theMode))
|
||||||
return true;
|
return true;
|
||||||
@ -1848,7 +1840,7 @@ namespace MED
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case eHEXA8: {
|
case eHEXA8: {
|
||||||
INITMSG(MYDEBUG,"eHEXA8"<<std::endl);
|
INITMSG("eHEXA8"<<std::endl);
|
||||||
|
|
||||||
if(THexa8a().Eval(theCellInfo,theNodeInfo,theElemNum,aRefSlice,aGaussSlice,theGaussCoord,theMode))
|
if(THexa8a().Eval(theCellInfo,theNodeInfo,theElemNum,aRefSlice,aGaussSlice,theGaussCoord,theMode))
|
||||||
return true;
|
return true;
|
||||||
@ -1859,7 +1851,7 @@ namespace MED
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case eTETRA10: {
|
case eTETRA10: {
|
||||||
INITMSG(MYDEBUG,"eTETRA10"<<std::endl);
|
INITMSG("eTETRA10"<<std::endl);
|
||||||
|
|
||||||
if(TTetra10a().Eval(theCellInfo,theNodeInfo,theElemNum,aRefSlice,aGaussSlice,theGaussCoord,theMode))
|
if(TTetra10a().Eval(theCellInfo,theNodeInfo,theElemNum,aRefSlice,aGaussSlice,theGaussCoord,theMode))
|
||||||
return true;
|
return true;
|
||||||
@ -1870,7 +1862,7 @@ namespace MED
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case ePYRA13: {
|
case ePYRA13: {
|
||||||
INITMSG(MYDEBUG,"ePYRA13"<<std::endl);
|
INITMSG("ePYRA13"<<std::endl);
|
||||||
|
|
||||||
if(TPyra13a().Eval(theCellInfo,theNodeInfo,theElemNum,aRefSlice,aGaussSlice,theGaussCoord,theMode))
|
if(TPyra13a().Eval(theCellInfo,theNodeInfo,theElemNum,aRefSlice,aGaussSlice,theGaussCoord,theMode))
|
||||||
return true;
|
return true;
|
||||||
@ -1881,7 +1873,7 @@ namespace MED
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case ePENTA15: {
|
case ePENTA15: {
|
||||||
INITMSG(MYDEBUG,"ePENTA15"<<std::endl);
|
INITMSG("ePENTA15"<<std::endl);
|
||||||
|
|
||||||
if(TPenta15a().Eval(theCellInfo,theNodeInfo,theElemNum,aRefSlice,aGaussSlice,theGaussCoord,theMode))
|
if(TPenta15a().Eval(theCellInfo,theNodeInfo,theElemNum,aRefSlice,aGaussSlice,theGaussCoord,theMode))
|
||||||
return true;
|
return true;
|
||||||
@ -1892,7 +1884,7 @@ namespace MED
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case eHEXA20: {
|
case eHEXA20: {
|
||||||
INITMSG(MYDEBUG,"eHEXA20"<<std::endl);
|
INITMSG("eHEXA20"<<std::endl);
|
||||||
|
|
||||||
if(THexa20a().Eval(theCellInfo,theNodeInfo,theElemNum,aRefSlice,aGaussSlice,theGaussCoord,theMode))
|
if(THexa20a().Eval(theCellInfo,theNodeInfo,theElemNum,aRefSlice,aGaussSlice,theGaussCoord,theMode))
|
||||||
return true;
|
return true;
|
||||||
@ -1903,7 +1895,7 @@ namespace MED
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
INITMSG(MYDEBUG,"eNONE"<<std::endl);
|
INITMSG("eNONE"<<std::endl);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1919,7 +1911,7 @@ namespace MED
|
|||||||
const TElemNum& theElemNum,
|
const TElemNum& theElemNum,
|
||||||
EModeSwitch theMode)
|
EModeSwitch theMode)
|
||||||
{
|
{
|
||||||
INITMSG(MYDEBUG,"GetBaryCenter\n");
|
INITMSG("GetBaryCenter\n");
|
||||||
const PMeshInfo& aMeshInfo = theCellInfo.GetMeshInfo();
|
const PMeshInfo& aMeshInfo = theCellInfo.GetMeshInfo();
|
||||||
TInt aDim = aMeshInfo->GetDim();
|
TInt aDim = aMeshInfo->GetDim();
|
||||||
static TInt aNbGauss = 1;
|
static TInt aNbGauss = 1;
|
||||||
@ -1935,7 +1927,7 @@ namespace MED
|
|||||||
|
|
||||||
TInt aConnDim = theCellInfo.GetConnDim();
|
TInt aConnDim = theCellInfo.GetConnDim();
|
||||||
|
|
||||||
INITMSGA(MYDEBUG,0,
|
INITMSGA(0,
|
||||||
"- aDim = "<<aDim<<
|
"- aDim = "<<aDim<<
|
||||||
"; aNbGauss = "<<aNbGauss<<
|
"; aNbGauss = "<<aNbGauss<<
|
||||||
"; aNbElem = "<<aNbElem<<
|
"; aNbElem = "<<aNbElem<<
|
||||||
@ -1965,21 +1957,22 @@ namespace MED
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef _DEBUG_
|
if (SALOME::VerbosityActivated())
|
||||||
|
{
|
||||||
for(TInt anElemId = 0; anElemId < aNbElem; anElemId++){
|
for(TInt anElemId = 0; anElemId < aNbElem; anElemId++){
|
||||||
TCoordSliceArr aCoordSliceArr = theGaussCoord.GetCoordSliceArr(anElemId);
|
TCoordSliceArr aCoordSliceArr = theGaussCoord.GetCoordSliceArr(anElemId);
|
||||||
INITMSG(MYVALUEDEBUG,"");
|
INITMSG("");
|
||||||
for(TInt aGaussId = 0; aGaussId < aNbGauss; aGaussId++){
|
for(TInt aGaussId = 0; aGaussId < aNbGauss; aGaussId++){
|
||||||
TCoordSlice& aCoordSlice = aCoordSliceArr[aGaussId];
|
TCoordSlice& aCoordSlice = aCoordSliceArr[aGaussId];
|
||||||
ADDMSG(MYVALUEDEBUG,"{");
|
ADDMSG("{");
|
||||||
for(TInt aDimId = 0; aDimId < aDim; aDimId++){
|
for(TInt aDimId = 0; aDimId < aDim; aDimId++){
|
||||||
ADDMSG(MYVALUEDEBUG,aCoordSlice[aDimId]<<" ");
|
ADDMSG(aCoordSlice[aDimId]<<" ");
|
||||||
}
|
}
|
||||||
ADDMSG(MYVALUEDEBUG,"} ");
|
ADDMSG("} ");
|
||||||
|
}
|
||||||
|
ADDMSG(std::endl);
|
||||||
}
|
}
|
||||||
ADDMSG(MYVALUEDEBUG,std::endl);
|
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -1992,7 +1985,7 @@ namespace MED
|
|||||||
const TElemNum& theElemNum,
|
const TElemNum& theElemNum,
|
||||||
EModeSwitch theMode)
|
EModeSwitch theMode)
|
||||||
{
|
{
|
||||||
INITMSG(MYDEBUG,"GetBaryCenter\n");
|
INITMSG("GetBaryCenter\n");
|
||||||
const PMeshInfo& aMeshInfo = thePolygoneInfo.GetMeshInfo();
|
const PMeshInfo& aMeshInfo = thePolygoneInfo.GetMeshInfo();
|
||||||
TInt aDim = aMeshInfo->GetDim();
|
TInt aDim = aMeshInfo->GetDim();
|
||||||
static TInt aNbGauss = 1;
|
static TInt aNbGauss = 1;
|
||||||
@ -2006,7 +1999,7 @@ namespace MED
|
|||||||
|
|
||||||
theGaussCoord.Init(aNbElem,aNbGauss,aDim,theMode);
|
theGaussCoord.Init(aNbElem,aNbGauss,aDim,theMode);
|
||||||
|
|
||||||
INITMSGA(MYDEBUG,0,
|
INITMSGA(0,
|
||||||
"- aDim = "<<aDim<<
|
"- aDim = "<<aDim<<
|
||||||
"; aNbGauss = "<<aNbGauss<<
|
"; aNbGauss = "<<aNbGauss<<
|
||||||
"; aNbElem = "<<aNbElem<<
|
"; aNbElem = "<<aNbElem<<
|
||||||
@ -2050,7 +2043,7 @@ namespace MED
|
|||||||
const TElemNum& theElemNum,
|
const TElemNum& theElemNum,
|
||||||
EModeSwitch theMode)
|
EModeSwitch theMode)
|
||||||
{
|
{
|
||||||
INITMSG(MYDEBUG,"GetBaryCenter\n");
|
INITMSG("GetBaryCenter\n");
|
||||||
const PMeshInfo& aMeshInfo = thePolyedreInfo.GetMeshInfo();
|
const PMeshInfo& aMeshInfo = thePolyedreInfo.GetMeshInfo();
|
||||||
TInt aDim = aMeshInfo->GetDim();
|
TInt aDim = aMeshInfo->GetDim();
|
||||||
static TInt aNbGauss = 1;
|
static TInt aNbGauss = 1;
|
||||||
@ -2064,7 +2057,7 @@ namespace MED
|
|||||||
|
|
||||||
theGaussCoord.Init(aNbElem,aNbGauss,aDim,theMode);
|
theGaussCoord.Init(aNbElem,aNbGauss,aDim,theMode);
|
||||||
|
|
||||||
INITMSGA(MYDEBUG,0,
|
INITMSGA(0,
|
||||||
"- aDim = "<<aDim<<
|
"- aDim = "<<aDim<<
|
||||||
"; aNbGauss = "<<aNbGauss<<
|
"; aNbGauss = "<<aNbGauss<<
|
||||||
"; aNbElem = "<<aNbElem<<
|
"; aNbElem = "<<aNbElem<<
|
||||||
|
@ -31,9 +31,7 @@
|
|||||||
#include <valarray>
|
#include <valarray>
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
|
|
||||||
//#if defined(_DEBUG_)
|
|
||||||
# define MED_TCSLICE_CHECK_RANGE
|
# define MED_TCSLICE_CHECK_RANGE
|
||||||
//#endif
|
|
||||||
|
|
||||||
namespace MED
|
namespace MED
|
||||||
{
|
{
|
||||||
|
@ -23,12 +23,6 @@
|
|||||||
#include "MED_Utilities.hxx"
|
#include "MED_Utilities.hxx"
|
||||||
#include "MED_Common.hxx"
|
#include "MED_Common.hxx"
|
||||||
|
|
||||||
#ifdef _DEBUG_
|
|
||||||
static int MYDEBUG = 0;
|
|
||||||
#else
|
|
||||||
//static int MYDEBUG = 0; // unused in release mode
|
|
||||||
#endif
|
|
||||||
|
|
||||||
int MED::PrefixPrinter::myCounter = 0;
|
int MED::PrefixPrinter::myCounter = 0;
|
||||||
|
|
||||||
MED::PrefixPrinter::PrefixPrinter(bool theIsActive):
|
MED::PrefixPrinter::PrefixPrinter(bool theIsActive):
|
||||||
@ -36,7 +30,8 @@ MED::PrefixPrinter::PrefixPrinter(bool theIsActive):
|
|||||||
{
|
{
|
||||||
if(myIsActive)
|
if(myIsActive)
|
||||||
myCounter++;
|
myCounter++;
|
||||||
MSG(MYDEBUG,"MED::PrefixPrinter::PrefixPrinter(...)- "<<myCounter);
|
|
||||||
|
MSG("MED::PrefixPrinter::PrefixPrinter(...)- "<<myCounter);
|
||||||
}
|
}
|
||||||
|
|
||||||
MED::PrefixPrinter::~PrefixPrinter() noexcept(false)
|
MED::PrefixPrinter::~PrefixPrinter() noexcept(false)
|
||||||
|
@ -24,6 +24,7 @@
|
|||||||
#define MED_Utilities_HeaderFile
|
#define MED_Utilities_HeaderFile
|
||||||
|
|
||||||
#include "MED_WrapperDef.hxx"
|
#include "MED_WrapperDef.hxx"
|
||||||
|
#include "utilities.h"
|
||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
@ -45,19 +46,11 @@ namespace MED
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef _DEBUG_
|
#define MSG(msg) if(SALOME::VerbosityActivated()) std::cout<<MED::PrefixPrinter::GetPrefix()<<msg<<" ("<<__FILE__<<" ["<<__LINE__<<"])\n"; else (void)0
|
||||||
#define MSG(deb,msg) if(deb) std::cout<<MED::PrefixPrinter::GetPrefix()<<msg<<" ("<<__FILE__<<" ["<<__LINE__<<"])\n"
|
#define BEGMSG(msg) if(SALOME::VerbosityActivated()) std::cout<<MED::PrefixPrinter::GetPrefix()<<msg; else (void)0
|
||||||
#define BEGMSG(deb,msg) if(deb) std::cout<<MED::PrefixPrinter::GetPrefix()<<msg
|
#define INITMSGA(lev,msg) if(SALOME::VerbosityActivated()) { MED::PrefixPrinter aPrefixPrinter_##lev(true); BEGMSG(msg); } else (void)0
|
||||||
#define INITMSGA(deb,lev,msg) MED::PrefixPrinter aPrefixPrinter_##lev(deb); BEGMSG(deb,msg)
|
#define INITMSG(msg) INITMSGA(,msg)
|
||||||
#define INITMSG(deb,msg) INITMSGA(deb,,msg)
|
#define ADDMSG(msg) if(SALOME::VerbosityActivated()) std::cout<<msg; else (void)0
|
||||||
#define ADDMSG(deb,msg) if(deb) std::cout<<msg
|
|
||||||
#else // _DEBUG_
|
|
||||||
#define MSG(deb,msg)
|
|
||||||
#define BEGMSG(deb,msg)
|
|
||||||
#define INITMSGA(deb,lev,msg)
|
|
||||||
#define INITMSG(deb,msg)
|
|
||||||
#define ADDMSG(deb,msg)
|
|
||||||
#endif // _DEBUG_
|
|
||||||
|
|
||||||
#ifndef EXCEPTION
|
#ifndef EXCEPTION
|
||||||
|
|
||||||
|
@ -26,9 +26,7 @@
|
|||||||
#include <vector>
|
#include <vector>
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
|
|
||||||
//#if defined(_DEBUG_)
|
|
||||||
# define MED_TVECTOR_CHECK_RANGE
|
# define MED_TVECTOR_CHECK_RANGE
|
||||||
//#endif
|
|
||||||
|
|
||||||
namespace MED
|
namespace MED
|
||||||
{
|
{
|
||||||
|
@ -36,14 +36,6 @@
|
|||||||
|
|
||||||
#include <boost/version.hpp>
|
#include <boost/version.hpp>
|
||||||
|
|
||||||
#ifdef _DEBUG_
|
|
||||||
static int MYDEBUG = 0;
|
|
||||||
static int MYVALUEDEBUG = 0;
|
|
||||||
#else
|
|
||||||
// static int MYDEBUG = 0; // unused in release mode
|
|
||||||
// static int MYVALUEDEBUG = 0; // unused in release mode
|
|
||||||
#endif
|
|
||||||
|
|
||||||
namespace MED
|
namespace MED
|
||||||
{
|
{
|
||||||
//---------------------------------------------------------------
|
//---------------------------------------------------------------
|
||||||
@ -56,13 +48,13 @@ namespace MED
|
|||||||
#else
|
#else
|
||||||
boost::detail::thread::lock_ops<TWrapper::TMutex>::lock(myWrapper->myMutex);
|
boost::detail::thread::lock_ops<TWrapper::TMutex>::lock(myWrapper->myMutex);
|
||||||
#endif
|
#endif
|
||||||
INITMSG(MYDEBUG, "TLockProxy() - this -"<<this<<"; myWrapper = "<<myWrapper<<std::endl);
|
INITMSG("TLockProxy() - this -"<<this<<"; myWrapper = "<<myWrapper<<std::endl);
|
||||||
}
|
}
|
||||||
|
|
||||||
TLockProxy
|
TLockProxy
|
||||||
::~TLockProxy()
|
::~TLockProxy()
|
||||||
{
|
{
|
||||||
INITMSG(MYDEBUG, "~TLockProxy() - this -"<<this<<"; myWrapper = "<<myWrapper<<std::endl);
|
INITMSG("~TLockProxy() - this -"<<this<<"; myWrapper = "<<myWrapper<<std::endl);
|
||||||
#if BOOST_VERSION >= 103500
|
#if BOOST_VERSION >= 103500
|
||||||
myWrapper->myMutex.unlock();
|
myWrapper->myMutex.unlock();
|
||||||
#else
|
#else
|
||||||
@ -168,7 +160,7 @@ namespace MED
|
|||||||
void
|
void
|
||||||
Print(SharedPtr<TimeStampValueType> theTimeStampValue)
|
Print(SharedPtr<TimeStampValueType> theTimeStampValue)
|
||||||
{
|
{
|
||||||
INITMSG(MYDEBUG,"Print - TimeStampValue\n");
|
INITMSG("Print - TimeStampValue\n");
|
||||||
typename TimeStampValueType::TTGeom2Value& aGeom2Value = theTimeStampValue->myGeom2Value;
|
typename TimeStampValueType::TTGeom2Value& aGeom2Value = theTimeStampValue->myGeom2Value;
|
||||||
typename TimeStampValueType::TTGeom2Value::const_iterator anIter = aGeom2Value.begin();
|
typename TimeStampValueType::TTGeom2Value::const_iterator anIter = aGeom2Value.begin();
|
||||||
for (; anIter != aGeom2Value.end(); anIter++) {
|
for (; anIter != aGeom2Value.end(); anIter++) {
|
||||||
@ -177,22 +169,22 @@ namespace MED
|
|||||||
TInt aNbElem = aMeshValue.myNbElem;
|
TInt aNbElem = aMeshValue.myNbElem;
|
||||||
TInt aNbGauss = aMeshValue.myNbGauss;
|
TInt aNbGauss = aMeshValue.myNbGauss;
|
||||||
TInt aNbComp = aMeshValue.myNbComp;
|
TInt aNbComp = aMeshValue.myNbComp;
|
||||||
INITMSG(MYDEBUG, "aGeom = "<<aGeom<<" - "<<aNbElem<<": ");
|
INITMSG("aGeom = "<<aGeom<<" - "<<aNbElem<<": ");
|
||||||
for (TInt iElem = 0; iElem < aNbElem; iElem++) {
|
for (TInt iElem = 0; iElem < aNbElem; iElem++) {
|
||||||
typename TimeStampValueType::TTMeshValue::TCValueSliceArr aValueSliceArr =
|
typename TimeStampValueType::TTMeshValue::TCValueSliceArr aValueSliceArr =
|
||||||
aMeshValue.GetGaussValueSliceArr(iElem);
|
aMeshValue.GetGaussValueSliceArr(iElem);
|
||||||
ADDMSG(MYVALUEDEBUG, "{");
|
ADDMSG("{");
|
||||||
for (TInt iGauss = 0; iGauss < aNbGauss; iGauss++) {
|
for (TInt iGauss = 0; iGauss < aNbGauss; iGauss++) {
|
||||||
const typename TimeStampValueType::TTMeshValue::TCValueSlice& aValueSlice =
|
const typename TimeStampValueType::TTMeshValue::TCValueSlice& aValueSlice =
|
||||||
aValueSliceArr[iGauss];
|
aValueSliceArr[iGauss];
|
||||||
for (TInt iComp = 0; iComp < aNbComp; iComp++) {
|
for (TInt iComp = 0; iComp < aNbComp; iComp++) {
|
||||||
ADDMSG(MYVALUEDEBUG, aValueSlice[iComp]<<" ");
|
ADDMSG(aValueSlice[iComp]<<" ");
|
||||||
}
|
}
|
||||||
ADDMSG(MYVALUEDEBUG, "| ");
|
ADDMSG("| ");
|
||||||
}
|
}
|
||||||
ADDMSG(MYVALUEDEBUG, "} ");
|
ADDMSG("} ");
|
||||||
}
|
}
|
||||||
ADDMSG(MYDEBUG, "\n");
|
ADDMSG("\n");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -341,7 +333,7 @@ namespace MED
|
|||||||
//if (aRet == 0)
|
//if (aRet == 0)
|
||||||
// aRet = MEDunvCr(myFile->Id(),&aMeshName);
|
// aRet = MEDunvCr(myFile->Id(),&aMeshName);
|
||||||
|
|
||||||
INITMSG(MYDEBUG, "TWrapper::SetMeshInfo - MED_MODE_ACCES = "<<theMode<<"; aRet = "<<aRet<<std::endl);
|
INITMSG("TWrapper::SetMeshInfo - MED_MODE_ACCES = "<<theMode<<"; aRet = "<<aRet<<std::endl);
|
||||||
|
|
||||||
if (theErr)
|
if (theErr)
|
||||||
*theErr = aRet;
|
*theErr = aRet;
|
||||||
@ -529,7 +521,7 @@ namespace MED
|
|||||||
aNbGroup,
|
aNbGroup,
|
||||||
&aGroupNames);
|
&aGroupNames);
|
||||||
|
|
||||||
INITMSG(MYDEBUG, "TWrapper::SetFamilyInfo - MED_MODE_ACCES = "<<theMode<<"; aRet = "<<aRet<<std::endl);
|
INITMSG("TWrapper::SetFamilyInfo - MED_MODE_ACCES = "<<theMode<<"; aRet = "<<aRet<<std::endl);
|
||||||
|
|
||||||
if (theErr)
|
if (theErr)
|
||||||
*theErr = aRet;
|
*theErr = aRet;
|
||||||
@ -602,17 +594,18 @@ namespace MED
|
|||||||
PFamilyInfo anInfo = CrFamilyInfo(theMeshInfo, aNbGroup, aNbAttr);
|
PFamilyInfo anInfo = CrFamilyInfo(theMeshInfo, aNbGroup, aNbAttr);
|
||||||
GetFamilyInfo(theId, *anInfo, theErr);
|
GetFamilyInfo(theId, *anInfo, theErr);
|
||||||
|
|
||||||
#ifdef _DEBUG_
|
if (SALOME::VerbosityActivated())
|
||||||
|
{
|
||||||
std::string aName = anInfo->GetName();
|
std::string aName = anInfo->GetName();
|
||||||
INITMSG(MYDEBUG, "GetPFamilyInfo - aFamilyName = '"<<aName<<
|
INITMSG("GetPFamilyInfo - aFamilyName = '"<<aName<<
|
||||||
"'; andId = "<<anInfo->GetId()<<
|
"'; andId = "<<anInfo->GetId()<<
|
||||||
"; aNbAttr = "<<aNbAttr<<
|
"; aNbAttr = "<<aNbAttr<<
|
||||||
"; aNbGroup = "<<aNbGroup<<"\n");
|
"; aNbGroup = "<<aNbGroup<<"\n");
|
||||||
for (TInt iGroup = 0; iGroup < aNbGroup; iGroup++) {
|
for (TInt iGroup = 0; iGroup < aNbGroup; iGroup++) {
|
||||||
aName = anInfo->GetGroupName(iGroup);
|
aName = anInfo->GetGroupName(iGroup);
|
||||||
INITMSG(MYDEBUG, "aGroupName = '"<<aName<<"'\n");
|
INITMSG("aGroupName = '"<<aName<<"'\n");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
return anInfo;
|
return anInfo;
|
||||||
}
|
}
|
||||||
@ -1163,37 +1156,38 @@ namespace MED
|
|||||||
PNodeInfo anInfo = CrNodeInfo(theMeshInfo, aNbElems);
|
PNodeInfo anInfo = CrNodeInfo(theMeshInfo, aNbElems);
|
||||||
GetNodeInfo(*anInfo, theErr);
|
GetNodeInfo(*anInfo, theErr);
|
||||||
|
|
||||||
#ifdef _DEBUG_
|
if (SALOME::VerbosityActivated())
|
||||||
|
{
|
||||||
TInt aDim = theMeshInfo->myDim;
|
TInt aDim = theMeshInfo->myDim;
|
||||||
TInt aNbElem = anInfo->GetNbElem();
|
TInt aNbElem = anInfo->GetNbElem();
|
||||||
INITMSG(MYDEBUG, "GetPNodeInfo: ");
|
INITMSG("GetPNodeInfo: ");
|
||||||
{
|
{
|
||||||
INITMSG(MYDEBUG, "aCoords: "<<aNbElem<<": ");
|
INITMSG("aCoords: "<<aNbElem<<": ");
|
||||||
TNodeCoord& aCoord = anInfo->myCoord;
|
TNodeCoord& aCoord = anInfo->myCoord;
|
||||||
for (TInt iElem = 0; iElem < aNbElem; iElem++) {
|
for (TInt iElem = 0; iElem < aNbElem; iElem++) {
|
||||||
for (TInt iDim = 0, anId = iElem*aDim; iDim < aDim; iDim++, anId++) {
|
for (TInt iDim = 0, anId = iElem*aDim; iDim < aDim; iDim++, anId++) {
|
||||||
ADDMSG(MYVALUEDEBUG, aCoord[anId]<<",");
|
ADDMSG(aCoord[anId]<<",");
|
||||||
}
|
}
|
||||||
ADDMSG(MYVALUEDEBUG, " ");
|
ADDMSG(" ");
|
||||||
}
|
}
|
||||||
ADDMSG(MYDEBUG, std::endl);
|
ADDMSG(std::endl);
|
||||||
|
|
||||||
BEGMSG(MYVALUEDEBUG, "GetFamNum: ");
|
BEGMSG("GetFamNum: ");
|
||||||
for (TInt iElem = 0; iElem < aNbElem; iElem++) {
|
for (TInt iElem = 0; iElem < aNbElem; iElem++) {
|
||||||
ADDMSG(MYVALUEDEBUG, anInfo->GetFamNum(iElem)<<", ");
|
ADDMSG(anInfo->GetFamNum(iElem)<<", ");
|
||||||
}
|
}
|
||||||
ADDMSG(MYVALUEDEBUG, std::endl);
|
ADDMSG(std::endl);
|
||||||
|
|
||||||
if (anInfo->IsElemNum()) {
|
if (anInfo->IsElemNum()) {
|
||||||
BEGMSG(MYVALUEDEBUG, "GetElemNum: ");
|
BEGMSG("GetElemNum: ");
|
||||||
for (TInt iElem = 0; iElem < aNbElem; iElem++) {
|
for (TInt iElem = 0; iElem < aNbElem; iElem++) {
|
||||||
ADDMSG(MYVALUEDEBUG, anInfo->GetElemNum(iElem)<<", ");
|
ADDMSG(anInfo->GetElemNum(iElem)<<", ");
|
||||||
}
|
}
|
||||||
ADDMSG(MYVALUEDEBUG, std::endl);
|
ADDMSG(std::endl);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
ADDMSG(MYDEBUG, std::endl);
|
ADDMSG(std::endl);
|
||||||
#endif
|
}
|
||||||
|
|
||||||
return anInfo;
|
return anInfo;
|
||||||
}
|
}
|
||||||
@ -1548,20 +1542,21 @@ namespace MED
|
|||||||
PPolygoneInfo anInfo = CrPolygoneInfo(theMeshInfo, theEntity, theGeom, aNbElem, aConnSize, theConnMode);
|
PPolygoneInfo anInfo = CrPolygoneInfo(theMeshInfo, theEntity, theGeom, aNbElem, aConnSize, theConnMode);
|
||||||
GetPolygoneInfo(anInfo);
|
GetPolygoneInfo(anInfo);
|
||||||
|
|
||||||
#ifdef _DEBUG_
|
if (SALOME::VerbosityActivated())
|
||||||
INITMSG(MYDEBUG, "GetPPolygoneInfo"<<
|
{
|
||||||
|
INITMSG("GetPPolygoneInfo"<<
|
||||||
" - theGeom = "<<theGeom<<
|
" - theGeom = "<<theGeom<<
|
||||||
"; aNbElem = "<<aNbElem<<": ");
|
"; aNbElem = "<<aNbElem<<": ");
|
||||||
for (TInt iElem = 1; iElem < aNbElem; iElem++) {
|
for (TInt iElem = 1; iElem < aNbElem; iElem++) {
|
||||||
TCConnSlice aConnSlice = anInfo->GetConnSlice(iElem);
|
TCConnSlice aConnSlice = anInfo->GetConnSlice(iElem);
|
||||||
TInt aConnDim = aConnSlice.size();
|
TInt aConnDim = aConnSlice.size();
|
||||||
for (TInt iConn = 0; iConn < aConnDim; iConn++) {
|
for (TInt iConn = 0; iConn < aConnDim; iConn++) {
|
||||||
ADDMSG(MYVALUEDEBUG, aConnSlice[iConn]<<",");
|
ADDMSG(aConnSlice[iConn]<<",");
|
||||||
}
|
}
|
||||||
ADDMSG(MYDEBUG, " ");
|
ADDMSG(" ");
|
||||||
|
}
|
||||||
|
ADDMSG(std::endl);
|
||||||
}
|
}
|
||||||
ADDMSG(MYDEBUG, std::endl);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
return anInfo;
|
return anInfo;
|
||||||
}
|
}
|
||||||
@ -1858,27 +1853,28 @@ namespace MED
|
|||||||
PPolyedreInfo anInfo = CrPolyedreInfo(theMeshInfo, theEntity, theGeom, aNbElem, aNbFaces, aConnSize, theConnMode);
|
PPolyedreInfo anInfo = CrPolyedreInfo(theMeshInfo, theEntity, theGeom, aNbElem, aNbFaces, aConnSize, theConnMode);
|
||||||
GetPolyedreInfo(anInfo);
|
GetPolyedreInfo(anInfo);
|
||||||
|
|
||||||
#ifdef _DEBUG_
|
if (SALOME::VerbosityActivated())
|
||||||
INITMSG(MYDEBUG, "GetPPolyedreInfo"<<
|
{
|
||||||
|
INITMSG("GetPPolyedreInfo"<<
|
||||||
" - theGeom = "<<theGeom<<
|
" - theGeom = "<<theGeom<<
|
||||||
"; aNbElem = "<<aNbElem<<": ");
|
"; aNbElem = "<<aNbElem<<": ");
|
||||||
for (TInt iElem = 0; iElem < aNbElem; iElem++) {
|
for (TInt iElem = 0; iElem < aNbElem; iElem++) {
|
||||||
TCConnSliceArr aConnSliceArr = anInfo->GetConnSliceArr(iElem);
|
TCConnSliceArr aConnSliceArr = anInfo->GetConnSliceArr(iElem);
|
||||||
TInt aNbFaces = aConnSliceArr.size();
|
TInt aNbFaces = aConnSliceArr.size();
|
||||||
ADDMSG(MYDEBUG, "{");
|
ADDMSG("{");
|
||||||
for (TInt iFace = 0; iFace < aNbFaces; iFace++) {
|
for (TInt iFace = 0; iFace < aNbFaces; iFace++) {
|
||||||
TCConnSlice aConnSlice = aConnSliceArr[iFace];
|
TCConnSlice aConnSlice = aConnSliceArr[iFace];
|
||||||
TInt aNbConn = aConnSlice.size();
|
TInt aNbConn = aConnSlice.size();
|
||||||
ADDMSG(MYDEBUG, "[");
|
ADDMSG("[");
|
||||||
for (TInt iConn = 0; iConn < aNbConn; iConn++) {
|
for (TInt iConn = 0; iConn < aNbConn; iConn++) {
|
||||||
ADDMSG(MYVALUEDEBUG, aConnSlice[iConn]<<",");
|
ADDMSG(aConnSlice[iConn]<<",");
|
||||||
}
|
}
|
||||||
ADDMSG(MYDEBUG, "] ");
|
ADDMSG("] ");
|
||||||
}
|
}
|
||||||
ADDMSG(MYDEBUG, "} ");
|
ADDMSG("} ");
|
||||||
|
}
|
||||||
|
ADDMSG(std::endl);
|
||||||
}
|
}
|
||||||
ADDMSG(MYDEBUG, std::endl);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
return anInfo;
|
return anInfo;
|
||||||
}
|
}
|
||||||
@ -2279,34 +2275,35 @@ namespace MED
|
|||||||
PCellInfo anInfo = CrCellInfo(theMeshInfo, theEntity, theGeom, aNbElem, theConnMode);
|
PCellInfo anInfo = CrCellInfo(theMeshInfo, theEntity, theGeom, aNbElem, theConnMode);
|
||||||
GetCellInfo(anInfo, theErr);
|
GetCellInfo(anInfo, theErr);
|
||||||
|
|
||||||
#ifdef _DEBUG_
|
if (SALOME::VerbosityActivated())
|
||||||
|
{
|
||||||
TInt aConnDim = anInfo->GetConnDim();
|
TInt aConnDim = anInfo->GetConnDim();
|
||||||
INITMSG(MYDEBUG, "GetPCellInfo - theEntity = "<<theEntity<<"; theGeom = "<<theGeom<<"; aConnDim: "<<aConnDim<<"\n");
|
INITMSG("GetPCellInfo - theEntity = "<<theEntity<<"; theGeom = "<<theGeom<<"; aConnDim: "<<aConnDim<<"\n");
|
||||||
BEGMSG(MYDEBUG, "GetPCellInfo - aNbElem: "<<aNbElem<<": ");
|
BEGMSG("GetPCellInfo - aNbElem: "<<aNbElem<<": ");
|
||||||
for (TInt iElem = 0; iElem < aNbElem; iElem++) {
|
for (TInt iElem = 0; iElem < aNbElem; iElem++) {
|
||||||
TCConnSlice aConnSlice = anInfo->GetConnSlice(iElem);
|
TCConnSlice aConnSlice = anInfo->GetConnSlice(iElem);
|
||||||
for (TInt iConn = 0; iConn < aConnDim; iConn++) {
|
for (TInt iConn = 0; iConn < aConnDim; iConn++) {
|
||||||
ADDMSG(MYVALUEDEBUG, aConnSlice[iConn]<<",");
|
ADDMSG(aConnSlice[iConn]<<",");
|
||||||
}
|
}
|
||||||
ADDMSG(MYVALUEDEBUG, " ");
|
ADDMSG(" ");
|
||||||
}
|
}
|
||||||
ADDMSG(MYDEBUG, std::endl);
|
ADDMSG(std::endl);
|
||||||
|
|
||||||
BEGMSG(MYVALUEDEBUG, "GetPCellInfo - GetFamNum: ");
|
BEGMSG("GetPCellInfo - GetFamNum: ");
|
||||||
for (TInt iElem = 0; iElem < aNbElem; iElem++) {
|
for (TInt iElem = 0; iElem < aNbElem; iElem++) {
|
||||||
ADDMSG(MYVALUEDEBUG, anInfo->GetFamNum(iElem)<<", ");
|
ADDMSG(anInfo->GetFamNum(iElem)<<", ");
|
||||||
}
|
}
|
||||||
ADDMSG(MYVALUEDEBUG, std::endl);
|
ADDMSG(std::endl);
|
||||||
|
|
||||||
if (anInfo->IsElemNum()) {
|
if (anInfo->IsElemNum()) {
|
||||||
BEGMSG(MYVALUEDEBUG, "GetPCellInfo - GetElemNum: ");
|
BEGMSG("GetPCellInfo - GetElemNum: ");
|
||||||
for (TInt iElem = 0; iElem < aNbElem; iElem++) {
|
for (TInt iElem = 0; iElem < aNbElem; iElem++) {
|
||||||
ADDMSG(MYVALUEDEBUG, anInfo->GetElemNum(iElem)<<", ");
|
ADDMSG(anInfo->GetElemNum(iElem)<<", ");
|
||||||
}
|
}
|
||||||
ADDMSG(MYVALUEDEBUG, std::endl);
|
ADDMSG(std::endl);
|
||||||
|
}
|
||||||
|
ADDMSG(std::endl);
|
||||||
}
|
}
|
||||||
ADDMSG(MYDEBUG, std::endl);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
return anInfo;
|
return anInfo;
|
||||||
}
|
}
|
||||||
@ -2687,14 +2684,14 @@ namespace MED
|
|||||||
PFieldInfo anInfo = CrFieldInfo(theMeshInfo, aNbComp);
|
PFieldInfo anInfo = CrFieldInfo(theMeshInfo, aNbComp);
|
||||||
GetFieldInfo(theId, *anInfo, theErr);
|
GetFieldInfo(theId, *anInfo, theErr);
|
||||||
|
|
||||||
#ifdef _DEBUG_
|
if (SALOME::VerbosityActivated())
|
||||||
INITMSG(MYDEBUG,
|
{
|
||||||
"GetPFieldInfo "<<
|
INITMSG("GetPFieldInfo "<<
|
||||||
"- aName = '"<<anInfo->GetName()<<"'"<<
|
"- aName = '"<<anInfo->GetName()<<"'"<<
|
||||||
"; aType = "<<anInfo->GetType()<<
|
"; aType = "<<anInfo->GetType()<<
|
||||||
"; aNbComp = "<<aNbComp<<
|
"; aNbComp = "<<aNbComp<<
|
||||||
std::endl);
|
std::endl);
|
||||||
#endif
|
}
|
||||||
|
|
||||||
return anInfo;
|
return anInfo;
|
||||||
}
|
}
|
||||||
@ -2896,14 +2893,12 @@ namespace MED
|
|||||||
}
|
}
|
||||||
bool anIsSatisfied =(nval > 0);
|
bool anIsSatisfied =(nval > 0);
|
||||||
if (anIsSatisfied) {
|
if (anIsSatisfied) {
|
||||||
INITMSG(MYDEBUG,
|
INITMSG("GetNbTimeStamps aNbTimeStamps = "<<aNbStamps<<
|
||||||
"GetNbTimeStamps aNbTimeStamps = "<<aNbStamps<<
|
|
||||||
"; aGeom = "<<aGeom<<"; anEntity = "<<anEntity<<"\n");
|
"; aGeom = "<<aGeom<<"; anEntity = "<<anEntity<<"\n");
|
||||||
if (anIsPerformAdditionalCheck) {
|
if (anIsPerformAdditionalCheck) {
|
||||||
anIsSatisfied = !strcmp(&aMeshName[0], &aMeshInfo.myName[0]);
|
anIsSatisfied = !strcmp(&aMeshName[0], &aMeshInfo.myName[0]);
|
||||||
if (!anIsSatisfied) {
|
if (!anIsSatisfied) {
|
||||||
INITMSG(MYDEBUG,
|
INITMSG("GetNbTimeStamps aMeshName = '"<<&aMeshName[0]<<"' != "<<
|
||||||
"GetNbTimeStamps aMeshName = '"<<&aMeshName[0]<<"' != "<<
|
|
||||||
"; aMeshInfo.myName = '"<<&aMeshInfo.myName[0]<<"'\n");
|
"; aMeshInfo.myName = '"<<&aMeshInfo.myName[0]<<"'\n");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -3062,15 +3057,16 @@ namespace MED
|
|||||||
PTimeStampInfo anInfo = CrTimeStampInfo(theFieldInfo, theEntity, theGeom2Size);
|
PTimeStampInfo anInfo = CrTimeStampInfo(theFieldInfo, theEntity, theGeom2Size);
|
||||||
GetTimeStampInfo(theId, *anInfo, theErr);
|
GetTimeStampInfo(theId, *anInfo, theErr);
|
||||||
|
|
||||||
#ifdef _DEBUG_
|
if (SALOME::VerbosityActivated())
|
||||||
INITMSG(MYDEBUG, "GetPTimeStampInfo - anEntity = "<<anInfo->GetEntity()<<"\n");
|
{
|
||||||
|
INITMSG("GetPTimeStampInfo - anEntity = "<<anInfo->GetEntity()<<"\n");
|
||||||
TGeom2NbGauss& aGeom2NbGauss = anInfo->myGeom2NbGauss;
|
TGeom2NbGauss& aGeom2NbGauss = anInfo->myGeom2NbGauss;
|
||||||
TGeom2NbGauss::const_iterator anIter = aGeom2NbGauss.begin();
|
TGeom2NbGauss::const_iterator anIter = aGeom2NbGauss.begin();
|
||||||
for (; anIter != aGeom2NbGauss.end(); anIter++) {
|
for (; anIter != aGeom2NbGauss.end(); anIter++) {
|
||||||
const EGeometrieElement& aGeom = anIter->first;
|
const EGeometrieElement& aGeom = anIter->first;
|
||||||
INITMSG(MYDEBUG, "aGeom = "<<aGeom<<" - "<<aGeom2NbGauss[aGeom]<<";\n");
|
INITMSG("aGeom = "<<aGeom<<" - "<<aGeom2NbGauss[aGeom]<<";\n");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
return anInfo;
|
return anInfo;
|
||||||
}
|
}
|
||||||
@ -3285,8 +3281,7 @@ namespace MED
|
|||||||
aNbComp);
|
aNbComp);
|
||||||
TInt aValueSize = theTimeStampValue->GetValueSize(aGeom);
|
TInt aValueSize = theTimeStampValue->GetValueSize(aGeom);
|
||||||
|
|
||||||
INITMSG(MYDEBUG,
|
INITMSG("TWrapper::GetTimeStampValue - aGeom = "<<aGeom<<
|
||||||
"TWrapper::GetTimeStampValue - aGeom = "<<aGeom<<
|
|
||||||
"; aNbVal = "<<aNbVal<<
|
"; aNbVal = "<<aNbVal<<
|
||||||
"; aNbValue = "<<aNbValue<<
|
"; aNbValue = "<<aNbValue<<
|
||||||
"; aNbGauss = "<<aNbGauss<<
|
"; aNbGauss = "<<aNbGauss<<
|
||||||
@ -3476,7 +3471,7 @@ namespace MED
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
INITMSG(MYDEBUG, "TWrapper::SetTimeStampValue - MED_MODE_ACCES = "<<theMode<<"; aRet = "<<aRet<<std::endl);
|
INITMSG("TWrapper::SetTimeStampValue - MED_MODE_ACCES = "<<theMode<<"; aRet = "<<aRet<<std::endl);
|
||||||
}
|
}
|
||||||
|
|
||||||
//----------------------------------------------------------------------------
|
//----------------------------------------------------------------------------
|
||||||
@ -3559,12 +3554,13 @@ namespace MED
|
|||||||
theMKey2Profile,
|
theMKey2Profile,
|
||||||
theKey2Gauss,
|
theKey2Gauss,
|
||||||
theErr);
|
theErr);
|
||||||
#ifdef _DEBUG_
|
if (SALOME::VerbosityActivated())
|
||||||
|
{
|
||||||
if (aFieldInfo->GetType() == eFLOAT64)
|
if (aFieldInfo->GetType() == eFLOAT64)
|
||||||
Print<TFloatTimeStampValue>(anInfo);
|
Print<TFloatTimeStampValue>(anInfo);
|
||||||
else
|
else
|
||||||
Print<TIntTimeStampValue>(anInfo);
|
Print<TIntTimeStampValue>(anInfo);
|
||||||
#endif
|
}
|
||||||
return anInfo;
|
return anInfo;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -3694,33 +3690,32 @@ namespace MED
|
|||||||
GetGrilleInfo(anInfo);
|
GetGrilleInfo(anInfo);
|
||||||
anInfo->SetGrilleType(type);
|
anInfo->SetGrilleType(type);
|
||||||
|
|
||||||
#ifdef _DEBUG_
|
if (SALOME::VerbosityActivated())
|
||||||
INITMSG(MYDEBUG, "GetPGrilleInfo: ");
|
|
||||||
{
|
{
|
||||||
|
INITMSG("GetPGrilleInfo: ");
|
||||||
|
|
||||||
TInt aNbElem = anInfo->GetNbNodes();
|
TInt aNbElem = anInfo->GetNbNodes();
|
||||||
BEGMSG(MYVALUEDEBUG, "GetFamNumNode: ");
|
BEGMSG("GetFamNumNode: ");
|
||||||
for (TInt iElem = 0; iElem < aNbElem; iElem++) {
|
for (TInt iElem = 0; iElem < aNbElem; iElem++) {
|
||||||
ADDMSG(MYVALUEDEBUG, anInfo->GetFamNumNode(iElem)<<", ");
|
ADDMSG(anInfo->GetFamNumNode(iElem)<<", ");
|
||||||
}
|
}
|
||||||
TInt aNbCells = anInfo->GetNbCells();
|
TInt aNbCells = anInfo->GetNbCells();
|
||||||
BEGMSG(MYVALUEDEBUG, "GetFamNum: ");
|
BEGMSG("GetFamNum: ");
|
||||||
for (TInt iElem = 0; iElem < aNbCells; iElem++) {
|
for (TInt iElem = 0; iElem < aNbCells; iElem++) {
|
||||||
ADDMSG(MYVALUEDEBUG, anInfo->GetFamNum(iElem)<<", ");
|
ADDMSG(anInfo->GetFamNum(iElem)<<", ");
|
||||||
}
|
}
|
||||||
ADDMSG(MYVALUEDEBUG, std::endl);
|
ADDMSG(std::endl);
|
||||||
BEGMSG(MYVALUEDEBUG, "GetCoordName: ");
|
BEGMSG("GetCoordName: ");
|
||||||
for (TInt iElem = 0; iElem < theMeshInfo->GetDim(); iElem++) {
|
for (TInt iElem = 0; iElem < theMeshInfo->GetDim(); iElem++) {
|
||||||
ADDMSG(MYVALUEDEBUG, anInfo->GetCoordName(iElem)<<", ");
|
ADDMSG(anInfo->GetCoordName(iElem)<<", ");
|
||||||
}
|
}
|
||||||
ADDMSG(MYVALUEDEBUG, std::endl);
|
ADDMSG(std::endl);
|
||||||
BEGMSG(MYVALUEDEBUG, "GetCoordUnit: ");
|
BEGMSG("GetCoordUnit: ");
|
||||||
for (TInt iElem = 0; iElem < theMeshInfo->GetDim(); iElem++) {
|
for (TInt iElem = 0; iElem < theMeshInfo->GetDim(); iElem++) {
|
||||||
ADDMSG(MYVALUEDEBUG, anInfo->GetCoordUnit(iElem)<<", ");
|
ADDMSG(anInfo->GetCoordUnit(iElem)<<", ");
|
||||||
}
|
}
|
||||||
ADDMSG(MYVALUEDEBUG, std::endl);
|
ADDMSG(std::endl);
|
||||||
|
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
return anInfo;
|
return anInfo;
|
||||||
}
|
}
|
||||||
|
@ -82,11 +82,6 @@
|
|||||||
|
|
||||||
#include "utilities.h"
|
#include "utilities.h"
|
||||||
|
|
||||||
#ifdef _DEBUG_
|
|
||||||
static int MYDEBUG = 0;
|
|
||||||
#else
|
|
||||||
static int MYDEBUG = 0;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
SMESH_ActorDef* SMESH_ActorDef::New(){
|
SMESH_ActorDef* SMESH_ActorDef::New(){
|
||||||
return new SMESH_ActorDef();
|
return new SMESH_ActorDef();
|
||||||
@ -114,7 +109,7 @@ SMESH_Actor* SMESH_Actor::New(TVisualObjPtr theVisualObj,
|
|||||||
|
|
||||||
SMESH_ActorDef::SMESH_ActorDef()
|
SMESH_ActorDef::SMESH_ActorDef()
|
||||||
{
|
{
|
||||||
if(MYDEBUG) MESSAGE("SMESH_ActorDef - "<<this);
|
MESSAGE("SMESH_ActorDef - "<<this);
|
||||||
|
|
||||||
SALOME_Actor::SetVisibility(false); // avoid update of pipelines
|
SALOME_Actor::SetVisibility(false); // avoid update of pipelines
|
||||||
|
|
||||||
@ -589,7 +584,7 @@ SMESH_ActorDef::SMESH_ActorDef()
|
|||||||
|
|
||||||
SMESH_ActorDef::~SMESH_ActorDef()
|
SMESH_ActorDef::~SMESH_ActorDef()
|
||||||
{
|
{
|
||||||
if(MYDEBUG) MESSAGE("~SMESH_ActorDef - "<<this);
|
MESSAGE("~SMESH_ActorDef - "<<this);
|
||||||
|
|
||||||
// Please keep the order same as one in the header file
|
// Please keep the order same as one in the header file
|
||||||
|
|
||||||
@ -1927,7 +1922,7 @@ void SMESH_ActorDef::Render(vtkRenderer* /*ren*/)
|
|||||||
|
|
||||||
void SMESH_ActorDef::Update()
|
void SMESH_ActorDef::Update()
|
||||||
{
|
{
|
||||||
if(MYDEBUG) MESSAGE("SMESH_ActorDef::Update");
|
MESSAGE("SMESH_ActorDef::Update");
|
||||||
|
|
||||||
myVisualObj->Update();
|
myVisualObj->Update();
|
||||||
|
|
||||||
@ -2657,7 +2652,7 @@ void SMESH_ActorDef::UpdateFilter()
|
|||||||
}
|
}
|
||||||
if ( GetVisibility() )
|
if ( GetVisibility() )
|
||||||
aFilter->Update();
|
aFilter->Update();
|
||||||
if (MYDEBUG) MESSAGE(aFilter->GetOutput()->GetNumberOfCells());
|
MESSAGE(aFilter->GetOutput()->GetNumberOfCells());
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifndef DISABLE_PLOT2DVIEWER
|
#ifndef DISABLE_PLOT2DVIEWER
|
||||||
|
@ -46,11 +46,6 @@
|
|||||||
#include <vtkUnstructuredGridWriter.h>
|
#include <vtkUnstructuredGridWriter.h>
|
||||||
#include <vtkUnsignedCharArray.h>
|
#include <vtkUnsignedCharArray.h>
|
||||||
|
|
||||||
//#ifdef _DEBUG_
|
|
||||||
//static int MYDEBUG = 1;
|
|
||||||
//#else
|
|
||||||
//static int MYDEBUG = 0;
|
|
||||||
//#endif
|
|
||||||
|
|
||||||
namespace SMESH
|
namespace SMESH
|
||||||
{
|
{
|
||||||
|
@ -68,11 +68,6 @@
|
|||||||
|
|
||||||
#include "utilities.h"
|
#include "utilities.h"
|
||||||
|
|
||||||
#ifdef _DEBUG_
|
|
||||||
static int MYDEBUG = 0;
|
|
||||||
#else
|
|
||||||
static int MYDEBUG = 0;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
||||||
@ -83,7 +78,7 @@ vtkStandardNewMacro(SMESH_DeviceActor)
|
|||||||
SMESH_DeviceActor
|
SMESH_DeviceActor
|
||||||
::SMESH_DeviceActor()
|
::SMESH_DeviceActor()
|
||||||
{
|
{
|
||||||
if(MYDEBUG) MESSAGE("SMESH_DeviceActor - "<<this);
|
MESSAGE("SMESH_DeviceActor - "<<this);
|
||||||
|
|
||||||
myIsShrinkable = false;
|
myIsShrinkable = false;
|
||||||
myIsShrunk = false;
|
myIsShrunk = false;
|
||||||
@ -140,7 +135,7 @@ SMESH_DeviceActor
|
|||||||
SMESH_DeviceActor
|
SMESH_DeviceActor
|
||||||
::~SMESH_DeviceActor()
|
::~SMESH_DeviceActor()
|
||||||
{
|
{
|
||||||
if(MYDEBUG) MESSAGE("~SMESH_DeviceActor - "<<this);
|
MESSAGE("~SMESH_DeviceActor - "<<this);
|
||||||
|
|
||||||
myMapper->Delete();
|
myMapper->Delete();
|
||||||
// myPlaneCollection->Delete(); -- it is vtkSmartPointer
|
// myPlaneCollection->Delete(); -- it is vtkSmartPointer
|
||||||
@ -851,7 +846,7 @@ SMESH_DeviceActor
|
|||||||
anID = myExtractGeometry->GetNodeObjId(theVtkID);
|
anID = myExtractGeometry->GetNodeObjId(theVtkID);
|
||||||
|
|
||||||
vtkIdType aRetID = myVisualObj->GetNodeObjId(anID);
|
vtkIdType aRetID = myVisualObj->GetNodeObjId(anID);
|
||||||
if(MYDEBUG) MESSAGE("GetNodeObjId - theVtkID = "<<theVtkID<<"; anID = "<<anID<<"; aRetID = "<<aRetID);
|
MESSAGE("GetNodeObjId - theVtkID = "<<theVtkID<<"; anID = "<<anID<<"; aRetID = "<<aRetID);
|
||||||
return aRetID;
|
return aRetID;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -862,7 +857,7 @@ SMESH_DeviceActor
|
|||||||
vtkDataSet* aDataSet = myMergeFilter->GetOutput();
|
vtkDataSet* aDataSet = myMergeFilter->GetOutput();
|
||||||
vtkIdType anID = myVisualObj->GetNodeVTKId(theObjID);
|
vtkIdType anID = myVisualObj->GetNodeVTKId(theObjID);
|
||||||
double* aCoord = (anID >=0 && anID < aDataSet->GetNumberOfPoints()) ? aDataSet->GetPoint(anID) : NULL;
|
double* aCoord = (anID >=0 && anID < aDataSet->GetNumberOfPoints()) ? aDataSet->GetPoint(anID) : NULL;
|
||||||
if(MYDEBUG) MESSAGE("GetNodeCoord - theObjID = "<<theObjID<<"; anID = "<<anID);
|
MESSAGE("GetNodeCoord - theObjID = "<<theObjID<<"; anID = "<<anID);
|
||||||
return aCoord;
|
return aCoord;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -892,7 +887,7 @@ SMESH_DeviceActor
|
|||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
vtkIdType aRetID = myVisualObj->GetElemObjId(anId3);
|
vtkIdType aRetID = myVisualObj->GetElemObjId(anId3);
|
||||||
if(MYDEBUG)
|
|
||||||
MESSAGE("GetElemObjId - theVtkID = "<<theVtkID<<"; anId2 = "<<anId2<<"; anId3 = "<<anId3<<"; aRetID = "<<aRetID);
|
MESSAGE("GetElemObjId - theVtkID = "<<theVtkID<<"; anId2 = "<<anId2<<"; anId3 = "<<anId3<<"; aRetID = "<<aRetID);
|
||||||
return aRetID;
|
return aRetID;
|
||||||
}
|
}
|
||||||
@ -904,7 +899,7 @@ SMESH_DeviceActor
|
|||||||
vtkDataSet* aDataSet = myVisualObj->GetUnstructuredGrid();
|
vtkDataSet* aDataSet = myVisualObj->GetUnstructuredGrid();
|
||||||
vtkIdType aGridID = myVisualObj->GetElemVTKId(theObjID);
|
vtkIdType aGridID = myVisualObj->GetElemVTKId(theObjID);
|
||||||
vtkCell* aCell = (aGridID >= 0 ) ? aDataSet->GetCell(aGridID) : NULL;
|
vtkCell* aCell = (aGridID >= 0 ) ? aDataSet->GetCell(aGridID) : NULL;
|
||||||
if(MYDEBUG)
|
|
||||||
MESSAGE("GetElemCell - theObjID = "<<theObjID<<"; aGridID = "<<aGridID);
|
MESSAGE("GetElemCell - theObjID = "<<theObjID<<"; aGridID = "<<aGridID);
|
||||||
return aCell;
|
return aCell;
|
||||||
}
|
}
|
||||||
|
@ -35,12 +35,6 @@
|
|||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
||||||
//#ifdef _DEBUG_
|
|
||||||
//static int MYDEBUG = 0;
|
|
||||||
//#else
|
|
||||||
//static int MYDEBUG = 0;
|
|
||||||
//#endif
|
|
||||||
|
|
||||||
#if defined __GNUC__
|
#if defined __GNUC__
|
||||||
#if __GNUC__ == 2
|
#if __GNUC__ == 2
|
||||||
#define __GNUC_2__
|
#define __GNUC_2__
|
||||||
|
@ -67,14 +67,7 @@ using namespace std;
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef _DEBUG_
|
|
||||||
static int MYDEBUG = 0;
|
|
||||||
static int MYDEBUGWITHFILES = 0;//1;
|
static int MYDEBUGWITHFILES = 0;//1;
|
||||||
#else
|
|
||||||
static int MYDEBUG = 0;
|
|
||||||
static int MYDEBUGWITHFILES = 0;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Class : SMESH_VisualObjDef
|
Class : SMESH_VisualObjDef
|
||||||
@ -86,7 +79,7 @@ static int MYDEBUGWITHFILES = 0;
|
|||||||
//=================================================================================
|
//=================================================================================
|
||||||
SMESH_VisualObjDef::SMESH_VisualObjDef()
|
SMESH_VisualObjDef::SMESH_VisualObjDef()
|
||||||
{
|
{
|
||||||
if ( MYDEBUG ) MESSAGE("-------------------------------SMESH_VisualObjDef::SMESH_VisualObjDef");
|
MESSAGE("-------------------------------SMESH_VisualObjDef::SMESH_VisualObjDef");
|
||||||
myGrid = vtkUnstructuredGrid::New();
|
myGrid = vtkUnstructuredGrid::New();
|
||||||
myLocalGrid = false;
|
myLocalGrid = false;
|
||||||
ClearEntitiesFlags();
|
ClearEntitiesFlags();
|
||||||
@ -94,8 +87,8 @@ SMESH_VisualObjDef::SMESH_VisualObjDef()
|
|||||||
}
|
}
|
||||||
SMESH_VisualObjDef::~SMESH_VisualObjDef()
|
SMESH_VisualObjDef::~SMESH_VisualObjDef()
|
||||||
{
|
{
|
||||||
if ( MYDEBUG ) MESSAGE("--------------------------------SMESH_VisualObjDef::~SMESH_VisualObjDef");
|
MESSAGE("--------------------------------SMESH_VisualObjDef::~SMESH_VisualObjDef");
|
||||||
if ( MYDEBUG ) MESSAGE( "myGrid->GetReferenceCount() = " << myGrid->GetReferenceCount() );
|
MESSAGE( "myGrid->GetReferenceCount() = " << myGrid->GetReferenceCount() );
|
||||||
myGrid->Delete();
|
myGrid->Delete();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -200,7 +193,7 @@ void SMESH_VisualObjDef::createPoints( vtkPoints* thePoints )
|
|||||||
//=================================================================================
|
//=================================================================================
|
||||||
void SMESH_VisualObjDef::buildPrs(bool buildGrid)
|
void SMESH_VisualObjDef::buildPrs(bool buildGrid)
|
||||||
{
|
{
|
||||||
if ( MYDEBUG ) MESSAGE("---------------------------SMESH_VisualObjDef::buildPrs " << buildGrid);
|
MESSAGE("---------------------------SMESH_VisualObjDef::buildPrs " << buildGrid);
|
||||||
if (buildGrid)
|
if (buildGrid)
|
||||||
{
|
{
|
||||||
myLocalGrid = true;
|
myLocalGrid = true;
|
||||||
@ -234,7 +227,7 @@ void SMESH_VisualObjDef::buildPrs(bool buildGrid)
|
|||||||
if (!GetMesh()->IsCompacted())
|
if (!GetMesh()->IsCompacted())
|
||||||
{
|
{
|
||||||
NulData(); // detach from the SMDS grid to allow immediate memory de-allocation in compactMesh()
|
NulData(); // detach from the SMDS grid to allow immediate memory de-allocation in compactMesh()
|
||||||
if ( MYDEBUG ) MESSAGE("*** buildPrs ==> compactMesh!");
|
MESSAGE("*** buildPrs ==> compactMesh!");
|
||||||
GetMesh()->CompactMesh();
|
GetMesh()->CompactMesh();
|
||||||
if ( SMESHDS_Mesh* m = dynamic_cast<SMESHDS_Mesh*>( GetMesh() )) // IPAL53915
|
if ( SMESHDS_Mesh* m = dynamic_cast<SMESHDS_Mesh*>( GetMesh() )) // IPAL53915
|
||||||
m->GetScript()->SetModified(false); // drop IsModified set in compactMesh()
|
m->GetScript()->SetModified(false); // drop IsModified set in compactMesh()
|
||||||
@ -309,7 +302,6 @@ void SMESH_VisualObjDef::buildElemPrs()
|
|||||||
myGrid->SetPoints( aPoints );
|
myGrid->SetPoints( aPoints );
|
||||||
aPoints->Delete();
|
aPoints->Delete();
|
||||||
|
|
||||||
if ( MYDEBUG )
|
|
||||||
MESSAGE("Update - myGrid->GetNumberOfPoints() = "<<myGrid->GetNumberOfPoints());
|
MESSAGE("Update - myGrid->GetNumberOfPoints() = "<<myGrid->GetNumberOfPoints());
|
||||||
|
|
||||||
// Calculate cells size
|
// Calculate cells size
|
||||||
@ -361,7 +353,7 @@ void SMESH_VisualObjDef::buildElemPrs()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if ( MYDEBUG )
|
|
||||||
MESSAGE( "Update - aNbCells = "<<aNbCells<<"; aCellsSize = "<<aCellsSize );
|
MESSAGE( "Update - aNbCells = "<<aNbCells<<"; aCellsSize = "<<aCellsSize );
|
||||||
|
|
||||||
// Create cells
|
// Create cells
|
||||||
@ -628,7 +620,7 @@ SMESH_MeshObj::SMESH_MeshObj(SMESH::SMESH_Mesh_ptr theMesh):
|
|||||||
myClient(SalomeApp_Application::orb(),theMesh)
|
myClient(SalomeApp_Application::orb(),theMesh)
|
||||||
{
|
{
|
||||||
myEmptyGrid = 0;
|
myEmptyGrid = 0;
|
||||||
if ( MYDEBUG )
|
|
||||||
MESSAGE("SMESH_MeshObj - this = "<<this<<"; theMesh->_is_nil() = "<<theMesh->_is_nil());
|
MESSAGE("SMESH_MeshObj - this = "<<this<<"; theMesh->_is_nil() = "<<theMesh->_is_nil());
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -638,7 +630,6 @@ SMESH_MeshObj::SMESH_MeshObj(SMESH::SMESH_Mesh_ptr theMesh):
|
|||||||
//=================================================================================
|
//=================================================================================
|
||||||
SMESH_MeshObj::~SMESH_MeshObj()
|
SMESH_MeshObj::~SMESH_MeshObj()
|
||||||
{
|
{
|
||||||
if ( MYDEBUG )
|
|
||||||
MESSAGE("SMESH_MeshObj - this = "<<this<<"\n");
|
MESSAGE("SMESH_MeshObj - this = "<<this<<"\n");
|
||||||
if ( myEmptyGrid )
|
if ( myEmptyGrid )
|
||||||
myEmptyGrid->Delete();
|
myEmptyGrid->Delete();
|
||||||
@ -651,9 +642,9 @@ SMESH_MeshObj::~SMESH_MeshObj()
|
|||||||
bool SMESH_MeshObj::Update( int theIsClear )
|
bool SMESH_MeshObj::Update( int theIsClear )
|
||||||
{
|
{
|
||||||
// Update SMDS_Mesh on client part
|
// Update SMDS_Mesh on client part
|
||||||
if ( MYDEBUG ) MESSAGE("SMESH_MeshObj::Update " << this);
|
MESSAGE("SMESH_MeshObj::Update " << this);
|
||||||
if ( myClient.Update(theIsClear) || GetUnstructuredGrid()->GetNumberOfPoints()==0) {
|
if ( myClient.Update(theIsClear) || GetUnstructuredGrid()->GetNumberOfPoints()==0) {
|
||||||
if ( MYDEBUG ) MESSAGE("buildPrs");
|
MESSAGE("buildPrs");
|
||||||
buildPrs(); // Fill unstructured grid
|
buildPrs(); // Fill unstructured grid
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -662,7 +653,7 @@ bool SMESH_MeshObj::Update( int theIsClear )
|
|||||||
|
|
||||||
bool SMESH_MeshObj::NulData()
|
bool SMESH_MeshObj::NulData()
|
||||||
{
|
{
|
||||||
if ( MYDEBUG ) MESSAGE ("SMESH_MeshObj::NulData() =============================================");
|
MESSAGE ("SMESH_MeshObj::NulData() =============================================");
|
||||||
if (!myEmptyGrid)
|
if (!myEmptyGrid)
|
||||||
{
|
{
|
||||||
myEmptyGrid = SMDS_UnstructuredGrid::New();
|
myEmptyGrid = SMDS_UnstructuredGrid::New();
|
||||||
@ -821,7 +812,7 @@ bool SMESH_MeshObj::IsNodePrs() const
|
|||||||
//=================================================================================
|
//=================================================================================
|
||||||
SMESH_SubMeshObj::SMESH_SubMeshObj( SMESH_MeshObj* theMeshObj )
|
SMESH_SubMeshObj::SMESH_SubMeshObj( SMESH_MeshObj* theMeshObj )
|
||||||
{
|
{
|
||||||
if ( MYDEBUG ) MESSAGE( "SMESH_SubMeshObj - theMeshObj = " << theMeshObj );
|
MESSAGE( "SMESH_SubMeshObj - theMeshObj = " << theMeshObj );
|
||||||
|
|
||||||
myMeshObj = theMeshObj;
|
myMeshObj = theMeshObj;
|
||||||
}
|
}
|
||||||
@ -855,7 +846,7 @@ void SMESH_SubMeshObj::UpdateFunctor( const SMESH::Controls::FunctorPtr& theFunc
|
|||||||
//=================================================================================
|
//=================================================================================
|
||||||
bool SMESH_SubMeshObj::Update( int theIsClear )
|
bool SMESH_SubMeshObj::Update( int theIsClear )
|
||||||
{
|
{
|
||||||
if ( MYDEBUG ) MESSAGE("SMESH_SubMeshObj::Update " << this)
|
MESSAGE("SMESH_SubMeshObj::Update " << this);
|
||||||
bool changed = myMeshObj->Update( theIsClear );
|
bool changed = myMeshObj->Update( theIsClear );
|
||||||
buildPrs(true);
|
buildPrs(true);
|
||||||
return changed;
|
return changed;
|
||||||
@ -876,13 +867,13 @@ SMESH_GroupObj::SMESH_GroupObj( SMESH::SMESH_GroupBase_ptr theGroup,
|
|||||||
: SMESH_SubMeshObj( theMeshObj ),
|
: SMESH_SubMeshObj( theMeshObj ),
|
||||||
myGroupServer( SMESH::SMESH_GroupBase::_duplicate(theGroup) )
|
myGroupServer( SMESH::SMESH_GroupBase::_duplicate(theGroup) )
|
||||||
{
|
{
|
||||||
if ( MYDEBUG ) MESSAGE("SMESH_GroupObj - theGroup->_is_nil() = "<<theGroup->_is_nil());
|
MESSAGE("SMESH_GroupObj - theGroup->_is_nil() = "<<theGroup->_is_nil());
|
||||||
myGroupServer->Register();
|
myGroupServer->Register();
|
||||||
}
|
}
|
||||||
|
|
||||||
SMESH_GroupObj::~SMESH_GroupObj()
|
SMESH_GroupObj::~SMESH_GroupObj()
|
||||||
{
|
{
|
||||||
if ( MYDEBUG ) MESSAGE("~SMESH_GroupObj");
|
MESSAGE("~SMESH_GroupObj");
|
||||||
myGroupServer->UnRegister();
|
myGroupServer->UnRegister();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1011,14 +1002,14 @@ SMESH_subMeshObj::SMESH_subMeshObj( SMESH::SMESH_subMesh_ptr theSubMesh,
|
|||||||
: SMESH_SubMeshObj( theMeshObj ),
|
: SMESH_SubMeshObj( theMeshObj ),
|
||||||
mySubMeshServer( SMESH::SMESH_subMesh::_duplicate( theSubMesh ) )
|
mySubMeshServer( SMESH::SMESH_subMesh::_duplicate( theSubMesh ) )
|
||||||
{
|
{
|
||||||
if ( MYDEBUG ) MESSAGE( "SMESH_subMeshObj - theSubMesh->_is_nil() = " << theSubMesh->_is_nil() );
|
MESSAGE( "SMESH_subMeshObj - theSubMesh->_is_nil() = " << theSubMesh->_is_nil() );
|
||||||
|
|
||||||
mySubMeshServer->Register();
|
mySubMeshServer->Register();
|
||||||
}
|
}
|
||||||
|
|
||||||
SMESH_subMeshObj::~SMESH_subMeshObj()
|
SMESH_subMeshObj::~SMESH_subMeshObj()
|
||||||
{
|
{
|
||||||
if ( MYDEBUG ) MESSAGE( "~SMESH_subMeshObj" );
|
MESSAGE( "~SMESH_subMeshObj" );
|
||||||
mySubMeshServer->UnRegister();
|
mySubMeshServer->UnRegister();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -44,23 +44,17 @@
|
|||||||
#include <SUIT_ResourceMgr.h>
|
#include <SUIT_ResourceMgr.h>
|
||||||
#include <SUIT_Session.h>
|
#include <SUIT_Session.h>
|
||||||
|
|
||||||
#ifdef _DEBUG_
|
|
||||||
static int MYDEBUG = 0;
|
|
||||||
#else
|
|
||||||
static int MYDEBUG = 0;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
SMESH_PreviewActorsCollection::SMESH_PreviewActorsCollection() :
|
SMESH_PreviewActorsCollection::SMESH_PreviewActorsCollection() :
|
||||||
mySelector( 0 ), myRenderer( 0 ), myCurrentChunk( 0 ), myChunkSize( 0 ), myIsShown( true )
|
mySelector( 0 ), myRenderer( 0 ), myCurrentChunk( 0 ), myChunkSize( 0 ), myIsShown( true )
|
||||||
{
|
{
|
||||||
if(MYDEBUG) MESSAGE("SMESH_PreviewActorsCollection - "<<this);
|
MESSAGE("SMESH_PreviewActorsCollection - "<<this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
SMESH_PreviewActorsCollection::~SMESH_PreviewActorsCollection()
|
SMESH_PreviewActorsCollection::~SMESH_PreviewActorsCollection()
|
||||||
{
|
{
|
||||||
if(MYDEBUG) MESSAGE("~SMESH_PreviewActorsCollection - "<<this);
|
MESSAGE("~SMESH_PreviewActorsCollection - "<<this);
|
||||||
clearActors();
|
clearActors();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -29,9 +29,7 @@
|
|||||||
#include <sys/sysinfo.h>
|
#include <sys/sysinfo.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef _DEBUG_
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#endif
|
|
||||||
|
|
||||||
int main ()
|
int main ()
|
||||||
{
|
{
|
||||||
@ -59,9 +57,9 @@ int main ()
|
|||||||
}
|
}
|
||||||
} catch (...) {}
|
} catch (...) {}
|
||||||
|
|
||||||
// #ifdef _DEBUG_
|
// if (SALOME::VerbosityActivated())
|
||||||
// std::cout << freeRamKb / 1024 << std::endl;
|
// std::cout << freeRamKb / 1024 << std::endl;
|
||||||
// #endif
|
|
||||||
return freeRamKb / 1024;
|
return freeRamKb / 1024;
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@ -1575,9 +1575,9 @@ MgAdapt::Status MgAdapt::addMessage(const std::string& msg,
|
|||||||
_errorMessages.push_back( msg );
|
_errorMessages.push_back( msg );
|
||||||
|
|
||||||
//~MESSAGE(msg);
|
//~MESSAGE(msg);
|
||||||
#ifdef _DEBUG_
|
if (SALOME::VerbosityActivated())
|
||||||
std::cout << msg << std::endl;
|
std::cout << msg << std::endl;
|
||||||
#endif
|
|
||||||
return ( _status = isFatal ? MgAdapt::DRS_FAIL : MgAdapt::DRS_WARN_SKIP_ELEM );
|
return ( _status = isFatal ? MgAdapt::DRS_FAIL : MgAdapt::DRS_WARN_SKIP_ELEM );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -83,12 +83,6 @@
|
|||||||
// maximum stored group name length in MED file
|
// maximum stored group name length in MED file
|
||||||
#define MAX_MED_GROUP_NAME_LENGTH 80
|
#define MAX_MED_GROUP_NAME_LENGTH 80
|
||||||
|
|
||||||
#ifdef _DEBUG_
|
|
||||||
static int MYDEBUG = 0;
|
|
||||||
#else
|
|
||||||
static int MYDEBUG = 0;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define cSMESH_Hyp(h) static_cast<const SMESH_Hypothesis*>(h)
|
#define cSMESH_Hyp(h) static_cast<const SMESH_Hypothesis*>(h)
|
||||||
|
|
||||||
typedef SMESH_HypoFilter THypType;
|
typedef SMESH_HypoFilter THypType;
|
||||||
@ -109,7 +103,7 @@ SMESH_Mesh::SMESH_Mesh(int theLocalId,
|
|||||||
SMESHDS_Document* theDocument):
|
SMESHDS_Document* theDocument):
|
||||||
_groupId( 0 ), _nbSubShapes( 0 )
|
_groupId( 0 ), _nbSubShapes( 0 )
|
||||||
{
|
{
|
||||||
if(MYDEBUG) MESSAGE("SMESH_Mesh::SMESH_Mesh(int localId)");
|
MESSAGE("SMESH_Mesh::SMESH_Mesh(int localId)");
|
||||||
_id = theLocalId;
|
_id = theLocalId;
|
||||||
_gen = theGen;
|
_gen = theGen;
|
||||||
_document = theDocument;
|
_document = theDocument;
|
||||||
@ -192,7 +186,7 @@ namespace
|
|||||||
|
|
||||||
SMESH_Mesh::~SMESH_Mesh()
|
SMESH_Mesh::~SMESH_Mesh()
|
||||||
{
|
{
|
||||||
if(MYDEBUG) MESSAGE("SMESH_Mesh::~SMESH_Mesh");
|
MESSAGE("SMESH_Mesh::~SMESH_Mesh");
|
||||||
|
|
||||||
if ( _document ) // avoid destructing _meshDS from ~SMESH_Gen()
|
if ( _document ) // avoid destructing _meshDS from ~SMESH_Gen()
|
||||||
_document->RemoveMesh( _id );
|
_document->RemoveMesh( _id );
|
||||||
@ -276,7 +270,7 @@ SMESH_Mesh* SMESH_Mesh::FindMesh( int meshId ) const
|
|||||||
|
|
||||||
void SMESH_Mesh::ShapeToMesh(const TopoDS_Shape & aShape)
|
void SMESH_Mesh::ShapeToMesh(const TopoDS_Shape & aShape)
|
||||||
{
|
{
|
||||||
if(MYDEBUG) MESSAGE("SMESH_Mesh::ShapeToMesh");
|
MESSAGE("SMESH_Mesh::ShapeToMesh");
|
||||||
|
|
||||||
if ( !aShape.IsNull() && _isShapeToMesh ) {
|
if ( !aShape.IsNull() && _isShapeToMesh ) {
|
||||||
if ( aShape.ShapeType() != TopAbs_COMPOUND && // group contents is allowed to change
|
if ( aShape.ShapeType() != TopAbs_COMPOUND && // group contents is allowed to change
|
||||||
@ -530,10 +524,12 @@ int SMESH_Mesh::MEDToMesh(const char* theFileName, const char* theMeshName)
|
|||||||
myReader.SetFile(theFileName);
|
myReader.SetFile(theFileName);
|
||||||
myReader.SetMeshName(theMeshName);
|
myReader.SetMeshName(theMeshName);
|
||||||
Driver_Mesh::Status status = myReader.Perform();
|
Driver_Mesh::Status status = myReader.Perform();
|
||||||
#ifdef _DEBUG_
|
|
||||||
|
if (SALOME::VerbosityActivated())
|
||||||
|
{
|
||||||
SMESH_ComputeErrorPtr er = myReader.GetError();
|
SMESH_ComputeErrorPtr er = myReader.GetError();
|
||||||
if ( er && !er->IsOK() ) std::cout << er->myComment << std::endl;
|
if ( er && !er->IsOK() ) std::cout << er->myComment << std::endl;
|
||||||
#endif
|
}
|
||||||
|
|
||||||
// Reading groups (sub-meshes are out of scope of MED import functionality)
|
// Reading groups (sub-meshes are out of scope of MED import functionality)
|
||||||
std::list<TNameAndType> aGroupNames = myReader.GetGroupNamesAndTypes();
|
std::list<TNameAndType> aGroupNames = myReader.GetGroupNamesAndTypes();
|
||||||
@ -638,7 +634,7 @@ SMESH_Mesh::AddHypothesis(const TopoDS_Shape & aSubShape,
|
|||||||
int anHypId,
|
int anHypId,
|
||||||
std::string* anError )
|
std::string* anError )
|
||||||
{
|
{
|
||||||
if(MYDEBUG) MESSAGE("SMESH_Mesh::AddHypothesis");
|
MESSAGE("SMESH_Mesh::AddHypothesis");
|
||||||
|
|
||||||
if ( anError )
|
if ( anError )
|
||||||
anError->clear();
|
anError->clear();
|
||||||
@ -662,7 +658,7 @@ SMESH_Mesh::AddHypothesis(const TopoDS_Shape & aSubShape,
|
|||||||
std::string hypName = anHyp->GetName();
|
std::string hypName = anHyp->GetName();
|
||||||
if ( hypName == "NotConformAllowed" )
|
if ( hypName == "NotConformAllowed" )
|
||||||
{
|
{
|
||||||
if(MYDEBUG) MESSAGE( "Hypothesis <NotConformAllowed> can be only global" );
|
MESSAGE( "Hypothesis <NotConformAllowed> can be only global" );
|
||||||
return SMESH_Hypothesis::HYP_INCOMPATIBLE;
|
return SMESH_Hypothesis::HYP_INCOMPATIBLE;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -717,8 +713,8 @@ SMESH_Mesh::AddHypothesis(const TopoDS_Shape & aSubShape,
|
|||||||
HasModificationsToDiscard(); // to reset _isModified flag if a mesh becomes empty
|
HasModificationsToDiscard(); // to reset _isModified flag if a mesh becomes empty
|
||||||
GetMeshDS()->Modified();
|
GetMeshDS()->Modified();
|
||||||
|
|
||||||
if(MYDEBUG) subMesh->DumpAlgoState(true);
|
if(SALOME::VerbosityActivated()) subMesh->DumpAlgoState(true);
|
||||||
if(MYDEBUG) SCRUTE(ret);
|
SCRUTE(ret);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -732,14 +728,14 @@ SMESH_Hypothesis::Hypothesis_Status
|
|||||||
SMESH_Mesh::RemoveHypothesis(const TopoDS_Shape & aSubShape,
|
SMESH_Mesh::RemoveHypothesis(const TopoDS_Shape & aSubShape,
|
||||||
int anHypId)
|
int anHypId)
|
||||||
{
|
{
|
||||||
if(MYDEBUG) MESSAGE("SMESH_Mesh::RemoveHypothesis");
|
MESSAGE("SMESH_Mesh::RemoveHypothesis");
|
||||||
|
|
||||||
StudyContextStruct *sc = _gen->GetStudyContext();
|
StudyContextStruct *sc = _gen->GetStudyContext();
|
||||||
if (sc->mapHypothesis.find(anHypId) == sc->mapHypothesis.end())
|
if (sc->mapHypothesis.find(anHypId) == sc->mapHypothesis.end())
|
||||||
throw SALOME_Exception(LOCALIZED("hypothesis does not exist"));
|
throw SALOME_Exception(LOCALIZED("hypothesis does not exist"));
|
||||||
|
|
||||||
SMESH_Hypothesis *anHyp = sc->mapHypothesis[anHypId];
|
SMESH_Hypothesis *anHyp = sc->mapHypothesis[anHypId];
|
||||||
if(MYDEBUG) { SCRUTE(anHyp->GetType()); }
|
SCRUTE(anHyp->GetType());
|
||||||
|
|
||||||
// shape
|
// shape
|
||||||
|
|
||||||
@ -787,8 +783,8 @@ SMESH_Mesh::RemoveHypothesis(const TopoDS_Shape & aSubShape,
|
|||||||
HasModificationsToDiscard(); // to reset _isModified flag if mesh become empty
|
HasModificationsToDiscard(); // to reset _isModified flag if mesh become empty
|
||||||
GetMeshDS()->Modified();
|
GetMeshDS()->Modified();
|
||||||
|
|
||||||
if(MYDEBUG) subMesh->DumpAlgoState(true);
|
if(SALOME::VerbosityActivated()) subMesh->DumpAlgoState(true);
|
||||||
if(MYDEBUG) SCRUTE(ret);
|
SCRUTE(ret);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1748,9 +1744,8 @@ double SMESH_Mesh::GetComputeProgress() const
|
|||||||
rate = algo->GetProgress();
|
rate = algo->GetProgress();
|
||||||
}
|
}
|
||||||
catch (...) {
|
catch (...) {
|
||||||
#ifdef _DEBUG_
|
if (SALOME::VerbosityActivated())
|
||||||
std::cerr << "Exception in " << algo->GetName() << "::GetProgress()" << std::endl;
|
std::cerr << "Exception in " << algo->GetName() << "::GetProgress()" << std::endl;
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
if ( 0. < rate && rate < 1.001 )
|
if ( 0. < rate && rate < 1.001 )
|
||||||
{
|
{
|
||||||
@ -2027,7 +2022,7 @@ int SMESH_Mesh::NbMeshes() const // nb meshes in the Study
|
|||||||
|
|
||||||
bool SMESH_Mesh::IsNotConformAllowed() const
|
bool SMESH_Mesh::IsNotConformAllowed() const
|
||||||
{
|
{
|
||||||
if(MYDEBUG) MESSAGE("SMESH_Mesh::IsNotConformAllowed");
|
MESSAGE("SMESH_Mesh::IsNotConformAllowed");
|
||||||
|
|
||||||
static SMESH_HypoFilter filter( SMESH_HypoFilter::HasName( "NotConformAllowed" ));
|
static SMESH_HypoFilter filter( SMESH_HypoFilter::HasName( "NotConformAllowed" ));
|
||||||
return GetHypothesis( _meshDS->ShapeToMesh(), filter, false );
|
return GetHypothesis( _meshDS->ShapeToMesh(), filter, false );
|
||||||
|
@ -5219,13 +5219,12 @@ void SMESH_MeshEditor::makeWalls (TNodeOfNodeListMap & mapNewNodes,
|
|||||||
srcEdges.push_back(aMesh->FindEdge (commonNodes[0],commonNodes[1],commonNodes[2]));
|
srcEdges.push_back(aMesh->FindEdge (commonNodes[0],commonNodes[1],commonNodes[2]));
|
||||||
else
|
else
|
||||||
srcEdges.push_back(aMesh->FindEdge (commonNodes[0],commonNodes[1]));
|
srcEdges.push_back(aMesh->FindEdge (commonNodes[0],commonNodes[1]));
|
||||||
#ifdef _DEBUG_
|
|
||||||
if ( !srcEdges.back() )
|
if (SALOME::VerbosityActivated() && !srcEdges.back())
|
||||||
{
|
{
|
||||||
cout << "SMESH_MeshEditor::makeWalls(), no source edge found for a free face #"
|
cout << "SMESH_MeshEditor::makeWalls(), no source edge found for a free face #"
|
||||||
<< iF << " of volume #" << vTool.ID() << endl;
|
<< iF << " of volume #" << vTool.ID() << endl;
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if ( freeInd.empty() )
|
if ( freeInd.empty() )
|
||||||
@ -6816,9 +6815,8 @@ SMESH_MeshEditor::PGroupIDs SMESH_MeshEditor::Offset( TIDSortedElemSet & theElem
|
|||||||
for ( size_t i = 0; i < new2OldNodes.size(); ++i )
|
for ( size_t i = 0; i < new2OldNodes.size(); ++i )
|
||||||
if ( const SMDS_MeshNode* n = new2OldNodes[ i ].first )
|
if ( const SMDS_MeshNode* n = new2OldNodes[ i ].first )
|
||||||
{
|
{
|
||||||
#ifndef _DEBUG_
|
|
||||||
if ( n->NbInverseElements() > 0 )
|
if (!SALOME::VerbosityActivated() || n->NbInverseElements() > 0 )
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
const SMDS_MeshNode* n2 =
|
const SMDS_MeshNode* n2 =
|
||||||
tgtMeshDS->AddNodeWithID( n->X(), n->Y(), n->Z(), idShift + n->GetID() );
|
tgtMeshDS->AddNodeWithID( n->X(), n->Y(), n->Z(), idShift + n->GetID() );
|
||||||
|
@ -3323,9 +3323,9 @@ double SMESH_MesherHelper::GetAngle( const TopoDS_Edge & theE1,
|
|||||||
vecRef = du ^ dv;
|
vecRef = du ^ dv;
|
||||||
if ( ++nbLoops > 10 )
|
if ( ++nbLoops > 10 )
|
||||||
{
|
{
|
||||||
#ifdef _DEBUG_
|
if (SALOME::VerbosityActivated())
|
||||||
cout << "SMESH_MesherHelper::GetAngle(): Captured in a sigularity" << endl;
|
cout << "SMESH_MesherHelper::GetAngle(): Captured in a sigularity" << endl;
|
||||||
#endif
|
|
||||||
return angle;
|
return angle;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -3745,9 +3745,7 @@ namespace { // Structures used by FixQuadraticElements()
|
|||||||
mutable vector< const QLink* > _sides;
|
mutable vector< const QLink* > _sides;
|
||||||
mutable bool _sideIsAdded[4]; // added in chain of links
|
mutable bool _sideIsAdded[4]; // added in chain of links
|
||||||
gp_Vec _normal;
|
gp_Vec _normal;
|
||||||
#ifdef _DEBUG_
|
|
||||||
mutable const SMDS_MeshElement* _face;
|
mutable const SMDS_MeshElement* _face;
|
||||||
#endif
|
|
||||||
|
|
||||||
QFace( const vector< const QLink*>& links, const SMDS_MeshElement* face=0 );
|
QFace( const vector< const QLink*>& links, const SMDS_MeshElement* face=0 );
|
||||||
|
|
||||||
@ -3861,11 +3859,8 @@ namespace { // Structures used by FixQuadraticElements()
|
|||||||
else
|
else
|
||||||
_normal.SetCoord(1e-33,0,0);
|
_normal.SetCoord(1e-33,0,0);
|
||||||
|
|
||||||
#ifdef _DEBUG_
|
if (SALOME::VerbosityActivated())
|
||||||
_face = face;
|
_face = face;
|
||||||
#else
|
|
||||||
(void)face; // unused in release mode
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
//================================================================================
|
//================================================================================
|
||||||
/*!
|
/*!
|
||||||
@ -4963,12 +4958,11 @@ void SMESH_MesherHelper::FixQuadraticElements(SMESH_ComputeErrorPtr& compError,
|
|||||||
if ( !myMesh->HasShapeToMesh() ) return;
|
if ( !myMesh->HasShapeToMesh() ) return;
|
||||||
SetSubShape( myMesh->GetShapeToMesh() );
|
SetSubShape( myMesh->GetShapeToMesh() );
|
||||||
|
|
||||||
#ifdef _DEBUG_
|
|
||||||
int nbSolids = 0;
|
int nbSolids = 0;
|
||||||
TopTools_IndexedMapOfShape solids;
|
TopTools_IndexedMapOfShape solids;
|
||||||
TopExp::MapShapes(myShape,TopAbs_SOLID,solids);
|
TopExp::MapShapes(myShape,TopAbs_SOLID,solids);
|
||||||
nbSolids = solids.Extent();
|
nbSolids = solids.Extent();
|
||||||
#endif
|
|
||||||
TopTools_MapOfShape faces; // faces not in solid or in not meshed solid
|
TopTools_MapOfShape faces; // faces not in solid or in not meshed solid
|
||||||
for ( TopExp_Explorer f(myShape,TopAbs_FACE,TopAbs_SOLID); f.More(); f.Next() ) {
|
for ( TopExp_Explorer f(myShape,TopAbs_FACE,TopAbs_SOLID); f.More(); f.Next() ) {
|
||||||
faces.Add( f.Current() ); // not in solid
|
faces.Add( f.Current() ); // not in solid
|
||||||
@ -4979,9 +4973,8 @@ void SMESH_MesherHelper::FixQuadraticElements(SMESH_ComputeErrorPtr& compError,
|
|||||||
faces.Add( f.Current() ); // in not meshed solid
|
faces.Add( f.Current() ); // in not meshed solid
|
||||||
}
|
}
|
||||||
else { // fix nodes in the solid and its faces
|
else { // fix nodes in the solid and its faces
|
||||||
#ifdef _DEBUG_
|
|
||||||
MSG("FIX SOLID " << nbSolids-- << " #" << GetMeshDS()->ShapeToIndex(s.Current()));
|
MSG("FIX SOLID " << nbSolids-- << " #" << GetMeshDS()->ShapeToIndex(s.Current()));
|
||||||
#endif
|
|
||||||
SMESH_MesherHelper h(*myMesh);
|
SMESH_MesherHelper h(*myMesh);
|
||||||
h.SetSubShape( s.Current() );
|
h.SetSubShape( s.Current() );
|
||||||
h.ToFixNodeParameters(true);
|
h.ToFixNodeParameters(true);
|
||||||
@ -4996,10 +4989,9 @@ void SMESH_MesherHelper::FixQuadraticElements(SMESH_ComputeErrorPtr& compError,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
// fix nodes on geom faces
|
// fix nodes on geom faces
|
||||||
#ifdef _DEBUG_
|
|
||||||
int nbfaces = nbSolids;
|
int nbfaces = faces.Extent();
|
||||||
nbfaces = faces.Extent(); /*avoid "unused varianbles": */ nbfaces++, nbfaces--;
|
|
||||||
#endif
|
|
||||||
for ( TopTools_MapIteratorOfMapOfShape fIt( faces ); fIt.More(); fIt.Next() ) {
|
for ( TopTools_MapIteratorOfMapOfShape fIt( faces ); fIt.More(); fIt.Next() ) {
|
||||||
MESSAGE("FIX FACE " << nbfaces-- << " #" << GetMeshDS()->ShapeToIndex(fIt.Key()));
|
MESSAGE("FIX FACE " << nbfaces-- << " #" << GetMeshDS()->ShapeToIndex(fIt.Key()));
|
||||||
MSG("FIX FACE " << nbfaces-- << " #" << GetMeshDS()->ShapeToIndex(fIt.Key()));
|
MSG("FIX FACE " << nbfaces-- << " #" << GetMeshDS()->ShapeToIndex(fIt.Key()));
|
||||||
@ -5102,13 +5094,15 @@ void SMESH_MesherHelper::FixQuadraticElements(SMESH_ComputeErrorPtr& compError,
|
|||||||
// hasRectFaces = hasRectFaces ||
|
// hasRectFaces = hasRectFaces ||
|
||||||
// ( volTool.GetVolumeType() == SMDS_VolumeTool::QUAD_HEXA ||
|
// ( volTool.GetVolumeType() == SMDS_VolumeTool::QUAD_HEXA ||
|
||||||
// volTool.GetVolumeType() == SMDS_VolumeTool::QUAD_PENTA );
|
// volTool.GetVolumeType() == SMDS_VolumeTool::QUAD_PENTA );
|
||||||
#ifdef _DEBUG_
|
|
||||||
|
if (SALOME::VerbosityActivated())
|
||||||
|
{
|
||||||
if ( nbN == 6 )
|
if ( nbN == 6 )
|
||||||
pFace->_face = GetMeshDS()->FindFace(faceNodes[0],faceNodes[2],faceNodes[4]);
|
pFace->_face = GetMeshDS()->FindFace(faceNodes[0],faceNodes[2],faceNodes[4]);
|
||||||
else
|
else
|
||||||
pFace->_face = GetMeshDS()->FindFace(faceNodes[0],faceNodes[2],
|
pFace->_face = GetMeshDS()->FindFace(faceNodes[0],faceNodes[2],
|
||||||
faceNodes[4],faceNodes[6] );
|
faceNodes[4],faceNodes[6] );
|
||||||
#endif
|
}
|
||||||
}
|
}
|
||||||
// collect pyramid apexes for further correction
|
// collect pyramid apexes for further correction
|
||||||
if ( vol->NbCornerNodes() == 5 )
|
if ( vol->NbCornerNodes() == 5 )
|
||||||
@ -5340,7 +5334,9 @@ void SMESH_MesherHelper::FixQuadraticElements(SMESH_ComputeErrorPtr& compError,
|
|||||||
move = gp_Vec( XYZ((*link1)->_mediumNode), newPnt.Transformed(loc) );
|
move = gp_Vec( XYZ((*link1)->_mediumNode), newPnt.Transformed(loc) );
|
||||||
if ( SMDS_FacePositionPtr nPos = (*link1)->_mediumNode->GetPosition())
|
if ( SMDS_FacePositionPtr nPos = (*link1)->_mediumNode->GetPosition())
|
||||||
nPos->SetParameters( newUV.X(), newUV.Y() );
|
nPos->SetParameters( newUV.X(), newUV.Y() );
|
||||||
#ifdef _DEBUG_
|
|
||||||
|
if (SALOME::VerbosityActivated())
|
||||||
|
{
|
||||||
if ( (XYZ((*link1)->node1()) - XYZ((*link1)->node2())).SquareModulus() <
|
if ( (XYZ((*link1)->node1()) - XYZ((*link1)->node2())).SquareModulus() <
|
||||||
move.SquareMagnitude())
|
move.SquareMagnitude())
|
||||||
{
|
{
|
||||||
@ -5353,7 +5349,7 @@ void SMESH_MesherHelper::FixQuadraticElements(SMESH_ComputeErrorPtr& compError,
|
|||||||
"newUV: "<<newUV.X()<<", "<<newUV.Y()<<" \t");
|
"newUV: "<<newUV.X()<<", "<<newUV.Y()<<" \t");
|
||||||
uv0.SetX( uv2.X() ); // avoid warning: variable set but not used
|
uv0.SetX( uv2.X() ); // avoid warning: variable set but not used
|
||||||
}
|
}
|
||||||
#endif
|
}
|
||||||
(*link1)->Move( move, /*sum=*/false, /*is2dFixed=*/true );
|
(*link1)->Move( move, /*sum=*/false, /*is2dFixed=*/true );
|
||||||
}
|
}
|
||||||
MSG( "Move " << (*link1)->_mediumNode->GetID() << " following "
|
MSG( "Move " << (*link1)->_mediumNode->GetID() << " following "
|
||||||
@ -5588,8 +5584,7 @@ void SMESH_MesherHelper::WriteShape(const TopoDS_Shape& s)
|
|||||||
{
|
{
|
||||||
const char* name = "/tmp/shape.brep";
|
const char* name = "/tmp/shape.brep";
|
||||||
BRepTools::Write( s, name );
|
BRepTools::Write( s, name );
|
||||||
#ifdef _DEBUG_
|
if (SALOME::VerbosityActivated())
|
||||||
std::cout << name << std::endl;
|
std::cout << name << std::endl;
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -4925,11 +4925,12 @@ list< SMESH_Pattern::TPoint* > & SMESH_Pattern::getShapePoints(const int theShap
|
|||||||
|
|
||||||
void SMESH_Pattern::DumpPoints() const
|
void SMESH_Pattern::DumpPoints() const
|
||||||
{
|
{
|
||||||
#ifdef _DEBUG_
|
if (SALOME::VerbosityActivated())
|
||||||
|
{
|
||||||
vector< TPoint >::const_iterator pVecIt = myPoints.begin();
|
vector< TPoint >::const_iterator pVecIt = myPoints.begin();
|
||||||
for ( int i = 0; pVecIt != myPoints.end(); pVecIt++, i++ )
|
for ( int i = 0; pVecIt != myPoints.end(); pVecIt++, i++ )
|
||||||
MESSAGE_ADD ( std::endl << i << ": " << *pVecIt );
|
MESSAGE_ADD ( std::endl << i << ": " << *pVecIt );
|
||||||
#endif
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//=======================================================================
|
//=======================================================================
|
||||||
@ -4939,14 +4940,15 @@ void SMESH_Pattern::DumpPoints() const
|
|||||||
|
|
||||||
SMESH_Pattern::TPoint::TPoint()
|
SMESH_Pattern::TPoint::TPoint()
|
||||||
{
|
{
|
||||||
#ifdef _DEBUG_
|
if (SALOME::VerbosityActivated())
|
||||||
|
{
|
||||||
myInitXYZ.SetCoord(7,7,7);
|
myInitXYZ.SetCoord(7,7,7);
|
||||||
myInitUV.SetCoord(7.,7.);
|
myInitUV.SetCoord(7.,7.);
|
||||||
myInitU = 7;
|
myInitU = 7;
|
||||||
myXYZ.SetCoord(7,7,7);
|
myXYZ.SetCoord(7,7,7);
|
||||||
myUV.SetCoord(7.,7.);
|
myUV.SetCoord(7.,7.);
|
||||||
myU = 7;
|
myU = 7;
|
||||||
#endif
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//=======================================================================
|
//=======================================================================
|
||||||
|
@ -59,12 +59,6 @@
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef _DEBUG_
|
|
||||||
static int MYDEBUG = 0;
|
|
||||||
#else
|
|
||||||
static int MYDEBUG = 0;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
namespace
|
namespace
|
||||||
{
|
{
|
||||||
using std::runtime_error;
|
using std::runtime_error;
|
||||||
@ -829,19 +823,19 @@ SMESH_Client::SMESH_Client(CORBA::ORB_ptr theORB,
|
|||||||
mySMESHDSMesh(NULL),
|
mySMESHDSMesh(NULL),
|
||||||
mySMDSMesh(NULL)
|
mySMDSMesh(NULL)
|
||||||
{
|
{
|
||||||
if ( MYDEBUG ) MESSAGE("SMESH_Client::SMESH_Client");
|
MESSAGE("SMESH_Client::SMESH_Client");
|
||||||
myMeshServer->Register();
|
myMeshServer->Register();
|
||||||
|
|
||||||
CORBA::Boolean anIsEmbeddedMode;
|
CORBA::Boolean anIsEmbeddedMode;
|
||||||
GetSMESHGen(theORB,anIsEmbeddedMode);
|
GetSMESHGen(theORB,anIsEmbeddedMode);
|
||||||
if(anIsEmbeddedMode){
|
if(anIsEmbeddedMode){
|
||||||
if ( MYDEBUG ) MESSAGE("Info: The same process, update mesh by pointer ");
|
MESSAGE("Info: The same process, update mesh by pointer ");
|
||||||
// just set client mesh pointer to server mesh pointer
|
// just set client mesh pointer to server mesh pointer
|
||||||
//SMESH_Mesh* aMesh = reinterpret_cast<SMESH_Mesh*>(theMesh->GetMeshPtr());
|
//SMESH_Mesh* aMesh = reinterpret_cast<SMESH_Mesh*>(theMesh->GetMeshPtr());
|
||||||
CORBA::LongLong pointeur = theMesh->GetMeshPtr();
|
CORBA::LongLong pointeur = theMesh->GetMeshPtr();
|
||||||
if( MYDEBUG ) MESSAGE("SMESH_Client::SMESH_Client pointeur "<<pointeur);
|
MESSAGE("SMESH_Client::SMESH_Client pointeur "<<pointeur);
|
||||||
SMESH_Mesh* aMesh = reinterpret_cast<SMESH_Mesh*> (pointeur);
|
SMESH_Mesh* aMesh = reinterpret_cast<SMESH_Mesh*> (pointeur);
|
||||||
if ( MYDEBUG ) MESSAGE("SMESH_Client::SMESH_Client aMesh "<<aMesh);
|
MESSAGE("SMESH_Client::SMESH_Client aMesh "<<aMesh);
|
||||||
//if(aMesh->GetMeshDS()->IsEmbeddedMode()){
|
//if(aMesh->GetMeshDS()->IsEmbeddedMode()){
|
||||||
if(anIsEmbeddedMode){
|
if(anIsEmbeddedMode){
|
||||||
mySMESHDSMesh = aMesh->GetMeshDS();
|
mySMESHDSMesh = aMesh->GetMeshDS();
|
||||||
@ -899,18 +893,18 @@ SMESH_Client::Update(bool theIsClear)
|
|||||||
bool anIsModified = true;
|
bool anIsModified = true;
|
||||||
if(mySMESHDSMesh)
|
if(mySMESHDSMesh)
|
||||||
{
|
{
|
||||||
if ( MYDEBUG ) MESSAGE("Update mySMESHDSMesh");
|
MESSAGE("Update mySMESHDSMesh");
|
||||||
SMESHDS_Script* aScript = mySMESHDSMesh->GetScript();
|
SMESHDS_Script* aScript = mySMESHDSMesh->GetScript();
|
||||||
anIsModified = aScript->IsModified();
|
anIsModified = aScript->IsModified();
|
||||||
aScript->SetModified(false);
|
aScript->SetModified(false);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if ( MYDEBUG ) MESSAGE("Update CORBA");
|
MESSAGE("Update CORBA");
|
||||||
SMESH::log_array_var aSeq = myMeshServer->GetLog( theIsClear );
|
SMESH::log_array_var aSeq = myMeshServer->GetLog( theIsClear );
|
||||||
CORBA::Long aLength = aSeq->length();
|
CORBA::Long aLength = aSeq->length();
|
||||||
anIsModified = aLength > 0;
|
anIsModified = aLength > 0;
|
||||||
if ( MYDEBUG ) MESSAGE( "Update: length of the script is "<<aLength );
|
MESSAGE( "Update: length of the script is "<<aLength );
|
||||||
|
|
||||||
if ( !anIsModified )
|
if ( !anIsModified )
|
||||||
return false;
|
return false;
|
||||||
@ -1021,7 +1015,7 @@ SMESH_Client::Update(bool theIsClear)
|
|||||||
INFOS("Unknown exception was cought !!!");
|
INFOS("Unknown exception was cought !!!");
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( MYDEBUG && mySMDSMesh )
|
if (mySMDSMesh )
|
||||||
{
|
{
|
||||||
MESSAGE("Update - mySMDSMesh->NbNodes() = "<<mySMDSMesh->NbNodes());
|
MESSAGE("Update - mySMDSMesh->NbNodes() = "<<mySMDSMesh->NbNodes());
|
||||||
MESSAGE("Update - mySMDSMesh->Nb0DElements() = "<<mySMDSMesh->Nb0DElements());
|
MESSAGE("Update - mySMDSMesh->Nb0DElements() = "<<mySMDSMesh->Nb0DElements());
|
||||||
|
@ -184,9 +184,9 @@ void SMESHDS_GroupBase::SetColorGroup(int theColorGroup)
|
|||||||
if ( aR < 0. || aR > 1. || // PAL19395
|
if ( aR < 0. || aR > 1. || // PAL19395
|
||||||
aG < 0. || aG > 1. ||
|
aG < 0. || aG > 1. ||
|
||||||
aB < 0. || aB > 1. )
|
aB < 0. || aB > 1. )
|
||||||
// #ifdef _DEBUG_
|
// if (SALOME::VerbosityActivated())
|
||||||
// cout << "SMESHDS_GroupBase::SetColorGroup("<<theColorGroup<<"), invalid color ignored"<<endl;
|
// cout << "SMESHDS_GroupBase::SetColorGroup("<<theColorGroup<<"), invalid color ignored"<<endl;
|
||||||
// #endif
|
|
||||||
return;
|
return;
|
||||||
Quantity_Color aColor( aR, aG, aB, Quantity_TOC_RGB );
|
Quantity_Color aColor( aR, aG, aB, Quantity_TOC_RGB );
|
||||||
SetColor( aColor );
|
SetColor( aColor );
|
||||||
|
@ -1060,9 +1060,9 @@ void SMESHGUI_BaseComputeOp::computeMesh()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (...) {
|
catch (...) {
|
||||||
#ifdef _DEBUG_
|
|
||||||
MESSAGE ( "Exception thrown during mesh visualization" );
|
MESSAGE ( "Exception thrown during mesh visualization" );
|
||||||
#endif
|
|
||||||
if ( SMDS_Mesh::CheckMemory(true) ) { // has memory to show warning?
|
if ( SMDS_Mesh::CheckMemory(true) ) { // has memory to show warning?
|
||||||
SMESH::OnVisuException();
|
SMESH::OnVisuException();
|
||||||
}
|
}
|
||||||
|
@ -540,7 +540,7 @@ void SMESH_CreateBoundaryAn::SetNewName()
|
|||||||
void SMESH_CreateBoundaryAn::SetCylinder()
|
void SMESH_CreateBoundaryAn::SetCylinder()
|
||||||
// ------------------------------------------------------------------------
|
// ------------------------------------------------------------------------
|
||||||
{
|
{
|
||||||
MESSAGE("Debut de SetCylinder")
|
MESSAGE("Debut de SetCylinder");
|
||||||
gBCylindre->setVisible(1);
|
gBCylindre->setVisible(1);
|
||||||
gBSphere->setVisible(0);
|
gBSphere->setVisible(0);
|
||||||
gBCone->setVisible(0);
|
gBCone->setVisible(0);
|
||||||
@ -555,7 +555,7 @@ void SMESH_CreateBoundaryAn::SetCylinder()
|
|||||||
void SMESH_CreateBoundaryAn::SetSphere()
|
void SMESH_CreateBoundaryAn::SetSphere()
|
||||||
// ------------------------------------------------------------------------
|
// ------------------------------------------------------------------------
|
||||||
{
|
{
|
||||||
MESSAGE("Debut de SetSphere")
|
MESSAGE("Debut de SetSphere");
|
||||||
gBCylindre->setVisible(0);
|
gBCylindre->setVisible(0);
|
||||||
gBSphere->setVisible(1);
|
gBSphere->setVisible(1);
|
||||||
gBCone->setVisible(0);
|
gBCone->setVisible(0);
|
||||||
@ -570,7 +570,7 @@ void SMESH_CreateBoundaryAn::SetSphere()
|
|||||||
void SMESH_CreateBoundaryAn::SetConeR()
|
void SMESH_CreateBoundaryAn::SetConeR()
|
||||||
// ------------------------------------------------------------------------
|
// ------------------------------------------------------------------------
|
||||||
{
|
{
|
||||||
MESSAGE("Debut de SetConeR")
|
MESSAGE("Debut de SetConeR");
|
||||||
//
|
//
|
||||||
// Stockage et conversion des valeurs si elles ont change
|
// Stockage et conversion des valeurs si elles ont change
|
||||||
if ((_BoundaryAnXaxisCone != SpinBox_Cone_X1->value()) ||
|
if ((_BoundaryAnXaxisCone != SpinBox_Cone_X1->value()) ||
|
||||||
@ -581,7 +581,7 @@ void SMESH_CreateBoundaryAn::SetConeR()
|
|||||||
(_BoundaryAnZorigCone != SpinBox_Cone_Z2->value()) ||
|
(_BoundaryAnZorigCone != SpinBox_Cone_Z2->value()) ||
|
||||||
(_BoundaryAngle != SpinBox_Cone_V1->value()) )
|
(_BoundaryAngle != SpinBox_Cone_V1->value()) )
|
||||||
{
|
{
|
||||||
MESSAGE("Stockage et conversion")
|
MESSAGE("Stockage et conversion");
|
||||||
_BoundaryAnXaxisCone = SpinBox_Cone_X1->value() ;
|
_BoundaryAnXaxisCone = SpinBox_Cone_X1->value() ;
|
||||||
_BoundaryAnYaxisCone = SpinBox_Cone_Y1->value() ;
|
_BoundaryAnYaxisCone = SpinBox_Cone_Y1->value() ;
|
||||||
_BoundaryAnZaxisCone = SpinBox_Cone_Z1->value() ;
|
_BoundaryAnZaxisCone = SpinBox_Cone_Z1->value() ;
|
||||||
@ -624,7 +624,7 @@ void SMESH_CreateBoundaryAn::SetConeR()
|
|||||||
void SMESH_CreateBoundaryAn::SetConeA()
|
void SMESH_CreateBoundaryAn::SetConeA()
|
||||||
// ------------------------------------------------------------------------
|
// ------------------------------------------------------------------------
|
||||||
{
|
{
|
||||||
MESSAGE("Debut de SetConeA")
|
MESSAGE("Debut de SetConeA");
|
||||||
// Stockage et conversion des valeurs si elles ont change
|
// Stockage et conversion des valeurs si elles ont change
|
||||||
if ((_BoundaryAnXcone1 != SpinBox_Cone_X1->value()) ||
|
if ((_BoundaryAnXcone1 != SpinBox_Cone_X1->value()) ||
|
||||||
(_BoundaryAnYcone1 != SpinBox_Cone_Y1->value()) ||
|
(_BoundaryAnYcone1 != SpinBox_Cone_Y1->value()) ||
|
||||||
@ -635,7 +635,7 @@ void SMESH_CreateBoundaryAn::SetConeA()
|
|||||||
(_BoundaryAnZcone2 != SpinBox_Cone_Z2->value()) ||
|
(_BoundaryAnZcone2 != SpinBox_Cone_Z2->value()) ||
|
||||||
(_BoundaryAnRayon2 != SpinBox_Cone_V2->value()) )
|
(_BoundaryAnRayon2 != SpinBox_Cone_V2->value()) )
|
||||||
{
|
{
|
||||||
MESSAGE("Stockage et conversion")
|
MESSAGE("Stockage et conversion");
|
||||||
_BoundaryAnXcone1 = SpinBox_Cone_X1->value() ;
|
_BoundaryAnXcone1 = SpinBox_Cone_X1->value() ;
|
||||||
_BoundaryAnYcone1 = SpinBox_Cone_Y1->value() ;
|
_BoundaryAnYcone1 = SpinBox_Cone_Y1->value() ;
|
||||||
_BoundaryAnZcone1 = SpinBox_Cone_Z1->value() ;
|
_BoundaryAnZcone1 = SpinBox_Cone_Z1->value() ;
|
||||||
@ -678,7 +678,7 @@ void SMESH_CreateBoundaryAn::SetConeA()
|
|||||||
void SMESH_CreateBoundaryAn::SetCone()
|
void SMESH_CreateBoundaryAn::SetCone()
|
||||||
// ------------------------------------------------------------------------
|
// ------------------------------------------------------------------------
|
||||||
{
|
{
|
||||||
MESSAGE("Debut de SetCone")
|
MESSAGE("Debut de SetCone");
|
||||||
gBCylindre->setVisible(0);
|
gBCylindre->setVisible(0);
|
||||||
gBSphere->setVisible(0);
|
gBSphere->setVisible(0);
|
||||||
gBCone->setVisible(1);
|
gBCone->setVisible(1);
|
||||||
@ -700,7 +700,7 @@ void SMESH_CreateBoundaryAn::SetCone()
|
|||||||
void SMESH_CreateBoundaryAn::SetTore()
|
void SMESH_CreateBoundaryAn::SetTore()
|
||||||
// ------------------------------------------------------------------------
|
// ------------------------------------------------------------------------
|
||||||
{
|
{
|
||||||
MESSAGE("Debut de SetTore")
|
MESSAGE("Debut de SetTore");
|
||||||
gBCylindre->setVisible(0);
|
gBCylindre->setVisible(0);
|
||||||
gBSphere->setVisible(0);
|
gBSphere->setVisible(0);
|
||||||
gBCone->setVisible(0);
|
gBCone->setVisible(0);
|
||||||
@ -718,7 +718,7 @@ void SMESH_CreateBoundaryAn::convertRayonAngle(int option)
|
|||||||
// par deux rayons ou avec un axe et un angle.
|
// par deux rayons ou avec un axe et un angle.
|
||||||
// Voir sfcoi1 de HOMARD
|
// Voir sfcoi1 de HOMARD
|
||||||
{
|
{
|
||||||
MESSAGE("Debut de convertRayonAngle, option = "<<option)
|
MESSAGE("Debut de convertRayonAngle, option = "<<option);
|
||||||
//
|
//
|
||||||
// o
|
// o
|
||||||
// ! .
|
// ! .
|
||||||
@ -814,7 +814,7 @@ SMESH_CreateBoundaryCAO::SMESH_CreateBoundaryCAO(SMESHGUI_HomardAdaptDlg* parent
|
|||||||
_parent(parent), _aName(aName),
|
_parent(parent), _aName(aName),
|
||||||
myHomardGen(SMESHHOMARD::HOMARD_Gen::_duplicate(myHomardGen0))
|
myHomardGen(SMESHHOMARD::HOMARD_Gen::_duplicate(myHomardGen0))
|
||||||
{
|
{
|
||||||
MESSAGE("Constructeur") ;
|
MESSAGE("Constructeur");
|
||||||
setupUi(this);
|
setupUi(this);
|
||||||
setModal(modal);
|
setModal(modal);
|
||||||
InitConnect();
|
InitConnect();
|
||||||
|
@ -81,12 +81,6 @@
|
|||||||
#define env_sep ":"
|
#define env_sep ":"
|
||||||
#endif // WIN32
|
#endif // WIN32
|
||||||
|
|
||||||
#ifdef _DEBUG_
|
|
||||||
static int MYDEBUG = 0;
|
|
||||||
#else
|
|
||||||
static int MYDEBUG = 0;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
namespace SMESH
|
namespace SMESH
|
||||||
{
|
{
|
||||||
typedef IMap<QString,HypothesisData*> THypothesisDataMap;
|
typedef IMap<QString,HypothesisData*> THypothesisDataMap;
|
||||||
@ -497,7 +491,7 @@ namespace SMESH
|
|||||||
|
|
||||||
SMESHGUI_GenericHypothesisCreator* GetHypothesisCreator(const QString& aHypType)
|
SMESHGUI_GenericHypothesisCreator* GetHypothesisCreator(const QString& aHypType)
|
||||||
{
|
{
|
||||||
if(MYDEBUG) MESSAGE("Get HypothesisCreator for " << aHypType.toLatin1().data());
|
MESSAGE("Get HypothesisCreator for " << aHypType.toLatin1().data());
|
||||||
|
|
||||||
SMESHGUI_GenericHypothesisCreator* aCreator = 0;
|
SMESHGUI_GenericHypothesisCreator* aCreator = 0;
|
||||||
|
|
||||||
@ -522,7 +516,7 @@ namespace SMESH
|
|||||||
// 3. Load Client Plugin Library
|
// 3. Load Client Plugin Library
|
||||||
try {
|
try {
|
||||||
// load plugin library
|
// load plugin library
|
||||||
if(MYDEBUG) MESSAGE("Loading client meshers plugin library ...");
|
MESSAGE("Loading client meshers plugin library ...");
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
#ifdef UNICODE
|
#ifdef UNICODE
|
||||||
LPTSTR path = new TCHAR[aClientLibName.length() + 1];
|
LPTSTR path = new TCHAR[aClientLibName.length() + 1];
|
||||||
@ -552,21 +546,21 @@ namespace SMESH
|
|||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
// get method, returning hypothesis creator
|
// get method, returning hypothesis creator
|
||||||
if(MYDEBUG) MESSAGE("Find GetHypothesisCreator() method ...");
|
MESSAGE("Find GetHypothesisCreator() method ...");
|
||||||
typedef SMESHGUI_GenericHypothesisCreator* (*GetHypothesisCreator) \
|
typedef SMESHGUI_GenericHypothesisCreator* (*GetHypothesisCreator) \
|
||||||
( const QString& );
|
( const QString& );
|
||||||
GetHypothesisCreator procHandle =
|
GetHypothesisCreator procHandle =
|
||||||
(GetHypothesisCreator)GetProc(libHandle, "GetHypothesisCreator");
|
(GetHypothesisCreator)GetProc(libHandle, "GetHypothesisCreator");
|
||||||
if (!procHandle) {
|
if (!procHandle) {
|
||||||
if(MYDEBUG) MESSAGE("bad hypothesis client plugin library");
|
MESSAGE("bad hypothesis client plugin library");
|
||||||
UnLoadLib(libHandle);
|
UnLoadLib(libHandle);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
// get hypothesis creator
|
// get hypothesis creator
|
||||||
if(MYDEBUG) MESSAGE("Get Hypothesis Creator for " << aHypType.toLatin1().data());
|
MESSAGE("Get Hypothesis Creator for " << aHypType.toLatin1().data());
|
||||||
aCreator = procHandle( aHypType );
|
aCreator = procHandle( aHypType );
|
||||||
if (!aCreator) {
|
if (!aCreator) {
|
||||||
if(MYDEBUG) MESSAGE("no such a hypothesis in this plugin");
|
MESSAGE("no such a hypothesis in this plugin");
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
// map hypothesis creator to a hypothesis name
|
// map hypothesis creator to a hypothesis name
|
||||||
@ -595,7 +589,7 @@ namespace SMESH
|
|||||||
const QString& aHypName,
|
const QString& aHypName,
|
||||||
const bool /*isAlgo*/)
|
const bool /*isAlgo*/)
|
||||||
{
|
{
|
||||||
if(MYDEBUG) MESSAGE("Create " << aHypType.toLatin1().data() <<
|
MESSAGE("Create " << aHypType.toLatin1().data() <<
|
||||||
" with name " << aHypName.toLatin1().data());
|
" with name " << aHypName.toLatin1().data());
|
||||||
HypothesisData* aHypData = GetHypothesisData(aHypType);
|
HypothesisData* aHypData = GetHypothesisData(aHypType);
|
||||||
QString aServLib = aHypData->ServerLibName;
|
QString aServLib = aHypData->ServerLibName;
|
||||||
@ -641,7 +635,7 @@ namespace SMESH
|
|||||||
|
|
||||||
bool AddHypothesisOnMesh (SMESH::SMESH_Mesh_ptr aMesh, SMESH::SMESH_Hypothesis_ptr aHyp)
|
bool AddHypothesisOnMesh (SMESH::SMESH_Mesh_ptr aMesh, SMESH::SMESH_Hypothesis_ptr aHyp)
|
||||||
{
|
{
|
||||||
if(MYDEBUG) MESSAGE ("SMESHGUI::AddHypothesisOnMesh");
|
MESSAGE ("SMESHGUI::AddHypothesisOnMesh");
|
||||||
int res = SMESH::HYP_UNKNOWN_FATAL;
|
int res = SMESH::HYP_UNKNOWN_FATAL;
|
||||||
SUIT_OverrideCursor wc;
|
SUIT_OverrideCursor wc;
|
||||||
|
|
||||||
@ -669,7 +663,7 @@ namespace SMESH
|
|||||||
|
|
||||||
bool AddHypothesisOnSubMesh (SMESH::SMESH_subMesh_ptr aSubMesh, SMESH::SMESH_Hypothesis_ptr aHyp)
|
bool AddHypothesisOnSubMesh (SMESH::SMESH_subMesh_ptr aSubMesh, SMESH::SMESH_Hypothesis_ptr aHyp)
|
||||||
{
|
{
|
||||||
if(MYDEBUG) MESSAGE("SMESHGUI::AddHypothesisOnSubMesh() ");
|
MESSAGE("SMESHGUI::AddHypothesisOnSubMesh() ");
|
||||||
int res = SMESH::HYP_UNKNOWN_FATAL;
|
int res = SMESH::HYP_UNKNOWN_FATAL;
|
||||||
SUIT_OverrideCursor wc;
|
SUIT_OverrideCursor wc;
|
||||||
|
|
||||||
@ -797,7 +791,7 @@ namespace SMESH
|
|||||||
if (SO_Hypothesis) {
|
if (SO_Hypothesis) {
|
||||||
SObjectList listSO = SMESH::getStudy()->FindDependances(SO_Hypothesis);
|
SObjectList listSO = SMESH::getStudy()->FindDependances(SO_Hypothesis);
|
||||||
|
|
||||||
if(MYDEBUG) MESSAGE("SMESHGUI::GetMeshesUsingAlgoOrHypothesis(): dependency number ="<<listSO.size());
|
MESSAGE("SMESHGUI::GetMeshesUsingAlgoOrHypothesis(): dependency number ="<<listSO.size());
|
||||||
for (unsigned int i = 0; i < listSO.size(); i++) {
|
for (unsigned int i = 0; i < listSO.size(); i++) {
|
||||||
_PTR(SObject) SO = listSO[i];
|
_PTR(SObject) SO = listSO[i];
|
||||||
if (SO) {
|
if (SO) {
|
||||||
@ -805,7 +799,7 @@ namespace SMESH
|
|||||||
if (aFather) {
|
if (aFather) {
|
||||||
_PTR(SObject) SOfatherFather = aFather->GetFather();
|
_PTR(SObject) SOfatherFather = aFather->GetFather();
|
||||||
if (SOfatherFather) {
|
if (SOfatherFather) {
|
||||||
if(MYDEBUG) MESSAGE("SMESHGUI::GetMeshesUsingAlgoOrHypothesis(): dependency added to list");
|
MESSAGE("SMESHGUI::GetMeshesUsingAlgoOrHypothesis(): dependency added to list");
|
||||||
index++;
|
index++;
|
||||||
listSOmesh.resize(index);
|
listSOmesh.resize(index);
|
||||||
listSOmesh[index - 1] = SOfatherFather;
|
listSOmesh[index - 1] = SOfatherFather;
|
||||||
@ -815,7 +809,7 @@ namespace SMESH
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (MYDEBUG) MESSAGE("SMESHGUI::GetMeshesUsingAlgoOrHypothesis(): completed");
|
MESSAGE("SMESHGUI::GetMeshesUsingAlgoOrHypothesis(): completed");
|
||||||
return listSOmesh;
|
return listSOmesh;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1557,7 +1557,9 @@ int SMESH_Block::GetOrderedEdges (const TopoDS_Face& theFace,
|
|||||||
theEdges.begin(), ++theEdges.begin());
|
theEdges.begin(), ++theEdges.begin());
|
||||||
TopExp::Vertices( theEdges.front(), vv[0], vv[1], true );
|
TopExp::Vertices( theEdges.front(), vv[0], vv[1], true );
|
||||||
if ( iE++ > theNbEdgesInWires.back() ) {
|
if ( iE++ > theNbEdgesInWires.back() ) {
|
||||||
#ifdef _DEBUG_
|
|
||||||
|
if (SALOME::VerbosityActivated())
|
||||||
|
{
|
||||||
gp_Pnt p = BRep_Tool::Pnt( theFirstVertex );
|
gp_Pnt p = BRep_Tool::Pnt( theFirstVertex );
|
||||||
MESSAGE ( " : Warning : vertex "<< theFirstVertex.TShape().operator->()
|
MESSAGE ( " : Warning : vertex "<< theFirstVertex.TShape().operator->()
|
||||||
<< " ( " << p.X() << " " << p.Y() << " " << p.Z() << " )"
|
<< " ( " << p.X() << " " << p.Y() << " " << p.Z() << " )"
|
||||||
@ -1573,7 +1575,8 @@ int SMESH_Block::GetOrderedEdges (const TopoDS_Face& theFace,
|
|||||||
MESSAGE_ADD ( i << " " << v.TShape().operator->() << " "
|
MESSAGE_ADD ( i << " " << v.TShape().operator->() << " "
|
||||||
<< p.X() << " " << p.Y() << " " << p.Z() << " " << std::endl );
|
<< p.X() << " " << p.Y() << " " << p.Z() << " " << std::endl );
|
||||||
}
|
}
|
||||||
#endif
|
}
|
||||||
|
|
||||||
break; // break infinite loop
|
break; // break infinite loop
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -46,11 +46,9 @@
|
|||||||
#include <TopoDS_Vertex.hxx>
|
#include <TopoDS_Vertex.hxx>
|
||||||
#include <TopoDS_Wire.hxx>
|
#include <TopoDS_Wire.hxx>
|
||||||
|
|
||||||
#ifdef _DEBUG_
|
|
||||||
//#define _MYDEBUG_
|
|
||||||
#include "SMESH_File.hxx"
|
#include "SMESH_File.hxx"
|
||||||
#include "SMESH_Comment.hxx"
|
#include "SMESH_Comment.hxx"
|
||||||
#endif
|
#include "utilities.h"
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
using boost::polygon::x;
|
using boost::polygon::x;
|
||||||
@ -155,12 +153,13 @@ namespace
|
|||||||
// }
|
// }
|
||||||
|
|
||||||
// -------------------------------------------------------------------------------------
|
// -------------------------------------------------------------------------------------
|
||||||
#ifdef _MYDEBUG_
|
|
||||||
// writes segments into a txt file readable by voronoi_visualizer
|
// writes segments into a txt file readable by voronoi_visualizer
|
||||||
void inSegmentsToFile( vector< InSegment>& inSegments)
|
void inSegmentsToFile( vector< InSegment>& inSegments)
|
||||||
{
|
{
|
||||||
if ( inSegments.size() > 1000 )
|
if (inSegments.size() > 1000 || !SALOME::VerbosityActivated())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
const char* fileName = "/misc/dn25/salome/eap/salome/misc/Code/C++/MAdebug.txt";
|
const char* fileName = "/misc/dn25/salome/eap/salome/misc/Code/C++/MAdebug.txt";
|
||||||
const char* user = getenv("USER");
|
const char* user = getenv("USER");
|
||||||
if ( !user || strcmp( user, "eap" )) return;
|
if ( !user || strcmp( user, "eap" )) return;
|
||||||
@ -219,11 +218,6 @@ namespace
|
|||||||
} while (edge != cell->incident_edge());
|
} while (edge != cell->incident_edge());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#else
|
|
||||||
#define inSegmentsToFile(arg) {}
|
|
||||||
//void dumpEdge( const TVDEdge* edge ) {}
|
|
||||||
//void dumpCell( const TVDCell* cell ) {}
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
// -------------------------------------------------------------------------------------
|
// -------------------------------------------------------------------------------------
|
||||||
|
|
||||||
@ -420,9 +414,9 @@ namespace
|
|||||||
|
|
||||||
void bndSegsToMesh( const vector< vector< BndSeg > >& bndSegsPerEdge )
|
void bndSegsToMesh( const vector< vector< BndSeg > >& bndSegsPerEdge )
|
||||||
{
|
{
|
||||||
if ( bndSegsPerEdge.empty() )
|
if (bndSegsPerEdge.empty() || !SALOME::VerbosityActivated())
|
||||||
return;
|
return;
|
||||||
#ifdef _MYDEBUG_
|
|
||||||
if ( !getenv("bndSegsToMesh")) return;
|
if ( !getenv("bndSegsToMesh")) return;
|
||||||
map< const TVDVertex *, int > v2Node;
|
map< const TVDVertex *, int > v2Node;
|
||||||
map< const TVDVertex *, int >::iterator v2n;
|
map< const TVDVertex *, int >::iterator v2n;
|
||||||
@ -472,7 +466,6 @@ namespace
|
|||||||
text << "\n";
|
text << "\n";
|
||||||
file.write( text.c_str(), text.size() );
|
file.write( text.c_str(), text.size() );
|
||||||
cout << fileName << endl;
|
cout << fileName << endl;
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//================================================================================
|
//================================================================================
|
||||||
|
@ -309,7 +309,7 @@ namespace
|
|||||||
buffer[length] = '\0';
|
buffer[length] = '\0';
|
||||||
infile.read(const_cast<char *>( buffer.get() ),length);
|
infile.read(const_cast<char *>( buffer.get() ),length);
|
||||||
|
|
||||||
MESSAGE( buffer.get() )
|
MESSAGE( buffer.get() );
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
SMESH_File redirectFile( redirect, /*open=*/false );
|
SMESH_File redirectFile( redirect, /*open=*/false );
|
||||||
|
@ -286,10 +286,8 @@ namespace // Utils used in SMESH_ElementSearcherImpl::FindElementsByPoint()
|
|||||||
|
|
||||||
TElementBoxPool& elBoPool = getLimitAndPool()->_elBoPool;
|
TElementBoxPool& elBoPool = getLimitAndPool()->_elBoPool;
|
||||||
|
|
||||||
#ifdef _DEBUG_
|
if (SALOME::VerbosityActivated() && theElemIt && !theElemIt->more() )
|
||||||
if ( theElemIt && !theElemIt->more() )
|
|
||||||
std::cout << "WARNING: ElementBndBoxTree constructed on empty iterator!" << std::endl;
|
std::cout << "WARNING: ElementBndBoxTree constructed on empty iterator!" << std::endl;
|
||||||
#endif
|
|
||||||
|
|
||||||
SMDS_ElemIteratorPtr elemIt = theElemIt ? theElemIt : mesh.elementsIterator( elemType );
|
SMDS_ElemIteratorPtr elemIt = theElemIt ? theElemIt : mesh.elementsIterator( elemType );
|
||||||
while ( elemIt->more() )
|
while ( elemIt->more() )
|
||||||
|
@ -2019,12 +2019,15 @@ namespace SMESH_MeshAlgos
|
|||||||
{
|
{
|
||||||
if ( nodes[i] == nodes[i+1] || nodes[i] == nodes[i+2] || nodes[i+1] == nodes[i+2] )
|
if ( nodes[i] == nodes[i+1] || nodes[i] == nodes[i+2] || nodes[i+1] == nodes[i+2] )
|
||||||
{
|
{
|
||||||
#ifdef _DEBUG_
|
if (SALOME::VerbosityActivated())
|
||||||
|
{
|
||||||
std::cerr << "BAD tria" << std::endl;
|
std::cerr << "BAD tria" << std::endl;
|
||||||
cf.Dump();
|
cf.Dump();
|
||||||
#else
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
if ( i < 0 ) cf.Dump(); // avoid "CutFace::Dump() unused in release mode"
|
if ( i < 0 ) cf.Dump(); // avoid "CutFace::Dump() unused in release mode"
|
||||||
#endif
|
}
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (!( tria = myMesh->FindFace( nodes[i], nodes[i+1], nodes[i+2] )))
|
if (!( tria = myMesh->FindFace( nodes[i], nodes[i+1], nodes[i+2] )))
|
||||||
|
@ -41,11 +41,8 @@ const char* SMESH::returnError(const char* txt)
|
|||||||
|
|
||||||
void SMESH::printErrorInDebugMode(const char* txt)
|
void SMESH::printErrorInDebugMode(const char* txt)
|
||||||
{
|
{
|
||||||
#ifdef _DEBUG_
|
if (SALOME::VerbosityActivated())
|
||||||
std::cerr << txt << " " << __FILE__ << ": " << __LINE__ << std::endl;
|
std::cerr << txt << " " << __FILE__ << ": " << __LINE__ << std::endl;
|
||||||
#else
|
|
||||||
(void)txt; // unused in release mode
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// ------------------------------------------------------------------
|
// ------------------------------------------------------------------
|
||||||
|
@ -932,11 +932,13 @@ Handle(_pyCommand) _pyGen::AddCommand( const TCollection_AsciiString& theCommand
|
|||||||
"Geom_POLYHEDRA", "Geom_BALL" };
|
"Geom_POLYHEDRA", "Geom_BALL" };
|
||||||
if ( -1 < iGeom && iGeom < nbTypes )
|
if ( -1 < iGeom && iGeom < nbTypes )
|
||||||
Threshold = SMESH + types[ iGeom ];
|
Threshold = SMESH + types[ iGeom ];
|
||||||
#ifdef _DEBUG_
|
|
||||||
|
if (SALOME::VerbosityActivated())
|
||||||
|
{
|
||||||
// is types complete? (compilation failure means that enum GeometryType changed)
|
// is types complete? (compilation failure means that enum GeometryType changed)
|
||||||
static_assert( sizeof(types) / sizeof(const char*) == nbTypes,
|
static_assert( sizeof(types) / sizeof(const char*) == nbTypes,
|
||||||
"Update names of GeometryType's!!!" );
|
"Update names of GeometryType's!!!" );
|
||||||
#endif
|
}
|
||||||
}
|
}
|
||||||
if (Type == "SMESH.FT_EntityType")
|
if (Type == "SMESH.FT_EntityType")
|
||||||
{
|
{
|
||||||
@ -953,11 +955,13 @@ Handle(_pyCommand) _pyGen::AddCommand( const TCollection_AsciiString& theCommand
|
|||||||
"Entity_Polyhedra", "Entity_Quad_Polyhedra", "Entity_Ball" };
|
"Entity_Polyhedra", "Entity_Quad_Polyhedra", "Entity_Ball" };
|
||||||
if ( -1 < iGeom && iGeom < nbTypes )
|
if ( -1 < iGeom && iGeom < nbTypes )
|
||||||
Threshold = SMESH + types[ iGeom ];
|
Threshold = SMESH + types[ iGeom ];
|
||||||
#ifdef _DEBUG_
|
|
||||||
|
if (SALOME::VerbosityActivated())
|
||||||
|
{
|
||||||
// is 'types' complete? (compilation failure means that enum EntityType changed)
|
// is 'types' complete? (compilation failure means that enum EntityType changed)
|
||||||
static_assert( sizeof(types) / sizeof(const char*) == nbTypes,
|
static_assert( sizeof(types) / sizeof(const char*) == nbTypes,
|
||||||
"Update names of EntityType's!!!" );
|
"Update names of EntityType's!!!" );
|
||||||
#endif
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if ( ThresholdID.Length() != 2 ) // neither '' nor ""
|
if ( ThresholdID.Length() != 2 ) // neither '' nor ""
|
||||||
|
@ -161,12 +161,6 @@ using SMESH::TVar;
|
|||||||
|
|
||||||
#define NUM_TMP_FILES 2
|
#define NUM_TMP_FILES 2
|
||||||
|
|
||||||
#ifdef _DEBUG_
|
|
||||||
static int MYDEBUG = 0;
|
|
||||||
#else
|
|
||||||
static int MYDEBUG = 0;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// Static variables definition
|
// Static variables definition
|
||||||
GEOM::GEOM_Gen_var SMESH_Gen_i::myGeomGen;
|
GEOM::GEOM_Gen_var SMESH_Gen_i::myGeomGen;
|
||||||
CORBA::ORB_var SMESH_Gen_i::myOrb;
|
CORBA::ORB_var SMESH_Gen_i::myOrb;
|
||||||
@ -455,7 +449,7 @@ GenericHypothesisCreator_i* SMESH_Gen_i::getHypothesisCreator(const char* theHyp
|
|||||||
thePlatformLibName = aPlatformLibName;
|
thePlatformLibName = aPlatformLibName;
|
||||||
|
|
||||||
Unexpect aCatch(SALOME_SalomeException);
|
Unexpect aCatch(SALOME_SalomeException);
|
||||||
if(MYDEBUG) MESSAGE( "Create Hypothesis <" << theHypName << "> from " << aPlatformLibName);
|
MESSAGE( "Create Hypothesis <" << theHypName << "> from " << aPlatformLibName);
|
||||||
|
|
||||||
typedef GenericHypothesisCreator_i* (*GetHypothesisCreator)(const char* );
|
typedef GenericHypothesisCreator_i* (*GetHypothesisCreator)(const char* );
|
||||||
GenericHypothesisCreator_i* aCreator;
|
GenericHypothesisCreator_i* aCreator;
|
||||||
@ -465,7 +459,7 @@ GenericHypothesisCreator_i* SMESH_Gen_i::getHypothesisCreator(const char* theHyp
|
|||||||
if (myHypCreatorMap.find(string(theHypName)) == myHypCreatorMap.end())
|
if (myHypCreatorMap.find(string(theHypName)) == myHypCreatorMap.end())
|
||||||
{
|
{
|
||||||
// load plugin library
|
// load plugin library
|
||||||
if(MYDEBUG) MESSAGE("Loading server meshers plugin library ...");
|
MESSAGE("Loading server meshers plugin library ...");
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
# ifdef UNICODE
|
# ifdef UNICODE
|
||||||
const wchar_t* path = Kernel_Utils::decode_s(aPlatformLibName);
|
const wchar_t* path = Kernel_Utils::decode_s(aPlatformLibName);
|
||||||
@ -491,7 +485,7 @@ GenericHypothesisCreator_i* SMESH_Gen_i::getHypothesisCreator(const char* theHyp
|
|||||||
}
|
}
|
||||||
|
|
||||||
// get method, returning hypothesis creator
|
// get method, returning hypothesis creator
|
||||||
if(MYDEBUG) MESSAGE("Find GetHypothesisCreator() method ...");
|
MESSAGE("Find GetHypothesisCreator() method ...");
|
||||||
GetHypothesisCreator procHandle =
|
GetHypothesisCreator procHandle =
|
||||||
(GetHypothesisCreator)GetProc( libHandle, "GetHypothesisCreator" );
|
(GetHypothesisCreator)GetProc( libHandle, "GetHypothesisCreator" );
|
||||||
if (!procHandle)
|
if (!procHandle)
|
||||||
@ -502,7 +496,7 @@ GenericHypothesisCreator_i* SMESH_Gen_i::getHypothesisCreator(const char* theHyp
|
|||||||
}
|
}
|
||||||
|
|
||||||
// get hypothesis creator
|
// get hypothesis creator
|
||||||
if(MYDEBUG) MESSAGE("Get Hypothesis Creator for " << theHypName);
|
MESSAGE("Get Hypothesis Creator for " << theHypName);
|
||||||
aCreator = procHandle(theHypName);
|
aCreator = procHandle(theHypName);
|
||||||
if (!aCreator)
|
if (!aCreator)
|
||||||
{
|
{
|
||||||
@ -553,8 +547,7 @@ SMESH::SMESH_Hypothesis_ptr SMESH_Gen_i::createHypothesis(const char* theHypName
|
|||||||
// activate the CORBA servant of hypothesis
|
// activate the CORBA servant of hypothesis
|
||||||
hypothesis_i = myHypothesis_i->_this();
|
hypothesis_i = myHypothesis_i->_this();
|
||||||
int nextId = RegisterObject( hypothesis_i );
|
int nextId = RegisterObject( hypothesis_i );
|
||||||
if(MYDEBUG) { MESSAGE( "Add hypo to map with id = "<< nextId ); }
|
MESSAGE( "Add hypo to map with id = "<< nextId );
|
||||||
else { (void)nextId; } // avoid "unused variable" warning in release mode
|
|
||||||
}
|
}
|
||||||
return hypothesis_i._retn();
|
return hypothesis_i._retn();
|
||||||
}
|
}
|
||||||
@ -570,21 +563,21 @@ SMESH::SMESH_Hypothesis_ptr SMESH_Gen_i::createHypothesis(const char* theHypName
|
|||||||
SMESH::SMESH_Mesh_ptr SMESH_Gen_i::createMesh()
|
SMESH::SMESH_Mesh_ptr SMESH_Gen_i::createMesh()
|
||||||
{
|
{
|
||||||
Unexpect aCatch(SALOME_SalomeException);
|
Unexpect aCatch(SALOME_SalomeException);
|
||||||
if(MYDEBUG) MESSAGE( "SMESH_Gen_i::createMesh" );
|
MESSAGE( "SMESH_Gen_i::createMesh" );
|
||||||
|
|
||||||
// Get or create the GEOM_Client instance
|
// Get or create the GEOM_Client instance
|
||||||
try {
|
try {
|
||||||
// create a new mesh object servant, store it in a map in study context
|
// create a new mesh object servant, store it in a map in study context
|
||||||
SMESH_Mesh_i* meshServant = new SMESH_Mesh_i( GetPOA(), this );
|
SMESH_Mesh_i* meshServant = new SMESH_Mesh_i( GetPOA(), this );
|
||||||
// create a new mesh object
|
// create a new mesh object
|
||||||
if(MYDEBUG) MESSAGE("myIsEmbeddedMode " << myIsEmbeddedMode);
|
MESSAGE("myIsEmbeddedMode " << myIsEmbeddedMode);
|
||||||
meshServant->SetImpl( myGen.CreateMesh( myIsEmbeddedMode ));
|
meshServant->SetImpl( myGen.CreateMesh( myIsEmbeddedMode ));
|
||||||
|
|
||||||
// activate the CORBA servant of Mesh
|
// activate the CORBA servant of Mesh
|
||||||
SMESH::SMESH_Mesh_var mesh = SMESH::SMESH_Mesh::_narrow( meshServant->_this() );
|
SMESH::SMESH_Mesh_var mesh = SMESH::SMESH_Mesh::_narrow( meshServant->_this() );
|
||||||
int nextId = RegisterObject( mesh );
|
int nextId = RegisterObject( mesh );
|
||||||
if(MYDEBUG) { MESSAGE( "Add mesh to map with id = "<< nextId); }
|
MESSAGE( "Add mesh to map with id = "<< nextId);
|
||||||
else { (void)nextId; } // avoid "unused variable" warning in release mode
|
|
||||||
return mesh._retn();
|
return mesh._retn();
|
||||||
}
|
}
|
||||||
catch (SALOME_Exception& S_ex) {
|
catch (SALOME_Exception& S_ex) {
|
||||||
@ -641,14 +634,19 @@ void SMESH_Gen_i::SetEmbeddedMode( CORBA::Boolean theMode )
|
|||||||
if (!envNoCatchSignals || !atoi(envNoCatchSignals))
|
if (!envNoCatchSignals || !atoi(envNoCatchSignals))
|
||||||
{
|
{
|
||||||
bool raiseFPE;
|
bool raiseFPE;
|
||||||
#ifdef _DEBUG_
|
|
||||||
|
if (SALOME::VerbosityActivated())
|
||||||
|
{
|
||||||
raiseFPE = true;
|
raiseFPE = true;
|
||||||
char* envDisableFPE = getenv("DISABLE_FPE");
|
char* envDisableFPE = getenv("DISABLE_FPE");
|
||||||
if (envDisableFPE && atoi(envDisableFPE))
|
if (envDisableFPE && atoi(envDisableFPE))
|
||||||
raiseFPE = false;
|
raiseFPE = false;
|
||||||
#else
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
raiseFPE = false;
|
raiseFPE = false;
|
||||||
#endif
|
}
|
||||||
|
|
||||||
OSD::SetSignal( raiseFPE );
|
OSD::SetSignal( raiseFPE );
|
||||||
}
|
}
|
||||||
// else OSD::SetSignal() is called in GUI
|
// else OSD::SetSignal() is called in GUI
|
||||||
@ -1200,7 +1198,7 @@ char* SMESH_Gen_i::GetOption(const char* name)
|
|||||||
SMESH::SMESH_Mesh_ptr SMESH_Gen_i::CreateMesh( GEOM::GEOM_Object_ptr theShapeObject )
|
SMESH::SMESH_Mesh_ptr SMESH_Gen_i::CreateMesh( GEOM::GEOM_Object_ptr theShapeObject )
|
||||||
{
|
{
|
||||||
Unexpect aCatch(SALOME_SalomeException);
|
Unexpect aCatch(SALOME_SalomeException);
|
||||||
if(MYDEBUG) MESSAGE( "SMESH_Gen_i::CreateMesh" );
|
MESSAGE( "SMESH_Gen_i::CreateMesh" );
|
||||||
// create mesh
|
// create mesh
|
||||||
SMESH::SMESH_Mesh_var mesh = this->createMesh();
|
SMESH::SMESH_Mesh_var mesh = this->createMesh();
|
||||||
// set shape
|
// set shape
|
||||||
@ -1234,7 +1232,7 @@ SMESH::SMESH_Mesh_ptr SMESH_Gen_i::CreateMesh( GEOM::GEOM_Object_ptr theShapeObj
|
|||||||
SMESH::SMESH_Mesh_ptr SMESH_Gen_i::CreateEmptyMesh()
|
SMESH::SMESH_Mesh_ptr SMESH_Gen_i::CreateEmptyMesh()
|
||||||
{
|
{
|
||||||
Unexpect aCatch(SALOME_SalomeException);
|
Unexpect aCatch(SALOME_SalomeException);
|
||||||
if(MYDEBUG) MESSAGE( "SMESH_Gen_i::CreateMesh" );
|
MESSAGE( "SMESH_Gen_i::CreateMesh" );
|
||||||
// create mesh
|
// create mesh
|
||||||
SMESH::SMESH_Mesh_var mesh = this->createMesh();
|
SMESH::SMESH_Mesh_var mesh = this->createMesh();
|
||||||
|
|
||||||
@ -1586,7 +1584,7 @@ CORBA::Boolean SMESH_Gen_i::IsReadyToCompute( SMESH::SMESH_Mesh_ptr theMesh,
|
|||||||
GEOM::GEOM_Object_ptr theShapeObject )
|
GEOM::GEOM_Object_ptr theShapeObject )
|
||||||
{
|
{
|
||||||
Unexpect aCatch(SALOME_SalomeException);
|
Unexpect aCatch(SALOME_SalomeException);
|
||||||
if(MYDEBUG) MESSAGE( "SMESH_Gen_i::IsReadyToCompute" );
|
MESSAGE( "SMESH_Gen_i::IsReadyToCompute" );
|
||||||
|
|
||||||
if ( CORBA::is_nil( theShapeObject ) )
|
if ( CORBA::is_nil( theShapeObject ) )
|
||||||
THROW_SALOME_CORBA_EXCEPTION( "bad shape object reference",
|
THROW_SALOME_CORBA_EXCEPTION( "bad shape object reference",
|
||||||
@ -1660,7 +1658,7 @@ SMESH::compute_error_array* SMESH_Gen_i::GetComputeErrors( SMESH::SMESH_Mesh_ptr
|
|||||||
GEOM::GEOM_Object_ptr theSubObject )
|
GEOM::GEOM_Object_ptr theSubObject )
|
||||||
{
|
{
|
||||||
Unexpect aCatch(SALOME_SalomeException);
|
Unexpect aCatch(SALOME_SalomeException);
|
||||||
if(MYDEBUG) MESSAGE( "SMESH_Gen_i::GetComputeErrors()" );
|
MESSAGE( "SMESH_Gen_i::GetComputeErrors()" );
|
||||||
|
|
||||||
if ( CORBA::is_nil( theSubObject ) && theMesh->HasShapeToMesh())
|
if ( CORBA::is_nil( theSubObject ) && theMesh->HasShapeToMesh())
|
||||||
THROW_SALOME_CORBA_EXCEPTION( "bad shape object reference", SALOME::BAD_PARAM );
|
THROW_SALOME_CORBA_EXCEPTION( "bad shape object reference", SALOME::BAD_PARAM );
|
||||||
@ -1734,7 +1732,7 @@ SMESH_Gen_i::GetBadInputElements( SMESH::SMESH_Mesh_ptr theMesh,
|
|||||||
CORBA::Short theSubShapeID )
|
CORBA::Short theSubShapeID )
|
||||||
{
|
{
|
||||||
Unexpect aCatch(SALOME_SalomeException);
|
Unexpect aCatch(SALOME_SalomeException);
|
||||||
if(MYDEBUG) MESSAGE( "SMESH_Gen_i::GetBadInputElements()" );
|
MESSAGE( "SMESH_Gen_i::GetBadInputElements()" );
|
||||||
|
|
||||||
if ( CORBA::is_nil( theMesh ) )
|
if ( CORBA::is_nil( theMesh ) )
|
||||||
THROW_SALOME_CORBA_EXCEPTION( "bad Mesh reference",SALOME::BAD_PARAM );
|
THROW_SALOME_CORBA_EXCEPTION( "bad Mesh reference",SALOME::BAD_PARAM );
|
||||||
@ -1855,7 +1853,7 @@ SMESH::algo_error_array* SMESH_Gen_i::GetAlgoState( SMESH::SMESH_Mesh_ptr theMes
|
|||||||
GEOM::GEOM_Object_ptr theSubObject )
|
GEOM::GEOM_Object_ptr theSubObject )
|
||||||
{
|
{
|
||||||
Unexpect aCatch(SALOME_SalomeException);
|
Unexpect aCatch(SALOME_SalomeException);
|
||||||
if(MYDEBUG) MESSAGE( "SMESH_Gen_i::GetAlgoState()" );
|
MESSAGE( "SMESH_Gen_i::GetAlgoState()" );
|
||||||
|
|
||||||
if ( CORBA::is_nil( theSubObject ) && theMesh->HasShapeToMesh())
|
if ( CORBA::is_nil( theSubObject ) && theMesh->HasShapeToMesh())
|
||||||
THROW_SALOME_CORBA_EXCEPTION( "bad shape object reference", SALOME::BAD_PARAM );
|
THROW_SALOME_CORBA_EXCEPTION( "bad shape object reference", SALOME::BAD_PARAM );
|
||||||
@ -1916,7 +1914,7 @@ SMESH_Gen_i::GetSubShapesId( GEOM::GEOM_Object_ptr theMainShapeObject,
|
|||||||
const SMESH::object_array& theListOfSubShapeObject )
|
const SMESH::object_array& theListOfSubShapeObject )
|
||||||
{
|
{
|
||||||
Unexpect aCatch(SALOME_SalomeException);
|
Unexpect aCatch(SALOME_SalomeException);
|
||||||
if(MYDEBUG) MESSAGE( "SMESH_Gen_i::GetSubShapesId" );
|
MESSAGE( "SMESH_Gen_i::GetSubShapesId" );
|
||||||
|
|
||||||
SMESH::long_array_var shapesId = new SMESH::long_array;
|
SMESH::long_array_var shapesId = new SMESH::long_array;
|
||||||
set<int> setId;
|
set<int> setId;
|
||||||
@ -1943,19 +1941,19 @@ SMESH_Gen_i::GetSubShapesId( GEOM::GEOM_Object_ptr theMainShapeObject,
|
|||||||
{
|
{
|
||||||
const TopoDS_Face& F = TopoDS::Face(exp.Current());
|
const TopoDS_Face& F = TopoDS::Face(exp.Current());
|
||||||
setId.insert(myIndexToShape.FindIndex(F));
|
setId.insert(myIndexToShape.FindIndex(F));
|
||||||
if(MYDEBUG) SCRUTE(myIndexToShape.FindIndex(F));
|
SCRUTE(myIndexToShape.FindIndex(F));
|
||||||
}
|
}
|
||||||
for (TopExp_Explorer exp(locShape,TopAbs_EDGE); exp.More(); exp.Next())
|
for (TopExp_Explorer exp(locShape,TopAbs_EDGE); exp.More(); exp.Next())
|
||||||
{
|
{
|
||||||
const TopoDS_Edge& E = TopoDS::Edge(exp.Current());
|
const TopoDS_Edge& E = TopoDS::Edge(exp.Current());
|
||||||
setId.insert(myIndexToShape.FindIndex(E));
|
setId.insert(myIndexToShape.FindIndex(E));
|
||||||
if(MYDEBUG) SCRUTE(myIndexToShape.FindIndex(E));
|
SCRUTE(myIndexToShape.FindIndex(E));
|
||||||
}
|
}
|
||||||
for (TopExp_Explorer exp(locShape,TopAbs_VERTEX); exp.More(); exp.Next())
|
for (TopExp_Explorer exp(locShape,TopAbs_VERTEX); exp.More(); exp.Next())
|
||||||
{
|
{
|
||||||
const TopoDS_Vertex& V = TopoDS::Vertex(exp.Current());
|
const TopoDS_Vertex& V = TopoDS::Vertex(exp.Current());
|
||||||
setId.insert(myIndexToShape.FindIndex(V));
|
setId.insert(myIndexToShape.FindIndex(V));
|
||||||
if(MYDEBUG) SCRUTE(myIndexToShape.FindIndex(V));
|
SCRUTE(myIndexToShape.FindIndex(V));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
shapesId->length(setId.size());
|
shapesId->length(setId.size());
|
||||||
@ -1963,9 +1961,9 @@ SMESH_Gen_i::GetSubShapesId( GEOM::GEOM_Object_ptr theMainShapeObject,
|
|||||||
int i=0;
|
int i=0;
|
||||||
for (iind = setId.begin(); iind != setId.end(); iind++)
|
for (iind = setId.begin(); iind != setId.end(); iind++)
|
||||||
{
|
{
|
||||||
if(MYDEBUG) SCRUTE((*iind));
|
SCRUTE((*iind));
|
||||||
shapesId[i] = (*iind);
|
shapesId[i] = (*iind);
|
||||||
if(MYDEBUG) SCRUTE(shapesId[i]);
|
SCRUTE(shapesId[i]);
|
||||||
i++;
|
i++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1990,7 +1988,7 @@ CORBA::Boolean SMESH_Gen_i::Compute( SMESH::SMESH_Mesh_ptr theMesh,
|
|||||||
{
|
{
|
||||||
//MEMOSTAT;
|
//MEMOSTAT;
|
||||||
Unexpect aCatch(SALOME_SalomeException);
|
Unexpect aCatch(SALOME_SalomeException);
|
||||||
if(MYDEBUG) MESSAGE( "SMESH_Gen_i::Compute" );
|
MESSAGE( "SMESH_Gen_i::Compute" );
|
||||||
|
|
||||||
if ( CORBA::is_nil( theShapeObject ) && theMesh->HasShapeToMesh())
|
if ( CORBA::is_nil( theShapeObject ) && theMesh->HasShapeToMesh())
|
||||||
THROW_SALOME_CORBA_EXCEPTION( "bad shape object reference",
|
THROW_SALOME_CORBA_EXCEPTION( "bad shape object reference",
|
||||||
@ -2085,7 +2083,7 @@ SMESH::MeshPreviewStruct* SMESH_Gen_i::Precompute( SMESH::SMESH_Mesh_ptr theMesh
|
|||||||
SMESH::long_array& theShapesId)
|
SMESH::long_array& theShapesId)
|
||||||
{
|
{
|
||||||
Unexpect aCatch(SALOME_SalomeException);
|
Unexpect aCatch(SALOME_SalomeException);
|
||||||
if(MYDEBUG) MESSAGE( "SMESH_Gen_i::Precompute" );
|
MESSAGE( "SMESH_Gen_i::Precompute" );
|
||||||
|
|
||||||
if ( CORBA::is_nil( theShapeObject ) && theMesh->HasShapeToMesh())
|
if ( CORBA::is_nil( theShapeObject ) && theMesh->HasShapeToMesh())
|
||||||
THROW_SALOME_CORBA_EXCEPTION( "bad shape object reference",
|
THROW_SALOME_CORBA_EXCEPTION( "bad shape object reference",
|
||||||
@ -2271,7 +2269,7 @@ SMESH::smIdType_array* SMESH_Gen_i::Evaluate(SMESH::SMESH_Mesh_ptr theMesh,
|
|||||||
GEOM::GEOM_Object_ptr theShapeObject)
|
GEOM::GEOM_Object_ptr theShapeObject)
|
||||||
{
|
{
|
||||||
Unexpect aCatch(SALOME_SalomeException);
|
Unexpect aCatch(SALOME_SalomeException);
|
||||||
if(MYDEBUG) MESSAGE( "SMESH_Gen_i::Evaluate" );
|
MESSAGE( "SMESH_Gen_i::Evaluate" );
|
||||||
|
|
||||||
if ( CORBA::is_nil( theShapeObject ) && theMesh->HasShapeToMesh())
|
if ( CORBA::is_nil( theShapeObject ) && theMesh->HasShapeToMesh())
|
||||||
THROW_SALOME_CORBA_EXCEPTION( "bad shape object reference", SALOME::BAD_PARAM );
|
THROW_SALOME_CORBA_EXCEPTION( "bad shape object reference", SALOME::BAD_PARAM );
|
||||||
@ -2872,16 +2870,16 @@ SMESH::SMESH_Mesh_ptr SMESH_Gen_i::CreateDualMesh(SMESH::SMESH_IDSource_ptr mesh
|
|||||||
|
|
||||||
if (PyErr_Occurred()) {
|
if (PyErr_Occurred()) {
|
||||||
// Restrieving python error
|
// Restrieving python error
|
||||||
MESSAGE("Catching error")
|
MESSAGE("Catching error");
|
||||||
PyObject *errtype, *errvalue, *traceback;
|
PyObject *errtype, *errvalue, *traceback;
|
||||||
PyErr_Fetch(&errtype, &errvalue, &traceback);
|
PyErr_Fetch(&errtype, &errvalue, &traceback);
|
||||||
if(errvalue != NULL) {
|
if(errvalue != NULL) {
|
||||||
MESSAGE("Error has a value")
|
MESSAGE("Error has a value");
|
||||||
PyObject *s = PyObject_Str(errvalue);
|
PyObject *s = PyObject_Str(errvalue);
|
||||||
Py_ssize_t size;
|
Py_ssize_t size;
|
||||||
std::string msg = PyUnicode_AsUTF8AndSize(s, &size);
|
std::string msg = PyUnicode_AsUTF8AndSize(s, &size);
|
||||||
msg = "Issue with the execution of create_dual_mesh:\n"+msg;
|
msg = "Issue with the execution of create_dual_mesh:\n"+msg;
|
||||||
MESSAGE("throwing exception")
|
MESSAGE("throwing exception");
|
||||||
// We need to deactivate the GIL before throwing the exception
|
// We need to deactivate the GIL before throwing the exception
|
||||||
PyGILState_Release(gstate);
|
PyGILState_Release(gstate);
|
||||||
THROW_SALOME_CORBA_EXCEPTION(msg.c_str(), SALOME::INTERNAL_ERROR );
|
THROW_SALOME_CORBA_EXCEPTION(msg.c_str(), SALOME::INTERNAL_ERROR );
|
||||||
@ -5221,7 +5219,7 @@ SALOMEDS::TMPFile* SMESH_Gen_i::Save( SALOMEDS::SComponent_ptr theComponent,
|
|||||||
SALOMEDS::TMPFile* SMESH_Gen_i::SaveASCII( SALOMEDS::SComponent_ptr theComponent,
|
SALOMEDS::TMPFile* SMESH_Gen_i::SaveASCII( SALOMEDS::SComponent_ptr theComponent,
|
||||||
const char* theURL,
|
const char* theURL,
|
||||||
bool isMultiFile ) {
|
bool isMultiFile ) {
|
||||||
if(MYDEBUG) MESSAGE( "SMESH_Gen_i::SaveASCII" );
|
MESSAGE( "SMESH_Gen_i::SaveASCII" );
|
||||||
SALOMEDS::TMPFile_var aStreamFile = Save( theComponent, theURL, isMultiFile );
|
SALOMEDS::TMPFile_var aStreamFile = Save( theComponent, theURL, isMultiFile );
|
||||||
return aStreamFile._retn();
|
return aStreamFile._retn();
|
||||||
|
|
||||||
@ -5361,7 +5359,7 @@ bool SMESH_Gen_i::Load( SALOMEDS::SComponent_ptr theComponent,
|
|||||||
size = aDataset->GetSize();
|
size = aDataset->GetSize();
|
||||||
char* libname_str = new char[ size ];
|
char* libname_str = new char[ size ];
|
||||||
aDataset->ReadFromDisk( libname_str );
|
aDataset->ReadFromDisk( libname_str );
|
||||||
if(MYDEBUG) SCRUTE( libname_str );
|
SCRUTE( libname_str );
|
||||||
libname = string( libname_str );
|
libname = string( libname_str );
|
||||||
delete [] libname_str;
|
delete [] libname_str;
|
||||||
aDataset->CloseOnDisk();
|
aDataset->CloseOnDisk();
|
||||||
@ -5383,7 +5381,7 @@ bool SMESH_Gen_i::Load( SALOMEDS::SComponent_ptr theComponent,
|
|||||||
|
|
||||||
// --> restore hypothesis from data
|
// --> restore hypothesis from data
|
||||||
if ( id > 0 && !hypname.empty()/* && !hypdata.empty()*/ ) { // VSR : persistent data can be empty
|
if ( id > 0 && !hypname.empty()/* && !hypdata.empty()*/ ) { // VSR : persistent data can be empty
|
||||||
if(MYDEBUG) MESSAGE("VSR - load hypothesis : id = " << id <<
|
MESSAGE("VSR - load hypothesis : id = " << id <<
|
||||||
", name = " << hypname.c_str() << ", persistent string = " << hypdata.c_str());
|
", name = " << hypname.c_str() << ", persistent string = " << hypdata.c_str());
|
||||||
SMESH::SMESH_Hypothesis_var myHyp;
|
SMESH::SMESH_Hypothesis_var myHyp;
|
||||||
|
|
||||||
@ -5403,7 +5401,7 @@ bool SMESH_Gen_i::Load( SALOMEDS::SComponent_ptr theComponent,
|
|||||||
myStudyContext->mapOldToNew( id, newId );
|
myStudyContext->mapOldToNew( id, newId );
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
if(MYDEBUG) MESSAGE( "VSR - SMESH_Gen::Load - can't get servant" );
|
MESSAGE( "VSR - SMESH_Gen::Load - can't get servant" );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -5460,7 +5458,7 @@ bool SMESH_Gen_i::Load( SALOMEDS::SComponent_ptr theComponent,
|
|||||||
size = aDataset->GetSize();
|
size = aDataset->GetSize();
|
||||||
char* libname_str = new char[ size ];
|
char* libname_str = new char[ size ];
|
||||||
aDataset->ReadFromDisk( libname_str );
|
aDataset->ReadFromDisk( libname_str );
|
||||||
if(MYDEBUG) SCRUTE( libname_str );
|
SCRUTE( libname_str );
|
||||||
libname = string( libname_str );
|
libname = string( libname_str );
|
||||||
delete [] libname_str;
|
delete [] libname_str;
|
||||||
aDataset->CloseOnDisk();
|
aDataset->CloseOnDisk();
|
||||||
@ -5472,7 +5470,7 @@ bool SMESH_Gen_i::Load( SALOMEDS::SComponent_ptr theComponent,
|
|||||||
size = aDataset->GetSize();
|
size = aDataset->GetSize();
|
||||||
char* hypdata_str = new char[ size ];
|
char* hypdata_str = new char[ size ];
|
||||||
aDataset->ReadFromDisk( hypdata_str );
|
aDataset->ReadFromDisk( hypdata_str );
|
||||||
if(MYDEBUG) SCRUTE( hypdata_str );
|
SCRUTE( hypdata_str );
|
||||||
hypdata = string( hypdata_str );
|
hypdata = string( hypdata_str );
|
||||||
delete [] hypdata_str;
|
delete [] hypdata_str;
|
||||||
aDataset->CloseOnDisk();
|
aDataset->CloseOnDisk();
|
||||||
@ -5483,7 +5481,7 @@ bool SMESH_Gen_i::Load( SALOMEDS::SComponent_ptr theComponent,
|
|||||||
|
|
||||||
// --> restore algorithm from data
|
// --> restore algorithm from data
|
||||||
if ( id > 0 && !hypname.empty()/* && !hypdata.empty()*/ ) { // VSR : persistent data can be empty
|
if ( id > 0 && !hypname.empty()/* && !hypdata.empty()*/ ) { // VSR : persistent data can be empty
|
||||||
if(MYDEBUG) MESSAGE("VSR - load algo : id = " << id <<
|
MESSAGE("VSR - load algo : id = " << id <<
|
||||||
", name = " << hypname.c_str() << ", persistent string = " << hypdata.c_str());
|
", name = " << hypname.c_str() << ", persistent string = " << hypdata.c_str());
|
||||||
SMESH::SMESH_Hypothesis_var myHyp;
|
SMESH::SMESH_Hypothesis_var myHyp;
|
||||||
|
|
||||||
@ -5507,7 +5505,7 @@ bool SMESH_Gen_i::Load( SALOMEDS::SComponent_ptr theComponent,
|
|||||||
myStudyContext->mapOldToNew( id, newId );
|
myStudyContext->mapOldToNew( id, newId );
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
if(MYDEBUG) MESSAGE( "VSR - SMESH_Gen::Load - can't get servant" );
|
MESSAGE( "VSR - SMESH_Gen::Load - can't get servant" );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -5536,7 +5534,7 @@ bool SMESH_Gen_i::Load( SALOMEDS::SComponent_ptr theComponent,
|
|||||||
int aNbObjects = aTopGroup->nInternalObjects();
|
int aNbObjects = aTopGroup->nInternalObjects();
|
||||||
if ( aNbObjects > 0 ) {
|
if ( aNbObjects > 0 ) {
|
||||||
// create mesh
|
// create mesh
|
||||||
if(MYDEBUG) MESSAGE( "VSR - load mesh : id = " << id );
|
MESSAGE( "VSR - load mesh : id = " << id );
|
||||||
SMESH::SMESH_Mesh_var myNewMesh = this->createMesh();
|
SMESH::SMESH_Mesh_var myNewMesh = this->createMesh();
|
||||||
SMESH_Mesh_i* myNewMeshImpl = dynamic_cast<SMESH_Mesh_i*>( GetServant( myNewMesh ).in() );
|
SMESH_Mesh_i* myNewMeshImpl = dynamic_cast<SMESH_Mesh_i*>( GetServant( myNewMesh ).in() );
|
||||||
if ( !myNewMeshImpl )
|
if ( !myNewMeshImpl )
|
||||||
@ -5672,7 +5670,7 @@ bool SMESH_Gen_i::Load( SALOMEDS::SComponent_ptr theComponent,
|
|||||||
aGroup->OpenOnDisk();
|
aGroup->OpenOnDisk();
|
||||||
// get number of applied algorithms
|
// get number of applied algorithms
|
||||||
int aNbSubObjects = aGroup->nInternalObjects();
|
int aNbSubObjects = aGroup->nInternalObjects();
|
||||||
if(MYDEBUG) MESSAGE( "VSR - number of applied algos " << aNbSubObjects );
|
MESSAGE( "VSR - number of applied algos " << aNbSubObjects );
|
||||||
for ( int j = 0; j < aNbSubObjects; j++ ) {
|
for ( int j = 0; j < aNbSubObjects; j++ ) {
|
||||||
char name_dataset[ HDF_NAME_MAX_LEN+1 ];
|
char name_dataset[ HDF_NAME_MAX_LEN+1 ];
|
||||||
aGroup->InternalObjectIndentify( j, name_dataset );
|
aGroup->InternalObjectIndentify( j, name_dataset );
|
||||||
@ -6175,7 +6173,7 @@ bool SMESH_Gen_i::LoadASCII( SALOMEDS::SComponent_ptr theComponent,
|
|||||||
const SALOMEDS::TMPFile& theStream,
|
const SALOMEDS::TMPFile& theStream,
|
||||||
const char* theURL,
|
const char* theURL,
|
||||||
bool isMultiFile ) {
|
bool isMultiFile ) {
|
||||||
if(MYDEBUG) MESSAGE( "SMESH_Gen_i::LoadASCII" );
|
MESSAGE( "SMESH_Gen_i::LoadASCII" );
|
||||||
return Load( theComponent, theStream, theURL, isMultiFile );
|
return Load( theComponent, theStream, theURL, isMultiFile );
|
||||||
|
|
||||||
//before call main ::Load method it's need for decipher text format to
|
//before call main ::Load method it's need for decipher text format to
|
||||||
@ -6212,7 +6210,7 @@ bool SMESH_Gen_i::LoadASCII( SALOMEDS::SComponent_ptr theComponent,
|
|||||||
|
|
||||||
void SMESH_Gen_i::Close( SALOMEDS::SComponent_ptr theComponent )
|
void SMESH_Gen_i::Close( SALOMEDS::SComponent_ptr theComponent )
|
||||||
{
|
{
|
||||||
if(MYDEBUG) MESSAGE( "SMESH_Gen_i::Close" );
|
MESSAGE( "SMESH_Gen_i::Close" );
|
||||||
|
|
||||||
// Clear study contexts data
|
// Clear study contexts data
|
||||||
myStudyContext->Clear();
|
myStudyContext->Clear();
|
||||||
@ -6236,7 +6234,7 @@ void SMESH_Gen_i::Close( SALOMEDS::SComponent_ptr theComponent )
|
|||||||
|
|
||||||
char* SMESH_Gen_i::ComponentDataType()
|
char* SMESH_Gen_i::ComponentDataType()
|
||||||
{
|
{
|
||||||
if(MYDEBUG) MESSAGE( "SMESH_Gen_i::ComponentDataType" );
|
MESSAGE( "SMESH_Gen_i::ComponentDataType" );
|
||||||
return CORBA::string_dup( "SMESH" );
|
return CORBA::string_dup( "SMESH" );
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -6254,12 +6252,12 @@ char* SMESH_Gen_i::IORToLocalPersistentID( SALOMEDS::SObject_ptr /*theSObject*/,
|
|||||||
CORBA::Boolean /*isMultiFile*/,
|
CORBA::Boolean /*isMultiFile*/,
|
||||||
CORBA::Boolean /*isASCII*/ )
|
CORBA::Boolean /*isASCII*/ )
|
||||||
{
|
{
|
||||||
if(MYDEBUG) MESSAGE( "SMESH_Gen_i::IORToLocalPersistentID" );
|
MESSAGE( "SMESH_Gen_i::IORToLocalPersistentID" );
|
||||||
|
|
||||||
if ( myStudyContext && strcmp( IORString, "" ) != 0 ) {
|
if ( myStudyContext && strcmp( IORString, "" ) != 0 ) {
|
||||||
int anId = myStudyContext->findId( IORString );
|
int anId = myStudyContext->findId( IORString );
|
||||||
if ( anId ) {
|
if ( anId ) {
|
||||||
if(MYDEBUG) MESSAGE( "VSR " << anId )
|
MESSAGE( "VSR " << anId );
|
||||||
char strId[ 20 ];
|
char strId[ 20 ];
|
||||||
sprintf( strId, "%d", anId );
|
sprintf( strId, "%d", anId );
|
||||||
return CORBA::string_dup( strId );
|
return CORBA::string_dup( strId );
|
||||||
@ -6281,7 +6279,7 @@ char* SMESH_Gen_i::LocalPersistentIDToIOR( SALOMEDS::SObject_ptr /*theSObject*/,
|
|||||||
CORBA::Boolean /*isMultiFile*/,
|
CORBA::Boolean /*isMultiFile*/,
|
||||||
CORBA::Boolean /*isASCII*/ )
|
CORBA::Boolean /*isASCII*/ )
|
||||||
{
|
{
|
||||||
if(MYDEBUG) MESSAGE( "SMESH_Gen_i::LocalPersistentIDToIOR(): id = " << aLocalPersistentID );
|
MESSAGE( "SMESH_Gen_i::LocalPersistentIDToIOR(): id = " << aLocalPersistentID );
|
||||||
|
|
||||||
if ( myStudyContext && strcmp( aLocalPersistentID, "" ) != 0 ) {
|
if ( myStudyContext && strcmp( aLocalPersistentID, "" ) != 0 ) {
|
||||||
int anId = atoi( aLocalPersistentID );
|
int anId = atoi( aLocalPersistentID );
|
||||||
@ -6645,8 +6643,8 @@ CORBA::Boolean SMESH_Gen_i::IsApplicable ( const char* theAlgoType,
|
|||||||
|
|
||||||
SMESH_CATCH( SMESH::doNothing );
|
SMESH_CATCH( SMESH::doNothing );
|
||||||
|
|
||||||
#ifdef _DEBUG_
|
if (SALOME::VerbosityActivated())
|
||||||
cout << "SMESH_Gen_i::IsApplicable(): exception in " << ( theAlgoType ? theAlgoType : "") << endl;
|
cout << "SMESH_Gen_i::IsApplicable(): exception in " << ( theAlgoType ? theAlgoType : "") << endl;
|
||||||
#endif
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -46,12 +46,6 @@
|
|||||||
|
|
||||||
#include <cctype>
|
#include <cctype>
|
||||||
|
|
||||||
#ifdef _DEBUG_
|
|
||||||
static int MYDEBUG = 0;
|
|
||||||
#else
|
|
||||||
static int MYDEBUG = 0;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
||||||
//=============================================================================
|
//=============================================================================
|
||||||
@ -162,7 +156,7 @@ long SMESH_Gen_i::GetBallElementsGroupsTag()
|
|||||||
|
|
||||||
bool SMESH_Gen_i::CanPublishInStudy(CORBA::Object_ptr theIOR)
|
bool SMESH_Gen_i::CanPublishInStudy(CORBA::Object_ptr theIOR)
|
||||||
{
|
{
|
||||||
if(MYDEBUG) MESSAGE("CanPublishInStudy - "<<!CORBA::is_nil(getStudyServant()));
|
MESSAGE("CanPublishInStudy - "<<!CORBA::is_nil(getStudyServant()));
|
||||||
|
|
||||||
if ( !myIsEnablePublish )
|
if ( !myIsEnablePublish )
|
||||||
return false;
|
return false;
|
||||||
@ -183,7 +177,7 @@ bool SMESH_Gen_i::CanPublishInStudy(CORBA::Object_ptr theIOR)
|
|||||||
if( !aGroup->_is_nil() )
|
if( !aGroup->_is_nil() )
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
if(MYDEBUG) MESSAGE("CanPublishInStudy--CANT");
|
MESSAGE("CanPublishInStudy--CANT");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -501,7 +495,7 @@ SALOMEDS::SObject_ptr SMESH_Gen_i::PublishInStudy(SALOMEDS::SObject_ptr /*theSOb
|
|||||||
return aSO._retn();
|
return aSO._retn();
|
||||||
if ( CORBA::is_nil( theIOR ))
|
if ( CORBA::is_nil( theIOR ))
|
||||||
return aSO._retn();
|
return aSO._retn();
|
||||||
if(MYDEBUG) MESSAGE("PublishInStudy");
|
MESSAGE("PublishInStudy");
|
||||||
|
|
||||||
// Publishing a mesh
|
// Publishing a mesh
|
||||||
SMESH::SMESH_Mesh_var aMesh = SMESH::SMESH_Mesh::_narrow( theIOR );
|
SMESH::SMESH_Mesh_var aMesh = SMESH::SMESH_Mesh::_narrow( theIOR );
|
||||||
@ -528,7 +522,7 @@ SALOMEDS::SObject_ptr SMESH_Gen_i::PublishInStudy(SALOMEDS::SObject_ptr /*theSOb
|
|||||||
aMesh = aGroup->GetMesh();
|
aMesh = aGroup->GetMesh();
|
||||||
aSO = PublishGroup( aMesh, aGroup, aShapeObject, theName );
|
aSO = PublishGroup( aMesh, aGroup, aShapeObject, theName );
|
||||||
}
|
}
|
||||||
if(MYDEBUG) MESSAGE("PublishInStudy_END");
|
MESSAGE("PublishInStudy_END");
|
||||||
|
|
||||||
return aSO._retn();
|
return aSO._retn();
|
||||||
}
|
}
|
||||||
@ -540,7 +534,7 @@ SALOMEDS::SObject_ptr SMESH_Gen_i::PublishInStudy(SALOMEDS::SObject_ptr /*theSOb
|
|||||||
|
|
||||||
SALOMEDS::SComponent_ptr SMESH_Gen_i::PublishComponent()
|
SALOMEDS::SComponent_ptr SMESH_Gen_i::PublishComponent()
|
||||||
{
|
{
|
||||||
if(MYDEBUG) MESSAGE("PublishComponent");
|
MESSAGE("PublishComponent");
|
||||||
if ( !myIsEnablePublish )
|
if ( !myIsEnablePublish )
|
||||||
return SALOMEDS::SComponent::_nil();
|
return SALOMEDS::SComponent::_nil();
|
||||||
|
|
||||||
@ -602,7 +596,7 @@ SALOMEDS::SComponent_ptr SMESH_Gen_i::PublishComponent()
|
|||||||
// (to support tree representation customization and drag-n-drop)
|
// (to support tree representation customization and drag-n-drop)
|
||||||
useCaseBuilder->SetRootCurrent();
|
useCaseBuilder->SetRootCurrent();
|
||||||
useCaseBuilder->Append( father ); // component object is added as the top level item
|
useCaseBuilder->Append( father ); // component object is added as the top level item
|
||||||
if(MYDEBUG) MESSAGE("PublishComponent--END");
|
MESSAGE("PublishComponent--END");
|
||||||
|
|
||||||
return father._retn();
|
return father._retn();
|
||||||
}
|
}
|
||||||
@ -619,7 +613,7 @@ SALOMEDS::SObject_ptr SMESH_Gen_i::PublishMesh (SMESH::SMESH_Mesh_ptr theMesh,
|
|||||||
return SALOMEDS::SObject::_nil();
|
return SALOMEDS::SObject::_nil();
|
||||||
if ( CORBA::is_nil( theMesh ))
|
if ( CORBA::is_nil( theMesh ))
|
||||||
return SALOMEDS::SObject::_nil();
|
return SALOMEDS::SObject::_nil();
|
||||||
if(MYDEBUG) MESSAGE("PublishMesh--IN");
|
MESSAGE("PublishMesh--IN");
|
||||||
|
|
||||||
// find or publish a mesh
|
// find or publish a mesh
|
||||||
|
|
||||||
@ -690,7 +684,7 @@ SALOMEDS::SObject_ptr SMESH_Gen_i::PublishMesh (SMESH::SMESH_Mesh_ptr theMesh,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(MYDEBUG) MESSAGE("PublishMesh_END");
|
MESSAGE("PublishMesh_END");
|
||||||
return aMeshSO._retn();
|
return aMeshSO._retn();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -900,7 +894,7 @@ SALOMEDS::SObject_ptr
|
|||||||
SMESH_Gen_i::PublishHypothesis (SMESH::SMESH_Hypothesis_ptr theHyp,
|
SMESH_Gen_i::PublishHypothesis (SMESH::SMESH_Hypothesis_ptr theHyp,
|
||||||
const char* theName)
|
const char* theName)
|
||||||
{
|
{
|
||||||
if(MYDEBUG) MESSAGE("PublishHypothesis");
|
MESSAGE("PublishHypothesis");
|
||||||
if ( !myIsEnablePublish )
|
if ( !myIsEnablePublish )
|
||||||
return SALOMEDS::SObject::_nil();
|
return SALOMEDS::SObject::_nil();
|
||||||
if (theHyp->_is_nil())
|
if (theHyp->_is_nil())
|
||||||
@ -935,7 +929,7 @@ SMESH_Gen_i::PublishHypothesis (SMESH::SMESH_Hypothesis_ptr theHyp,
|
|||||||
|
|
||||||
SetName( aHypSO, theName, hypType.in() );
|
SetName( aHypSO, theName, hypType.in() );
|
||||||
|
|
||||||
if(MYDEBUG) MESSAGE("PublishHypothesis--END")
|
MESSAGE("PublishHypothesis--END");
|
||||||
return aHypSO._retn();
|
return aHypSO._retn();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1097,7 +1091,7 @@ SALOMEDS::SObject_ptr
|
|||||||
SMESH_Gen_i::GetMeshOrSubmeshByShape (SMESH::SMESH_Mesh_ptr theMesh,
|
SMESH_Gen_i::GetMeshOrSubmeshByShape (SMESH::SMESH_Mesh_ptr theMesh,
|
||||||
GEOM::GEOM_Object_ptr theShape)
|
GEOM::GEOM_Object_ptr theShape)
|
||||||
{
|
{
|
||||||
if(MYDEBUG) MESSAGE("GetMeshOrSubmeshByShape")
|
MESSAGE("GetMeshOrSubmeshByShape");
|
||||||
SALOMEDS::SObject_wrap aMeshOrSubMesh;
|
SALOMEDS::SObject_wrap aMeshOrSubMesh;
|
||||||
if (theMesh->_is_nil() || ( theShape->_is_nil() && theMesh->HasShapeToMesh()))
|
if (theMesh->_is_nil() || ( theShape->_is_nil() && theMesh->HasShapeToMesh()))
|
||||||
return aMeshOrSubMesh._retn();
|
return aMeshOrSubMesh._retn();
|
||||||
@ -1121,7 +1115,7 @@ SMESH_Gen_i::GetMeshOrSubmeshByShape (SMESH::SMESH_Mesh_ptr theMesh,
|
|||||||
aMeshOrSubMesh = ObjectToSObject( aSubMesh );
|
aMeshOrSubMesh = ObjectToSObject( aSubMesh );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(MYDEBUG) MESSAGE("GetMeshOrSubmeshByShape--END")
|
MESSAGE("GetMeshOrSubmeshByShape--END");
|
||||||
return aMeshOrSubMesh._retn();
|
return aMeshOrSubMesh._retn();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1134,7 +1128,7 @@ bool SMESH_Gen_i::AddHypothesisToShape(SMESH::SMESH_Mesh_ptr theMesh,
|
|||||||
GEOM::GEOM_Object_ptr theShape,
|
GEOM::GEOM_Object_ptr theShape,
|
||||||
SMESH::SMESH_Hypothesis_ptr theHyp)
|
SMESH::SMESH_Hypothesis_ptr theHyp)
|
||||||
{
|
{
|
||||||
if(MYDEBUG) MESSAGE("AddHypothesisToShape")
|
MESSAGE("AddHypothesisToShape");
|
||||||
if (theMesh->_is_nil() ||
|
if (theMesh->_is_nil() ||
|
||||||
theHyp->_is_nil() || (theShape->_is_nil()
|
theHyp->_is_nil() || (theShape->_is_nil()
|
||||||
&& theMesh->HasShapeToMesh()) )
|
&& theMesh->HasShapeToMesh()) )
|
||||||
@ -1175,7 +1169,7 @@ bool SMESH_Gen_i::AddHypothesisToShape(SMESH::SMESH_Mesh_ptr theMesh,
|
|||||||
|
|
||||||
addReference( AHR, theHyp );
|
addReference( AHR, theHyp );
|
||||||
|
|
||||||
if(MYDEBUG) MESSAGE("AddHypothesisToShape--END")
|
MESSAGE("AddHypothesisToShape--END");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -591,9 +591,10 @@ void HOMARD_Cas_i::AddBoundaryGroup(const char* BoundaryName, const char* Group)
|
|||||||
//
|
//
|
||||||
SALOME::ExceptionStruct es;
|
SALOME::ExceptionStruct es;
|
||||||
es.type = SALOME::BAD_PARAM;
|
es.type = SALOME::BAD_PARAM;
|
||||||
#ifdef _DEBUG_
|
|
||||||
|
if (SALOME::VerbosityActivated())
|
||||||
texte += "\nInvalid AddBoundaryGroup";
|
texte += "\nInvalid AddBoundaryGroup";
|
||||||
#endif
|
|
||||||
INFOS(texte);
|
INFOS(texte);
|
||||||
es.text = CORBA::string_dup(texte.c_str());
|
es.text = CORBA::string_dup(texte.c_str());
|
||||||
throw SALOME::SALOME_Exception(es);
|
throw SALOME::SALOME_Exception(es);
|
||||||
|
@ -96,12 +96,6 @@
|
|||||||
|
|
||||||
#include "SMESH_TryCatch.hxx" // include after OCCT headers!
|
#include "SMESH_TryCatch.hxx" // include after OCCT headers!
|
||||||
|
|
||||||
#ifdef _DEBUG_
|
|
||||||
static int MYDEBUG = 0;
|
|
||||||
#else
|
|
||||||
static int MYDEBUG = 0;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
using SMESH::TPythonDump;
|
using SMESH::TPythonDump;
|
||||||
using SMESH::TVar;
|
using SMESH::TVar;
|
||||||
@ -664,7 +658,7 @@ SMESH_Mesh_i::AddHypothesis(GEOM::GEOM_Object_ptr aSubShape,
|
|||||||
if ( prevNbMeshEnt > 0 /*newNbMeshEnt != prevNbMeshEnt*/ )
|
if ( prevNbMeshEnt > 0 /*newNbMeshEnt != prevNbMeshEnt*/ )
|
||||||
_gen_i->UpdateIcons( mesh );
|
_gen_i->UpdateIcons( mesh );
|
||||||
}
|
}
|
||||||
if(MYDEBUG) MESSAGE( " AddHypothesis(): status = " << status );
|
MESSAGE( " AddHypothesis(): status = " << status );
|
||||||
|
|
||||||
// Update Python script
|
// Update Python script
|
||||||
TPythonDump() << "status = " << mesh << ".AddHypothesis( "
|
TPythonDump() << "status = " << mesh << ".AddHypothesis( "
|
||||||
@ -684,7 +678,7 @@ SMESH_Mesh_i::addHypothesis(GEOM::GEOM_Object_ptr aSubShape,
|
|||||||
SMESH::SMESH_Hypothesis_ptr anHyp,
|
SMESH::SMESH_Hypothesis_ptr anHyp,
|
||||||
std::string* anErrorText)
|
std::string* anErrorText)
|
||||||
{
|
{
|
||||||
if(MYDEBUG) MESSAGE("addHypothesis");
|
MESSAGE("addHypothesis");
|
||||||
|
|
||||||
if (CORBA::is_nil( aSubShape ) && HasShapeToMesh())
|
if (CORBA::is_nil( aSubShape ) && HasShapeToMesh())
|
||||||
THROW_SALOME_CORBA_EXCEPTION("bad Sub-shape reference",SALOME::BAD_PARAM);
|
THROW_SALOME_CORBA_EXCEPTION("bad Sub-shape reference",SALOME::BAD_PARAM);
|
||||||
@ -770,7 +764,7 @@ SMESH_Hypothesis::Hypothesis_Status
|
|||||||
SMESH_Mesh_i::removeHypothesis(GEOM::GEOM_Object_ptr aSubShape,
|
SMESH_Mesh_i::removeHypothesis(GEOM::GEOM_Object_ptr aSubShape,
|
||||||
SMESH::SMESH_Hypothesis_ptr anHyp)
|
SMESH::SMESH_Hypothesis_ptr anHyp)
|
||||||
{
|
{
|
||||||
if(MYDEBUG) MESSAGE("removeHypothesis()");
|
MESSAGE("removeHypothesis()");
|
||||||
|
|
||||||
if (CORBA::is_nil( aSubShape ) && HasShapeToMesh())
|
if (CORBA::is_nil( aSubShape ) && HasShapeToMesh())
|
||||||
THROW_SALOME_CORBA_EXCEPTION("bad Sub-shape reference", SALOME::BAD_PARAM);
|
THROW_SALOME_CORBA_EXCEPTION("bad Sub-shape reference", SALOME::BAD_PARAM);
|
||||||
@ -816,7 +810,7 @@ SMESH::ListOfHypothesis *
|
|||||||
SMESH_Mesh_i::GetHypothesisList(GEOM::GEOM_Object_ptr aSubShape)
|
SMESH_Mesh_i::GetHypothesisList(GEOM::GEOM_Object_ptr aSubShape)
|
||||||
{
|
{
|
||||||
Unexpect aCatch(SALOME_SalomeException);
|
Unexpect aCatch(SALOME_SalomeException);
|
||||||
if (MYDEBUG) MESSAGE("GetHypothesisList");
|
MESSAGE("GetHypothesisList");
|
||||||
if (_impl->HasShapeToMesh() && CORBA::is_nil(aSubShape))
|
if (_impl->HasShapeToMesh() && CORBA::is_nil(aSubShape))
|
||||||
THROW_SALOME_CORBA_EXCEPTION("bad Sub-shape reference", SALOME::BAD_PARAM);
|
THROW_SALOME_CORBA_EXCEPTION("bad Sub-shape reference", SALOME::BAD_PARAM);
|
||||||
|
|
||||||
@ -856,7 +850,7 @@ SMESH_Mesh_i::GetHypothesisList(GEOM::GEOM_Object_ptr aSubShape)
|
|||||||
SMESH::submesh_array* SMESH_Mesh_i::GetSubMeshes()
|
SMESH::submesh_array* SMESH_Mesh_i::GetSubMeshes()
|
||||||
{
|
{
|
||||||
Unexpect aCatch(SALOME_SalomeException);
|
Unexpect aCatch(SALOME_SalomeException);
|
||||||
if (MYDEBUG) MESSAGE("GetSubMeshes");
|
MESSAGE("GetSubMeshes");
|
||||||
|
|
||||||
SMESH::submesh_array_var aList = new SMESH::submesh_array();
|
SMESH::submesh_array_var aList = new SMESH::submesh_array();
|
||||||
|
|
||||||
@ -1220,7 +1214,7 @@ void SMESH_Mesh_i::RemoveGroupWithContents( SMESH::SMESH_GroupBase_ptr theGroup
|
|||||||
SMESH::ListOfGroups * SMESH_Mesh_i::GetGroups()
|
SMESH::ListOfGroups * SMESH_Mesh_i::GetGroups()
|
||||||
{
|
{
|
||||||
Unexpect aCatch(SALOME_SalomeException);
|
Unexpect aCatch(SALOME_SalomeException);
|
||||||
if (MYDEBUG) MESSAGE("GetGroups");
|
MESSAGE("GetGroups");
|
||||||
|
|
||||||
SMESH::ListOfGroups_var aList = new SMESH::ListOfGroups();
|
SMESH::ListOfGroups_var aList = new SMESH::ListOfGroups();
|
||||||
|
|
||||||
@ -3122,7 +3116,7 @@ SMESH::SMESH_Group_ptr SMESH_Mesh_i::ConvertToStandalone( SMESH::SMESH_GroupBase
|
|||||||
|
|
||||||
SMESH::SMESH_subMesh_ptr SMESH_Mesh_i::createSubMesh( GEOM::GEOM_Object_ptr theSubShapeObject )
|
SMESH::SMESH_subMesh_ptr SMESH_Mesh_i::createSubMesh( GEOM::GEOM_Object_ptr theSubShapeObject )
|
||||||
{
|
{
|
||||||
if(MYDEBUG) MESSAGE( "createSubMesh" );
|
MESSAGE( "createSubMesh" );
|
||||||
TopoDS_Shape myLocSubShape = _gen_i->GeomObjectToShape(theSubShapeObject);
|
TopoDS_Shape myLocSubShape = _gen_i->GeomObjectToShape(theSubShapeObject);
|
||||||
::SMESH_subMesh * mySubMesh = _impl->GetSubMesh(myLocSubShape);
|
::SMESH_subMesh * mySubMesh = _impl->GetSubMesh(myLocSubShape);
|
||||||
int subMeshId = 0;
|
int subMeshId = 0;
|
||||||
@ -3154,8 +3148,7 @@ SMESH::SMESH_subMesh_ptr SMESH_Mesh_i::createSubMesh( GEOM::GEOM_Object_ptr theS
|
|||||||
|
|
||||||
// register CORBA object for persistence
|
// register CORBA object for persistence
|
||||||
int nextId = _gen_i->RegisterObject( subMesh );
|
int nextId = _gen_i->RegisterObject( subMesh );
|
||||||
if(MYDEBUG) { MESSAGE( "Add submesh to map with id = "<< nextId); }
|
MESSAGE( "Add submesh to map with id = "<< nextId);
|
||||||
else { (void)nextId; } // avoid "unused variable" warning
|
|
||||||
|
|
||||||
// to track changes of GEOM groups
|
// to track changes of GEOM groups
|
||||||
if ( subMeshId > 0 )
|
if ( subMeshId > 0 )
|
||||||
@ -3291,8 +3284,7 @@ SMESH::SMESH_GroupBase_ptr SMESH_Mesh_i::createGroup (SMESH::ElementType
|
|||||||
|
|
||||||
// register CORBA object for persistence
|
// register CORBA object for persistence
|
||||||
int nextId = _gen_i->RegisterObject( aGroup );
|
int nextId = _gen_i->RegisterObject( aGroup );
|
||||||
if(MYDEBUG) { MESSAGE( "Add group to map with id = "<< nextId); }
|
MESSAGE( "Add group to map with id = "<< nextId);
|
||||||
else { nextId = ( nextId > 0 ); } // avoid "unused variable" warning in release mode
|
|
||||||
|
|
||||||
// to track changes of GEOM groups
|
// to track changes of GEOM groups
|
||||||
if ( !theShape.IsNull() ) {
|
if ( !theShape.IsNull() ) {
|
||||||
@ -3313,7 +3305,7 @@ SMESH::SMESH_GroupBase_ptr SMESH_Mesh_i::createGroup (SMESH::ElementType
|
|||||||
|
|
||||||
void SMESH_Mesh_i::removeGroup( const int theId )
|
void SMESH_Mesh_i::removeGroup( const int theId )
|
||||||
{
|
{
|
||||||
if(MYDEBUG) MESSAGE("SMESH_Mesh_i::removeGroup()" );
|
MESSAGE("SMESH_Mesh_i::removeGroup()");
|
||||||
if ( _mapGroups.find( theId ) != _mapGroups.end() ) {
|
if ( _mapGroups.find( theId ) != _mapGroups.end() ) {
|
||||||
SMESH::SMESH_GroupBase_var group = _mapGroups[theId];
|
SMESH::SMESH_GroupBase_var group = _mapGroups[theId];
|
||||||
_mapGroups.erase( theId );
|
_mapGroups.erase( theId );
|
||||||
@ -3480,7 +3472,7 @@ void SMESH_Mesh_i::onHypothesisModified(int theHypID, bool theUpdateIcons)
|
|||||||
|
|
||||||
void SMESH_Mesh_i::SetImpl(::SMESH_Mesh * impl)
|
void SMESH_Mesh_i::SetImpl(::SMESH_Mesh * impl)
|
||||||
{
|
{
|
||||||
if(MYDEBUG) MESSAGE("SMESH_Mesh_i::SetImpl");
|
MESSAGE("SMESH_Mesh_i::SetImpl");
|
||||||
_impl = impl;
|
_impl = impl;
|
||||||
if ( _impl )
|
if ( _impl )
|
||||||
_impl->SetCallUp( new TCallUp_i(this));
|
_impl->SetCallUp( new TCallUp_i(this));
|
||||||
@ -3494,7 +3486,7 @@ void SMESH_Mesh_i::SetImpl(::SMESH_Mesh * impl)
|
|||||||
|
|
||||||
::SMESH_Mesh & SMESH_Mesh_i::GetImpl()
|
::SMESH_Mesh & SMESH_Mesh_i::GetImpl()
|
||||||
{
|
{
|
||||||
if(MYDEBUG) MESSAGE("SMESH_Mesh_i::GetImpl()");
|
MESSAGE("SMESH_Mesh_i::GetImpl()");
|
||||||
return *_impl;
|
return *_impl;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -5189,7 +5181,7 @@ CORBA::LongLong SMESH_Mesh_i::GetMeshPtr()
|
|||||||
_preMeshInfo->FullLoadFromFile();
|
_preMeshInfo->FullLoadFromFile();
|
||||||
|
|
||||||
CORBA::LongLong pointeur = CORBA::LongLong(_impl);
|
CORBA::LongLong pointeur = CORBA::LongLong(_impl);
|
||||||
if ( MYDEBUG ) MESSAGE("CORBA::LongLong SMESH_Mesh_i::GetMeshPtr() "<<pointeur);
|
MESSAGE("CORBA::LongLong SMESH_Mesh_i::GetMeshPtr() "<<pointeur);
|
||||||
return pointeur;
|
return pointeur;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -5931,8 +5923,7 @@ void SMESH_Mesh_i::CreateGroupServants()
|
|||||||
|
|
||||||
// register CORBA object for persistence
|
// register CORBA object for persistence
|
||||||
int nextId = _gen_i->RegisterObject( groupVar );
|
int nextId = _gen_i->RegisterObject( groupVar );
|
||||||
if(MYDEBUG) { MESSAGE( "Add group to map with id = "<< nextId); }
|
MESSAGE( "Add group to map with id = "<< nextId);
|
||||||
else { (void)nextId; } // avoid "unused variable" warning in release mode
|
|
||||||
|
|
||||||
// publishing the groups in the study
|
// publishing the groups in the study
|
||||||
GEOM::GEOM_Object_var shapeVar = _gen_i->ShapeToGeomObject( shape );
|
GEOM::GEOM_Object_var shapeVar = _gen_i->ShapeToGeomObject( shape );
|
||||||
|
@ -36,12 +36,6 @@
|
|||||||
#include <vector>
|
#include <vector>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
#ifdef _DEBUG_
|
|
||||||
static int MYDEBUG = 0;
|
|
||||||
#else
|
|
||||||
static int MYDEBUG = 0;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
||||||
|
|
||||||
@ -242,7 +236,7 @@ void SMESH_NoteBook::ReplaceVariables()
|
|||||||
TCollection_AsciiString aMethod = aCmd->GetMethod();
|
TCollection_AsciiString aMethod = aCmd->GetMethod();
|
||||||
TCollection_AsciiString aObject = aCmd->GetObject();
|
TCollection_AsciiString aObject = aCmd->GetObject();
|
||||||
TCollection_AsciiString aResultValue = aCmd->GetResultValue();
|
TCollection_AsciiString aResultValue = aCmd->GetResultValue();
|
||||||
if(MYDEBUG) {
|
if(SALOME::VerbosityActivated()) {
|
||||||
cout<<"Command before : "<< aCmd->GetString()<<endl;
|
cout<<"Command before : "<< aCmd->GetString()<<endl;
|
||||||
cout<<"Method : "<< aMethod<<endl;
|
cout<<"Method : "<< aMethod<<endl;
|
||||||
cout<<"Object : "<< aObject<<endl;
|
cout<<"Object : "<< aObject<<endl;
|
||||||
@ -329,7 +323,7 @@ void SMESH_NoteBook::ReplaceVariables()
|
|||||||
}
|
}
|
||||||
|
|
||||||
if(it != _objectMap.end()) {
|
if(it != _objectMap.end()) {
|
||||||
if(MYDEBUG)
|
if(SALOME::VerbosityActivated())
|
||||||
cout << "Found object : " << (*it).first << endl;
|
cout << "Found object : " << (*it).first << endl;
|
||||||
SMESH_ObjectStates *aStates = (*it).second;
|
SMESH_ObjectStates *aStates = (*it).second;
|
||||||
// Case for LocalLength hypothesis
|
// Case for LocalLength hypothesis
|
||||||
@ -384,7 +378,7 @@ void SMESH_NoteBook::ReplaceVariables()
|
|||||||
if(aMethod == "SetLayerDistribution"){
|
if(aMethod == "SetLayerDistribution"){
|
||||||
LayerDistributionStates* aLDStates = (LayerDistributionStates*)(aStates);
|
LayerDistributionStates* aLDStates = (LayerDistributionStates*)(aStates);
|
||||||
aLDStates->AddDistribution(aCmd->GetArg(1));
|
aLDStates->AddDistribution(aCmd->GetArg(1));
|
||||||
if(MYDEBUG)
|
if(SALOME::VerbosityActivated())
|
||||||
cout<<"Add Distribution :"<<aCmd->GetArg(1)<<endl;
|
cout<<"Add Distribution :"<<aCmd->GetArg(1)<<endl;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -723,10 +717,10 @@ void SMESH_NoteBook::ReplaceVariables()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
if(MYDEBUG)
|
if(SALOME::VerbosityActivated())
|
||||||
cout << "Object not found" << endl;
|
cout << "Object not found" << endl;
|
||||||
}
|
}
|
||||||
if(MYDEBUG) {
|
if(SALOME::VerbosityActivated()) {
|
||||||
cout<<"Command after: "<< aCmd->GetString()<<endl;
|
cout<<"Command after: "<< aCmd->GetString()<<endl;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -766,7 +760,7 @@ void SMESH_NoteBook::InitObjectMap()
|
|||||||
std::vector< std::string > allVars = aGen->GetAllParameters( anID.in() );
|
std::vector< std::string > allVars = aGen->GetAllParameters( anID.in() );
|
||||||
SALOMEDS::ListOfListOfStrings_var aSections = aStudy->ParseVariables(aParameters.in());
|
SALOMEDS::ListOfListOfStrings_var aSections = aStudy->ParseVariables(aParameters.in());
|
||||||
_entry2VarsMap[ TCollection_AsciiString( anID.in() )] = allVars;
|
_entry2VarsMap[ TCollection_AsciiString( anID.in() )] = allVars;
|
||||||
if(MYDEBUG) {
|
if(SALOME::VerbosityActivated()) {
|
||||||
cout<<"Entry : "<< anID<<endl;
|
cout<<"Entry : "<< anID<<endl;
|
||||||
cout<<"aParameters : "<<aParameters<<endl;
|
cout<<"aParameters : "<<aParameters<<endl;
|
||||||
}
|
}
|
||||||
@ -781,7 +775,7 @@ void SMESH_NoteBook::InitObjectMap()
|
|||||||
else if (!aMesh->_is_nil() ) {
|
else if (!aMesh->_is_nil() ) {
|
||||||
anObjType = "Mesh";
|
anObjType = "Mesh";
|
||||||
}
|
}
|
||||||
if(MYDEBUG)
|
if(SALOME::VerbosityActivated())
|
||||||
cout<<"The object Type : "<<anObjType<<endl;
|
cout<<"The object Type : "<<anObjType<<endl;
|
||||||
SMESH_ObjectStates *aState = NULL;
|
SMESH_ObjectStates *aState = NULL;
|
||||||
if(anObjType == "LayerDistribution")
|
if(anObjType == "LayerDistribution")
|
||||||
@ -800,7 +794,7 @@ void SMESH_NoteBook::InitObjectMap()
|
|||||||
aVar.InsertAfter(aVar.Length(), SMESH::TVar::Quote() );
|
aVar.InsertAfter(aVar.Length(), SMESH::TVar::Quote() );
|
||||||
}
|
}
|
||||||
aVars.push_back(aVar);
|
aVars.push_back(aVar);
|
||||||
if(MYDEBUG) {
|
if(SALOME::VerbosityActivated()) {
|
||||||
cout<<"Variable: '"<<aVar<<"'"<<endl;
|
cout<<"Variable: '"<<aVar<<"'"<<endl;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -826,7 +820,7 @@ void SMESH_NoteBook::InitObjectMap()
|
|||||||
//================================================================================
|
//================================================================================
|
||||||
void SMESH_NoteBook::AddCommand(const TCollection_AsciiString& theString)
|
void SMESH_NoteBook::AddCommand(const TCollection_AsciiString& theString)
|
||||||
{
|
{
|
||||||
if(MYDEBUG)
|
if(SALOME::VerbosityActivated())
|
||||||
cout<<theString<<endl;
|
cout<<theString<<endl;
|
||||||
Handle(_pyCommand) aCommand = new _pyCommand( theString, -1);
|
Handle(_pyCommand) aCommand = new _pyCommand( theString, -1);
|
||||||
_commands.push_back(aCommand);
|
_commands.push_back(aCommand);
|
||||||
|
@ -926,9 +926,9 @@ void SMESH_PreMeshInfo::readSubMeshes(DriverMED_R_SMESHDS_Mesh* reader) const
|
|||||||
// -- Most probably a bad study was saved when there were
|
// -- Most probably a bad study was saved when there were
|
||||||
// not fixed bugs in SMDS_MeshInfo
|
// not fixed bugs in SMDS_MeshInfo
|
||||||
if ( elemSet.size() < nbElems ) {
|
if ( elemSet.size() < nbElems ) {
|
||||||
#ifdef _DEBUG_
|
if (SALOME::VerbosityActivated())
|
||||||
cout << "SMESH_Gen_i::Load(), warning: Node position data is invalid" << endl;
|
cout << "SMESH_Gen_i::Load(), warning: Node position data is invalid" << endl;
|
||||||
#endif
|
|
||||||
nbElems = elemSet.size();
|
nbElems = elemSet.size();
|
||||||
}
|
}
|
||||||
// add elements to sub-meshes
|
// add elements to sub-meshes
|
||||||
|
@ -46,12 +46,6 @@
|
|||||||
|
|
||||||
#include <cstring>
|
#include <cstring>
|
||||||
|
|
||||||
#ifdef _DEBUG_
|
|
||||||
static int MYDEBUG = 0;
|
|
||||||
#else
|
|
||||||
static int MYDEBUG = 0;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "SMESH_TryCatch.hxx"
|
#include "SMESH_TryCatch.hxx"
|
||||||
|
|
||||||
namespace SMESH
|
namespace SMESH
|
||||||
@ -92,7 +86,7 @@ namespace SMESH
|
|||||||
if ( !objEntry.empty() )
|
if ( !objEntry.empty() )
|
||||||
aCollection += (TVar::ObjPrefix() + objEntry ).c_str();
|
aCollection += (TVar::ObjPrefix() + objEntry ).c_str();
|
||||||
aSMESHGen->AddToPythonScript(aCollection);
|
aSMESHGen->AddToPythonScript(aCollection);
|
||||||
if(MYDEBUG) MESSAGE(aString);
|
MESSAGE(aString);
|
||||||
// prevent misuse of already treated variables
|
// prevent misuse of already treated variables
|
||||||
aSMESHGen->UpdateParameters(CORBA::Object_var().in(),"");
|
aSMESHGen->UpdateParameters(CORBA::Object_var().in(),"");
|
||||||
}
|
}
|
||||||
@ -693,11 +687,8 @@ namespace SMESH
|
|||||||
|
|
||||||
void printException( const char* text )
|
void printException( const char* text )
|
||||||
{
|
{
|
||||||
#ifdef _DEBUG_
|
if (SALOME::VerbosityActivated())
|
||||||
std::cout << "Exception in SMESH_Gen_i::DumpPython(): " << text << std::endl;
|
std::cout << "Exception in SMESH_Gen_i::DumpPython(): " << text << std::endl;
|
||||||
#else
|
|
||||||
(void)text; // unused in release mode
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//=======================================================================
|
//=======================================================================
|
||||||
|
@ -1317,9 +1317,9 @@ bool AdaptiveAlgo::Compute(SMESH_Mesh & theMesh,
|
|||||||
|
|
||||||
if ( iLoop > 20 )
|
if ( iLoop > 20 )
|
||||||
{
|
{
|
||||||
#ifdef _DEBUG_
|
if(SALOME::VerbosityActivated())
|
||||||
cout << "Infinite loop in AdaptiveAlgo::Compute()" << endl;
|
cout << "Infinite loop in AdaptiveAlgo::Compute()" << endl;
|
||||||
#endif
|
|
||||||
sizeDecreased = false;
|
sizeDecreased = false;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -977,10 +977,7 @@ namespace
|
|||||||
int _origNodeInd; // index of _hexNodes[0] node within the _grid
|
int _origNodeInd; // index of _hexNodes[0] node within the _grid
|
||||||
size_t _i,_j,_k;
|
size_t _i,_j,_k;
|
||||||
bool _hasTooSmall;
|
bool _hasTooSmall;
|
||||||
|
|
||||||
#ifdef _DEBUG_
|
|
||||||
int _cellID;
|
int _cellID;
|
||||||
#endif
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
Hexahedron(Grid* grid);
|
Hexahedron(Grid* grid);
|
||||||
@ -2429,11 +2426,9 @@ namespace
|
|||||||
tgtLink._link = _hexLinks + ( srcLink._link - other._hexLinks );
|
tgtLink._link = _hexLinks + ( srcLink._link - other._hexLinks );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#ifdef _DEBUG_
|
|
||||||
|
if (SALOME::VerbosityActivated())
|
||||||
_cellID = cellID;
|
_cellID = cellID;
|
||||||
#else
|
|
||||||
(void)cellID; // unused in release mode
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//================================================================================
|
//================================================================================
|
||||||
@ -4249,11 +4244,10 @@ namespace
|
|||||||
h->_eIntPoints.reserve(2);
|
h->_eIntPoints.reserve(2);
|
||||||
h->_eIntPoints.push_back( ip );
|
h->_eIntPoints.push_back( ip );
|
||||||
added = true;
|
added = true;
|
||||||
#ifdef _DEBUG_
|
|
||||||
// check if ip is really inside the hex
|
// check if ip is really inside the hex
|
||||||
if ( h->isOutParam( ip->_uvw ))
|
if (SALOME::VerbosityActivated() && h->isOutParam( ip->_uvw ))
|
||||||
throw SALOME_Exception("ip outside a hex");
|
throw SALOME_Exception("ip outside a hex");
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return added;
|
return added;
|
||||||
@ -4816,11 +4810,13 @@ namespace
|
|||||||
helper.GetMeshDS()->RemoveFreeElement( v, /*sm=*/nullptr, /*fromGroups=*/false );
|
helper.GetMeshDS()->RemoveFreeElement( v, /*sm=*/nullptr, /*fromGroups=*/false );
|
||||||
v = nullptr;
|
v = nullptr;
|
||||||
//_hasTooSmall = true;
|
//_hasTooSmall = true;
|
||||||
#ifdef _DEBUG_
|
|
||||||
|
if (SALOME::VerbosityActivated())
|
||||||
|
{
|
||||||
std::cout << "Remove INVALID polyhedron, _cellID = " << _cellID
|
std::cout << "Remove INVALID polyhedron, _cellID = " << _cellID
|
||||||
<< " ijk = ( " << _i << " " << _j << " " << _k << " ) "
|
<< " ijk = ( " << _i << " " << _j << " " << _k << " ) "
|
||||||
<< " solid " << volDef->_solidID << std::endl;
|
<< " solid " << volDef->_solidID << std::endl;
|
||||||
#endif
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -5253,14 +5249,14 @@ namespace
|
|||||||
*/
|
*/
|
||||||
bool Hexahedron::debugDumpLink( Hexahedron::_Link* link )
|
bool Hexahedron::debugDumpLink( Hexahedron::_Link* link )
|
||||||
{
|
{
|
||||||
#ifdef _DEBUG_
|
if (SALOME::VerbosityActivated())
|
||||||
|
{
|
||||||
gp_Pnt p1 = link->_nodes[0]->Point(), p2 = link->_nodes[1]->Point();
|
gp_Pnt p1 = link->_nodes[0]->Point(), p2 = link->_nodes[1]->Point();
|
||||||
cout << "BUG: not shared link. IKJ = ( "<< _i << " " << _j << " " << _k << " )" << endl
|
cout << "BUG: not shared link. IKJ = ( "<< _i << " " << _j << " " << _k << " )" << endl
|
||||||
<< "n1 (" << p1.X() << ", "<< p1.Y() << ", "<< p1.Z() << " )" << endl
|
<< "n1 (" << p1.X() << ", "<< p1.Y() << ", "<< p1.Z() << " )" << endl
|
||||||
<< "n2 (" << p2.X() << ", "<< p2.Y() << ", "<< p2.Z() << " )" << endl;
|
<< "n2 (" << p2.X() << ", "<< p2.Y() << ", "<< p2.Z() << " )" << endl;
|
||||||
#else
|
}
|
||||||
(void)link; // unused in release mode
|
|
||||||
#endif
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
//================================================================================
|
//================================================================================
|
||||||
|
@ -1242,12 +1242,13 @@ bool _QuadFaceGrid::Init(const TopoDS_Face& f, SMESH_ProxyMesh& mesh)
|
|||||||
if (mySides.size() != 4)
|
if (mySides.size() != 4)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
#ifdef _DEBUG_
|
if (SALOME::VerbosityActivated())
|
||||||
|
{
|
||||||
mySides.GetSide( Q_BOTTOM )->SetID( Q_BOTTOM );
|
mySides.GetSide( Q_BOTTOM )->SetID( Q_BOTTOM );
|
||||||
mySides.GetSide( Q_RIGHT )->SetID( Q_RIGHT );
|
mySides.GetSide( Q_RIGHT )->SetID( Q_RIGHT );
|
||||||
mySides.GetSide( Q_TOP )->SetID( Q_TOP );
|
mySides.GetSide( Q_TOP )->SetID( Q_TOP );
|
||||||
mySides.GetSide( Q_LEFT )->SetID( Q_LEFT );
|
mySides.GetSide( Q_LEFT )->SetID( Q_LEFT );
|
||||||
#endif
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -1148,7 +1148,9 @@ void StdMeshers_FaceSide::reverseProxySubmesh( const TopoDS_Edge& E )
|
|||||||
|
|
||||||
void StdMeshers_FaceSide::dump(const char* msg) const
|
void StdMeshers_FaceSide::dump(const char* msg) const
|
||||||
{
|
{
|
||||||
#ifdef _DEBUG_
|
if (!SALOME::VerbosityActivated())
|
||||||
|
return;
|
||||||
|
|
||||||
if (msg) MESSAGE ( std::endl << msg );
|
if (msg) MESSAGE ( std::endl << msg );
|
||||||
MESSAGE_BEGIN ("NB EDGES: "<< myEdge.size() );
|
MESSAGE_BEGIN ("NB EDGES: "<< myEdge.size() );
|
||||||
MESSAGE_ADD ( "nbPoints: "<<myNbPonits<<" vecSize: " << myPoints.size()<<" "<<myFalsePoints.size() );
|
MESSAGE_ADD ( "nbPoints: "<<myNbPonits<<" vecSize: " << myPoints.size()<<" "<<myFalsePoints.size() );
|
||||||
@ -1176,9 +1178,6 @@ void StdMeshers_FaceSide::dump(const char* msg) const
|
|||||||
MESSAGE_ADD ( "\tF: "<<myFirst[i]<< " L: "<< myLast[i] );
|
MESSAGE_ADD ( "\tF: "<<myFirst[i]<< " L: "<< myLast[i] );
|
||||||
MESSAGE_END ( "\tnormPar: "<<myNormPar[i]<<endl );
|
MESSAGE_END ( "\tnormPar: "<<myNormPar[i]<<endl );
|
||||||
}
|
}
|
||||||
#else
|
|
||||||
(void)msg; // unused in release mode
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//================================================================================
|
//================================================================================
|
||||||
|
@ -38,25 +38,13 @@
|
|||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
||||||
// Define error message and _MYDEBUG_ if needed
|
// Define error message
|
||||||
#ifdef _DEBUG_
|
|
||||||
#define BAD_MESH_ERR \
|
#define BAD_MESH_ERR \
|
||||||
error(SMESH_Comment("Can't detect block-wise structure of the input 2D mesh.\n" \
|
error(SMESH_Comment("Can't detect block-wise structure of the input 2D mesh.\n" \
|
||||||
__FILE__ ":" )<<__LINE__)
|
__FILE__ ":" )<<__LINE__)
|
||||||
//#define _MYDEBUG_
|
|
||||||
#else
|
|
||||||
#define BAD_MESH_ERR \
|
|
||||||
error(SMESH_Comment("Can't detect block-wise structure of the input 2D mesh"))
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
// Debug output
|
// Debug output
|
||||||
#ifdef _MYDEBUG_
|
|
||||||
#define _DUMP_(msg) cout << msg << endl
|
#define _DUMP_(msg) cout << msg << endl
|
||||||
#else
|
|
||||||
#define _DUMP_(msg)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
namespace
|
namespace
|
||||||
{
|
{
|
||||||
@ -68,12 +56,12 @@ namespace
|
|||||||
{
|
{
|
||||||
B_BOTTOM=0, B_RIGHT, B_TOP, B_LEFT, B_FRONT, B_BACK, NB_BLOCK_SIDES
|
B_BOTTOM=0, B_RIGHT, B_TOP, B_LEFT, B_FRONT, B_BACK, NB_BLOCK_SIDES
|
||||||
};
|
};
|
||||||
#ifdef _MYDEBUG_
|
|
||||||
const char* SBoxSides[] = //!< names of block sides -- needed for DEBUG only
|
const char* SBoxSides[] = //!< names of block sides -- needed for DEBUG only
|
||||||
{
|
{
|
||||||
"BOTTOM", "RIGHT", "TOP", "LEFT", "FRONT", "BACK", "UNDEFINED"
|
"BOTTOM", "RIGHT", "TOP", "LEFT", "FRONT", "BACK", "UNDEFINED"
|
||||||
};
|
};
|
||||||
#endif
|
|
||||||
enum EQuadEdge //!< edges of quadrangle side
|
enum EQuadEdge //!< edges of quadrangle side
|
||||||
{
|
{
|
||||||
Q_BOTTOM = 0, Q_RIGHT, Q_TOP, Q_LEFT, NB_QUAD_SIDES
|
Q_BOTTOM = 0, Q_RIGHT, Q_TOP, Q_LEFT, NB_QUAD_SIDES
|
||||||
|
@ -712,15 +712,14 @@ namespace
|
|||||||
|
|
||||||
void pointsToPython(const std::vector<gp_XYZ>& p)
|
void pointsToPython(const std::vector<gp_XYZ>& p)
|
||||||
{
|
{
|
||||||
#ifdef _DEBUG_
|
if (SALOME::VerbosityActivated())
|
||||||
|
{
|
||||||
for ( size_t i = SMESH_Block::ID_V000; i < p.size(); ++i )
|
for ( size_t i = SMESH_Block::ID_V000; i < p.size(); ++i )
|
||||||
{
|
{
|
||||||
cout << "mesh.AddNode( " << p[i].X() << ", "<< p[i].Y() << ", "<< p[i].Z() << ") # " << i <<" " ;
|
cout << "mesh.AddNode( " << p[i].X() << ", "<< p[i].Y() << ", "<< p[i].Z() << ") # " << i <<" " ;
|
||||||
SMESH_Block::DumpShapeID( i, cout ) << endl;
|
SMESH_Block::DumpShapeID( i, cout ) << endl;
|
||||||
}
|
}
|
||||||
#else
|
}
|
||||||
(void)p; // unused in release mode
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace
|
} // namespace
|
||||||
@ -3283,10 +3282,12 @@ bool StdMeshers_Prism_3D::IsApplicable(const TopoDS_Shape & shape, bool toCheckA
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#ifdef _DEBUG_
|
|
||||||
|
if (SALOME::VerbosityActivated())
|
||||||
|
{
|
||||||
TopTools_IndexedMapOfShape allShapes; // usage: allShapes.FindIndex( s )
|
TopTools_IndexedMapOfShape allShapes; // usage: allShapes.FindIndex( s )
|
||||||
TopExp::MapShapes( shape, allShapes );
|
TopExp::MapShapes( shape, allShapes );
|
||||||
#endif
|
}
|
||||||
|
|
||||||
TopTools_IndexedDataMapOfShapeListOfShape facesOfEdge;
|
TopTools_IndexedDataMapOfShapeListOfShape facesOfEdge;
|
||||||
TopTools_ListIteratorOfListOfShape faceIt;
|
TopTools_ListIteratorOfListOfShape faceIt;
|
||||||
@ -3475,9 +3476,11 @@ bool StdMeshers_Prism_3D::IsApplicable(const TopoDS_Shape & shape, bool toCheckA
|
|||||||
if ( iLoop > allFaces.Extent() * 10 )
|
if ( iLoop > allFaces.Extent() * 10 )
|
||||||
{
|
{
|
||||||
isOK = false;
|
isOK = false;
|
||||||
#ifdef _DEBUG_
|
|
||||||
|
if(SALOME::VerbosityActivated())
|
||||||
|
{
|
||||||
cerr << "BUG: infinite loop in StdMeshers_Prism_3D::IsApplicable()" << endl;
|
cerr << "BUG: infinite loop in StdMeshers_Prism_3D::IsApplicable()" << endl;
|
||||||
#endif
|
}
|
||||||
}
|
}
|
||||||
} // while hasAdvanced
|
} // while hasAdvanced
|
||||||
|
|
||||||
@ -4342,7 +4345,9 @@ bool StdMeshers_PrismAsBlock::IsForwardEdge(SMESHDS_Mesh* meshDS,
|
|||||||
void StdMeshers_PrismAsBlock::faceGridToPythonDump(const SMESH_Block::TShapeID face,
|
void StdMeshers_PrismAsBlock::faceGridToPythonDump(const SMESH_Block::TShapeID face,
|
||||||
const int nb)
|
const int nb)
|
||||||
{
|
{
|
||||||
#ifdef _DEBUG_
|
if(!SALOME::VerbosityActivated())
|
||||||
|
return;
|
||||||
|
|
||||||
gp_XYZ pOnF[6] = { gp_XYZ(0,0,0), gp_XYZ(0,0,1),
|
gp_XYZ pOnF[6] = { gp_XYZ(0,0,0), gp_XYZ(0,0,1),
|
||||||
gp_XYZ(0,0,0), gp_XYZ(0,1,0),
|
gp_XYZ(0,0,0), gp_XYZ(0,1,0),
|
||||||
gp_XYZ(0,0,0), gp_XYZ(1,0,0) };
|
gp_XYZ(0,0,0), gp_XYZ(1,0,0) };
|
||||||
@ -4378,10 +4383,6 @@ void StdMeshers_PrismAsBlock::faceGridToPythonDump(const SMESH_Block::TShapeID f
|
|||||||
<< n << ", " << n+1 << ", "
|
<< n << ", " << n+1 << ", "
|
||||||
<< n+nb+2 << ", " << n+nb+1 << "]) " << endl;
|
<< n+nb+2 << ", " << n+nb+1 << "]) " << endl;
|
||||||
}
|
}
|
||||||
#else
|
|
||||||
(void)face; // unused in release mode
|
|
||||||
(void)nb; // unused in release mode
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//================================================================================
|
//================================================================================
|
||||||
@ -4989,7 +4990,9 @@ int StdMeshers_PrismAsBlock::TSideFace::InsertSubShapes(TBlockShapes& shapeMap)
|
|||||||
|
|
||||||
void StdMeshers_PrismAsBlock::TSideFace::dumpNodes(int nbNodes) const
|
void StdMeshers_PrismAsBlock::TSideFace::dumpNodes(int nbNodes) const
|
||||||
{
|
{
|
||||||
#ifdef _DEBUG_
|
if (!SALOME::VerbosityActivated())
|
||||||
|
return;
|
||||||
|
|
||||||
cout << endl << "NODES OF FACE "; SMESH_Block::DumpShapeID( myID, cout ) << endl;
|
cout << endl << "NODES OF FACE "; SMESH_Block::DumpShapeID( myID, cout ) << endl;
|
||||||
THorizontalEdgeAdaptor* hSize0 = (THorizontalEdgeAdaptor*) HorizCurve(0);
|
THorizontalEdgeAdaptor* hSize0 = (THorizontalEdgeAdaptor*) HorizCurve(0);
|
||||||
cout << "Horiz side 0: "; hSize0->dumpNodes(nbNodes); cout << endl;
|
cout << "Horiz side 0: "; hSize0->dumpNodes(nbNodes); cout << endl;
|
||||||
@ -5000,9 +5003,6 @@ void StdMeshers_PrismAsBlock::TSideFace::dumpNodes(int nbNodes) const
|
|||||||
TVerticalEdgeAdaptor* vSide1 = (TVerticalEdgeAdaptor*) VertiCurve(1);
|
TVerticalEdgeAdaptor* vSide1 = (TVerticalEdgeAdaptor*) VertiCurve(1);
|
||||||
cout << "Verti side 1: "; vSide1->dumpNodes(nbNodes); cout << endl;
|
cout << "Verti side 1: "; vSide1->dumpNodes(nbNodes); cout << endl;
|
||||||
delete hSize0; delete hSize1; delete vSide0; delete vSide1;
|
delete hSize0; delete hSize1; delete vSide0; delete vSide1;
|
||||||
#else
|
|
||||||
(void)nbNodes; // unused in release mode
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//================================================================================
|
//================================================================================
|
||||||
@ -5043,14 +5043,13 @@ gp_Pnt StdMeshers_PrismAsBlock::TVerticalEdgeAdaptor::Value(const Standard_Real
|
|||||||
|
|
||||||
void StdMeshers_PrismAsBlock::TVerticalEdgeAdaptor::dumpNodes(int nbNodes) const
|
void StdMeshers_PrismAsBlock::TVerticalEdgeAdaptor::dumpNodes(int nbNodes) const
|
||||||
{
|
{
|
||||||
#ifdef _DEBUG_
|
if (!SALOME::VerbosityActivated())
|
||||||
|
return;
|
||||||
|
|
||||||
for ( int i = 0; i < nbNodes && i < (int)myNodeColumn->size(); ++i )
|
for ( int i = 0; i < nbNodes && i < (int)myNodeColumn->size(); ++i )
|
||||||
cout << (*myNodeColumn)[i]->GetID() << " ";
|
cout << (*myNodeColumn)[i]->GetID() << " ";
|
||||||
if ( nbNodes < (int) myNodeColumn->size() )
|
if ( nbNodes < (int) myNodeColumn->size() )
|
||||||
cout << myNodeColumn->back()->GetID();
|
cout << myNodeColumn->back()->GetID();
|
||||||
#else
|
|
||||||
(void)nbNodes; // unused in release mode
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//================================================================================
|
//================================================================================
|
||||||
@ -5074,7 +5073,9 @@ gp_Pnt StdMeshers_PrismAsBlock::THorizontalEdgeAdaptor::Value(const Standard_Rea
|
|||||||
|
|
||||||
void StdMeshers_PrismAsBlock::THorizontalEdgeAdaptor::dumpNodes(int nbNodes) const
|
void StdMeshers_PrismAsBlock::THorizontalEdgeAdaptor::dumpNodes(int nbNodes) const
|
||||||
{
|
{
|
||||||
#ifdef _DEBUG_
|
if (!SALOME::VerbosityActivated())
|
||||||
|
return;
|
||||||
|
|
||||||
// Not bedugged code. Last node is sometimes incorrect
|
// Not bedugged code. Last node is sometimes incorrect
|
||||||
const TSideFace* side = mySide;
|
const TSideFace* side = mySide;
|
||||||
double u = 0;
|
double u = 0;
|
||||||
@ -5108,9 +5109,6 @@ void StdMeshers_PrismAsBlock::THorizontalEdgeAdaptor::dumpNodes(int nbNodes) con
|
|||||||
side->GetColumns( u , col, col2 );
|
side->GetColumns( u , col, col2 );
|
||||||
if ( n != col->second[ i ] )
|
if ( n != col->second[ i ] )
|
||||||
cout << col->second[ i ]->GetID();
|
cout << col->second[ i ]->GetID();
|
||||||
#else
|
|
||||||
(void)nbNodes; // unused in release mode
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//================================================================================
|
//================================================================================
|
||||||
|
@ -124,14 +124,19 @@ namespace {
|
|||||||
bool storeShapeForDebug(const TopoDS_Shape& shape)
|
bool storeShapeForDebug(const TopoDS_Shape& shape)
|
||||||
{
|
{
|
||||||
bool toShow;
|
bool toShow;
|
||||||
#ifdef _DEBUG_
|
|
||||||
|
if (SALOME::VerbosityActivated())
|
||||||
|
{
|
||||||
const char* type[] ={"COMPOUND","COMPSOLID","SOLID","SHELL","FACE","WIRE","EDGE","VERTEX"};
|
const char* type[] ={"COMPOUND","COMPSOLID","SOLID","SHELL","FACE","WIRE","EDGE","VERTEX"};
|
||||||
BRepTools::Write( shape, SMESH_Comment("/tmp/") << type[shape.ShapeType()] << "_"
|
BRepTools::Write( shape, SMESH_Comment("/tmp/") << type[shape.ShapeType()] << "_"
|
||||||
<< shape.TShape().operator->() << ".brep");
|
<< shape.TShape().operator->() << ".brep");
|
||||||
toShow = !theMeshDS[0]; // no show
|
toShow = !theMeshDS[0]; // no show
|
||||||
#else
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
toShow = theMeshDS[0]; // no show
|
toShow = theMeshDS[0]; // no show
|
||||||
#endif
|
}
|
||||||
|
|
||||||
if ( toShow ) {
|
if ( toShow ) {
|
||||||
show_shape( shape, "avoid warning: show_shape() defined but not used");
|
show_shape( shape, "avoid warning: show_shape() defined but not used");
|
||||||
show_list( "avoid warning: show_list() defined but not used", list< TopoDS_Edge >() );
|
show_list( "avoid warning: show_list() defined but not used", list< TopoDS_Edge >() );
|
||||||
@ -542,10 +547,11 @@ bool StdMeshers_ProjectionUtils::FindSubShapeAssociation(const TopoDS_Shape& the
|
|||||||
// b) find association of a couple of vertices and recall self.
|
// b) find association of a couple of vertices and recall self.
|
||||||
//
|
//
|
||||||
|
|
||||||
#ifdef _DEBUG_
|
if (SALOME::VerbosityActivated())
|
||||||
|
{
|
||||||
theMeshDS[0] = theMesh1->GetMeshDS(); // debug
|
theMeshDS[0] = theMesh1->GetMeshDS(); // debug
|
||||||
theMeshDS[1] = theMesh2->GetMeshDS();
|
theMeshDS[1] = theMesh2->GetMeshDS();
|
||||||
#endif
|
}
|
||||||
|
|
||||||
// =================================================================================
|
// =================================================================================
|
||||||
// 1) Is it the case of associating a group member -> another group? (PAL16202, 16203)
|
// 1) Is it the case of associating a group member -> another group? (PAL16202, 16203)
|
||||||
@ -2803,10 +2809,10 @@ namespace StdMeshers_ProjectionUtils
|
|||||||
const double D = M.Determinant();
|
const double D = M.Determinant();
|
||||||
if ( D < 1e-3 * ( newSrcOrig - _srcOrig ).Modulus() )
|
if ( D < 1e-3 * ( newSrcOrig - _srcOrig ).Modulus() )
|
||||||
{
|
{
|
||||||
#ifdef _DEBUG_
|
if (SALOME::VerbosityActivated())
|
||||||
cerr << "TrsfFinder3D::Invert()"
|
cerr << "TrsfFinder3D::Invert()"
|
||||||
<< "D " << M.Determinant() << " IsSingular " << M.IsSingular() << endl;
|
<< "D " << M.Determinant() << " IsSingular " << M.IsSingular() << endl;
|
||||||
#endif
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
gp_Mat Minv = M.Inverted();
|
gp_Mat Minv = M.Inverted();
|
||||||
|
@ -2507,9 +2507,8 @@ bool StdMeshers_Projection_2D::Compute(SMESH_Mesh& theMesh, const TopoDS_Shape&
|
|||||||
TAssocTool::Morph morph( srcWires );
|
TAssocTool::Morph morph( srcWires );
|
||||||
morph.Perform( helper, tgtWires, helper.GetSurface( tgtFace ),
|
morph.Perform( helper, tgtWires, helper.GetSurface( tgtFace ),
|
||||||
_src2tgtNodes, /*moveAll=*/true );
|
_src2tgtNodes, /*moveAll=*/true );
|
||||||
#ifdef _DEBUG_
|
if(SALOME::VerbosityActivated())
|
||||||
cout << "StdMeshers_Projection_2D: Projection mesh IsDistorted2D() ==> do morph" << endl;
|
cout << "StdMeshers_Projection_2D: Projection mesh IsDistorted2D() ==> do morph" << endl;
|
||||||
#endif
|
|
||||||
|
|
||||||
if ( !fixDistortedFaces( helper, tgtWires )) // smooth and check
|
if ( !fixDistortedFaces( helper, tgtWires )) // smooth and check
|
||||||
return error("Invalid mesh generated");
|
return error("Invalid mesh generated");
|
||||||
|
@ -1194,10 +1194,8 @@ namespace
|
|||||||
|
|
||||||
theVariants.insert( *this );
|
theVariants.insert( *this );
|
||||||
|
|
||||||
#ifndef _DEBUG_
|
if (SALOME::VerbosityActivated() && theVariants.size() > 1 ) // erase a worse variant
|
||||||
if ( theVariants.size() > 1 ) // erase a worse variant
|
|
||||||
theVariants.erase( ++theVariants.begin() );
|
theVariants.erase( ++theVariants.begin() );
|
||||||
#endif
|
|
||||||
};
|
};
|
||||||
|
|
||||||
// first criterion - equality of nbSeg of opposite sides
|
// first criterion - equality of nbSeg of opposite sides
|
||||||
|
@ -4644,7 +4644,9 @@ void _Simplex::SortSimplices(vector<_Simplex>& simplices)
|
|||||||
|
|
||||||
void _ViscousBuilder::makeGroupOfLE()
|
void _ViscousBuilder::makeGroupOfLE()
|
||||||
{
|
{
|
||||||
#ifdef _DEBUG_
|
if (!SALOME::VerbosityActivated())
|
||||||
|
return;
|
||||||
|
|
||||||
for ( size_t i = 0 ; i < _sdVec.size(); ++i )
|
for ( size_t i = 0 ; i < _sdVec.size(); ++i )
|
||||||
{
|
{
|
||||||
if ( _sdVec[i]._n2eMap.empty() ) continue;
|
if ( _sdVec[i]._n2eMap.empty() ) continue;
|
||||||
@ -4700,7 +4702,6 @@ void _ViscousBuilder::makeGroupOfLE()
|
|||||||
<< "'%s-%s' % (faceId1+1, faceId2))");
|
<< "'%s-%s' % (faceId1+1, faceId2))");
|
||||||
dumpFunctionEnd();
|
dumpFunctionEnd();
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//================================================================================
|
//================================================================================
|
||||||
@ -5835,9 +5836,8 @@ void _ViscousBuilder::putOnOffsetSurface( _EdgesOnShape& eos,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (SALOME::VerbosityActivated())
|
||||||
|
{
|
||||||
#ifdef _DEBUG_
|
|
||||||
// dumpMove() for debug
|
// dumpMove() for debug
|
||||||
size_t i = 0;
|
size_t i = 0;
|
||||||
for ( ; i < eos._edges.size(); ++i )
|
for ( ; i < eos._edges.size(); ++i )
|
||||||
@ -5855,7 +5855,7 @@ void _ViscousBuilder::putOnOffsetSurface( _EdgesOnShape& eos,
|
|||||||
}
|
}
|
||||||
dumpFunctionEnd();
|
dumpFunctionEnd();
|
||||||
}
|
}
|
||||||
#endif
|
}
|
||||||
|
|
||||||
_ConvexFace* cnvFace;
|
_ConvexFace* cnvFace;
|
||||||
if ( moveAll != _LayerEdge::UPD_NORMAL_CONV &&
|
if ( moveAll != _LayerEdge::UPD_NORMAL_CONV &&
|
||||||
|
@ -240,9 +240,7 @@ namespace VISCOUS_2D
|
|||||||
|
|
||||||
bool SetNewLength( const double length );
|
bool SetNewLength( const double length );
|
||||||
|
|
||||||
#ifdef _DEBUG_
|
int _ID; // debug
|
||||||
int _ID;
|
|
||||||
#endif
|
|
||||||
};
|
};
|
||||||
//--------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------
|
||||||
/*!
|
/*!
|
||||||
@ -674,9 +672,10 @@ bool _ViscousBuilder2D::error(const string& text )
|
|||||||
_error->myAlgo = smError->myAlgo;
|
_error->myAlgo = smError->myAlgo;
|
||||||
smError = _error;
|
smError = _error;
|
||||||
}
|
}
|
||||||
#ifdef _DEBUG_
|
|
||||||
|
if (SALOME::VerbosityActivated())
|
||||||
cout << "_ViscousBuilder2D::error " << text << endl;
|
cout << "_ViscousBuilder2D::error " << text << endl;
|
||||||
#endif
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1339,9 +1338,9 @@ void _ViscousBuilder2D::setLayerEdgeData( _LayerEdge& lEdge,
|
|||||||
lEdge._ray.SetDirection( lEdge._normal2D );
|
lEdge._ray.SetDirection( lEdge._normal2D );
|
||||||
lEdge._isBlocked = false;
|
lEdge._isBlocked = false;
|
||||||
lEdge._length2D = 0;
|
lEdge._length2D = 0;
|
||||||
#ifdef _DEBUG_
|
|
||||||
|
if (SALOME::VerbosityActivated())
|
||||||
lEdge._ID = _nbLE++;
|
lEdge._ID = _nbLE++;
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//================================================================================
|
//================================================================================
|
||||||
|
Loading…
Reference in New Issue
Block a user