-// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2011 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
//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
// SMESH DriverMED : driver to read and write 'med' files
#include <sstream>
#include "DriverMED_W_SMESHDS_Mesh.h"
-#include "DriverMED_W_SMDS_Mesh.h"
#include "DriverMED_Family.h"
#include "SMESHDS_Mesh.hxx"
return name.str();
}
-void DriverMED_W_SMESHDS_Mesh::SetMeshName(const std::string& theMeshName)
-{
- myMeshName = theMeshName;
-}
-
void DriverMED_W_SMESHDS_Mesh::AddGroup(SMESHDS_GroupBase* theGroup)
{
myGroups.push_back(theGroup);
};
typedef boost::shared_ptr<TCoordHelper> TCoordHelperPtr;
-
- //-------------------------------------------------------
- /*!
- * \brief Class helping to use either SMDS_0DElementIterator,
- * SMDS_EdgeIterator, SMDS_FaceIterator or SMDS_VolumeIterator
- * in the same code
- */
- //-------------------------------------------------------
- struct TElemIterator
- {
- virtual const SMDS_MeshElement* next() = 0;
- virtual ~TElemIterator() {}
- };
- typedef boost::shared_ptr<TElemIterator> PElemIterator;
-
- template< class SMDSIteratorPtr > class TypedElemIterator: public TElemIterator
- {
- SMDSIteratorPtr myItPtr;
- public:
- TypedElemIterator(SMDSIteratorPtr it): myItPtr(it) {}
- virtual const SMDS_MeshElement* next() {
- if ( myItPtr->more() ) return myItPtr->next();
- else return 0;
- }
- };
- typedef TypedElemIterator< SMDS_0DElementIteratorPtr > T0DElementIterator;
- typedef TypedElemIterator< SMDS_EdgeIteratorPtr > TEdgeIterator;
- typedef TypedElemIterator< SMDS_FaceIteratorPtr > TFaceIterator;
- typedef TypedElemIterator< SMDS_VolumeIteratorPtr > TVolumeIterator;
-
//-------------------------------------------------------
/*!
* \brief Structure describing element type
typedef NCollection_DataMap< Standard_Address, int > TElemFamilyMap;
- //typedef map<const SMDS_MeshElement *, int> TElemFamilyMap;
//================================================================================
/*!
}
// Mesh dimension definition
- TInt aMeshDimension;
+ TInt aSpaceDimension;
TCoordHelperPtr aCoordHelperPtr;
{
bool anIsXDimension = false;
anIsXDimension = (aBounds[1] - aBounds[0]) + abs(aBounds[1]) + abs(aBounds[0]) > EPS;
anIsYDimension = (aBounds[3] - aBounds[2]) + abs(aBounds[3]) + abs(aBounds[2]) > EPS;
anIsZDimension = (aBounds[5] - aBounds[4]) + abs(aBounds[5]) + abs(aBounds[4]) > EPS;
- aMeshDimension = anIsXDimension + anIsYDimension + anIsZDimension;
- if(!aMeshDimension)
- aMeshDimension = 3;
+ aSpaceDimension = anIsXDimension + anIsYDimension + anIsZDimension;
+ if(!aSpaceDimension)
+ aSpaceDimension = 3;
// PAL16857(SMESH not conform to the MED convention):
- if ( aMeshDimension == 2 && anIsZDimension ) // 2D only if mesh is in XOY plane
- aMeshDimension = 3;
+ if ( aSpaceDimension == 2 && anIsZDimension ) // 2D only if mesh is in XOY plane
+ aSpaceDimension = 3;
// PAL18941(a saved study with a mesh belong Z is opened and the mesh is belong X)
- if ( aMeshDimension == 1 && !anIsXDimension ) {// 1D only if mesh is along OX
+ if ( aSpaceDimension == 1 && !anIsXDimension ) {// 1D only if mesh is along OX
if ( anIsYDimension ) {
- aMeshDimension = 2;
+ aSpaceDimension = 2;
anIsXDimension = true;
} else {
- aMeshDimension = 3;
+ aSpaceDimension = 3;
}
}
}
SMDS_NodeIteratorPtr aNodesIter = myMesh->nodesIterator(/*idInceasingOrder=*/true);
- switch(aMeshDimension){
+ switch(aSpaceDimension){
case 3:
aCoordHelperPtr.reset(new TCoordHelper(aNodesIter,aXYZGetCoord,aXYZName));
break;
break;
}
}
-
+ TInt aMeshDimension = 0;
+ if ( myMesh->NbEdges() > 0 )
+ aMeshDimension = 1;
+ if ( myMesh->NbFaces() > 0 )
+ aMeshDimension = 2;
+ if ( myMesh->NbVolumes() > 0 )
+ aMeshDimension = 3;
- PMeshInfo aMeshInfo = myMed->CrMeshInfo(aMeshDimension,aMeshDimension,aMeshName);
+ PMeshInfo aMeshInfo = myMed->CrMeshInfo(aMeshDimension,aSpaceDimension,aMeshName);
MESSAGE("Add - aMeshName : "<<aMeshName<<"; "<<aMeshInfo->GetName());
myMed->SetMeshInfo(aMeshInfo);
{
// coordinates
TCoordSlice aTCoordSlice = aNodeInfo->GetCoordSlice( iNode );
- for(TInt iCoord = 0; iCoord < aMeshDimension; iCoord++){
+ for(TInt iCoord = 0; iCoord < aSpaceDimension; iCoord++){
aTCoordSlice[iCoord] = aCoordHelperPtr->GetCoord(iCoord);
}
// node number
anElemFamMap.Clear();
// coordinate names and units
- for (TInt iCoord = 0; iCoord < aMeshDimension; iCoord++) {
+ for (TInt iCoord = 0; iCoord < aSpaceDimension; iCoord++) {
aNodeInfo->SetCoordName( iCoord, aCoordHelperPtr->GetName(iCoord));
aNodeInfo->SetCoordUnit( iCoord, aCoordHelperPtr->GetUnit(iCoord));
}
nbElemInfo.NbQuadrangles( ORDER_LINEAR ),
SMDSAbs_Face));
aTElemTypeDatas.push_back( TElemTypeData(anEntity,
- eQUAD8,
- nbElemInfo.NbQuadrangles( ORDER_QUADRATIC ),
- SMDSAbs_Face));
+ eQUAD8,
+ nbElemInfo.NbQuadrangles( ORDER_QUADRATIC ) -
+ nbElemInfo.NbBiQuadQuadrangles(),
+ SMDSAbs_Face));
+ aTElemTypeDatas.push_back( TElemTypeData(anEntity,
+ eQUAD9,
+ nbElemInfo.NbBiQuadQuadrangles(),
+ SMDSAbs_Face));
if ( polyTypesSupported ) {
aTElemTypeDatas.push_back( TElemTypeData(anEntity,
ePOLYGONE,
SMDSAbs_Volume));
aTElemTypeDatas.push_back( TElemTypeData(anEntity,
eHEXA20,
- nbElemInfo.NbHexas( ORDER_QUADRATIC ),
+ nbElemInfo.NbHexas( ORDER_QUADRATIC )-
+ nbElemInfo.NbTriQuadHexas(),
+ SMDSAbs_Volume));
+ aTElemTypeDatas.push_back( TElemTypeData(anEntity,
+ eHEXA27,
+ nbElemInfo.NbTriQuadHexas(),
+ SMDSAbs_Volume));
+ aTElemTypeDatas.push_back( TElemTypeData(anEntity,
+ eOCTA12,
+ nbElemInfo.NbHexPrisms(),
SMDSAbs_Volume));
if ( polyTypesSupported ) {
- //MESSAGE("polyTypesSupported");
aTElemTypeDatas.push_back( TElemTypeData(anEntity,
ePOLYEDRE,
nbElemInfo.NbPolyhedrons(),
if ( aElemTypeData->_nbElems == 0 )
continue;
- // iterator on elements of a current type
- PElemIterator elemIterator;
int defaultFamilyId = 0;
switch ( aElemTypeData->_smdsType ) {
case SMDSAbs_0DElement:
- elemIterator = PElemIterator( new T0DElementIterator( myMesh->elements0dIterator() ));
defaultFamilyId = my0DElementsDefaultFamilyId;
break;
case SMDSAbs_Edge:
- elemIterator = PElemIterator( new TEdgeIterator( myMesh->edgesIterator() ));
defaultFamilyId = myEdgesDefaultFamilyId;
break;
case SMDSAbs_Face:
- elemIterator = PElemIterator( new TFaceIterator( myMesh->facesIterator() ));
defaultFamilyId = myFacesDefaultFamilyId;
break;
case SMDSAbs_Volume:
- elemIterator = PElemIterator( new TVolumeIterator( myMesh->volumesIterator() ));
defaultFamilyId = myVolumesDefaultFamilyId;
break;
default:
continue;
}
+
+ // iterator on elements of a current type
+ SMDS_ElemIteratorPtr elemIterator = myMesh->elementsIterator( aElemTypeData->_smdsType );
+ if ( !elemIterator->more()) continue;
int iElem = 0;
- //cout << " Treat type " << aElemTypeData->_geomType << " nb = " <<aElemTypeData->_nbElems<< endl;
// Treat POLYGONs
// ---------------
if ( aElemTypeData->_geomType == ePOLYGONE )
if ( ++iElem == aPolygoneInfo->GetNbElem() )
break;
}
- // if(TInt aNbElems = aPolygoneElemNums.size())
- // // add one element in connectivities,
- // // referenced by the last element in indices
- // aPolygoneConn.push_back(0);
- //cout << " SetPolygoneInfo(aPolygoneInfo)" << endl;
myMed->SetPolygoneInfo(aPolygoneInfo);
}
// ----------------
else if (aElemTypeData->_geomType == ePOLYEDRE )
{
- //MESSAGE("_geomType == ePOLYEDRE");
if ( nbPolyhedronNodes == 0 ) {
// Count nb of nodes
while ( const SMDS_MeshElement* anElem = elemIterator->next() ) {
break;
}
}
- //MESSAGE("nbPolyhedronNodes=" << nbPolyhedronNodes);
- //MESSAGE("nbPolyhedronFaces=" << nbPolyhedronFaces);
- //MESSAGE("_nbElems="<< aElemTypeData->_nbElems);
}
else {
// Store in med file
continue;
if ( !aPolyedre->IsPoly() )
continue;
- //MESSAGE("index[" << iElem << "]=" << index[iElem] << " iElem=" << iElem);
// index
TInt aNbFaces = aPolyedre->NbFaces();
index[ iElem+1 ] = index[ iElem ] + aNbFaces;
- //MESSAGE("index[" << iElem+1 << "]=" << index[iElem+1] << " iElem=" << iElem);
// face index
for (TInt f = 1; f <= aNbFaces; ++f, ++iFace ) {
int aNbFaceNodes = aPolyedre->NbFaceNodes( f );
faces[ iFace+1 ] = faces[ iFace ] + aNbFaceNodes;
- //MESSAGE("faces[" << iFace+1 << "]=" << faces[iFace+1] << " iFace=" << iFace);
}
// connectivity
SMDS_ElemIteratorPtr nodeIt = anElem->nodesIterator();
const SMDS_MeshElement* aNode = nodeIt->next();
#ifdef _EDF_NODE_IDS_
conn[ iNode ] = aNodeIdMap[aNode->GetID()];
- //MESSAGE("conn["<< iNode << "]=" << conn[iNode] << " aNode->GetID()=" << aNode->GetID());
#else
conn[ iNode ] = aNode->GetID();
- //MESSAGE("conn["<< iNode << "]=" << conn[iNode]);
#endif
++iNode;
}
if ( ++iElem == aPolyhInfo->GetNbElem() )
break;
}
- //cout << " SetPolyedreInfo(aPolyhInfo )" << endl;
myMed->SetPolyedreInfo(aPolyhInfo);
}
} // if (aElemTypeData->_geomType == ePOLYEDRE )
break;
}
// store data in a file
- //cout << " SetCellInfo(aCellInfo)" << endl;
myMed->SetCellInfo(aCellInfo);
}