-// Copyright (C) 2007-2013 CEA/DEN, EDF R&D
+// Copyright (C) 2007-2015 CEA/DEN, EDF R&D
//
// 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.
+// version 2.1 of the License, or (at your option) any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
#ifdef WIN32
#include <io.h>
-#endif
-
-#ifndef WIN32
-#define HAS_XDR
+#else
#include <unistd.h>
#endif
#ifdef HAS_XDR
+#include <rpc/types.h>
#include <rpc/xdr.h>
#endif
using namespace SauvUtilities;
-using namespace ParaMEDMEM;
-using namespace std;
+using namespace MEDCoupling;
namespace
{
if ( const int * conn = getGibi2MedQuadraticInterlace( type ))
{
Cell* ma = const_cast<Cell*>(&aCell);
- vector< Node* > new_nodes( ma->_nodes.size() );
- for ( size_t i = 0; i < new_nodes.size(); ++i )
+ std::vector< Node* > new_nodes( ma->_nodes.size() );
+ for (std:: size_t i = 0; i < new_nodes.size(); ++i )
new_nodes[ i ] = ma->_nodes[ conn[ i ]];
ma->_nodes.swap( new_nodes );
}
//================================================================================
void getReverseVector (const INTERP_KERNEL::NormalizedCellType type,
- vector<pair<int,int> > & swapVec )
+ std::vector<std::pair<int,int> > & swapVec )
{
swapVec.clear();
{
case NORM_TETRA4:
swapVec.resize(1);
- swapVec[0] = make_pair( 1, 2 );
+ swapVec[0] = std::make_pair( 1, 2 );
break;
case NORM_PYRA5:
swapVec.resize(1);
- swapVec[0] = make_pair( 1, 3 );
+ swapVec[0] = std::make_pair( 1, 3 );
break;
case NORM_PENTA6:
swapVec.resize(2);
- swapVec[0] = make_pair( 1, 2 );
- swapVec[1] = make_pair( 4, 5 );
+ swapVec[0] = std::make_pair( 1, 2 );
+ swapVec[1] = std::make_pair( 4, 5 );
break;
case NORM_HEXA8:
swapVec.resize(2);
- swapVec[0] = make_pair( 1, 3 );
- swapVec[1] = make_pair( 5, 7 );
+ swapVec[0] = std::make_pair( 1, 3 );
+ swapVec[1] = std::make_pair( 5, 7 );
break;
case NORM_TETRA10:
swapVec.resize(3);
- swapVec[0] = make_pair( 1, 2 );
- swapVec[1] = make_pair( 4, 6 );
- swapVec[2] = make_pair( 8, 9 );
+ swapVec[0] = std::make_pair( 1, 2 );
+ swapVec[1] = std::make_pair( 4, 6 );
+ swapVec[2] = std::make_pair( 8, 9 );
break;
case NORM_PYRA13:
swapVec.resize(4);
- swapVec[0] = make_pair( 1, 3 );
- swapVec[1] = make_pair( 5, 8 );
- swapVec[2] = make_pair( 6, 7 );
- swapVec[3] = make_pair( 10, 12 );
+ swapVec[0] = std::make_pair( 1, 3 );
+ swapVec[1] = std::make_pair( 5, 8 );
+ swapVec[2] = std::make_pair( 6, 7 );
+ swapVec[3] = std::make_pair( 10, 12 );
break;
case NORM_PENTA15:
swapVec.resize(4);
- swapVec[0] = make_pair( 1, 2 );
- swapVec[1] = make_pair( 4, 5 );
- swapVec[2] = make_pair( 6, 8 );
- swapVec[3] = make_pair( 9, 11 );
+ swapVec[0] = std::make_pair( 1, 2 );
+ swapVec[1] = std::make_pair( 4, 5 );
+ swapVec[2] = std::make_pair( 6, 8 );
+ swapVec[3] = std::make_pair( 9, 11 );
break;
case NORM_HEXA20:
swapVec.resize(7);
- swapVec[0] = make_pair( 1, 3 );
- swapVec[1] = make_pair( 5, 7 );
- swapVec[2] = make_pair( 8, 11 );
- swapVec[3] = make_pair( 9, 10 );
- swapVec[4] = make_pair( 12, 15 );
- swapVec[5] = make_pair( 13, 14 );
- swapVec[6] = make_pair( 17, 19 );
+ swapVec[0] = std::make_pair( 1, 3 );
+ swapVec[1] = std::make_pair( 5, 7 );
+ swapVec[2] = std::make_pair( 8, 11 );
+ swapVec[3] = std::make_pair( 9, 10 );
+ swapVec[4] = std::make_pair( 12, 15 );
+ swapVec[5] = std::make_pair( 13, 14 );
+ swapVec[6] = std::make_pair( 17, 19 );
break;
// case NORM_SEG3: no need to reverse edges
// swapVec.resize(1);
- // swapVec[0] = make_pair( 1, 2 );
+ // swapVec[0] = std::make_pair( 1, 2 );
// break;
case NORM_TRI6:
swapVec.resize(2);
- swapVec[0] = make_pair( 1, 2 );
- swapVec[1] = make_pair( 3, 5 );
+ swapVec[0] = std::make_pair( 1, 2 );
+ swapVec[1] = std::make_pair( 3, 5 );
break;
case NORM_QUAD8:
swapVec.resize(3);
- swapVec[0] = make_pair( 1, 3 );
- swapVec[1] = make_pair( 4, 7 );
- swapVec[2] = make_pair( 5, 6 );
+ swapVec[0] = std::make_pair( 1, 3 );
+ swapVec[1] = std::make_pair( 4, 7 );
+ swapVec[2] = std::make_pair( 5, 6 );
break;
default:;
}
*/
//================================================================================
- inline void reverse(const Cell & aCell, const vector<pair<int,int> > & swapVec )
+ inline void reverse(const Cell & aCell, const std::vector<std::pair<int,int> > & swapVec )
{
Cell* ma = const_cast<Cell*>(&aCell);
for ( unsigned i = 0; i < swapVec.size(); ++i )
*/
struct TCellByIDCompare
{
- bool operator () (const Cell* i1, const Cell* i2)
+ bool operator () (const Cell* i1, const Cell* i2) const
{
return i1->_number < i2->_number;
}
};
- typedef map< const Cell*, unsigned, TCellByIDCompare > TCellToOrderMap;
+ typedef std::map< const Cell*, unsigned, TCellByIDCompare > TCellToOrderMap;
//================================================================================
/*!
const int * SauvUtilities::getGibi2MedQuadraticInterlace( INTERP_KERNEL::NormalizedCellType type )
{
- static vector<const int*> conn;
+ static std::vector<const int*> conn;
static const int hexa20 [] = {0,6,4,2, 12,18,16,14, 7,5,3,1, 19,17,15,13, 8,11,10,9};
static const int penta15[] = {0,2,4, 9,11,13, 1,3,5, 10,12,14, 6,8,7};
static const int pyra13 [] = {0,2,4,6, 12, 1,3,5,7, 8,9,10,11};
{
int i2 = ( i + 1 ) % _nodes.size();
if ( _reverse )
- return make_pair( _nodes[i2]->_number, _nodes[i]->_number );
+ return std::make_pair( _nodes[i2]->_number, _nodes[i]->_number );
else
- return make_pair( _nodes[i]->_number, _nodes[i2]->_number );
+ return std::make_pair( _nodes[i]->_number, _nodes[i2]->_number );
}
//================================================================================
*/
//================================================================================
-string ASCIIReader::getName() const
+std::string ASCIIReader::getName() const
{
int len = _width;
while (( _curPos[len-1] == ' ' || _curPos[len-1] == 0) && len > 0 )
len--;
- return string( _curPos, len );
+ return std::string( _curPos, len );
}
//================================================================================
{
bool xdr_ok = false;
#ifdef HAS_XDR
+#ifdef WIN32
+ if ((_xdrs_file = ::fopen(_fileName.c_str(), "rb")))
+#else
if ((_xdrs_file = ::fopen(_fileName.c_str(), "r")))
+#endif
{
_xdrs = (XDR *)malloc(sizeof(XDR));
xdrstdio_create((XDR*)_xdrs, _xdrs_file, XDR_DECODE);
{
if(_iRead < _nbToRead)
{
- cout << "_iRead, _nbToRead : " << _iRead << " " << _nbToRead << endl;
- cout << "Unfinished iteration before new one !" << endl;
+ std::cout << "_iRead, _nbToRead : " << _iRead << " " << _nbToRead << std::endl;
+ std::cout << "Unfinished iteration before new one !" << std::endl;
THROW_IK_EXCEPTION("SauvUtilities::XDRReader::init(): Unfinished iteration before new one !");
}
_iRead = 0;
char* s = _xdr_cvals + _iRead*_width;
while (( s[len-1] == ' ' || s[len-1] == 0) && len > 0 )
len--;
- return string( s, len );
+ return std::string( s, len );
}
//================================================================================
//================================================================================
/*!
- * \brief Makes ParaMEDMEM::MEDFileData from self
+ * \brief Safely adds a new Group
+ */
+//================================================================================
+
+Group* IntermediateMED::addNewGroup(std::vector<SauvUtilities::Group*>* groupsToFix)
+{
+ if ( _groups.size() == _groups.capacity() ) // re-allocation would occure
+ {
+ std::vector<Group> newGroups( _groups.size() );
+ newGroups.push_back( Group() );
+
+ for ( size_t i = 0; i < _groups.size(); ++i )
+ {
+ // avoid copying _cells
+ std::vector<const Cell*> cells;
+ cells.swap( _groups[i]._cells );
+ newGroups[i] = _groups[i];
+ newGroups[i]._cells.swap( cells );
+
+ // correct pointers to sub-groups
+ for ( size_t j = 0; j < _groups[i]._groups.size(); ++j )
+ {
+ int iG = _groups[i]._groups[j] - &_groups[0];
+ newGroups[i]._groups[j] = & newGroups[ iG ];
+ }
+ }
+
+ // fix given groups
+ if ( groupsToFix )
+ for ( size_t i = 0; i < groupsToFix->size(); ++i )
+ if ( (*groupsToFix)[i] )
+ {
+ int iG = (*groupsToFix)[i] - &_groups[0];
+ (*groupsToFix)[i] = & newGroups[ iG ];
+ }
+
+ // fix field supports
+ for ( int isNode = 0; isNode < 2; ++isNode )
+ {
+ std::vector<DoubleField* >& fields = isNode ? _nodeFields : _cellFields;
+ for ( size_t i = 0; i < fields.size(); ++i )
+ {
+ if ( !fields[i] ) continue;
+ for ( size_t j = 0; j < fields[i]->_sub.size(); ++j )
+ if ( fields[i]->_sub[j]._support )
+ {
+ int iG = fields[i]->_sub[j]._support - &_groups[0];
+ fields[i]->_sub[j]._support = & newGroups[ iG ];
+ }
+ if ( fields[i]->_group )
+ {
+ int iG = fields[i]->_group - &_groups[0];
+ fields[i]->_group = & newGroups[ iG ];
+ }
+ }
+ }
+
+ _groups.swap( newGroups );
+ }
+ else
+ {
+ _groups.push_back( Group() );
+ }
+ return &_groups.back();
+}
+
+//================================================================================
+/*!
+ * \brief Makes MEDCoupling::MEDFileData from self
*/
//================================================================================
-ParaMEDMEM::MEDFileData* IntermediateMED::convertInMEDFileDS()
+MEDCoupling::MEDFileData* IntermediateMED::convertInMEDFileDS()
{
- MEDCouplingAutoRefCountObjectPtr< MEDFileUMesh > mesh = makeMEDFileMesh();
- MEDCouplingAutoRefCountObjectPtr< MEDFileFields > fields = makeMEDFileFields(mesh);
+ MCAuto< MEDFileUMesh > mesh = makeMEDFileMesh();
+ MCAuto< MEDFileFields > fields = makeMEDFileFields(mesh);
- MEDCouplingAutoRefCountObjectPtr< MEDFileMeshes > meshes = MEDFileMeshes::New();
- MEDCouplingAutoRefCountObjectPtr< MEDFileData > medData = MEDFileData::New();
+ MCAuto< MEDFileMeshes > meshes = MEDFileMeshes::New();
+ MCAuto< MEDFileData > medData = MEDFileData::New();
meshes->pushMesh( mesh );
medData->setMeshes( meshes );
if ( fields ) medData->setFields( fields );
//================================================================================
/*!
- * \brief Creates ParaMEDMEM::MEDFileUMesh from its data
+ * \brief Creates MEDCoupling::MEDFileUMesh from its data
*/
//================================================================================
-ParaMEDMEM::MEDFileUMesh* IntermediateMED::makeMEDFileMesh()
+MEDCoupling::MEDFileUMesh* IntermediateMED::makeMEDFileMesh()
{
// check if all needed piles are present
checkDataAvailability();
// IMP 0020434: mapping GIBI names to MED names
// set med names to objects (mesh, fields, support, group or other)
- set<int> treatedGroups;
+ std::set<int> treatedGroups;
- list<nameGIBItoMED>::iterator itGIBItoMED = _listGIBItoMED_mail.begin();
+ std::list<nameGIBItoMED>::iterator itGIBItoMED = _listGIBItoMED_mail.begin();
for (; itGIBItoMED != _listGIBItoMED_mail.end(); itGIBItoMED++)
{
if ( (int)_groups.size() < itGIBItoMED->gibi_id ) continue;
*/
//================================================================================
-void IntermediateMED::setFieldLongNames(set< string >& usedNames)
+void IntermediateMED::setFieldLongNames(std::set< std::string >& usedNames)
{
- list<nameGIBItoMED>::iterator itGIBItoMED = _listGIBItoMED_cham.begin();
+ std::list<nameGIBItoMED>::iterator itGIBItoMED = _listGIBItoMED_cham.begin();
for (; itGIBItoMED != _listGIBItoMED_cham.end(); itGIBItoMED++)
{
if (itGIBItoMED->gibi_pile == PILE_FIELD)
for (itGIBItoMED =_listGIBItoMED_comp.begin(); itGIBItoMED != _listGIBItoMED_comp.end(); itGIBItoMED++)
{
- string medName = _mapStrings[itGIBItoMED->med_id];
- string gibiName = _mapStrings[itGIBItoMED->gibi_id];
+ std::string medName = _mapStrings[itGIBItoMED->med_id];
+ std::string gibiName = _mapStrings[itGIBItoMED->gibi_id];
bool name_found = false;
for ( int isNodal = 0; isNodal < 2 && !name_found; ++isNodal )
{
- vector<DoubleField* > & fields = isNodal ? _nodeFields : _cellFields;
+ std::vector<DoubleField* > & fields = isNodal ? _nodeFields : _cellFields;
for ( size_t ifi = 0; ifi < fields.size() && !name_found; ifi++)
{
if (medName.find( fields[ifi]->_name + "." ) == 0 )
{
- vector<DoubleField::_Sub_data>& aSubDs = fields[ifi]->_sub;
+ std::vector<DoubleField::_Sub_data>& aSubDs = fields[ifi]->_sub;
int nbSub = aSubDs.size();
for (int isu = 0; isu < nbSub; isu++)
for (int ico = 0; ico < aSubDs[isu].nbComponents(); ico++)
{
if (aSubDs[isu].compName(ico) == gibiName)
{
- string medNameCompo = medName.substr( fields[ifi]->_name.size() + 1 );
+ std::string medNameCompo = medName.substr( fields[ifi]->_name.size() + 1 );
fields[ifi]->_sub[isu].compName(ico) = medNameCompo;
}
}
}
}
// remove empty sub-_groups
- vector< Group* > newSubGroups;
+ std::vector< Group* > newSubGroups;
newSubGroups.reserve( grp._groups.size() );
for (size_t j = 0; j < grp._groups.size(); ++j )
if ( !grp._groups[j]->empty() )
grp._cells.clear();
grp._groups.clear();
if ( !grp._name.empty() )
- cout << "Erase a group with elements of different dim |" << grp._name << "|"<< endl;
+ std::cout << "Erase a group with elements of different dim |" << grp._name << "|"<< std::endl;
break;
}
}
void IntermediateMED::orientElements2D()
{
- set<Cell>::const_iterator elemIt, elemEnd;
- vector< pair<int,int> > swapVec;
+ std::set<Cell>::const_iterator elemIt, elemEnd;
+ std::vector< std::pair<int,int> > swapVec;
// ------------------------------------
// fix connectivity of quadratic edges
// ------------------------------------
- set<Cell>& quadEdges = _cellsByType[ INTERP_KERNEL::NORM_SEG3 ];
+ std::set<Cell>& quadEdges = _cellsByType[ INTERP_KERNEL::NORM_SEG3 ];
if ( !quadEdges.empty() )
{
elemIt = quadEdges.begin(), elemEnd = quadEdges.end();
}
CellsByDimIterator faceIt( *this, 2 );
- while ( const set<Cell > * faces = faceIt.nextType() )
+ while ( const std::set<Cell > * faces = faceIt.nextType() )
{
TCellType cellType = faceIt.type();
bool isQuadratic = getGibi2MedQuadraticInterlace( cellType );
// --------------------------
// orient faces clockwise
// --------------------------
- int iQuad = isQuadratic ? 2 : 1;
- for ( elemIt = faces->begin(), elemEnd = faces->end(); elemIt != elemEnd; elemIt++ )
- {
- // look for index of the most left node
- int iLeft = 0, iNode, nbNodes = elemIt->_nodes.size() / iQuad;
- double x, minX = nodeCoords( elemIt->_nodes[0] )[0];
- for ( iNode = 1; iNode < nbNodes; ++iNode )
- if (( x = nodeCoords( elemIt->_nodes[ iNode ])[ 0 ]) < minX )
- minX = x, iLeft = iNode;
-
- // indeces of the nodes neighboring the most left one
- int iPrev = ( iLeft - 1 < 0 ) ? nbNodes - 1 : iLeft - 1;
- int iNext = ( iLeft + 1 == nbNodes ) ? 0 : iLeft + 1;
- // find components of prev-left and left-next vectors
- double xP = nodeCoords( elemIt->_nodes[ iPrev ])[ 0 ];
- double yP = nodeCoords( elemIt->_nodes[ iPrev ])[ 1 ];
- double xN = nodeCoords( elemIt->_nodes[ iNext ])[ 0 ];
- double yN = nodeCoords( elemIt->_nodes[ iNext ])[ 1 ];
- double xL = nodeCoords( elemIt->_nodes[ iLeft ])[ 0 ];
- double yL = nodeCoords( elemIt->_nodes[ iLeft ])[ 1 ];
- double xPL = xL - xP, yPL = yL - yP; // components of prev-left vector
- double xLN = xN - xL, yLN = yN - yL; // components of left-next vector
- // normalise y of the vectors
- double modPL = sqrt ( xPL * xPL + yPL * yPL );
- double modLN = sqrt ( xLN * xLN + yLN * yLN );
- if ( modLN > std::numeric_limits<double>::min() &&
- modPL > std::numeric_limits<double>::min() )
- {
- yPL /= modPL;
- yLN /= modLN;
- // summary direction of neighboring links must be positive
- bool clockwise = ( yPL + yLN > 0 );
- if ( !clockwise )
- reverse( *elemIt, swapVec );
- }
- }
+ // COMMENTED for issue 0022612 note 17739
+ // int iQuad = isQuadratic ? 2 : 1;
+ // for ( elemIt = faces->begin(), elemEnd = faces->end(); elemIt != elemEnd; elemIt++ )
+ // {
+ // // look for index of the most left node
+ // int iLeft = 0, iNode, nbNodes = elemIt->_nodes.size() / iQuad;
+ // double x, minX = nodeCoords( elemIt->_nodes[0] )[0];
+ // for ( iNode = 1; iNode < nbNodes; ++iNode )
+ // if (( x = nodeCoords( elemIt->_nodes[ iNode ])[ 0 ]) < minX )
+ // minX = x, iLeft = iNode;
+
+ // // indeces of the nodes neighboring the most left one
+ // int iPrev = ( iLeft - 1 < 0 ) ? nbNodes - 1 : iLeft - 1;
+ // int iNext = ( iLeft + 1 == nbNodes ) ? 0 : iLeft + 1;
+ // // find components of prev-left and left-next vectors
+ // double xP = nodeCoords( elemIt->_nodes[ iPrev ])[ 0 ];
+ // double yP = nodeCoords( elemIt->_nodes[ iPrev ])[ 1 ];
+ // double xN = nodeCoords( elemIt->_nodes[ iNext ])[ 0 ];
+ // double yN = nodeCoords( elemIt->_nodes[ iNext ])[ 1 ];
+ // double xL = nodeCoords( elemIt->_nodes[ iLeft ])[ 0 ];
+ // double yL = nodeCoords( elemIt->_nodes[ iLeft ])[ 1 ];
+ // double xPL = xL - xP, yPL = yL - yP; // components of prev-left vector
+ // double xLN = xN - xL, yLN = yN - yL; // components of left-next vector
+ // // normalise y of the vectors
+ // double modPL = sqrt ( xPL * xPL + yPL * yPL );
+ // double modLN = sqrt ( xLN * xLN + yLN * yLN );
+ // if ( modLN > std::numeric_limits<double>::min() &&
+ // modPL > std::numeric_limits<double>::min() )
+ // {
+ // yPL /= modPL;
+ // yLN /= modLN;
+ // // summary direction of neighboring links must be positive
+ // bool clockwise = ( yPL + yLN > 0 );
+ // if ( !clockwise )
+ // reverse( *elemIt, swapVec );
+ // }
+ // }
}
}
void IntermediateMED::orientElements3D()
{
// set _reverse flags of faces
- orientFaces3D();
+ // COMMENTED for issue 0022612 note 17739
+ //orientFaces3D();
// -----------------
// fix connectivity
// -----------------
- set<Cell>::const_iterator elemIt, elemEnd;
- vector< pair<int,int> > swapVec;
+ std::set<Cell>::const_iterator elemIt, elemEnd;
+ std::vector< std::pair<int,int> > swapVec;
for ( int dim = 1; dim <= 3; ++dim )
{
CellsByDimIterator cellsIt( *this, dim );
- while ( const set<Cell > * elems = cellsIt.nextType() )
+ while ( const std::set<Cell > * elems = cellsIt.nextType() )
{
TCellType cellType = cellsIt.type();
bool isQuadratic = getGibi2MedQuadraticInterlace( cellType );
}
}
- orientVolumes();
+ // COMMENTED for issue 0022612 note 17739
+ //orientVolumes();
}
//================================================================================
void IntermediateMED::orientFaces3D()
{
// fill map of links and their faces
- set<const Cell*> faces;
- map<const Cell*, Group*> fgm;
- map<Link, list<const Cell*> > linkFacesMap;
- map<Link, list<const Cell*> >::iterator lfIt, lfIt2;
+ std::set<const Cell*> faces;
+ std::map<const Cell*, Group*> fgm;
+ std::map<Link, std::list<const Cell*> > linkFacesMap;
+ std::map<Link, std::list<const Cell*> >::iterator lfIt, lfIt2;
for (size_t i=0; i!=_groups.size(); ++i)
{
{
for ( size_t k = 0; k < grp._cells[j]->_nodes.size(); ++k )
linkFacesMap[ grp._cells[j]->link( k ) ].push_back( grp._cells[j] );
- fgm.insert( make_pair( grp._cells[j], &grp ));
+ fgm.insert( std::make_pair( grp._cells[j], &grp ));
}
}
// dump linkFacesMap
// for ( lfIt = linkFacesMap.begin(); lfIt!=linkFacesMap.end(); lfIt++) {
- // cout<< "LINK: " << lfIt->first.first << "-" << lfIt->first.second << endl;
- // list<const Cell*> & fList = lfIt->second;
- // list<const Cell*>::iterator fIt = fList.begin();
+ // cout<< "LINK: " << lfIt->first.first << "-" << lfIt->first.second << std::endl;
+ // std::list<const Cell*> & fList = lfIt->second;
+ // std::list<const Cell*>::iterator fIt = fList.begin();
// for ( ; fIt != fList.end(); fIt++ )
- // cout << "\t" << **fIt << fgm[*fIt]->nom << endl;
+ // cout << "\t" << **fIt << fgm[*fIt]->nom << std::endl;
// }
// Each oriented link must appear in one face only, else a face is reversed.
- queue<const Cell*> faceQueue; /* the queue contains well oriented faces
+ std::queue<const Cell*> faceQueue; /* the queue contains well oriented faces
whose neighbors orientation is to be checked */
bool manifold = true;
while ( !linkFacesMap.empty() )
// find the neighbor faces
lfIt = linkFacesMap.find( link );
int nbFaceByLink = 0;
- list< const Cell* > ml;
+ std::list< const Cell* > ml;
if ( lfIt != linkFacesMap.end() )
{
- list<const Cell*> & fList = lfIt->second;
- list<const Cell*>::iterator fIt = fList.begin();
+ std::list<const Cell*> & fList = lfIt->second;
+ std::list<const Cell*>::iterator fIt = fList.begin();
assert( fIt != fList.end() );
for ( ; fIt != fList.end(); fIt++, nbFaceByLink++ )
{
lfIt2 = linkFacesMap.find( badlink );
if ( lfIt2 != linkFacesMap.end() )
{
- list<const Cell*> & ff = lfIt2->second;
- list<const Cell*>::iterator lfIt3 = find( ff.begin(), ff.end(), badFace );
+ std::list<const Cell*> & ff = lfIt2->second;
+ std::list<const Cell*>::iterator lfIt3 = find( ff.begin(), ff.end(), badFace );
// check if badFace has been found,
// else we can't erase it
// case of degenerated face in edge
lfIt = linkFacesMap.find( revLink );
if ( lfIt != linkFacesMap.end() )
{
- list<const Cell*> & fList = lfIt->second;
- list<const Cell*>::iterator fIt = fList.begin();
+ std::list<const Cell*> & fList = lfIt->second;
+ std::list<const Cell*>::iterator fIt = fList.begin();
for ( ; fIt != fList.end(); fIt++, nbFaceByLink++ )
{
ml.push_back( *fIt );
{
if ( manifold )
{
- list<const Cell*>::iterator ii = ml.begin();
- cout << nbFaceByLink << " faces by 1 link:" << endl;
+ std::list<const Cell*>::iterator ii = ml.begin();
+ std::cout << nbFaceByLink << " faces by 1 link:" << std::endl;
for( ; ii!= ml.end(); ii++ )
- cout << "in sub-mesh <" << fgm[ *ii ]->_name << "> " << **ii << endl;
+ std::cout << "in sub-mesh <" << fgm[ *ii ]->_name << "> " << **ii << std::endl;
}
manifold = false;
}
} // while ( !linkFacesMap.empty() )
if ( !manifold )
- cout << " -> Non manifold mesh, faces orientation may be incorrect" << endl;
+ std::cout << " -> Non manifold mesh, faces orientation may be incorrect" << std::endl;
}
//================================================================================
void IntermediateMED::orientVolumes()
{
- set<Cell>::const_iterator elemIt, elemEnd;
- vector< pair<int,int> > swapVec;
+ std::set<Cell>::const_iterator elemIt, elemEnd;
+ std::vector< std::pair<int,int> > swapVec;
CellsByDimIterator cellsIt( *this, 3 );
- while ( const set<Cell > * elems = cellsIt.nextType() )
+ while ( const std::set<Cell > * elems = cellsIt.nextType() )
{
TCellType cellType = cellsIt.type();
elemIt = elems->begin(), elemEnd = elems->end();
vec03[0] = n3[0] - n[0][0];
vec03[1] = n3[1] - n[0][1];
vec03[2] = n3[2] - n[0][2];
- if ( fabs( normal[0]+normal[1]+normal[2] ) <= numeric_limits<double>::max() ) // vec01 || vec02
+ if ( fabs( normal[0]+normal[1]+normal[2] ) <= std::numeric_limits<double>::max() ) // vec01 || vec02
{
normal[0] = vec01[1] * vec03[2] - vec01[2] * vec03[1]; // vec01 ^ vec03
normal[1] = vec01[2] * vec03[0] - vec01[0] * vec03[2];
void IntermediateMED::numberElements()
{
- set<Cell>::const_iterator elemIt, elemEnd;
+ std::set<Cell>::const_iterator elemIt, elemEnd;
// numbering _cells of type NORM_POINT1 by node number
{
- const set<Cell>& points = _cellsByType[ INTERP_KERNEL::NORM_POINT1 ];
+ const std::set<Cell>& points = _cellsByType[ INTERP_KERNEL::NORM_POINT1 ];
elemIt = points.begin(), elemEnd = points.end();
for ( ; elemIt != elemEnd; ++elemIt )
elemIt->_number = elemIt->_nodes[0]->_number;
bool ok = true, renumEntity = false;
CellsByDimIterator cellsIt( *this, dim );
int prevNbElems = 0;
- while ( const set<Cell> * typeCells = cellsIt.nextType() )
+ while ( const std::set<Cell> * typeCells = cellsIt.nextType() )
{
TID minNumber = std::numeric_limits<TID>::max(), maxNumber = 0;
for ( elemIt = typeCells->begin(), elemEnd = typeCells->end(); elemIt!=elemEnd; ++elemIt)
{
cellsIt.init( dim );
prevNbElems = cellsIt.nextType()->size(); // no need to renumber the first type
- while ( const set<Cell> * typeCells = cellsIt.nextType() )
+ while ( const std::set<Cell> * typeCells = cellsIt.nextType() )
{
for ( elemIt = typeCells->begin(), elemEnd = typeCells->end(); elemIt!=elemEnd; ++elemIt)
elemIt->_number += prevNbElems;
{
int cellID=1;
cellsIt.init( dim );
- while ( const set<Cell> * typeCells = cellsIt.nextType() )
+ while ( const std::set<Cell> * typeCells = cellsIt.nextType() )
for ( elemIt = typeCells->begin(), elemEnd = typeCells->end(); elemIt!=elemEnd; ++elemIt)
elemIt->_number = cellID++;
}
*/
//================================================================================
-ParaMEDMEM::DataArrayDouble * IntermediateMED::getCoords()
+MEDCoupling::DataArrayDouble * IntermediateMED::getCoords()
{
DataArrayDouble* coordArray = DataArrayDouble::New();
coordArray->alloc( _nbNodes, _spaceDim );
*/
//================================================================================
-void IntermediateMED::setConnectivity( ParaMEDMEM::MEDFileUMesh* mesh,
- ParaMEDMEM::DataArrayDouble* coords )
+void IntermediateMED::setConnectivity( MEDCoupling::MEDFileUMesh* mesh,
+ MEDCoupling::DataArrayDouble* coords )
{
int meshDim = 0;
mesh->setCoords( coords );
- set<Cell>::const_iterator elemIt, elemEnd;
+ std::set<Cell>::const_iterator elemIt, elemEnd;
for ( int dim = 3; dim > 0; --dim )
{
CellsByDimIterator dimCells( *this, dim );
{
// fill connectivity array to take into account order of elements in the sauv file
const int nbCellNodes = cells->begin()->_nodes.size();
- vector< TID > connectivity( cells->size() * nbCellNodes );
+ std::vector< TID > connectivity( cells->size() * nbCellNodes );
int * nodalConnOfCell;
for ( elemIt = cells->begin(), elemEnd = cells->end(); elemIt != elemEnd; ++elemIt )
{
*/
//================================================================================
-void IntermediateMED::setGroups( ParaMEDMEM::MEDFileUMesh* mesh )
+void IntermediateMED::setGroups( MEDCoupling::MEDFileUMesh* mesh )
{
bool isMeshNameSet = false;
const int meshDim = mesh->getMeshDimension();
{
const int meshDimRelToMaxExt = ( dim == 0 ? 1 : dim - meshDim );
- vector<const DataArrayInt *> medGroups;
- vector<MEDCouplingAutoRefCountObjectPtr<DataArrayInt> > refGroups;
+ std::vector<const DataArrayInt *> medGroups;
+ std::vector<MCAuto<DataArrayInt> > refGroups;
for ( size_t i = 0; i < _groups.size(); ++i )
{
Group& grp = _groups[i];
// sort cells by ID and remember their initial order in the group
TCellToOrderMap cell2order;
unsigned orderInGroup = 0;
- vector< Group* > groupVec;
+ std::vector< Group* > groupVec;
if ( grp._groups.empty() ) groupVec.push_back( & grp );
else groupVec = grp._groups;
for ( size_t iG = 0; iG < groupVec.size(); ++iG )
if ( (int)getDim( aG ) != dim )
continue;
for ( size_t iC = 0; iC < aG->_cells.size(); ++iC )
- cell2order.insert( cell2order.end(), make_pair( aG->_cells[iC], orderInGroup++ ));
+ cell2order.insert( cell2order.end(), std::make_pair( aG->_cells[iC], orderInGroup++ ));
}
if ( cell2order.empty() )
continue;
bool isSelfIntersect = ( orderInGroup != cell2order.size() );
if ( isSelfIntersect ) // self intersecting group
{
- ostringstream msg;
+ std::ostringstream msg;
msg << "Self intersecting sub-mesh: id = " << i+1
- << ", name = |" << grp._name << "|" << endl
- << " nb unique elements = " << cell2order.size() << endl
+ << ", name = |" << grp._name << "|" << std::endl
+ << " nb unique elements = " << cell2order.size() << std::endl
<< " total nb elements = " << orderInGroup;
if ( grp._isProfile )
{
}
else
{
- cout << msg.str() << endl;
+ std::cout << msg.str() << std::endl;
}
}
// create a med group
grp._medGroup = DataArrayInt::New();
grp._medGroup->setName( grp._name.c_str() );
grp._medGroup->alloc( cell2order.size(), /*nbOfCompo=*/1 );
- int * idsPrt = grp._medGroup->getPointer();
+ int * idsPtr = grp._medGroup->getPointer();
TCellToOrderMap::iterator cell2orderIt, cell2orderEnd = cell2order.end();
for ( cell2orderIt = cell2order.begin(); cell2orderIt != cell2orderEnd; ++cell2orderIt )
- *idsPrt++ = (*cell2orderIt).first->_number - 1;
+ *idsPtr++ = (*cell2orderIt).first->_number - 1;
// try to set the mesh name
if ( !isMeshNameSet &&
// Issue 0021311. Use case: a gibi group has references (recorded in pile 1)
// and several names (pile 27) refer (pile 10) to this group.
// We create a copy of this group per each named reference
+ std::set<std::string> uniqueNames;
+ uniqueNames.insert( grp._name );
for ( unsigned iRef = 0 ; iRef < grp._refNames.size(); ++iRef )
- if ( !grp._refNames[ iRef ].empty() )
+ if ( !grp._refNames[ iRef ].empty() &&
+ uniqueNames.insert( grp._refNames[ iRef ]).second ) // for name uniqueness (23155)
{
- refGroups.push_back( grp._medGroup->deepCpy() );
+ refGroups.push_back( grp._medGroup->deepCopy() );
refGroups.back()->setName( grp._refNames[ iRef ].c_str() );
medGroups.push_back( refGroups.back() );
}
int dim = getDim( grp );
int nbElems = 0;
- CellsByDimIterator dimCells( *this, dim );
- while ( const set<Cell > * cells = dimCells.nextType() )
- nbElems += cells->size();
-
- const bool onAll = ( nbElems == grp->size() );
-
if ( dim == 0 )
- dimRel = 0;
+ {
+ nbElems = _nbNodes;
+ dimRel = 0;
+ }
else
{
+ CellsByDimIterator dimCells( *this, dim );
+ while ( const std::set<Cell > * cells = dimCells.nextType() )
+ nbElems += cells->size();
+
int meshDim = 3;
for ( ; meshDim > 0; --meshDim )
{
}
dimRel = dim - meshDim;
}
+
+ bool onAll = ( nbElems == grp->size() );
return onAll;
}
*/
//================================================================================
-ParaMEDMEM::MEDFileFields * IntermediateMED::makeMEDFileFields(ParaMEDMEM::MEDFileUMesh* mesh)
+MEDCoupling::MEDFileFields * IntermediateMED::makeMEDFileFields(MEDCoupling::MEDFileUMesh* mesh)
{
if ( _nodeFields.empty() && _cellFields.empty() ) return 0;
// set long names
- set< string > usedFieldNames;
+ std::set< std::string > usedFieldNames;
setFieldLongNames(usedFieldNames);
MEDFileFields* fields = MEDFileFields::New();
//================================================================================
void IntermediateMED::setFields( SauvUtilities::DoubleField* fld,
- ParaMEDMEM::MEDFileFields* medFields,
- ParaMEDMEM::MEDFileUMesh* mesh,
+ MEDCoupling::MEDFileFields* medFields,
+ MEDCoupling::MEDFileUMesh* mesh,
const TID castemID,
- set< string >& usedFieldNames)
+ std::set< std::string >& usedFieldNames)
{
bool sameNbGauss = true;
if ( !fld || !fld->isMedCompatible( sameNbGauss )) return;
const bool uniteSubs = fld->hasCommonSupport() && sameNbGauss;
if ( !uniteSubs )
- cout << "Castem field #" << castemID << " <" << fld->_name
- << "> is incompatible with MED format, so we split it into several fields" << endl;
+ std::cout << "Castem field #" << castemID << " <" << fld->_name
+ << "> is incompatible with MED format, so we split it into several fields:" << std::endl;
for ( size_t iSub = 0; iSub < fld->_sub.size(); )
{
{
fld->setValues( valPtr, iSub );
setTS( fld, values, medFields, mesh, iSub++ );
+
+ std::cout << fld->_name << " with compoments";
+ for ( size_t i = 0; i < (size_t)fld->_sub[iSub-1].nbComponents(); ++i )
+ std::cout << " " << fld->_sub[iSub-1]._comp_names[ i ];
+ std::cout << std::endl;
}
}
}
//================================================================================
void IntermediateMED::setTS( SauvUtilities::DoubleField* fld,
- ParaMEDMEM::DataArrayDouble* values,
- ParaMEDMEM::MEDFileFields* medFields,
- ParaMEDMEM::MEDFileUMesh* mesh,
+ MEDCoupling::DataArrayDouble* values,
+ MEDCoupling::MEDFileFields* medFields,
+ MEDCoupling::MEDFileUMesh* mesh,
const int iSub)
{
// treat a field support
timeStamp->setName( fld->_name.c_str() );
timeStamp->setDescription( fld->_description.c_str() );
// set the mesh
- MEDCouplingAutoRefCountObjectPtr< MEDCouplingUMesh > dimMesh = mesh->getMeshAtLevel( dimRel );
if ( onAll )
{
+ MCAuto
+ < MEDCouplingUMesh > dimMesh = mesh->getMeshAtLevel( dimRel );
timeStamp->setMesh( dimMesh );
}
+ else if ( timeStamp->getTypeOfField() == MEDCoupling::ON_NODES )
+ {
+ DataArrayDouble * coo = mesh->getCoords();
+ MCAuto
+ <DataArrayDouble> subCoo = coo->selectByTupleId(support->_medGroup->begin(),
+ support->_medGroup->end());
+ MCAuto< MEDCouplingUMesh > nodeSubMesh =
+ MEDCouplingUMesh::Build0DMeshFromCoords( subCoo );
+ timeStamp->setMesh( nodeSubMesh );
+ }
else
{
- MEDCouplingAutoRefCountObjectPtr
+ MCAuto
+ < MEDCouplingUMesh > dimMesh = mesh->getMeshAtLevel( dimRel );
+ MCAuto
<MEDCouplingMesh> subMesh = dimMesh->buildPart(support->_medGroup->begin(),
support->_medGroup->end());
timeStamp->setMesh( subMesh);
timeStamp->setArray( values );
values->decrRef();
// set gauss points
- if ( timeStamp->getTypeOfField() == ParaMEDMEM::ON_GAUSS_PT )
+ if ( timeStamp->getTypeOfField() == MEDCoupling::ON_GAUSS_PT )
{
- TGaussDef gaussDef( support->_cellType, fld->_sub[iSub].nbGauss() );
- timeStamp->setGaussLocalizationOnType( support->_cellType,
+ TGaussDef gaussDef( fld->_sub[iSub]._support->_cellType,
+ fld->_sub[iSub].nbGauss() );
+ timeStamp->setGaussLocalizationOnType( fld->_sub[iSub]._support->_cellType,
gaussDef.myRefCoords,
gaussDef.myCoords,
gaussDef.myWeights );
timeStamp->setOrder( nbTS );
// add the time-stamp
- timeStamp->checkCoherency();
+ timeStamp->checkConsistencyLight();
if ( onAll )
fld->_curMedField->appendFieldNoProfileSBT( timeStamp );
else
void IntermediateMED::makeFieldNewName(std::set< std::string >& usedNames,
SauvUtilities::DoubleField* fld )
{
- string base = fld->_name;
+ std::string base = fld->_name;
if ( base.empty() )
{
base = "F_";
}
else
{
- string::size_type pos = base.rfind('_');
- if ( pos != string::npos )
+ std::string::size_type pos = base.rfind('_');
+ if ( pos != std::string::npos )
base = base.substr( 0, pos+1 );
else
base += '_';
if ( _sub.size() < 2 )
return false;
bool sameSupports = true;
- Group* grp1 = _sub[0]._support;
+ Group* grpp1 = _sub[0]._support;// grpp NOT grp because XDR under Windows defines grp...
for ( size_t i = 1; i < _sub.size() && sameSupports; ++i )
- sameSupports = ( grp1 == _sub[i]._support );
+ sameSupports = ( grpp1 == _sub[i]._support );
return sameSupports;
}
sameNbGauss = true;
if ( !_sub[iSub].isSameNbGauss() )
{
- cout << "Field <" << _name << "> : different nb of gauss points in components" <<endl;
+ std::cout << "Field <" << _name << "> : different nb of gauss points in components" << std::endl;
sameNbGauss = false;
//return false;
}
bool DoubleField::hasSameComponentsBySupport() const
{
- vector< _Sub_data >::const_iterator sub_data = _sub.begin();
+ std::vector< _Sub_data >::const_iterator sub_data = _sub.begin();
const _Sub_data& first_sub_data = *sub_data;
for ( ++sub_data ; sub_data != _sub.end(); ++sub_data )
{
*/
//================================================================================
-ParaMEDMEM::TypeOfField DoubleField::getMedType( const int iSub ) const
+MEDCoupling::TypeOfField DoubleField::getMedType( const int iSub ) const
{
using namespace INTERP_KERNEL;
*/
//================================================================================
-ParaMEDMEM::TypeOfTimeDiscretization DoubleField::getMedTimeDisc() const
+MEDCoupling::TypeOfTimeDiscretization DoubleField::getMedTimeDisc() const
{
return ONE_TIME;
// NO_TIME = 4,
int iComp = 0;
for ( int iS = 0; iS < iSub; ++iS )
iComp += _sub[iS].nbComponents();
- const vector< double > * compValues = &_comp_values[ iComp ];
+ const std::vector< double > * compValues = &_comp_values[ iComp ];
// Set values
- const vector< unsigned >& relocTable = getSupport( iSub )->_relocTable;
+ const std::vector< unsigned >& relocTable = getSupport( iSub )->_relocTable;
const int nbElems = _sub[iSub]._support->size();
const int nbGauss = _sub[iSub].nbGauss();
