X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEDLoader%2FSauvWriter.cxx;h=7d6440aa2cd5b16a9e8f171d5d2344a8f88577b8;hb=f810b8691a25da097d91b87793ecbf121ab9ead8;hp=5fb31d2b65cc50d3d5ac660cda2e852c48e35902;hpb=f1a947b32a36d8dc8e3079b25305bb50e8cb59a0;p=tools%2Fmedcoupling.git diff --git a/src/MEDLoader/SauvWriter.cxx b/src/MEDLoader/SauvWriter.cxx index 5fb31d2b6..7d6440aa2 100644 --- a/src/MEDLoader/SauvWriter.cxx +++ b/src/MEDLoader/SauvWriter.cxx @@ -1,9 +1,9 @@ -// 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 @@ -34,7 +34,7 @@ #include #include -using namespace ParaMEDMEM; +using namespace MEDCoupling; using namespace SauvUtilities; using namespace std; @@ -212,17 +212,35 @@ namespace } } -//================================================================================ -/*! - * \brief Creates SauvWriter - */ -//================================================================================ +SauvWriter::SauvWriter():_cpy_grp_if_on_single_family(false) +{ +} SauvWriter* SauvWriter::New() { return new SauvWriter; } +std::size_t SauvWriter::getHeapMemorySizeWithoutChildren() const +{ + return 0; +} + +std::vector SauvWriter::getDirectChildrenWithNull() const +{ + return std::vector(); +} + +void SauvWriter::setCpyGrpIfOnASingleFamilyStatus(bool status) +{ + _cpy_grp_if_on_single_family=status; +} + +bool SauvWriter::getCpyGrpIfOnASingleFamilyStatus() const +{ + return _cpy_grp_if_on_single_family; +} + //================================================================================ /*! * \brief Fills own DS by MEDFileData @@ -244,7 +262,10 @@ void SauvWriter::setMEDFileDS(const MEDFileData* medData, if ( fields ) for ( int i = 0; i < fields->getNumberOfFields(); ++i ) { - MEDFileFieldMultiTS * f = fields->getFieldAtPos(i); + MEDFileAnyTypeFieldMultiTS * fB = fields->getFieldAtPos(i); + MEDFileFieldMultiTS * f = dynamic_cast(fB); + if(!f) + continue;// fields on int32 not managed if ( f->getMeshName() == _fileMesh->getName() ) { vector< vector > fTypes = f->getTypesOfFieldAvailable(); @@ -353,7 +374,7 @@ void SauvWriter::fillFamilySubMeshes() for ( size_t iDim = 0; iDim < dims.size(); ++iDim ) { int dimRelExt = dims[ iDim ]; - MEDCouplingAutoRefCountObjectPtr< MEDCouplingMesh > mesh = _fileMesh->getGenMeshAtLevel(dimRelExt); + MCAuto< MEDCouplingMesh > mesh = _fileMesh->getMeshAtLevel(dimRelExt); const DataArrayInt * famIds = _fileMesh->getFamilyFieldAtLevel(dimRelExt); if ( !famIds ) continue; @@ -404,7 +425,7 @@ void SauvWriter::fillFamilySubMeshes() //================================================================================ /*! - * \brief fill sub-mehses of groups + * \brief fill sub-meshes of groups */ //================================================================================ @@ -418,22 +439,46 @@ void SauvWriter::fillGroupSubMeshes() const vector& famNames = g2ff->second; if ( famNames.empty() ) continue; std::vector famSubMeshes( famNames.size() ); + std::size_t k = 0; for ( size_t i = 0; i < famNames.size(); ++i ) { int famID = _fileMesh->getFamilyId( famNames[i].c_str() ); map< int, SubMesh* >::iterator i2f = _famIDs2Sub.find( famID ); - if ( i2f == _famIDs2Sub.end() ) - THROW_IK_EXCEPTION("SauvWriter::fillGroupSubMeshes(): unknown family ID: " << famID); - famSubMeshes[ i ] = i2f->second; + if ( i2f != _famIDs2Sub.end() ) + { + famSubMeshes[ k ] = i2f->second; + ++k; + } } + // if a family exists but has no element, no submesh has been found for this family + // => we have to resize famSubMeshes with the number of submeshes stored + if (k != famNames.size()) + famSubMeshes.resize(k); SubMesh* grpSubMesh = addSubMesh( groupName, famSubMeshes[0]->_dimRelExt ); - grpSubMesh->_subs.swap( famSubMeshes ); + if(!_cpy_grp_if_on_single_family) + grpSubMesh->_subs.swap( famSubMeshes ); + else + { + /* If a group sub mesh consists of only one family, the group is written as + * a copy of this family. + * A mesh composed of only one submesh may cause an issue with some Gibi operators.*/ + if (famSubMeshes.size() == 1) + { + for(int i = 0; i < famSubMeshes[0]->cellIDsByTypeSize() ; i++) + { + grpSubMesh->_cellIDsByType[i] = famSubMeshes[0]->_cellIDsByType[i]; + } + } + else + grpSubMesh->_subs.swap( famSubMeshes ); + } } } + //================================================================================ /*! - * \brief fill sub-mehses of profiles + * \brief fill sub-meshes of profiles */ //================================================================================ @@ -443,7 +488,7 @@ void SauvWriter::fillProfileSubMeshes() SubMesh* nilSm = (SubMesh*) 0; for ( int isOnNodes = 0; isOnNodes < 2; ++isOnNodes ) { - vector< MEDCouplingAutoRefCountObjectPtr< MEDFileFieldMultiTS > > + vector< MCAuto< MEDFileFieldMultiTS > > fields = isOnNodes ? _nodeFields : _cellFields; for ( size_t i = 0; i < fields.size(); ++i ) { @@ -453,7 +498,7 @@ void SauvWriter::fillProfileSubMeshes() vector< vector > typesF; vector< vector > pfls, locs; fields[i]->getFieldSplitedByType( iters[0].first, iters[0].second, - _fileMesh->getName(), types, typesF, pfls, locs); + _fileMesh->getName().c_str(), types, typesF, pfls, locs); int dimRelExt; for ( size_t iType = 0; iType < types.size(); ++iType ) { @@ -501,7 +546,7 @@ int SauvWriter::evaluateNbProfileSubMeshes() const vector< vector > typesF; vector< vector > pfls, locs; _cellFields[i]->getFieldSplitedByType( iters[0].first, iters[0].second, - _fileMesh->getName(), types, typesF, pfls, locs); + _fileMesh->getName().c_str(), types, typesF, pfls, locs); nb += 2 * types.size(); // x 2 - a type can be on nodes and on cells at the same time } @@ -518,8 +563,8 @@ void SauvWriter::makeProfileIDs( SubMesh* sm, INTERP_KERNEL::NormalizedCellType type, const DataArrayInt* profile ) { - MEDCouplingAutoRefCountObjectPtr< MEDCouplingMesh > - mesh = _fileMesh->getGenMeshAtLevel(sm->_dimRelExt); + MCAuto< MEDCouplingMesh > + mesh = _fileMesh->getMeshAtLevel(sm->_dimRelExt); const MEDCouplingUMesh* uMesh = dynamic_cast< const MEDCouplingUMesh* > ((const MEDCouplingMesh*) mesh ); if ( sm->_dimRelExt == 1 ) type = INTERP_KERNEL::NORM_POINT1; @@ -555,9 +600,18 @@ void SauvWriter::makeProfileIDs( SubMesh* sm, code[2] = -1; } vector idsPerType( 1, profile ); - MEDCouplingAutoRefCountObjectPtr + MCAuto resIDs = uMesh->checkTypeConsistencyAndContig( code, idsPerType ); - ids.assign( resIDs->begin(), resIDs->end() ); + if (( const DataArrayInt *) resIDs ) + { + ids.assign( resIDs->begin(), resIDs->end() ); + } + else // mesh includes only one type + { + int nbE = code[1]; + for ( ids.resize( nbE ); nbE; --nbE ) + ids[ nbE-1 ] = nbE-1; + } } } @@ -567,10 +621,10 @@ void SauvWriter::makeProfileIDs( SubMesh* sm, */ //================================================================================ -void SauvWriter::write(const char* fileName) +void SauvWriter::write(const std::string& fileName) { std::fstream fileStream; - fileStream.open( fileName, ios::out); + fileStream.open( fileName.c_str(), ios::out); if #ifdef WIN32 ( !fileStream || !fileStream.is_open() ) @@ -607,7 +661,7 @@ void SauvWriter::write(const char* fileName) void SauvWriter::writeFileHead() { - MEDCouplingAutoRefCountObjectPtr< MEDCouplingMesh > mesh = _fileMesh->getGenMeshAtLevel(0); + MCAuto< MEDCouplingMesh > mesh = _fileMesh->getMeshAtLevel(0); *_sauvFile << " ENREGISTREMENT DE TYPE 4" << endl @@ -688,9 +742,9 @@ void SauvWriter::writeSubMeshes() else { // write each sub-type as a SAUV sub-mesh - MEDCouplingAutoRefCountObjectPtr< MEDCouplingMesh > - mesh = _fileMesh->getGenMeshAtLevel( sm._dimRelExt ); - MEDCouplingAutoRefCountObjectPtr< MEDCouplingUMesh> + MCAuto< MEDCouplingMesh > + mesh = _fileMesh->getMeshAtLevel( sm._dimRelExt ); + MCAuto< MEDCouplingUMesh> umesh = mesh->buildUnstructured(); for ( int iType=0; iType < sm.cellIDsByTypeSize(); ++iType ) @@ -787,8 +841,8 @@ void SauvWriter::writeCompoundSubMesh(int iSub) void SauvWriter::writeNodes() { - MEDCouplingAutoRefCountObjectPtr< MEDCouplingMesh > mesh = _fileMesh->getGenMeshAtLevel( 1 ); - MEDCouplingAutoRefCountObjectPtr< MEDCouplingUMesh > umesh = mesh->buildUnstructured(); + MCAuto< MEDCouplingMesh > mesh = _fileMesh->getMeshAtLevel( 1 ); + MCAuto< MEDCouplingUMesh > umesh = mesh->buildUnstructured(); // write the index connecting nodes with their coodrinates @@ -817,7 +871,7 @@ void SauvWriter::writeNodes() _sauvFile->precision(14); _sauvFile->setf( ios_base::scientific, ios_base::floatfield ); _sauvFile->setf( ios_base::uppercase ); - MEDCouplingAutoRefCountObjectPtr< DataArrayDouble> coordArray = umesh->getCoordinatesAndOwner(); + MCAuto< DataArrayDouble> coordArray = umesh->getCoordinatesAndOwner(); const double precision = 1.e-99; // PAL12077 for ( int i = 0; i < nbNodes; ++i) { @@ -942,7 +996,7 @@ void SauvWriter::writeLongNames() void SauvWriter::writeFieldNames( const bool isNodal, std::map& fldNamePrefixMap) { - vector< MEDCouplingAutoRefCountObjectPtr< MEDFileFieldMultiTS > >& + vector< MCAuto< MEDFileFieldMultiTS > >& flds = isNodal ? _nodeFields : _cellFields; map nameNbMap; @@ -1051,7 +1105,7 @@ void SauvWriter::writeNodalFields(map& fldNamePrefixMap) vector< vector > typesF; vector< vector > pfls, locs; vector< vector< std::pair > > valsVec; - valsVec=_nodeFields[iF]->getFieldSplitedByType( it.first, it.second, _fileMesh->getName(), + valsVec=_nodeFields[iF]->getFieldSplitedByType( it.first, it.second, _fileMesh->getName().c_str(), types, typesF, pfls, locs); // believe that there can be only one type in a nodal field, // so do not use a loop on types @@ -1100,7 +1154,7 @@ void SauvWriter::writeNodalFields(map& fldNamePrefixMap) vector< vector > typesF; vector< vector > pfls, locs; vector< vector< std::pair > > valsVec; - valsVec = _nodeFields[iF]->getFieldSplitedByType( it.first, it.second, _fileMesh->getName(), + valsVec = _nodeFields[iF]->getFieldSplitedByType( it.first, it.second, _fileMesh->getName().c_str(), types, typesF, pfls, locs); // believe that there can be only one type in a nodal field, // so do not perform a loop on types @@ -1161,7 +1215,7 @@ void SauvWriter::writeElemFields(map& fldNamePrefixMap) vector< vector > typesF; vector< vector > pfls, locs; vector< vector< std::pair > > valsVec; - valsVec = _cellFields[iF]->getFieldSplitedByType( it.first, it.second, _fileMesh->getName(), + valsVec = _cellFields[iF]->getFieldSplitedByType( it.first, it.second, _fileMesh->getName().c_str(), types, typesF, pfls, locs); for ( size_t i = 0; i < valsVec.size(); ++i ) nbSub += valsVec[i].size(); @@ -1188,7 +1242,7 @@ void SauvWriter::writeElemFields(map& fldNamePrefixMap) vector types; vector< vector > typesF; vector< vector > pfls, locs; - _cellFields[iF]->getFieldSplitedByType( it.first, it.second, _fileMesh->getName(), + _cellFields[iF]->getFieldSplitedByType( it.first, it.second, _fileMesh->getName().c_str(), types, typesF, pfls, locs); for ( size_t iType = 0; iType < pfls.size(); ++iType ) for ( size_t iP = 0; iP < pfls[iType].size(); ++iP ) @@ -1254,7 +1308,7 @@ void SauvWriter::writeElemTimeStamp(int iF, int iter, int order) vector< vector > typesF; vector< vector > pfls, locs; vector< vector< std::pair > > valsVec; - valsVec = _cellFields[iF]->getFieldSplitedByType( iter, order, _fileMesh->getName(), + valsVec = _cellFields[iF]->getFieldSplitedByType( iter, order, _fileMesh->getName().c_str(), types, typesF, pfls, locs); for ( size_t iType = 0; iType < pfls.size(); ++iType ) for ( size_t iP = 0; iP < pfls[iType].size(); ++iP )