-// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2023 CEA, EDF, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
#include "MED_Wrapper.hxx"
#include "MED_TStructures.hxx"
#include "MED_Utilities.hxx"
+#include "MED_TFile.hxx"
+#include "MEDFileUtilities.hxx"
#include <med.h>
#include <med_err.h>
+#include <med_proto.h>
-#include <boost/version.hpp>
-
-#ifdef _DEBUG_
-static int MYDEBUG = 0;
-static int MYVALUEDEBUG = 0;
-#else
-static int MYDEBUG = 0;
-static int MYVALUEDEBUG = 0;
+#ifdef WIN32
+#include <windows.h>
#endif
+#include <boost/version.hpp>
+
namespace MED
{
//---------------------------------------------------------------
#else
boost::detail::thread::lock_ops<TWrapper::TMutex>::lock(myWrapper->myMutex);
#endif
- INITMSG(MYDEBUG, "TLockProxy() - this -"<<this<<"; myWrapper = "<<myWrapper<<std::endl);
+ INITMSG("TLockProxy() - this -"<<this<<"; myWrapper = "<<myWrapper<<std::endl);
}
TLockProxy
::~TLockProxy()
{
- INITMSG(MYDEBUG, "~TLockProxy() - this -"<<this<<"; myWrapper = "<<myWrapper<<std::endl);
+ INITMSG("~TLockProxy() - this -"<<this<<"; myWrapper = "<<myWrapper<<std::endl);
#if BOOST_VERSION >= 103500
myWrapper->myMutex.unlock();
#else
}
//---------------------------------------------------------------
- class TFile
+ const TIdt& MEDIDTHoder::Id() const
{
- TFile();
- TFile(const TFile&);
-
- public:
- TFile(const std::string& theFileName):
- myCount(0),
- myFid(0),
- myFileName(theFileName)
- {}
+ if (myFid < 0)
+ EXCEPTION(std::runtime_error, "TFile - GetFid() < 0");
+ return myFid;
+ }
- ~TFile()
+ void TMemFile::Open(EModeAcces theMode, TErr* theErr)
+ {
+ if (this->myCount++ == 0)
{
- Close();
+ std::string dftFileName = MEDCoupling::MEDFileWritableStandAlone::GenerateUniqueDftFileNameInMem();
+ med_access_mode modeTmp(MED_ACC_CREAT);
+ if(memfile.app_image_ptr)
+ modeTmp = med_access_mode(theMode);
+ myFid = MEDmemFileOpen(dftFileName.c_str(),&memfile,MED_FALSE,modeTmp);
}
-
- void
- Open(EModeAcces theMode,
- TErr* theErr = NULL)
- {
- if (myCount++ == 0) {
- const char* aFileName = myFileName.c_str();
- myFid = MEDfileOpen(aFileName, med_access_mode(theMode));
+ if (theErr)
+ *theErr = TErr(myFid);
+ else if (myFid < 0)
+ EXCEPTION(std::runtime_error,"TMemFile - MEDmemFileOpen");
+ }
+
+ TFile::TFile(const std::string& theFileName, TInt theMajor, TInt theMinor):
+ myFileName(theFileName),
+ myMajor(theMajor),
+ myMinor(theMinor)
+ {
+ if ((myMajor < 0) || (myMajor > MED_MAJOR_NUM)) myMajor = MED_MAJOR_NUM;
+ if ((myMinor < 0) || (myMajor == MED_MAJOR_NUM && myMinor > MED_MINOR_NUM)) myMinor = MED_MINOR_NUM;
+ }
+
+ void TFile::Open(EModeAcces theMode, TErr* theErr)
+ {
+ if (myCount++ == 0) {
+ const char* aFileName = myFileName.c_str();
+#ifdef WIN32
+ if (med_access_mode(theMode) == MED_ACC_RDWR) {
+ // Force removing readonly attribute from a file under Windows, because of a bug in the HDF5
+ std::string aReadOlnyRmCmd = "attrib -r \"" + myFileName + "\"> nul 2>&1";
+#ifdef UNICODE
+ const char* to_decode = aReadOlnyRmCmd.c_str();
+ int size_needed = MultiByteToWideChar(CP_UTF8, 0, to_decode, strlen(to_decode), NULL, 0);
+ wchar_t* awReadOlnyRmCmd = new wchar_t[size_needed + 1];
+ MultiByteToWideChar(CP_UTF8, 0, to_decode, strlen(to_decode), awReadOlnyRmCmd, size_needed);
+ awReadOlnyRmCmd[size_needed] = '\0';
+ _wsystem(awReadOlnyRmCmd);
+ delete[] awReadOlnyRmCmd;
+#else
+ system(aReadOlnyRmCmd.c_str());
+#endif
}
- if (theErr)
- *theErr = TErr(myFid);
- else if (myFid < 0)
- EXCEPTION(std::runtime_error, "TFile - MEDfileOpen('"<<myFileName<<"',"<<theMode<<")");
- }
-
- const TIdt&
- Id() const
- {
- if (myFid < 0)
- EXCEPTION(std::runtime_error, "TFile - GetFid() < 0");
- return myFid;
- }
-
- void
- Close()
- {
- if (--myCount == 0)
- MEDfileClose(myFid);
+#endif
+ myFid = MEDfileVersionOpen(aFileName,med_access_mode(theMode), myMajor, myMinor, MED_RELEASE_NUM);
}
-
- protected:
- TInt myCount;
- TIdt myFid;
- std::string myFileName;
- };
+ if (theErr)
+ *theErr = TErr(myFid);
+ else if (myFid < 0)
+ EXCEPTION(std::runtime_error,"TFile - MEDfileVersionOpen('"<<myFileName<<"',"<<theMode<<"',"<< myMajor <<"',"<< myMinor<<"',"<< MED_RELEASE_NUM<<")");
+ }
//---------------------------------------------------------------
class TFileWrapper
{
- PFile myFile;
+ PFileInternal myFile;
+ TInt myMinor;
public:
- TFileWrapper(const PFile& theFile,
- EModeAcces theMode,
- TErr* theErr = NULL):
- myFile(theFile)
+ TFileWrapper(const PFileInternal& theFile,
+ EModeAcces theMode,
+ TErr* theErr = NULL,
+ TInt theMinor=-1):
+ myFile(theFile),
+ myMinor(theMinor)
{
+ if (myMinor < 0) myMinor = MED_MINOR_NUM;
myFile->Open(theMode, theErr);
}
void
Print(SharedPtr<TimeStampValueType> theTimeStampValue)
{
- INITMSG(MYDEBUG,"Print - TimeStampValue\n");
+ INITMSG("Print - TimeStampValue\n");
typename TimeStampValueType::TTGeom2Value& aGeom2Value = theTimeStampValue->myGeom2Value;
typename TimeStampValueType::TTGeom2Value::const_iterator anIter = aGeom2Value.begin();
for (; anIter != aGeom2Value.end(); anIter++) {
TInt aNbElem = aMeshValue.myNbElem;
TInt aNbGauss = aMeshValue.myNbGauss;
TInt aNbComp = aMeshValue.myNbComp;
- INITMSG(
MYDEBUG, "aGeom = "<<aGeom<<" - "<<aNbElem<<": ");
+ INITMSG("aGeom = "<<aGeom<<" - "<<aNbElem<<": ");
for (TInt iElem = 0; iElem < aNbElem; iElem++) {
typename TimeStampValueType::TTMeshValue::TCValueSliceArr aValueSliceArr =
aMeshValue.GetGaussValueSliceArr(iElem);
- ADDMSG(MYVALUEDEBUG, "{");
+ ADDMSG("{");
for (TInt iGauss = 0; iGauss < aNbGauss; iGauss++) {
const typename TimeStampValueType::TTMeshValue::TCValueSlice& aValueSlice =
aValueSliceArr[iGauss];
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");
}
}
//---------------------------------------------------------------
TWrapper
- ::TWrapper(const std::string& theFileName):
- myFile(new TFile(theFileName))
+ ::TWrapper(const std::string& theFileName, bool write, TFileInternal *tfileInst, TInt theMajor, TInt theMinor):
+ myMajor(theMajor),
+ myMinor(theMinor)
{
+ if(!tfileInst)
+ myFile.reset(new TFile(theFileName, theMajor, theMinor) );
+ else
+ myFile.reset(new TFileDecorator(tfileInst) );
+
TErr aRet;
- myFile->Open(eLECTURE_ECRITURE, &aRet);
- // if (aRet < 0)
- // myFile->Close();
- // myFile->Open(eLECTURE_AJOUT, &aRet);
- // }
- if (aRet < 0) {
- myFile->Close();
- myFile->Open(eLECTURE, &aRet);
+ if ( write ) {
+ myFile->Open(eLECTURE_ECRITURE, &aRet);
+ if (aRet < 0) {
+ myFile->Close();
+ myFile->Open(eCREATION, &aRet);
+ }
}
- if (aRet < 0) {
- myFile->Close();
- myFile->Open(eCREATION, &aRet);
+ else {
+ myFile->Open(eLECTURE, &aRet);
}
}
TWrapper
::GetNbMeshes(TErr* theErr)
{
- TFileWrapper aFileWrapper(myFile, eLECTURE, theErr);
+ TFileWrapper aFileWrapper(myFile, eLECTURE, theErr, myMinor);
if (theErr && *theErr < 0)
return -1;
//----------------------------------------------------------------------------
void
TWrapper
- ::GetMeshInfo(TInt theMeshId,
+ ::GetMeshInfo(TInt theMeshId,
MED::TMeshInfo& theInfo,
- TErr* theErr)
+ TErr* theErr)
{
- TFileWrapper aFileWrapper(myFile, eLECTURE, theErr);
+ TFileWrapper aFileWrapper(myFile, eLECTURE, theErr, myMinor);
if (theErr && *theErr < 0)
return;
void
TWrapper
::SetMeshInfo(const MED::TMeshInfo& theInfo,
- TErr* theErr)
+ TErr* theErr)
{
TErr aRet;
SetMeshInfo(theInfo, eLECTURE_ECRITURE, &aRet);
void
TWrapper
::SetMeshInfo(const MED::TMeshInfo& theInfo,
- EModeAcces theMode,
- TErr* theErr)
+ EModeAcces theMode,
+ TErr* theErr)
{
- TFileWrapper aFileWrapper(myFile, theMode, theErr);
+ TFileWrapper aFileWrapper(myFile, theMode, theErr, myMinor);
if (theErr && *theErr < 0)
return;
//if (aRet == 0)
// 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)
*theErr = aRet;
//----------------------------------------------------------------------------
PMeshInfo
TWrapper
- ::CrMeshInfo(TInt theDim,
- TInt theSpaceDim,
+ ::CrMeshInfo(TInt theDim,
+ TInt theSpaceDim,
const std::string& theValue,
- EMaillage theType,
+ EMaillage theType,
const std::string& theDesc)
{
return PMeshInfo(new TTMeshInfo
//----------------------------------------------------------------------------
PMeshInfo
TWrapper
- ::GetPMeshInfo(TInt theId,
+ ::GetPMeshInfo(TInt theId,
TErr* theErr)
{
PMeshInfo anInfo = CrMeshInfo();
TInt
TWrapper
::GetNbFamilies(const MED::TMeshInfo& theInfo,
- TErr* theErr)
+ TErr* theErr)
{
- TFileWrapper aFileWrapper(myFile, eLECTURE, theErr);
+ TFileWrapper aFileWrapper(myFile, eLECTURE, theErr, myMinor);
if (theErr && *theErr < 0)
return -1;
//----------------------------------------------------------------------------
TInt
TWrapper
- ::GetNbFamAttr(TInt theFamId,
+ ::GetNbFamAttr(TInt theFamId,
const MED::TMeshInfo& theInfo,
- TErr* theErr)
+ TErr* theErr)
{
- TFileWrapper aFileWrapper(myFile, eLECTURE, theErr);
+ TFileWrapper aFileWrapper(myFile, eLECTURE, theErr, myMinor);
if (theErr && *theErr < 0)
return -1;
//----------------------------------------------------------------------------
TInt
TWrapper
- ::GetNbFamGroup(TInt theFamId,
+ ::GetNbFamGroup(TInt theFamId,
const MED::TMeshInfo& theInfo,
- TErr* theErr)
+ TErr* theErr)
{
- TFileWrapper aFileWrapper(myFile, eLECTURE, theErr);
+ TFileWrapper aFileWrapper(myFile, eLECTURE, theErr, myMinor);
if (theErr && *theErr < 0)
return -1;
//----------------------------------------------------------------------------
void
TWrapper
- ::GetFamilyInfo(TInt theFamId,
+ ::GetFamilyInfo(TInt theFamId,
MED::TFamilyInfo& theInfo,
- TErr* theErr)
+ TErr* theErr)
{
- TFileWrapper aFileWrapper(myFile, eLECTURE, theErr);
+ TFileWrapper aFileWrapper(myFile, eLECTURE, theErr, myMinor);
if (theErr && *theErr < 0)
return;
void
TWrapper
::SetFamilyInfo(const MED::TFamilyInfo& theInfo,
- TErr* theErr)
+ TErr* theErr)
{
TErr aRet;
SetFamilyInfo(theInfo, eLECTURE_ECRITURE, &aRet);
void
TWrapper
::SetFamilyInfo(const MED::TFamilyInfo& theInfo,
- EModeAcces theMode,
- TErr* theErr)
+ EModeAcces theMode,
+ TErr* theErr)
{
- TFileWrapper aFileWrapper(myFile, theMode, theErr);
+ TFileWrapper aFileWrapper(myFile, theMode, theErr, myMinor);
if (theErr && *theErr < 0)
return;
aNbGroup,
&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)
*theErr = aRet;
//----------------------------------------------------------------------------
PFamilyInfo
TWrapper
- ::CrFamilyInfo(const PMeshInfo& theMeshInfo,
- TInt theNbGroup,
- TInt theNbAttr,
- TInt theId,
+ ::CrFamilyInfo(const PMeshInfo& theMeshInfo,
+ TInt theNbGroup,
+ TInt theNbAttr,
+ TInt theId,
const std::string& theValue)
{
return PFamilyInfo(new TTFamilyInfo
//----------------------------------------------------------------------------
PFamilyInfo
TWrapper
- ::CrFamilyInfo(const PMeshInfo& theMeshInfo,
- const std::string& theValue,
- TInt theId,
- const MED::TStringSet& theGroupNames,
+ ::CrFamilyInfo(const PMeshInfo& theMeshInfo,
+ const std::string& theValue,
+ TInt theId,
+ const MED::TStringSet& theGroupNames,
const MED::TStringVector& theAttrDescs,
- const MED::TIntVector& theAttrIds,
- const MED::TIntVector& theAttrVals)
+ const MED::TIntVector& theAttrIds,
+ const MED::TIntVector& theAttrVals)
{
return PFamilyInfo(new TTFamilyInfo
(theMeshInfo,
//----------------------------------------------------------------------------
PFamilyInfo
TWrapper
- ::CrFamilyInfo(const PMeshInfo& theMeshInfo,
+ ::CrFamilyInfo(const PMeshInfo& theMeshInfo,
const PFamilyInfo& theInfo)
{
return PFamilyInfo(new TTFamilyInfo
PFamilyInfo
TWrapper
::GetPFamilyInfo(const PMeshInfo& theMeshInfo,
- TInt theId,
- TErr* theErr)
+ TInt theId,
+ TErr* theErr)
{
// must be reimplemented in connection with mesh type eSTRUCTURE
// if (theMeshInfo->GetType() != eNON_STRUCTURE)
PFamilyInfo anInfo = CrFamilyInfo(theMeshInfo, aNbGroup, aNbAttr);
GetFamilyInfo(theId, *anInfo, theErr);
-#ifdef _DEBUG_
- std::string aName = anInfo->GetName();
- INITMSG(MYDEBUG, "GetPFamilyInfo - aFamilyName = '"<<aName<<
- "'; andId = "<<anInfo->GetId()<<
- "; aNbAttr = "<<aNbAttr<<
- "; aNbGroup = "<<aNbGroup<<"\n");
- for (TInt iGroup = 0; iGroup < aNbGroup; iGroup++) {
- aName = anInfo->GetGroupName(iGroup);
- INITMSG(MYDEBUG, "aGroupName = '"<<aName<<"'\n");
+ if (SALOME::VerbosityActivated())
+ {
+ std::string aName = anInfo->GetName();
+ INITMSG("GetPFamilyInfo - aFamilyName = '"<<aName<<
+ "'; andId = "<<anInfo->GetId()<<
+ "; aNbAttr = "<<aNbAttr<<
+ "; aNbGroup = "<<aNbGroup<<"\n");
+ for (TInt iGroup = 0; iGroup < aNbGroup; iGroup++) {
+ aName = anInfo->GetGroupName(iGroup);
+ INITMSG("aGroupName = '"<<aName<<"'\n");
+ }
}
-#endif
return anInfo;
}
//----------------------------------------------------------------------------
void
TWrapper
- ::GetNames(TElemInfo& theInfo,
- TInt theNb,
- EEntiteMaillage theEntity,
+ ::GetNames(TElemInfo& theInfo,
+ TInt /*theNb*/,
+ EEntiteMaillage theEntity,
EGeometrieElement theGeom,
- TErr* theErr)
+ TErr* theErr)
{
- TFileWrapper aFileWrapper(myFile, eLECTURE, theErr);
+ TFileWrapper aFileWrapper(myFile, eLECTURE, theErr, myMinor);
if (theErr && *theErr < 0)
return;
//----------------------------------------------------------------------------
void
TWrapper
- ::SetNames(const TElemInfo& theInfo,
- EEntiteMaillage theEntity,
+ ::SetNames(const TElemInfo& theInfo,
+ EEntiteMaillage theEntity,
EGeometrieElement theGeom,
- TErr* theErr)
+ TErr* theErr)
{
SetNames(theInfo, eLECTURE_ECRITURE, theEntity, theGeom, theErr);
}
//----------------------------------------------------------------------------
void
TWrapper
- ::SetNames(const TElemInfo& theInfo,
- EModeAcces theMode,
- EEntiteMaillage theEntity,
+ ::SetNames(const TElemInfo& theInfo,
+ EModeAcces theMode,
+ EEntiteMaillage theEntity,
EGeometrieElement theGeom,
- TErr* theErr)
+ TErr* theErr)
{
- TFileWrapper aFileWrapper(myFile, theMode, theErr);
+ TFileWrapper aFileWrapper(myFile, theMode, theErr, myMinor);
if (theErr && *theErr < 0)
return;
MED_NO_DT,
MED_NO_IT,
anEntity,
- aGeom,
+ aGeom,
(TInt)anInfo.myElemNames->size(),
&anElemNames);
if (theErr)
//----------------------------------------------------------------------------
void
TWrapper
- ::GetNumeration(TElemInfo& theInfo,
- TInt theNb,
- EEntiteMaillage theEntity,
+ ::GetNumeration(TElemInfo& theInfo,
+ TInt /*theNb*/,
+ EEntiteMaillage theEntity,
EGeometrieElement theGeom,
- TErr* theErr)
+ TErr* theErr)
{
- TFileWrapper aFileWrapper(myFile, eLECTURE, theErr);
+ TFileWrapper aFileWrapper(myFile, eLECTURE, theErr, myMinor);
if (theErr && *theErr < 0)
return;
//----------------------------------------------------------------------------
void
TWrapper
- ::SetNumeration(const TElemInfo& theInfo,
- EEntiteMaillage theEntity,
+ ::SetNumeration(const TElemInfo& theInfo,
+ EEntiteMaillage theEntity,
EGeometrieElement theGeom,
- TErr* theErr)
+ TErr* theErr)
{
SetNumeration(theInfo, eLECTURE_ECRITURE, theEntity, theGeom, theErr);
}
//----------------------------------------------------------------------------
void
TWrapper
- ::SetNumeration(const TElemInfo& theInfo,
- EModeAcces theMode,
- EEntiteMaillage theEntity,
+ ::SetNumeration(const TElemInfo& theInfo,
+ EModeAcces theMode,
+ EEntiteMaillage theEntity,
EGeometrieElement theGeom,
- TErr* theErr)
+ TErr* theErr)
{
- TFileWrapper aFileWrapper(myFile, theMode, theErr);
+ TFileWrapper aFileWrapper(myFile, theMode, theErr, myMinor);
if (theErr && *theErr < 0)
return;
//----------------------------------------------------------------------------
void
TWrapper
- ::GetFamilies(TElemInfo& theInfo,
- TInt theNb,
- EEntiteMaillage theEntity,
+ ::GetFamilies(TElemInfo& theInfo,
+ TInt /*theNb*/,
+ EEntiteMaillage theEntity,
EGeometrieElement theGeom,
- TErr* theErr)
+ TErr* theErr)
{
- TFileWrapper aFileWrapper(myFile, eLECTURE, theErr);
+ TFileWrapper aFileWrapper(myFile, eLECTURE, theErr, myMinor);
if (theErr && *theErr < 0)
return;
//----------------------------------------------------------------------------
void
TWrapper
- ::SetFamilies(const TElemInfo& theInfo,
- EEntiteMaillage theEntity,
+ ::SetFamilies(const TElemInfo& theInfo,
+ EEntiteMaillage theEntity,
EGeometrieElement theGeom,
- TErr* theErr)
+ TErr* theErr)
{
SetFamilies(theInfo, eLECTURE_ECRITURE, theEntity, theGeom, theErr);
}
//----------------------------------------------------------------------------
void
TWrapper
- ::SetFamilies(const TElemInfo& theInfo,
- EModeAcces theMode,
- EEntiteMaillage theEntity,
+ ::SetFamilies(const TElemInfo& theInfo,
+ EModeAcces theMode,
+ EEntiteMaillage theEntity,
EGeometrieElement theGeom,
- TErr* theErr)
+ TErr* theErr)
{
- TFileWrapper aFileWrapper(myFile, theMode, theErr);
+ TFileWrapper aFileWrapper(myFile, theMode, theErr, myMinor);
if (theErr && *theErr < 0)
return;
TInt
TWrapper
::GetNbNodes(const MED::TMeshInfo& theMeshInfo,
- TErr* theErr)
+ TErr* theErr)
{
return GetNbNodes(theMeshInfo, eCOOR, theErr);
}
ETable theTable,
TErr* theErr)
{
- TFileWrapper aFileWrapper(myFile, eLECTURE, theErr);
+ TFileWrapper aFileWrapper(myFile, eLECTURE, theErr, myMinor);
if (theErr && *theErr < 0)
return -1;
::GetNodeInfo(MED::TNodeInfo& theInfo,
TErr* theErr)
{
- TFileWrapper aFileWrapper(myFile, eLECTURE, theErr);
+ TFileWrapper aFileWrapper(myFile, eLECTURE, theErr, myMinor);
if (theErr && *theErr < 0)
return;
EModeAcces theMode,
TErr* theErr)
{
- TFileWrapper aFileWrapper(myFile, theMode, theErr);
+ TFileWrapper aFileWrapper(myFile, theMode, theErr, myMinor);
if (theErr && *theErr < 0)
return;
PNodeInfo anInfo = CrNodeInfo(theMeshInfo, aNbElems);
GetNodeInfo(*anInfo, theErr);
-#ifdef _DEBUG_
- TInt aDim = theMeshInfo->myDim;
- TInt aNbElem = anInfo->GetNbElem();
- INITMSG(MYDEBUG, "GetPNodeInfo: ");
+ if (SALOME::VerbosityActivated())
{
- INITMSG(MYDEBUG, "aCoords: "<<aNbElem<<": ");
- TNodeCoord& aCoord = anInfo->myCoord;
- for (TInt iElem = 0; iElem < aNbElem; iElem++) {
- for (TInt iDim = 0, anId = iElem*aDim; iDim < aDim; iDim++, anId++) {
- ADDMSG(MYVALUEDEBUG, aCoord[anId]<<",");
+ TInt aDim = theMeshInfo->myDim;
+ TInt aNbElem = anInfo->GetNbElem();
+ INITMSG("GetPNodeInfo: ");
+ {
+ INITMSG("aCoords: "<<aNbElem<<": ");
+ TNodeCoord& aCoord = anInfo->myCoord;
+ for (TInt iElem = 0; iElem < aNbElem; iElem++) {
+ for (TInt iDim = 0, anId = iElem*aDim; iDim < aDim; iDim++, anId++) {
+ ADDMSG(aCoord[anId]<<",");
+ }
+ ADDMSG(" ");
}
- ADDMSG(MYVALUEDEBUG, " ");
- }
- ADDMSG(MYDEBUG, std::endl);
+ ADDMSG(std::endl);
- BEGMSG(MYVALUEDEBUG, "GetFamNum: ");
- for (TInt iElem = 0; iElem < aNbElem; iElem++) {
- ADDMSG(MYVALUEDEBUG, anInfo->GetFamNum(iElem)<<", ");
- }
- ADDMSG(MYVALUEDEBUG, std::endl);
-
- if (anInfo->IsElemNum()) {
- BEGMSG(MYVALUEDEBUG, "GetElemNum: ");
+ BEGMSG("GetFamNum: ");
for (TInt iElem = 0; iElem < aNbElem; iElem++) {
- ADDMSG(MYVALUEDEBUG, anInfo->GetElemNum(iElem)<<", ");
+ ADDMSG(anInfo->GetFamNum(iElem)<<", ");
+ }
+ ADDMSG(std::endl);
+
+ if (anInfo->IsElemNum()) {
+ BEGMSG("GetElemNum: ");
+ for (TInt iElem = 0; iElem < aNbElem; iElem++) {
+ ADDMSG(anInfo->GetElemNum(iElem)<<", ");
+ }
+ ADDMSG(std::endl);
}
- ADDMSG(MYVALUEDEBUG, std::endl);
}
+ ADDMSG(std::endl);
}
- ADDMSG(MYDEBUG, std::endl);
-#endif
return anInfo;
}
EConnectivite theConnMode,
TErr* theErr)
{
- TFileWrapper aFileWrapper(myFile, eLECTURE, theErr);
+ TFileWrapper aFileWrapper(myFile, eLECTURE, theErr, myMinor);
if (theErr && *theErr < 0)
return 0;
::GetPolygoneInfo(MED::TPolygoneInfo& theInfo,
TErr* theErr)
{
- TFileWrapper aFileWrapper(myFile, eLECTURE, theErr);
+ TFileWrapper aFileWrapper(myFile, eLECTURE, theErr, myMinor);
if (theErr && *theErr < 0)
return;
EModeAcces theMode,
TErr* theErr)
{
- TFileWrapper aFileWrapper(myFile, theMode, theErr);
+ TFileWrapper aFileWrapper(myFile, theMode, theErr, myMinor);
if (theErr && *theErr < 0)
return;
PPolygoneInfo anInfo = CrPolygoneInfo(theMeshInfo, theEntity, theGeom, aNbElem, aConnSize, theConnMode);
GetPolygoneInfo(anInfo);
-#ifdef _DEBUG_
- INITMSG(MYDEBUG, "GetPPolygoneInfo"<<
- " - theGeom = "<<theGeom<<
- "; aNbElem = "<<aNbElem<<": ");
- for (TInt iElem = 1; iElem < aNbElem; iElem++) {
- TCConnSlice aConnSlice = anInfo->GetConnSlice(iElem);
- TInt aConnDim = aConnSlice.size();
- for (TInt iConn = 0; iConn < aConnDim; iConn++) {
- ADDMSG(MYVALUEDEBUG, aConnSlice[iConn]<<",");
+ if (SALOME::VerbosityActivated())
+ {
+ INITMSG("GetPPolygoneInfo"<<
+ " - theGeom = "<<theGeom<<
+ "; aNbElem = "<<aNbElem<<": ");
+ for (TInt iElem = 1; iElem < aNbElem; iElem++) {
+ TCConnSlice aConnSlice = anInfo->GetConnSlice(iElem);
+ TInt aConnDim = aConnSlice.size();
+ for (TInt iConn = 0; iConn < aConnDim; iConn++) {
+ ADDMSG(aConnSlice[iConn]<<",");
+ }
+ ADDMSG(" ");
}
- ADDMSG(MYDEBUG, " ");
+ ADDMSG(std::endl);
}
- ADDMSG(MYDEBUG, std::endl);
-#endif
return anInfo;
}
EConnectivite theConnMode,
TErr* theErr)
{
- TFileWrapper aFileWrapper(myFile, eLECTURE, theErr);
+ TFileWrapper aFileWrapper(myFile, eLECTURE, theErr, myMinor);
if (theErr && *theErr < 0)
EXCEPTION(std::runtime_error, "GetPolyedreConnSize - (...)");
::GetPolyedreInfo(TPolyedreInfo& theInfo,
TErr* theErr)
{
- TFileWrapper aFileWrapper(myFile, eLECTURE, theErr);
+ TFileWrapper aFileWrapper(myFile, eLECTURE, theErr, myMinor);
if (theErr && *theErr < 0)
return;
EModeAcces theMode,
TErr* theErr)
{
- TFileWrapper aFileWrapper(myFile, theMode, theErr);
+ TFileWrapper aFileWrapper(myFile, theMode, theErr, myMinor);
if (theErr && *theErr < 0)
return;
PPolyedreInfo anInfo = CrPolyedreInfo(theMeshInfo, theEntity, theGeom, aNbElem, aNbFaces, aConnSize, theConnMode);
GetPolyedreInfo(anInfo);
-#ifdef _DEBUG_
- INITMSG(MYDEBUG, "GetPPolyedreInfo"<<
- " - theGeom = "<<theGeom<<
- "; aNbElem = "<<aNbElem<<": ");
- for (TInt iElem = 0; iElem < aNbElem; iElem++) {
- TCConnSliceArr aConnSliceArr = anInfo->GetConnSliceArr(iElem);
- TInt aNbFaces = aConnSliceArr.size();
- ADDMSG(MYDEBUG, "{");
- for (TInt iFace = 0; iFace < aNbFaces; iFace++) {
- TCConnSlice aConnSlice = aConnSliceArr[iFace];
- TInt aNbConn = aConnSlice.size();
- ADDMSG(MYDEBUG, "[");
- for (TInt iConn = 0; iConn < aNbConn; iConn++) {
- ADDMSG(MYVALUEDEBUG, aConnSlice[iConn]<<",");
+ if (SALOME::VerbosityActivated())
+ {
+ INITMSG("GetPPolyedreInfo"<<
+ " - theGeom = "<<theGeom<<
+ "; aNbElem = "<<aNbElem<<": ");
+ for (TInt iElem = 0; iElem < aNbElem; iElem++) {
+ TCConnSliceArr aConnSliceArr = anInfo->GetConnSliceArr(iElem);
+ TInt aNbFaces = aConnSliceArr.size();
+ ADDMSG("{");
+ for (TInt iFace = 0; iFace < aNbFaces; iFace++) {
+ TCConnSlice aConnSlice = aConnSliceArr[iFace];
+ TInt aNbConn = aConnSlice.size();
+ ADDMSG("[");
+ for (TInt iConn = 0; iConn < aNbConn; iConn++) {
+ ADDMSG(aConnSlice[iConn]<<",");
+ }
+ ADDMSG("] ");
}
- ADDMSG(MYDEBUG, "] ");
+ ADDMSG("} ");
}
- ADDMSG(MYDEBUG, "} ");
+ ADDMSG(std::endl);
}
- ADDMSG(MYDEBUG, std::endl);
-#endif
return anInfo;
}
{
TEntityInfo anInfo;
- TFileWrapper aFileWrapper(myFile, eLECTURE, theErr);
+ TFileWrapper aFileWrapper(myFile, eLECTURE, theErr, myMinor);
if (theErr && *theErr < 0)
return anInfo;
EConnectivite theConnMode,
TErr* theErr)
{
- TFileWrapper aFileWrapper(myFile, eLECTURE, theErr);
+ TFileWrapper aFileWrapper(myFile, eLECTURE, theErr, myMinor);
if (theErr && *theErr < 0)
return -1;
::GetCellInfo(MED::TCellInfo& theInfo,
TErr* theErr)
{
- TFileWrapper aFileWrapper(myFile, eLECTURE, theErr);
+ TFileWrapper aFileWrapper(myFile, eLECTURE, theErr, myMinor);
if (theErr && *theErr < 0)
return;
TValueHolder<EConnectivite, med_connectivity_mode> aConnMode (theInfo.myConnMode);
TErr aRet;
+ med_bool dummy;
+ aRet = MEDmeshnEntity(myFile->Id(),
+ &aMeshName,
+ MED_NO_DT,
+ MED_NO_IT,
+ anEntity,
+ aGeom,
+ MED_NAME,
+ aConnMode,
+ &dummy, &dummy);
+ if ( aRet > 0 )
+ {
+ // names are present in the file, they will be read in spite of theInfo.myIsElemNames
+ theInfo.myIsElemNames = eVRAI;
+ theInfo.myElemNames.reset( new TString( theInfo.myNbElem * GetPNOMLength() + 1 ));
+ anElemNames.myRepresentation = & ((TString&) theInfo.myElemNames )[0];
+ }
+
aRet = MEDmeshElementRd(myFile->Id(),
&aMeshName,
MED_NO_DT,
EXCEPTION(std::runtime_error, "GetCellInfo - MEDmeshElementRd(...)");
if (anIsFamNum == MED_FALSE)
- {
- int mySize = (int) theInfo.myFamNum->size();
- theInfo.myFamNum->clear();
- theInfo.myFamNum->resize(mySize, 0);
- }
+ {
+ int mySize = (int) theInfo.myFamNum->size();
+ theInfo.myFamNum->clear();
+ theInfo.myFamNum->resize(mySize, 0);
+ }
}
EModeAcces theMode,
TErr* theErr)
{
- TFileWrapper aFileWrapper(myFile, theMode, theErr);
+ TFileWrapper aFileWrapper(myFile, theMode, theErr, myMinor);
if (theErr && *theErr < 0)
return;
if (theErr)
*theErr = aRet;
else if (aRet < 0)
- EXCEPTION(std::runtime_error, "SetCellInfo - MEDmeshElementWr(...)");
+ EXCEPTION(std::runtime_error, "SetCellInfo - MEDmeshElementWr(...), ret="<< aRet);
}
//----------------------------------------------------------------------------
PCellInfo
TWrapper
- ::CrCellInfo(const PMeshInfo& theMeshInfo,
- EEntiteMaillage theEntity,
+ ::CrCellInfo(const PMeshInfo& theMeshInfo,
+ EEntiteMaillage theEntity,
EGeometrieElement theGeom,
- TInt theNbElem,
- EConnectivite theConnMode,
- EBooleen theIsElemNum,
- EBooleen theIsElemNames,
- EModeSwitch theMode)
+ TInt theNbElem,
+ EConnectivite theConnMode,
+ EBooleen theIsElemNum,
+ EBooleen theIsElemNames,
+ EModeSwitch theMode)
{
return PCellInfo(new TTCellInfo
(theMeshInfo,
PCellInfo anInfo = CrCellInfo(theMeshInfo, theEntity, theGeom, aNbElem, theConnMode);
GetCellInfo(anInfo, theErr);
-#ifdef _DEBUG_
- TInt aConnDim = anInfo->GetConnDim();
- INITMSG(MYDEBUG, "GetPCellInfo - theEntity = "<<theEntity<<"; theGeom = "<<theGeom<<"; aConnDim: "<<aConnDim<<"\n");
- BEGMSG(MYDEBUG, "GetPCellInfo - aNbElem: "<<aNbElem<<": ");
- for (TInt iElem = 0; iElem < aNbElem; iElem++) {
- TCConnSlice aConnSlice = anInfo->GetConnSlice(iElem);
- for (TInt iConn = 0; iConn < aConnDim; iConn++) {
- ADDMSG(MYVALUEDEBUG, aConnSlice[iConn]<<",");
+ if (SALOME::VerbosityActivated())
+ {
+ TInt aConnDim = anInfo->GetConnDim();
+ INITMSG("GetPCellInfo - theEntity = "<<theEntity<<"; theGeom = "<<theGeom<<"; aConnDim: "<<aConnDim<<"\n");
+ BEGMSG("GetPCellInfo - aNbElem: "<<aNbElem<<": ");
+ for (TInt iElem = 0; iElem < aNbElem; iElem++) {
+ TCConnSlice aConnSlice = anInfo->GetConnSlice(iElem);
+ for (TInt iConn = 0; iConn < aConnDim; iConn++) {
+ ADDMSG(aConnSlice[iConn]<<",");
+ }
+ ADDMSG(" ");
}
- ADDMSG(MYVALUEDEBUG, " ");
- }
- ADDMSG(MYDEBUG, std::endl);
-
- BEGMSG(MYVALUEDEBUG, "GetPCellInfo - GetFamNum: ");
- for (TInt iElem = 0; iElem < aNbElem; iElem++) {
- ADDMSG(MYVALUEDEBUG, anInfo->GetFamNum(iElem)<<", ");
- }
- ADDMSG(MYVALUEDEBUG, std::endl);
+ ADDMSG(std::endl);
- if (anInfo->IsElemNum()) {
- BEGMSG(MYVALUEDEBUG, "GetPCellInfo - GetElemNum: ");
+ BEGMSG("GetPCellInfo - GetFamNum: ");
for (TInt iElem = 0; iElem < aNbElem; iElem++) {
- ADDMSG(MYVALUEDEBUG, anInfo->GetElemNum(iElem)<<", ");
+ ADDMSG(anInfo->GetFamNum(iElem)<<", ");
+ }
+ ADDMSG(std::endl);
+
+ if (anInfo->IsElemNum()) {
+ BEGMSG("GetPCellInfo - GetElemNum: ");
+ for (TInt iElem = 0; iElem < aNbElem; iElem++) {
+ ADDMSG(anInfo->GetElemNum(iElem)<<", ");
+ }
+ ADDMSG(std::endl);
}
- ADDMSG(MYVALUEDEBUG, std::endl);
+ ADDMSG(std::endl);
}
- ADDMSG(MYDEBUG, std::endl);
-#endif
return anInfo;
}
//----------------------------------------------------------------------------
EGeometrieElement
TWrapper
- ::GetBallGeom(const TMeshInfo& theMeshInfo)
+ ::GetBallGeom(const TMeshInfo& /*theMeshInfo*/)
{
- TFileWrapper aFileWrapper(myFile, eLECTURE);
+ TErr anError;
+ TFileWrapper aFileWrapper(myFile, eLECTURE, &anError, myMinor);
// read med_geometry_type of "MED_BALL" element
char geotypename[ MED_NAME_SIZE + 1] = MED_BALL_NAME;
TWrapper
::GetNbBalls(const TMeshInfo& theMeshInfo)
{
- TFileWrapper aFileWrapper(myFile, eLECTURE);
+ TErr anError;
+ TFileWrapper aFileWrapper(myFile, eLECTURE, &anError, myMinor);
EGeometrieElement ballType = GetBallGeom(theMeshInfo);
if (ballType < 0)
::GetBallInfo(TBallInfo& theInfo,
TErr* theErr)
{
- TFileWrapper aFileWrapper(myFile, eLECTURE, theErr);
+ TFileWrapper aFileWrapper(myFile, eLECTURE, theErr, myMinor);
// check geometry of MED_BALL
if (theInfo.myGeom == eBALL)
EModeAcces theMode,
TErr* theErr)
{
- TFileWrapper aFileWrapper(myFile, theMode, theErr);
+ TFileWrapper aFileWrapper(myFile, theMode, theErr, myMinor);
TErr ret;
char ballsupportname[MED_NAME_SIZE+1] = "BALL_SUPPORT_MESH";
// write node ids
SetCellInfo(theInfo, theMode, theErr);
- if (theErr && theErr < 0)
+ if (theErr && *theErr < 0)
return;
// write diameter
TWrapper
::GetNbFields(TErr* theErr)
{
- TFileWrapper aFileWrapper(myFile, eLECTURE, theErr);
+ TFileWrapper aFileWrapper(myFile, eLECTURE, theErr, myMinor);
if (theErr && *theErr < 0)
return -1;
::GetNbComp(TInt theFieldId,
TErr* theErr)
{
- TFileWrapper aFileWrapper(myFile, eLECTURE, theErr);
+ TFileWrapper aFileWrapper(myFile, eLECTURE, theErr, myMinor);
if (theErr && *theErr < 0)
return -1;
MED::TFieldInfo& theInfo,
TErr* theErr)
{
- TFileWrapper aFileWrapper(myFile, eLECTURE, theErr);
+ TFileWrapper aFileWrapper(myFile, eLECTURE, theErr, myMinor);
if (theErr && *theErr < 0)
return;
EModeAcces theMode,
TErr* theErr)
{
- TFileWrapper aFileWrapper(myFile, theMode, theErr);
+ TFileWrapper aFileWrapper(myFile, theMode, theErr, myMinor);
if (theErr && *theErr < 0)
return;
PFieldInfo anInfo = CrFieldInfo(theMeshInfo, aNbComp);
GetFieldInfo(theId, *anInfo, theErr);
-#ifdef _DEBUG_
- INITMSG(MYDEBUG,
- "GetPFieldInfo "<<
- "- aName = '"<<anInfo->GetName()<<"'"<<
- "; aType = "<<anInfo->GetType()<<
- "; aNbComp = "<<aNbComp<<
- std::endl);
-#endif
+ if (SALOME::VerbosityActivated())
+ {
+ INITMSG("GetPFieldInfo "<<
+
"- aName = '"<<anInfo->GetName()<<"'"<<
+
"; aType = "<<anInfo->GetType()<<
+
"; aNbComp = "<<aNbComp<<
+ std::endl);
+ }
return anInfo;
}
TWrapper
::GetNbGauss(TErr* theErr)
{
- TFileWrapper aFileWrapper(myFile, eLECTURE, theErr);
+ TFileWrapper aFileWrapper(myFile, eLECTURE, theErr, myMinor);
if (theErr && *theErr < 0)
return -1;
::GetGaussPreInfo(TInt theId,
TErr* theErr)
{
- TFileWrapper aFileWrapper(myFile, eLECTURE, theErr);
+ TFileWrapper aFileWrapper(myFile, eLECTURE, theErr, myMinor);
if (theErr && *theErr < 0)
return TGaussInfo::TInfo(TGaussInfo::TKey(ePOINT1, ""), 0);
//----------------------------------------------------------------------------
void
TWrapper
- ::GetGaussInfo(TInt theId,
+ ::GetGaussInfo(TInt /*theId*/,
TGaussInfo& theInfo,
TErr* theErr)
{
- TFileWrapper aFileWrapper(myFile, eLECTURE, theErr);
+ TFileWrapper aFileWrapper(myFile, eLECTURE, theErr, myMinor);
if (theErr && *theErr < 0)
return;
TErr* theErr)
{
theEntity = EEntiteMaillage(-1);
- TFileWrapper aFileWrapper(myFile, eLECTURE, theErr);
+ TFileWrapper aFileWrapper(myFile, eLECTURE, theErr, myMinor);
if (theErr) {
if (theEntityInfo.empty())
}
bool anIsSatisfied =(nval > 0);
if (anIsSatisfied) {
- INITMSG(MYDEBUG,
- "GetNbTimeStamps aNbTimeStamps = "<<aNbStamps<<
+ INITMSG("GetNbTimeStamps aNbTimeStamps = "<<aNbStamps<<
"; aGeom = "<<aGeom<<"; anEntity = "<<anEntity<<"\n");
if (anIsPerformAdditionalCheck) {
anIsSatisfied = !strcmp(&aMeshName[0], &aMeshInfo.myName[0]);
if (!anIsSatisfied) {
- INITMSG(MYDEBUG,
- "GetNbTimeStamps aMeshName = '"<<&aMeshName[0]<<"' != "<<
+ INITMSG("GetNbTimeStamps aMeshName = '"<<&aMeshName[0]<<"' != "<<
"; aMeshInfo.myName = '"<<&aMeshInfo.myName[0]<<"'\n");
}
}
MED::TTimeStampInfo& theInfo,
TErr* theErr)
{
- TFileWrapper aFileWrapper(myFile, eLECTURE, theErr);
+ TFileWrapper aFileWrapper(myFile, eLECTURE, theErr, myMinor);
const TGeom2Size& aGeom2Size = theInfo.myGeom2Size;
PTimeStampInfo anInfo = CrTimeStampInfo(theFieldInfo, theEntity, theGeom2Size);
GetTimeStampInfo(theId, *anInfo, theErr);
-#ifdef _DEBUG_
- INITMSG(MYDEBUG, "GetPTimeStampInfo - anEntity = "<<anInfo->GetEntity()<<"\n");
- TGeom2NbGauss& aGeom2NbGauss = anInfo->myGeom2NbGauss;
- TGeom2NbGauss::const_iterator anIter = aGeom2NbGauss.begin();
- for (; anIter != aGeom2NbGauss.end(); anIter++) {
- const EGeometrieElement& aGeom = anIter->first;
- INITMSG(MYDEBUG, "aGeom = "<<aGeom<<" - "<<aGeom2NbGauss[aGeom]<<";\n");
+ if (SALOME::VerbosityActivated())
+ {
+ INITMSG("GetPTimeStampInfo - anEntity = "<<anInfo->GetEntity()<<"\n");
+ TGeom2NbGauss& aGeom2NbGauss = anInfo->myGeom2NbGauss;
+ TGeom2NbGauss::const_iterator anIter = aGeom2NbGauss.begin();
+ for (; anIter != aGeom2NbGauss.end(); anIter++) {
+ const EGeometrieElement& aGeom = anIter->first;
+ INITMSG("aGeom = "<<aGeom<<" - "<<aGeom2NbGauss[aGeom]<<";\n");
+ }
}
-#endif
return anInfo;
}
TWrapper
::GetNbProfiles(TErr* theErr)
{
- TFileWrapper aFileWrapper(myFile, eLECTURE, theErr);
+ TFileWrapper aFileWrapper(myFile, eLECTURE, theErr, myMinor);
if (theErr && *theErr < 0)
return -1;
::GetProfilePreInfo(TInt theId,
TErr* theErr)
{
- TFileWrapper aFileWrapper(myFile, eLECTURE, theErr);
+ TFileWrapper aFileWrapper(myFile, eLECTURE, theErr, myMinor);
if (theErr && *theErr < 0)
return TProfileInfo::TInfo();
//----------------------------------------------------------------------------
void
TWrapper
- ::GetProfileInfo(TInt theId,
+ ::GetProfileInfo(TInt /*theId*/,
TProfileInfo& theInfo,
TErr* theErr)
{
- TFileWrapper aFileWrapper(myFile, eLECTURE, theErr);
+ TFileWrapper aFileWrapper(myFile, eLECTURE, theErr, myMinor);
if (theErr && *theErr < 0)
return;
EModeAcces theMode,
TErr* theErr)
{
- TFileWrapper aFileWrapper(myFile, theMode, theErr);
+ TFileWrapper aFileWrapper(myFile, theMode, theErr, myMinor);
if (theErr && *theErr < 0)
return;
const TKey2Gauss& theKey2Gauss,
TErr* theErr)
{
- TFileWrapper aFileWrapper(myFile, eLECTURE, theErr);
+ TFileWrapper aFileWrapper(myFile, eLECTURE, theErr, myMinor);
if (theErr && *theErr < 0)
return;
aNbComp);
TInt aValueSize = theTimeStampValue->GetValueSize(aGeom);
- INITMSG(MYDEBUG,
- "TWrapper::GetTimeStampValue - aGeom = "<<aGeom<<
+ INITMSG("TWrapper::GetTimeStampValue - aGeom = "<<aGeom<<
"; aNbVal = "<<aNbVal<<
"; aNbValue = "<<aNbValue<<
"; aNbGauss = "<<aNbGauss<<
EModeAcces theMode,
TErr* theErr)
{
- TFileWrapper aFileWrapper(myFile, theMode, theErr);
+ TFileWrapper aFileWrapper(myFile, theMode, theErr, myMinor);
if (theErr && *theErr < 0)
return;
}
- INITMSG(
MYDEBUG, "TWrapper::SetTimeStampValue - MED_MODE_ACCES = "<<theMode<<"; aRet = "<<aRet<<std::endl);
+ INITMSG("TWrapper::SetTimeStampValue - MED_MODE_ACCES = "<<theMode<<"; aRet = "<<aRet<<std::endl);
}
//----------------------------------------------------------------------------
theMKey2Profile,
theKey2Gauss,
theErr);
-#ifdef _DEBUG_
- if (aFieldInfo->GetType() == eFLOAT64)
- Print<TFloatTimeStampValue>(anInfo);
- else
- Print<TIntTimeStampValue>(anInfo);
-#endif
+ if (SALOME::VerbosityActivated())
+ {
+ if (aFieldInfo->GetType() == eFLOAT64)
+ Print<TFloatTimeStampValue>(anInfo);
+ else
+ Print<TIntTimeStampValue>(anInfo);
+ }
return anInfo;
}
GetGrilleInfo(anInfo);
anInfo->SetGrilleType(type);
-#ifdef _DEBUG_
- INITMSG(MYDEBUG, "GetPGrilleInfo: ");
+ if (SALOME::VerbosityActivated())
{
+ INITMSG("GetPGrilleInfo: ");
+
TInt aNbElem = anInfo->GetNbNodes();
- BEGMSG(MYVALUEDEBUG, "GetFamNumNode: ");
+ BEGMSG("GetFamNumNode: ");
for (TInt iElem = 0; iElem < aNbElem; iElem++) {
- ADDMSG(MYVALUEDEBUG, anInfo->GetFamNumNode(iElem)<<", ");
+ ADDMSG(anInfo->GetFamNumNode(iElem)<<", ");
}
TInt aNbCells = anInfo->GetNbCells();
- BEGMSG(MYVALUEDEBUG, "GetFamNum: ");
+ BEGMSG("GetFamNum: ");
for (TInt iElem = 0; iElem < aNbCells; iElem++) {
- ADDMSG(MYVALUEDEBUG, anInfo->GetFamNum(iElem)<<", ");
+ ADDMSG(anInfo->GetFamNum(iElem)<<", ");
}
- ADDMSG(MYVALUEDEBUG, std::endl);
- BEGMSG(MYVALUEDEBUG, "GetCoordName: ");
+ ADDMSG(std::endl);
+ BEGMSG("GetCoordName: ");
for (TInt iElem = 0; iElem < theMeshInfo->GetDim(); iElem++) {
- ADDMSG(MYVALUEDEBUG, anInfo->GetCoordName(iElem)<<", ");
+ ADDMSG(anInfo->GetCoordName(iElem)<<", ");
}
- ADDMSG(MYVALUEDEBUG, std::endl);
- BEGMSG(MYVALUEDEBUG, "GetCoordUnit: ");
+ ADDMSG(std::endl);
+ BEGMSG("GetCoordUnit: ");
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;
}
::GetGrilleInfo(TGrilleInfo& theInfo,
TErr* theErr)
{
- TFileWrapper aFileWrapper(myFile, eLECTURE, theErr);
+ TFileWrapper aFileWrapper(myFile, eLECTURE, theErr, myMinor);
if (theErr && *theErr < 0)
return;
{
if (theInfo.myMeshInfo->myType != eSTRUCTURE)
return;
- TFileWrapper aFileWrapper(myFile, theMode, theErr);
+ TFileWrapper aFileWrapper(myFile, theMode, theErr, myMinor);
if (theErr && *theErr < 0)
return;
//----------------------------------------------------------------------------
PGrilleInfo
TWrapper
- ::CrGrilleInfo(const PMeshInfo& theMeshInfo)
+ ::CrGrilleInfo(const PMeshInfo& /*theMeshInfo*/)
{
return PGrilleInfo(); // not implemented????
}
EGrilleType& theGridType,
TErr* theErr)
{
- TFileWrapper aFileWrapper(myFile, eLECTURE, theErr);
+ TFileWrapper aFileWrapper(myFile, eLECTURE, theErr, myMinor);
if (theErr && *theErr < 0)
EXCEPTION(std::runtime_error, " GetGrilleType - aFileWrapper (...)");
TIntVector& theStruct,
TErr* theErr)
{
- TFileWrapper aFileWrapper(myFile, eLECTURE, theErr);
+ TFileWrapper aFileWrapper(myFile, eLECTURE, theErr, myMinor);
if (theErr && *theErr < 0)
return;
