X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEDLoader%2FMEDFileParameter.cxx;h=9f281464ac4d438097718549ad94dd28c0cb96d4;hb=0b187729ac99d3e9e9bb9d2be8cb8600a783be6c;hp=09536b60c73550070791607521c297da40b07f37;hpb=f1a947b32a36d8dc8e3079b25305bb50e8cb59a0;p=tools%2Fmedcoupling.git diff --git a/src/MEDLoader/MEDFileParameter.cxx b/src/MEDLoader/MEDFileParameter.cxx index 09536b60c..9f281464a 100644 --- a/src/MEDLoader/MEDFileParameter.cxx +++ b/src/MEDLoader/MEDFileParameter.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 @@ -20,13 +20,14 @@ #include "MEDFileParameter.hxx" #include "MEDFileUtilities.hxx" +#include "MEDFileSafeCaller.txx" #include "MEDLoaderBase.hxx" #include "InterpKernelAutoPtr.hxx" #include -using namespace ParaMEDMEM; +using namespace MEDCoupling; MEDFileParameter1TS::MEDFileParameter1TS(int iteration, int order, double time):_iteration(iteration),_order(order),_time(time) { @@ -50,7 +51,7 @@ bool MEDFileParameter1TS::isEqual(const MEDFileParameter1TS *other, double eps, return true; } -MEDFileParameter1TS *MEDFileParameterDouble1TSWTI::deepCpy() const throw(INTERP_KERNEL::Exception) +MEDFileParameter1TS *MEDFileParameterDouble1TSWTI::deepCpy() const { return new MEDFileParameterDouble1TSWTI(*this); } @@ -67,11 +68,16 @@ bool MEDFileParameterDouble1TSWTI::isEqual(const MEDFileParameter1TS *other, dou return true; } -std::size_t MEDFileParameterDouble1TSWTI::getHeapMemorySize() const +std::size_t MEDFileParameterDouble1TSWTI::getHeapMemorySizeWithoutChildren() const { return sizeof(MEDFileParameterDouble1TSWTI); } +std::vector MEDFileParameterDouble1TSWTI::getDirectChildrenWithNull() const +{ + return std::vector(); +} + std::string MEDFileParameterDouble1TSWTI::simpleRepr() const { std::ostringstream oss; @@ -100,18 +106,18 @@ MEDFileParameterDouble1TSWTI::MEDFileParameterDouble1TSWTI(int iteration, int or { } -void MEDFileParameterDouble1TSWTI::finishLoading(med_idt fid, const std::string& name, int dt, int it, int nbOfSteps) throw(INTERP_KERNEL::Exception) +void MEDFileParameterDouble1TSWTI::finishLoading(med_idt fid, const std::string& name, int dt, int it, int nbOfSteps) { std::ostringstream oss; oss << "MEDFileParameterDouble1TS::finishLoading : no specified time step (" << dt << "," << it << ") ! Time steps available : "; for(int i=0;i(&_arr)); + MEDFILESAFECALLERRD0(MEDparameterValueRd,(fid,name.c_str(),_iteration,_order,reinterpret_cast(&_arr))); return ; } else @@ -124,25 +130,25 @@ void MEDFileParameterDouble1TSWTI::finishLoading(med_idt fid, const std::string& throw INTERP_KERNEL::Exception(oss.str().c_str()); } -void MEDFileParameterDouble1TSWTI::readValue(med_idt fid, const std::string& name) throw(INTERP_KERNEL::Exception) +void MEDFileParameterDouble1TSWTI::readValue(med_idt fid, const std::string& name) { - MEDparameterValueRd(fid,name.c_str(),_iteration,_order,reinterpret_cast(&_arr)); + MEDFILESAFECALLERRD0(MEDparameterValueRd,(fid,name.c_str(),_iteration,_order,reinterpret_cast(&_arr))); } -void MEDFileParameterDouble1TSWTI::finishLoading(med_idt fid, const std::string& name, int timeStepId) throw(INTERP_KERNEL::Exception) +void MEDFileParameterDouble1TSWTI::finishLoading(med_idt fid, const std::string& name, int timeStepId) { int locDt,locIt; double dt; - MEDparameterComputationStepInfo(fid,name.c_str(),timeStepId+1,&locDt,&locIt,&dt); + MEDFILESAFECALLERRD0(MEDparameterComputationStepInfo,(fid,name.c_str(),timeStepId+1,&locDt,&locIt,&dt)); _iteration=locDt; _order=locIt; _time=dt; - MEDparameterValueRd(fid,name.c_str(),_iteration,_order,reinterpret_cast(&_arr)); + MEDFILESAFECALLERRD0(MEDparameterValueRd,(fid,name.c_str(),_iteration,_order,reinterpret_cast(&_arr))); } -void MEDFileParameterDouble1TSWTI::writeLL(med_idt fid, const std::string& name, const MEDFileWritable& mw) const throw(INTERP_KERNEL::Exception) +void MEDFileParameterDouble1TSWTI::writeLL(med_idt fid, const std::string& name, const MEDFileWritable& mw) const { char nameW[MED_NAME_SIZE+1]; MEDLoaderBase::safeStrCpy(name.c_str(),MED_NAME_SIZE,nameW,mw.getTooLongStrPolicy()); - MEDparameterValueWr(fid,nameW,_iteration,_order,_time,reinterpret_cast(&_arr)); + MEDFILESAFECALLERWR0(MEDparameterValueWr,(fid,nameW,_iteration,_order,_time,reinterpret_cast(&_arr))); } std::size_t MEDFileParameterTinyInfo::getHeapMemSizeOfStrings() const @@ -162,13 +168,13 @@ bool MEDFileParameterTinyInfo::isEqualStrings(const MEDFileParameterTinyInfo& ot return true; } -void MEDFileParameterTinyInfo::writeLLHeader(med_idt fid, med_parameter_type typ) const throw(INTERP_KERNEL::Exception) +void MEDFileParameterTinyInfo::writeLLHeader(med_idt fid, med_parameter_type typ) const { char nameW[MED_NAME_SIZE+1],descW[MED_COMMENT_SIZE+1],dtunitW[MED_SNAME_SIZE+1]; MEDLoaderBase::safeStrCpy(_name.c_str(),MED_NAME_SIZE,nameW,getTooLongStrPolicy()); MEDLoaderBase::safeStrCpy(_desc_name.c_str(),MED_COMMENT_SIZE,descW,getTooLongStrPolicy()); MEDLoaderBase::safeStrCpy(_dt_unit.c_str(),MED_SNAME_SIZE,dtunitW,getTooLongStrPolicy()); - MEDparameterCr(fid,nameW,typ,descW,dtunitW); + MEDFILESAFECALLERWR0(MEDparameterCr,(fid,nameW,typ,descW,dtunitW)); } void MEDFileParameterTinyInfo::mainRepr(int bkOffset, std::ostream& oss) const @@ -184,17 +190,17 @@ MEDFileParameterDouble1TS *MEDFileParameterDouble1TS::New() return new MEDFileParameterDouble1TS; } -MEDFileParameterDouble1TS *MEDFileParameterDouble1TS::New(const char *fileName) throw(INTERP_KERNEL::Exception) +MEDFileParameterDouble1TS *MEDFileParameterDouble1TS::New(const std::string& fileName) { return new MEDFileParameterDouble1TS(fileName); } -MEDFileParameterDouble1TS *MEDFileParameterDouble1TS::New(const char *fileName, const char *paramName) throw(INTERP_KERNEL::Exception) +MEDFileParameterDouble1TS *MEDFileParameterDouble1TS::New(const std::string& fileName, const std::string& paramName) { return new MEDFileParameterDouble1TS(fileName,paramName); } -MEDFileParameterDouble1TS *MEDFileParameterDouble1TS::New(const char *fileName, const char *paramName, int dt, int it) throw(INTERP_KERNEL::Exception) +MEDFileParameterDouble1TS *MEDFileParameterDouble1TS::New(const std::string& fileName, const std::string& paramName, int dt, int it) { return new MEDFileParameterDouble1TS(fileName,paramName,dt,it); } @@ -203,10 +209,10 @@ MEDFileParameterDouble1TS::MEDFileParameterDouble1TS() { } -MEDFileParameterDouble1TS::MEDFileParameterDouble1TS(const char *fileName, const char *paramName, int dt, int it) throw(INTERP_KERNEL::Exception) +MEDFileParameterDouble1TS::MEDFileParameterDouble1TS(const std::string& fileName, const std::string& paramName, int dt, int it) { MEDFileUtilities::CheckFileForRead(fileName); - MEDFileUtilities::AutoFid fid=MEDfileOpen(fileName,MED_ACC_RDONLY); + MEDFileUtilities::AutoFid fid=MEDfileOpen(fileName.c_str(),MED_ACC_RDONLY); int nbPar=MEDnParameter(fid); std::ostringstream oss; oss << "MEDFileParameterDouble1TS : no double param name \"" << paramName << "\" ! Double Parameters available are : "; INTERP_KERNEL::AutoPtr pName=MEDLoaderBase::buildEmptyString(MED_NAME_SIZE); @@ -216,7 +222,7 @@ MEDFileParameterDouble1TS::MEDFileParameterDouble1TS(const char *fileName, const for(int i=0;i pName=MEDLoaderBase::buildEmptyString(MED_NAME_SIZE); @@ -248,7 +254,7 @@ MEDFileParameterDouble1TS::MEDFileParameterDouble1TS(const char *fileName, const for(int i=0;i unitName=MEDLoaderBase::buildEmptyString(MED_SNAME_SIZE); med_parameter_type paramType; int nbOfSteps; - MEDparameterInfo(fid,1,pName,¶mType,descName,unitName,&nbOfSteps); + MEDFILESAFECALLERRD0(MEDparameterInfo,(fid,1,pName,¶mType,descName,unitName,&nbOfSteps)); std::string paramNameCpp=MEDLoaderBase::buildStringFromFortran(pName,MED_NAME_SIZE); if(paramType==MED_FLOAT64) { @@ -327,7 +333,7 @@ bool MEDFileParameterDouble1TS::isEqual(const MEDFileParameter1TS *other, double return true; } -MEDFileParameter1TS *MEDFileParameterDouble1TS::deepCpy() const throw(INTERP_KERNEL::Exception) +MEDFileParameter1TS *MEDFileParameterDouble1TS::deepCpy() const { return new MEDFileParameterDouble1TS(*this); } @@ -340,15 +346,20 @@ std::string MEDFileParameterDouble1TS::simpleRepr() const return oss.str(); } -std::size_t MEDFileParameterDouble1TS::getHeapMemorySize() const +std::size_t MEDFileParameterDouble1TS::getHeapMemorySizeWithoutChildren() const { return getHeapMemSizeOfStrings()+sizeof(MEDFileParameterDouble1TS); } -void MEDFileParameterDouble1TS::write(const char *fileName, int mode) const throw(INTERP_KERNEL::Exception) +std::vector MEDFileParameterDouble1TS::getDirectChildrenWithNull() const +{ + return std::vector(); +} + +void MEDFileParameterDouble1TS::write(const std::string& fileName, int mode) const { med_access_mode medmod=MEDFileUtilities::TraduceWriteMode(mode); - MEDFileUtilities::AutoFid fid=MEDfileOpen(fileName,medmod); + MEDFileUtilities::AutoFid fid=MEDfileOpen(fileName.c_str(),medmod); MEDFileParameterTinyInfo::writeLLHeader(fid,MED_FLOAT64); MEDFileParameterDouble1TSWTI::writeLL(fid,_name,*this); } @@ -358,12 +369,12 @@ MEDFileParameterMultiTS *MEDFileParameterMultiTS::New() return new MEDFileParameterMultiTS; } -MEDFileParameterMultiTS *MEDFileParameterMultiTS::New(const char *fileName) throw(INTERP_KERNEL::Exception) +MEDFileParameterMultiTS *MEDFileParameterMultiTS::New(const std::string& fileName) { return new MEDFileParameterMultiTS(fileName); } -MEDFileParameterMultiTS *MEDFileParameterMultiTS::New(const char *fileName, const char *paramName) throw(INTERP_KERNEL::Exception) +MEDFileParameterMultiTS *MEDFileParameterMultiTS::New(const std::string& fileName, const std::string& paramName) { return new MEDFileParameterMultiTS(fileName,paramName); } @@ -383,10 +394,10 @@ MEDFileParameterMultiTS::MEDFileParameterMultiTS(const MEDFileParameterMultiTS& } } -MEDFileParameterMultiTS::MEDFileParameterMultiTS(const char *fileName) throw(INTERP_KERNEL::Exception) +MEDFileParameterMultiTS::MEDFileParameterMultiTS(const std::string& fileName) { MEDFileUtilities::CheckFileForRead(fileName); - MEDFileUtilities::AutoFid fid=MEDfileOpen(fileName,MED_ACC_RDONLY); + MEDFileUtilities::AutoFid fid=MEDfileOpen(fileName.c_str(),MED_ACC_RDONLY); int nbPar=MEDnParameter(fid); if(nbPar<1) { @@ -398,7 +409,7 @@ MEDFileParameterMultiTS::MEDFileParameterMultiTS(const char *fileName) throw(INT INTERP_KERNEL::AutoPtr unitName=MEDLoaderBase::buildEmptyString(MED_SNAME_SIZE); med_parameter_type paramType; int nbOfSteps; - MEDparameterInfo(fid,1,pName,¶mType,descName,unitName,&nbOfSteps); + MEDFILESAFECALLERRD0(MEDparameterInfo,(fid,1,pName,¶mType,descName,unitName,&nbOfSteps)); std::string paramNameCpp=MEDLoaderBase::buildStringFromFortran(pName,MED_NAME_SIZE); _dt_unit=MEDLoaderBase::buildStringFromFortran(unitName,MED_SNAME_SIZE); _name=paramNameCpp; @@ -406,10 +417,10 @@ MEDFileParameterMultiTS::MEDFileParameterMultiTS(const char *fileName) throw(INT finishLoading(fid,paramType,nbOfSteps); } -MEDFileParameterMultiTS::MEDFileParameterMultiTS(const char *fileName, const char *paramName) throw(INTERP_KERNEL::Exception) +MEDFileParameterMultiTS::MEDFileParameterMultiTS(const std::string& fileName, const std::string& paramName) { MEDFileUtilities::CheckFileForRead(fileName); - MEDFileUtilities::AutoFid fid=MEDfileOpen(fileName,MED_ACC_RDONLY); + MEDFileUtilities::AutoFid fid=MEDfileOpen(fileName.c_str(),MED_ACC_RDONLY); int nbPar=MEDnParameter(fid); std::ostringstream oss; oss << "MEDFileParameterDouble1TS : no double param name \"" << paramName << "\" ! Double Parameters available are : "; INTERP_KERNEL::AutoPtr pName=MEDLoaderBase::buildEmptyString(MED_NAME_SIZE); @@ -419,7 +430,7 @@ MEDFileParameterMultiTS::MEDFileParameterMultiTS(const char *fileName, const cha for(int i=0;ireadValue(fid,_name.c_str()); @@ -465,24 +476,26 @@ void MEDFileParameterMultiTS::finishLoading(med_idt fid, med_parameter_type typ, break;*/ default: throw INTERP_KERNEL::Exception("MEDFileParameterMultiTS::finishLoading : supporting only FLOAT64 !"); - } + } } } -std::size_t MEDFileParameterMultiTS::getHeapMemorySize() const +std::size_t MEDFileParameterMultiTS::getHeapMemorySizeWithoutChildren() const { - std::size_t ret=sizeof(MEDFileParameterMultiTS); - std::size_t ret2=sizeof(MEDCouplingAutoRefCountObjectPtr)*_param_per_ts.capacity(); - for(std::size_t i=0;i<_param_per_ts.size();i++) - { - const MEDFileParameter1TS *pt(_param_per_ts[i]); - if(pt) - ret2+=pt->getHeapMemorySize(); - } - return ret2+ret; + std::size_t ret(sizeof(MEDFileParameterMultiTS)); + ret+=sizeof(MEDCouplingAutoRefCountObjectPtr)*_param_per_ts.capacity(); + return ret; } -MEDFileParameterMultiTS *MEDFileParameterMultiTS::deepCpy() const throw(INTERP_KERNEL::Exception) +std::vector MEDFileParameterMultiTS::getDirectChildrenWithNull() const +{ + std::vector ret; + for(std::vector< MEDCouplingAutoRefCountObjectPtr >::const_iterator it=_param_per_ts.begin();it!=_param_per_ts.end();it++) + ret.push_back((const MEDFileParameter1TS *)*it); + return ret; +} + +MEDFileParameterMultiTS *MEDFileParameterMultiTS::deepCpy() const { return new MEDFileParameterMultiTS(*this,true); } @@ -506,14 +519,14 @@ bool MEDFileParameterMultiTS::isEqual(const MEDFileParameterMultiTS *other, doub return true; } -void MEDFileParameterMultiTS::write(const char *fileName, int mode) const throw(INTERP_KERNEL::Exception) +void MEDFileParameterMultiTS::write(const std::string& fileName, int mode) const { med_access_mode medmod=MEDFileUtilities::TraduceWriteMode(mode); - MEDFileUtilities::AutoFid fid=MEDfileOpen(fileName,medmod); + MEDFileUtilities::AutoFid fid=MEDfileOpen(fileName.c_str(),medmod); writeLL(fid,*this); } -void MEDFileParameterMultiTS::writeLL(med_idt fid, const MEDFileWritable& mw) const throw(INTERP_KERNEL::Exception) +void MEDFileParameterMultiTS::writeLL(med_idt fid, const MEDFileWritable& mw) const { std::set diffType; for(std::vector< MEDCouplingAutoRefCountObjectPtr >::const_iterator it=_param_per_ts.begin();it!=_param_per_ts.end();it++) @@ -554,7 +567,7 @@ void MEDFileParameterMultiTS::simpleRepr2(int bkOffset, std::ostream& oss) const } } -void MEDFileParameterMultiTS::appendValue(int dt, int it, double time, double val) throw(INTERP_KERNEL::Exception) +void MEDFileParameterMultiTS::appendValue(int dt, int it, double time, double val) { MEDCouplingAutoRefCountObjectPtr elt=MEDFileParameterDouble1TSWTI::New(dt,it,time); elt->setValue(val); @@ -562,7 +575,7 @@ void MEDFileParameterMultiTS::appendValue(int dt, int it, double time, double va _param_per_ts.push_back(elt2); } -double MEDFileParameterMultiTS::getDoubleValue(int iteration, int order) const throw(INTERP_KERNEL::Exception) +double MEDFileParameterMultiTS::getDoubleValue(int iteration, int order) const { int pos=getPosOfTimeStep(iteration,order); const MEDFileParameter1TS *elt=_param_per_ts[pos]; @@ -581,7 +594,7 @@ double MEDFileParameterMultiTS::getDoubleValue(int iteration, int order) const t return eltC->getValue(); } -int MEDFileParameterMultiTS::getPosOfTimeStep(int iteration, int order) const throw(INTERP_KERNEL::Exception) +int MEDFileParameterMultiTS::getPosOfTimeStep(int iteration, int order) const { int ret=0; std::ostringstream oss; oss << "MEDFileParameterMultiTS::getPosOfTimeStep : no such iteration=" << iteration << " order=" << order << " ! Possibilities are :"; @@ -590,7 +603,7 @@ int MEDFileParameterMultiTS::getPosOfTimeStep(int iteration, int order) const th const MEDFileParameter1TS *elt(*it); if(elt) { - if(elt->getIteration()==iteration && elt->getOrder()) + if(elt->getIteration()==iteration && elt->getOrder()==order) return ret; else oss << "(" << elt->getIteration() << "," << elt->getOrder() << "), "; @@ -599,7 +612,7 @@ int MEDFileParameterMultiTS::getPosOfTimeStep(int iteration, int order) const th throw INTERP_KERNEL::Exception(oss.str().c_str()); } -int MEDFileParameterMultiTS::getPosGivenTime(double time, double eps) const throw(INTERP_KERNEL::Exception) +int MEDFileParameterMultiTS::getPosGivenTime(double time, double eps) const { int ret=0; std::ostringstream oss; oss << "MEDFileParameterMultiTS::getPosGivenTime : no such time=" << time << " ! Possibilities are :"; @@ -620,7 +633,7 @@ int MEDFileParameterMultiTS::getPosGivenTime(double time, double eps) const thro /*! * \return an internal pointer that can be null. Warning the caller is \b not responsible of the returned pointer. */ -MEDFileParameter1TS *MEDFileParameterMultiTS::getTimeStepAtPos(int posId) const throw(INTERP_KERNEL::Exception) +MEDFileParameter1TS *MEDFileParameterMultiTS::getTimeStepAtPos(int posId) const { if(posId<0 || posId>=(int)_param_per_ts.size()) { @@ -630,7 +643,7 @@ MEDFileParameter1TS *MEDFileParameterMultiTS::getTimeStepAtPos(int posId) const return const_cast(static_cast(_param_per_ts[posId])); } -void MEDFileParameterMultiTS::eraseTimeStepIds(const int *startIds, const int *endIds) throw(INTERP_KERNEL::Exception) +void MEDFileParameterMultiTS::eraseTimeStepIds(const int *startIds, const int *endIds) { std::vector b(_param_per_ts.size(),true); int len=(int)_param_per_ts.size(); @@ -650,7 +663,12 @@ void MEDFileParameterMultiTS::eraseTimeStepIds(const int *startIds, const int *e _param_per_ts=paramPerTs; } -std::vector< std::pair > MEDFileParameterMultiTS::getIterations() const throw(INTERP_KERNEL::Exception) +int MEDFileParameterMultiTS::getNumberOfTS() const +{ + return (int) getIterations().size(); +} + +std::vector< std::pair > MEDFileParameterMultiTS::getIterations() const { std::vector< std::pair > ret; for(std::vector< MEDCouplingAutoRefCountObjectPtr >::const_iterator it=_param_per_ts.begin();it!=_param_per_ts.end();it++) @@ -665,7 +683,7 @@ std::vector< std::pair > MEDFileParameterMultiTS::getIterations() const /*! * \param [out] ret1 */ -std::vector< std::pair > MEDFileParameterMultiTS::getTimeSteps(std::vector& ret1) const throw(INTERP_KERNEL::Exception) +std::vector< std::pair > MEDFileParameterMultiTS::getTimeSteps(std::vector& ret1) const { std::vector< std::pair > ret0; ret1.clear(); @@ -686,15 +704,15 @@ MEDFileParameters *MEDFileParameters::New() return new MEDFileParameters; } -MEDFileParameters *MEDFileParameters::New(const char *fileName) throw(INTERP_KERNEL::Exception) +MEDFileParameters *MEDFileParameters::New(const std::string& fileName) { return new MEDFileParameters(fileName); } -MEDFileParameters::MEDFileParameters(const char *fileName) throw(INTERP_KERNEL::Exception) +MEDFileParameters::MEDFileParameters(const std::string& fileName) { MEDFileUtilities::CheckFileForRead(fileName); - MEDFileUtilities::AutoFid fid=MEDfileOpen(fileName,MED_ACC_RDONLY); + MEDFileUtilities::AutoFid fid=MEDfileOpen(fileName.c_str(),MED_ACC_RDONLY); int nbPar=MEDnParameter(fid); _params.resize(nbPar); INTERP_KERNEL::AutoPtr pName=MEDLoaderBase::buildEmptyString(MED_NAME_SIZE); @@ -704,9 +722,9 @@ MEDFileParameters::MEDFileParameters(const char *fileName) throw(INTERP_KERNEL:: for(int i=0;i)*_params.capacity(); - for(std::size_t i=0;i<_params.size();i++) - { - const MEDFileParameterMultiTS *pt(_params[i]); - if(pt) - ret2+=pt->getHeapMemorySize(); - } - return ret2+ret; + std::size_t ret(sizeof(MEDFileParameters)); + ret+=sizeof(MEDCouplingAutoRefCountObjectPtr)*_params.capacity(); + return ret; +} + +std::vector MEDFileParameters::getDirectChildrenWithNull() const +{ + std::vector ret; + for(std::vector< MEDCouplingAutoRefCountObjectPtr >::const_iterator it=_params.begin();it!=_params.end();it++) + ret.push_back((const MEDFileParameterMultiTS *)*it); + return ret; } -MEDFileParameters *MEDFileParameters::deepCpy() const throw(INTERP_KERNEL::Exception) +MEDFileParameters *MEDFileParameters::deepCpy() const { return new MEDFileParameters(*this,true); } @@ -762,14 +782,14 @@ MEDFileParameters::MEDFileParameters(const MEDFileParameters& other, bool deepCo } } -void MEDFileParameters::write(const char *fileName, int mode) const throw(INTERP_KERNEL::Exception) +void MEDFileParameters::write(const std::string& fileName, int mode) const { med_access_mode medmod=MEDFileUtilities::TraduceWriteMode(mode); - MEDFileUtilities::AutoFid fid=MEDfileOpen(fileName,medmod); + MEDFileUtilities::AutoFid fid=MEDfileOpen(fileName.c_str(),medmod); writeLL(fid); } -void MEDFileParameters::writeLL(med_idt fid) const throw(INTERP_KERNEL::Exception) +void MEDFileParameters::writeLL(med_idt fid) const { for(std::vector< MEDCouplingAutoRefCountObjectPtr >::const_iterator it=_params.begin();it!=_params.end();it++) { @@ -779,7 +799,7 @@ void MEDFileParameters::writeLL(med_idt fid) const throw(INTERP_KERNEL::Exceptio } } -std::vector MEDFileParameters::getParamsNames() const throw(INTERP_KERNEL::Exception) +std::vector MEDFileParameters::getParamsNames() const { std::vector ret(_params.size()); int i=0; @@ -816,14 +836,14 @@ void MEDFileParameters::simpleReprWithoutHeader(std::ostream& oss) const } } -void MEDFileParameters::resize(int newSize) throw(INTERP_KERNEL::Exception) +void MEDFileParameters::resize(int newSize) { if(newSize<0) throw INTERP_KERNEL::Exception("MEDFileParameters::resize : should be positive !"); _params.resize(newSize); } -void MEDFileParameters::pushParam(MEDFileParameterMultiTS *param) throw(INTERP_KERNEL::Exception) +void MEDFileParameters::pushParam(MEDFileParameterMultiTS *param) { if(param) param->incrRef(); @@ -831,7 +851,7 @@ void MEDFileParameters::pushParam(MEDFileParameterMultiTS *param) throw(INTERP_K _params.push_back(elt); } -void MEDFileParameters::setParamAtPos(int i, MEDFileParameterMultiTS *param) throw(INTERP_KERNEL::Exception) +void MEDFileParameters::setParamAtPos(int i, MEDFileParameterMultiTS *param) { if(i<0) throw INTERP_KERNEL::Exception("MEDFileParameters::setParamAtPos : should be positive !"); @@ -846,7 +866,7 @@ void MEDFileParameters::setParamAtPos(int i, MEDFileParameterMultiTS *param) thr /*! * \return an internal pointer that can be null. Warning the caller is \b not responsible of the returned pointer. */ -MEDFileParameterMultiTS *MEDFileParameters::getParamAtPos(int i) const throw(INTERP_KERNEL::Exception) +MEDFileParameterMultiTS *MEDFileParameters::getParamAtPos(int i) const { if(i<0 || i>=(int)_params.size()) { @@ -860,13 +880,13 @@ MEDFileParameterMultiTS *MEDFileParameters::getParamAtPos(int i) const throw(INT /*! * \return an internal pointer that can be null. Warning the caller is \b not responsible of the returned pointer. */ -MEDFileParameterMultiTS *MEDFileParameters::getParamWithName(const char *paramName) const throw(INTERP_KERNEL::Exception) +MEDFileParameterMultiTS *MEDFileParameters::getParamWithName(const std::string& paramName) const { int pos=getPosFromParamName(paramName); return getParamAtPos(pos); } -void MEDFileParameters::destroyParamAtPos(int i) throw(INTERP_KERNEL::Exception) +void MEDFileParameters::destroyParamAtPos(int i) { if(i<0 || i>=(int)_params.size()) { @@ -876,7 +896,7 @@ void MEDFileParameters::destroyParamAtPos(int i) throw(INTERP_KERNEL::Exception) _params[i]=MEDCouplingAutoRefCountObjectPtr(0); } -int MEDFileParameters::getPosFromParamName(const char *paramName) const throw(INTERP_KERNEL::Exception) +int MEDFileParameters::getPosFromParamName(const std::string& paramName) const { std::ostringstream oss; oss << "MEDFileParameters::getPosFromParamName : no such name=" << paramName << " ! Possibilities are :"; int ret=0; @@ -894,7 +914,7 @@ int MEDFileParameters::getPosFromParamName(const char *paramName) const throw(IN throw INTERP_KERNEL::Exception(oss.str().c_str()); } -int MEDFileParameters::getNumberOfParams() const throw(INTERP_KERNEL::Exception) +int MEDFileParameters::getNumberOfParams() const { return (int)_params.size(); }