X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEDLoader%2FSauvReader.cxx;h=30a62fecbe913530f3a61ad35fe08233e0120b63;hb=844b1a4785909ad42206965838a6d0f826dfb5c1;hp=7c76e36cb53991f0b233e3051ecda1da142ab820;hpb=b3484c5993a2fb7f31ce22644a39742326007cdb;p=tools%2Fmedcoupling.git diff --git a/src/MEDLoader/SauvReader.cxx b/src/MEDLoader/SauvReader.cxx index 7c76e36cb..30a62fecb 100644 --- a/src/MEDLoader/SauvReader.cxx +++ b/src/MEDLoader/SauvReader.cxx @@ -1,9 +1,9 @@ -// Copyright (C) 2007-2013 CEA/DEN, EDF R&D +// Copyright (C) 2007-2019 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 @@ -24,7 +24,7 @@ #include "SauvReader.hxx" #include "SauvMedConvertor.hxx" -#include "MEDCouplingAutoRefCountObjectPtr.hxx" +#include "MCAuto.hxx" #include "NormalizedUnstructuredMesh.hxx" #include "MEDCouplingRefCountObject.hxx" @@ -32,7 +32,7 @@ #include #include -using namespace ParaMEDMEM; +using namespace MEDCoupling; using namespace SauvUtilities; using namespace std; @@ -44,14 +44,14 @@ using namespace std; */ //================================================================================ -SauvReader* SauvReader::New(const char *fileName) +SauvReader* SauvReader::New(const std::string& fileName) { - if ( !fileName || strlen(fileName) < 1 ) THROW_IK_EXCEPTION("Invalid file name"); + if ( fileName.empty() ) THROW_IK_EXCEPTION("Invalid file name"); - ParaMEDMEM::MEDCouplingAutoRefCountObjectPtr< SauvUtilities::FileReader> parser; + MEDCoupling::MCAuto< SauvUtilities::FileReader> parser; // try to open as XRD - parser = new XDRReader( fileName ); + parser = new XDRReader( fileName.c_str() ); if ( parser->open() ) { SauvReader* reader = new SauvReader; @@ -60,7 +60,7 @@ SauvReader* SauvReader::New(const char *fileName) } // try to open as ASCII - parser = new ASCIIReader( fileName ); + parser = new ASCIIReader( fileName.c_str() ); if ( parser->open() ) { SauvReader* reader = new SauvReader; @@ -86,7 +86,7 @@ std::size_t SauvReader::getHeapMemorySizeWithoutChildren() const return 0; } -std::vector SauvReader::getDirectChildren() const +std::vector SauvReader::getDirectChildrenWithNull() const { return std::vector(); } @@ -112,7 +112,7 @@ std::string SauvReader::lineNb() const */ //================================================================================ -ParaMEDMEM::MEDFileData * SauvReader::loadInMEDFileDS() +MEDCoupling::MEDFileData * SauvReader::loadInMEDFileDS() { SauvUtilities::IntermediateMED iMed; // intermadiate DS _iMed = &iMed; @@ -139,6 +139,8 @@ ParaMEDMEM::MEDFileData * SauvReader::loadInMEDFileDS() readRecord4(); else if (recordNumber == 7 ) readRecord7(); + else if (recordNumber == 8 ) + readRecord8(); else if (recordNumber == 5 ) break; // stop reading else @@ -146,7 +148,7 @@ ParaMEDMEM::MEDFileData * SauvReader::loadInMEDFileDS() THROW_IK_EXCEPTION("XDR : ENREGISTREMENT DE TYPE " << recordNumber << " not implemented!!!"); } - ParaMEDMEM::MEDFileData* medFileData = iMed.convertInMEDFileDS(); + MEDCoupling::MEDFileData* medFileData = iMed.convertInMEDFileDS(); return medFileData; } @@ -212,6 +214,38 @@ void SauvReader::readRecord7() } } +//================================================================================ +/*! + * \brief Reads "ENREGISTREMENT DE TYPE 8" + */ +//================================================================================ + +void SauvReader::readRecord8() +{ + // This record is useless (a constant table) + // => we skip it + int info; + int nbIntToSkip; + if ( !isASCII() ) + { + getInt(); + info = getInt(); + int i = 0; + if (info == 3) { + // castem >= 18 + // 1 more line + nbIntToSkip = 145; + } + else + nbIntToSkip = 141; + + while (i <= nbIntToSkip) { + getInt(); + i ++; + } + } +} + //================================================================================ /*! * \brief Reads the pile number, nb of objects and nb named of objects @@ -220,7 +254,7 @@ void SauvReader::readRecord7() int SauvReader::readPileNumber(int& nbNamedObjects, int& nbObjects) { - // FORMAT(' PILE NUMERO',I4,'NBRE ObjectS NOMMES',I8,'NBRE ObjectS',I8) + // FORMAT(' PILE NUMERO',I4,'NBRE OBJETS NOMMES',I8,'NBRE OBJETS',I8) int pileNumber; if ( !isASCII() ) { @@ -233,7 +267,7 @@ int SauvReader::readPileNumber(int& nbNamedObjects, int& nbObjects) { char* line; getNextLine(line); - const char *s1 = " PILE NUMERO", *s2 = "NBRE ObjectS NOMMES", *s3 = "NBRE ObjectS"; + const char *s1 = " PILE NUMERO", *s2 = "NBRE OBJETS NOMMES", *s3 = "NBRE OBJETS"; if ( ! GIBI_EQUAL( line, s1 ) ) THROW_IK_EXCEPTION("Could not read the pile number " << lineNb() ); line = line + strlen(s1); @@ -384,7 +418,7 @@ void SauvReader::read_PILE_SOUS_MAILLAGE(const int nbObjects, else for (initIntReading(nbElements); more(); next()); - // not a composit group + // not a composite group if (castemCellType>0 && nbSubGroups==0) { group._cellType = SauvUtilities::gibi2medGeom(castemCellType); @@ -428,9 +462,9 @@ void SauvReader::read_PILE_SOUS_MAILLAGE(const int nbObjects, SauvUtilities::Group & grp = _iMed->_groups[ grpID-1 ]; if ( !grp._name.empty() ) // a group has several names { // create a group with subgroup grp and named grp.name - _iMed->_groups.push_back(Group()); - _iMed->_groups.back()._groups.push_back( &_iMed->_groups[ grpID-1 ]); - _iMed->_groups.back()._name = grp._name; + SauvUtilities::Group* newGroup = _iMed->addNewGroup(); + newGroup->_groups.push_back( &_iMed->_groups[ grpID-1 ]); + newGroup->_name = grp._name; } grp._name=objectNames[i]; #ifdef _DEBUG @@ -638,7 +672,7 @@ void SauvReader::read_PILE_COORDONNEES (const int nbObjects, std::vector& supports, { SauvUtilities::Group* group = NULL; set sup_set( supports.begin(), supports.end() ); - if (sup_set.size() == 1 ) // one or equal supports + if ( sup_set.size() == 1 ) // one or equal supports { group = supports[0]; } @@ -688,8 +722,7 @@ void SauvReader::setFieldSupport(const vector& supports, sameOrder = ( supports[j] == newGroups[ j % newGroups.size() ]); if ( sameOrder ) { - _iMed->_groups.push_back( SauvUtilities::Group() ); - group = & _iMed->_groups.back(); + group = _iMed->addNewGroup( & newGroups ); group->_groups.swap( newGroups ); } } @@ -716,7 +749,7 @@ void SauvReader::setFieldSupport(const vector& supports, // relocate sub-components according to a new order of groups if ( isModified ) { - vector< DoubleField::_Sub_data > newSub( field->_sub.size() ); + vector< DoubleField::_Sub_data > newSub ( field->_sub.size() ); vector< vector< double > > newValues( field->_comp_values.size() ); size_t iFromSub = 0, iNewSub = 0, iNewComp = 0; for ( ; iFromSub < field->_sub.size(); iFromSub += groups.size() )