Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[bos #32517][EDF] Dynamic logging: Removed MYDEBUG.
[modules/smesh.git]
/
src
/
DriverMED
/
DriverMED_R_SMESHDS_Mesh.cxx
diff --git
a/src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx
b/src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx
index 68f17df380dcdfcb178840f1dc1c0c6085288f47..9eab4fc8858bec48fc6344e878c6c35f0b53895c 100644
(file)
--- a/
src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx
+++ b/
src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
19
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
22
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-36,18
+36,12
@@
#include "MED_Utilities.hxx"
#include <NCollection_Map.hxx>
#include "MED_Utilities.hxx"
#include <NCollection_Map.hxx>
+#include <smIdType.hxx>
#include "utilities.h"
//#include <stdlib.h>
#include "utilities.h"
//#include <stdlib.h>
-#ifdef _DEBUG_
-static int MYDEBUG = 0;
-//#define _DEXCEPT_
-#else
-static int MYDEBUG = 0;
-#endif
-
#define _EDF_NODE_IDS_
using namespace MED;
#define _EDF_NODE_IDS_
using namespace MED;
@@
-109,7
+103,7
@@
Driver_Mesh::Status DriverMED_R_SMESHDS_Mesh::Perform()
try {
#endif
myFamilies.clear();
try {
#endif
myFamilies.clear();
-
if(MYDEBUG)
MESSAGE("Perform - myFile : "<<myFile);
+ MESSAGE("Perform - myFile : "<<myFile);
PWrapper aMed = CrWrapperR(myFile);
aResult = DRS_EMPTY;
PWrapper aMed = CrWrapperR(myFile);
aResult = DRS_EMPTY;
@@
-124,7
+118,7
@@
Driver_Mesh::Status DriverMED_R_SMESHDS_Mesh::Perform()
if (myMeshId != -1) aMeshName = SMESH_Comment( myMeshId );
else aMeshName = myMeshName;
if (myMeshId != -1) aMeshName = SMESH_Comment( myMeshId );
else aMeshName = myMeshName;
-
if(MYDEBUG)
MESSAGE("Perform - aMeshName : "<<aMeshName<<"; "<<aMeshInfo->GetName());
+ MESSAGE("Perform - aMeshName : "<<aMeshName<<"; "<<aMeshInfo->GetName());
if ( aMeshName != aMeshInfo->GetName() ) continue;
aResult = DRS_OK;
if ( aMeshName != aMeshInfo->GetName() ) continue;
aResult = DRS_OK;
@@
-132,18
+126,18
@@
Driver_Mesh::Status DriverMED_R_SMESHDS_Mesh::Perform()
//------------------------------------------------
TErr anErr;
TInt aNbFams = aMed->GetNbFamilies(aMeshInfo);
//------------------------------------------------
TErr anErr;
TInt aNbFams = aMed->GetNbFamilies(aMeshInfo);
-
if(MYDEBUG)
MESSAGE("Read " << aNbFams << " families");
+ MESSAGE("Read " << aNbFams << " families");
for (TInt iFam = 0; iFam < aNbFams; iFam++)
{
PFamilyInfo aFamilyInfo = aMed->GetPFamilyInfo(aMeshInfo,iFam+1,&anErr);
if(anErr >= 0){
TInt aFamId = aFamilyInfo->GetId();
for (TInt iFam = 0; iFam < aNbFams; iFam++)
{
PFamilyInfo aFamilyInfo = aMed->GetPFamilyInfo(aMeshInfo,iFam+1,&anErr);
if(anErr >= 0){
TInt aFamId = aFamilyInfo->GetId();
-
if(MYDEBUG)
MESSAGE("Family " << aFamId << " :");
+ MESSAGE("Family " << aFamId << " :");
DriverMED_FamilyPtr aFamily (new DriverMED_Family);
TInt aNbGrp = aFamilyInfo->GetNbGroup();
DriverMED_FamilyPtr aFamily (new DriverMED_Family);
TInt aNbGrp = aFamilyInfo->GetNbGroup();
-
if(MYDEBUG)
MESSAGE("belong to " << aNbGrp << " groups");
+ MESSAGE("belong to " << aNbGrp << " groups");
bool isAttrOk = false;
if(aFamilyInfo->GetNbAttr() == aNbGrp)
isAttrOk = true;
bool isAttrOk = false;
if(aFamilyInfo->GetNbAttr() == aNbGrp)
isAttrOk = true;
@@
-154,7
+148,7
@@
Driver_Mesh::Status DriverMED_R_SMESHDS_Mesh::Perform()
TInt anAttrVal = aFamilyInfo->GetAttrVal(iGr);
aFamily->SetGroupAttributVal(anAttrVal);
}
TInt anAttrVal = aFamilyInfo->GetAttrVal(iGr);
aFamily->SetGroupAttributVal(anAttrVal);
}
-
if(MYDEBUG)
MESSAGE(aGroupName);
+ MESSAGE(aGroupName);
if ( strncmp( aGroupName.c_str(), NIG_GROUP_PREFIX, strlen(NIG_GROUP_PREFIX) ) != 0 )
aFamily->AddGroupName( fixUTF8( aGroupName ));
}
if ( strncmp( aGroupName.c_str(), NIG_GROUP_PREFIX, strlen(NIG_GROUP_PREFIX) ) != 0 )
aFamily->AddGroupName( fixUTF8( aGroupName ));
}
@@
-181,7
+175,7
@@
Driver_Mesh::Status DriverMED_R_SMESHDS_Mesh::Perform()
EBooleen anIsNodeNum = aNodeInfo->IsElemNum();
TInt aNbElems = aNodeInfo->GetNbElem();
EBooleen anIsNodeNum = aNodeInfo->IsElemNum();
TInt aNbElems = aNodeInfo->GetNbElem();
-
if(MYDEBUG)
MESSAGE("Perform - aNodeInfo->GetNbElem() = "<<aNbElems<<"; anIsNodeNum = "<<anIsNodeNum);
+ MESSAGE("Perform - aNodeInfo->GetNbElem() = "<<aNbElems<<"; anIsNodeNum = "<<anIsNodeNum);
DriverMED_FamilyPtr aFamily;
for ( TInt iElem = 0; iElem < aNbElems; iElem++ )
{
DriverMED_FamilyPtr aFamily;
for ( TInt iElem = 0; iElem < aNbElems; iElem++ )
{
@@
-225,7
+219,7
@@
Driver_Mesh::Status DriverMED_R_SMESHDS_Mesh::Perform()
// Reading pre information about all MED cells
//--------------------------------------------
// Reading pre information about all MED cells
//--------------------------------------------
- typedef MED::TVector<
int
> TNodeIds;
+ typedef MED::TVector<
smIdType
> TNodeIds;
bool takeNumbers = true; // initially we trust the numbers from file
MED::TEntityInfo aEntityInfo = aMed->GetEntityInfo(aMeshInfo, eNOD);
MED::TEntityInfo::iterator anEntityIter = aEntityInfo.begin();
bool takeNumbers = true; // initially we trust the numbers from file
MED::TEntityInfo aEntityInfo = aMed->GetEntityInfo(aMeshInfo, eNOD);
MED::TEntityInfo::iterator anEntityIter = aEntityInfo.begin();
@@
-269,7
+263,7
@@
Driver_Mesh::Status DriverMED_R_SMESHDS_Mesh::Perform()
aNodeIds.assign( aBallInfo->myConn->begin(), aBallInfo->myConn->end());
// allocate array of diameters
aNodeIds.assign( aBallInfo->myConn->begin(), aBallInfo->myConn->end());
// allocate array of diameters
- vtkIdType maxID =
myMesh->MaxElementID() + aNbBalls
;
+ vtkIdType maxID =
FromSmIdType<vtkIdType>(myMesh->MaxElementID() + aNbBalls)
;
if ( anIsElemNum && !aBallInfo->myElemNum->empty() )
maxID = *std::max_element( aBallInfo->myElemNum->begin(),
aBallInfo->myElemNum->end() );
if ( anIsElemNum && !aBallInfo->myElemNum->empty() )
maxID = *std::max_element( aBallInfo->myElemNum->begin(),
aBallInfo->myElemNum->end() );
@@
-318,7
+312,7
@@
Driver_Mesh::Status DriverMED_R_SMESHDS_Mesh::Perform()
EBooleen anIsElemNum = takeNumbers ? aPolygoneInfo->IsElemNum() : eFAUX;
typedef SMDS_MeshFace* (SMESHDS_Mesh::* FAddPolyWithID)
EBooleen anIsElemNum = takeNumbers ? aPolygoneInfo->IsElemNum() : eFAUX;
typedef SMDS_MeshFace* (SMESHDS_Mesh::* FAddPolyWithID)
- (const std::vector<
int> & nodes_ids, const int
ID);
+ (const std::vector<
smIdType> & nodes_ids, const smIdType
ID);
typedef SMDS_MeshFace* (SMESHDS_Mesh::* FAddPolygon)
(const std::vector<const SMDS_MeshNode*> & nodes);
typedef SMDS_MeshFace* (SMESHDS_Mesh::* FAddPolygon)
(const std::vector<const SMDS_MeshNode*> & nodes);
@@
-355,7
+349,7
@@
Driver_Mesh::Status DriverMED_R_SMESHDS_Mesh::Perform()
#endif
if ( anIsElemNum ) {
TInt anElemId = aPolygoneInfo->GetElemNum( iElem );
#endif
if ( anIsElemNum ) {
TInt anElemId = aPolygoneInfo->GetElemNum( iElem );
- anElement = (myMesh->*addPolyWithID)( aNodeIds,
anElemId
);
+ anElement = (myMesh->*addPolyWithID)( aNodeIds,
ToSmIdType(anElemId)
);
}
if ( !anElement ) {
aNodes.resize( aNbConn );
}
if ( !anElement ) {
aNodes.resize( aNbConn );
@@
-436,7
+430,7
@@
Driver_Mesh::Status DriverMED_R_SMESHDS_Mesh::Perform()
#endif
if(anIsElemNum){
TInt anElemId = aPolyedreInfo->GetElemNum(iElem);
#endif
if(anIsElemNum){
TInt anElemId = aPolyedreInfo->GetElemNum(iElem);
- anElement = myMesh->AddPolyhedralVolumeWithID(aNodeIds,aQuantities,
anElemId
);
+ anElement = myMesh->AddPolyhedralVolumeWithID(aNodeIds,aQuantities,
ToSmIdType(anElemId)
);
}
if(!anElement){
vector<const SMDS_MeshNode*> aNodes(aNbNodes);
}
if(!anElement){
vector<const SMDS_MeshNode*> aNodes(aNbNodes);
@@
-474,8
+468,8
@@
Driver_Mesh::Status DriverMED_R_SMESHDS_Mesh::Perform()
PCellInfo aCellInfo = aMed->GetPCellInfo(aMeshInfo,anEntity,aGeom);
EBooleen anIsElemNum = takeNumbers ? aCellInfo->IsElemNum() : eFAUX;
TInt aNbElems = aCellInfo->GetNbElem();
PCellInfo aCellInfo = aMed->GetPCellInfo(aMeshInfo,anEntity,aGeom);
EBooleen anIsElemNum = takeNumbers ? aCellInfo->IsElemNum() : eFAUX;
TInt aNbElems = aCellInfo->GetNbElem();
-
if(MYDEBUG)
MESSAGE("Perform - anEntity = "<<anEntity<<"; anIsElemNum = "<<anIsElemNum);
-
if(MYDEBUG)
MESSAGE("Perform - aGeom = "<<aGeom<<"; aNbElems = "<<aNbElems);
+ MESSAGE("Perform - anEntity = "<<anEntity<<"; anIsElemNum = "<<anIsElemNum);
+ MESSAGE("Perform - aGeom = "<<aGeom<<"; aNbElems = "<<aNbElems);
TInt aNbNodes = -1;
switch(aGeom){
TInt aNbNodes = -1;
switch(aGeom){
@@
-502,7
+496,7
@@
Driver_Mesh::Status DriverMED_R_SMESHDS_Mesh::Perform()
default:;
}
vector<TInt> aNodeIds(aNbNodes);
default:;
}
vector<TInt> aNodeIds(aNbNodes);
- for (
i
nt iElem = 0; iElem < aNbElems; iElem++ )
+ for (
TI
nt iElem = 0; iElem < aNbElems; iElem++ )
{
bool anIsValidConnect = false;
TCConnSlice aConnSlice = aCellInfo->GetConnSlice(iElem);
{
bool anIsValidConnect = false;
TCConnSlice aConnSlice = aCellInfo->GetConnSlice(iElem);
@@
-1045,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;
}
@@
-1054,7
+1048,7
@@
list<string> DriverMED_R_SMESHDS_Mesh::GetMeshNames(Status& theStatus)
list<string> aMeshNames;
try {
list<string> aMeshNames;
try {
-
if(MYDEBUG)
MESSAGE("GetMeshNames - myFile : " << myFile);
+ MESSAGE("GetMeshNames - myFile : " << myFile);
theStatus = DRS_OK;
PWrapper aMed = CrWrapperR(myFile);
theStatus = DRS_OK;
PWrapper aMed = CrWrapperR(myFile);
@@
-1131,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 )))
{