X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEDLoader%2FSwig%2FMEDLoaderCommon.i;h=d53d6d623fa5ae57a2da8d282c891bfc26cd0231;hb=e95ee11e7df126315ffd11c2518b648a6915ad51;hp=7219f54e168735c3804b8bedc707db6da0cdad2e;hpb=77d84ed27cd5c8feef4b5def1495efcd51908b0c;p=tools%2Fmedcoupling.git diff --git a/src/MEDLoader/Swig/MEDLoaderCommon.i b/src/MEDLoader/Swig/MEDLoaderCommon.i index 7219f54e1..d53d6d623 100644 --- a/src/MEDLoader/Swig/MEDLoaderCommon.i +++ b/src/MEDLoader/Swig/MEDLoaderCommon.i @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2016 CEA/DEN, EDF R&D +// Copyright (C) 2017-2021 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 @@ -18,8 +18,6 @@ // // Author : Anthony Geay (EDF R&D) -%module MEDLoader - #define MEDCOUPLING_EXPORT #define MEDLOADER_EXPORT @@ -40,9 +38,12 @@ #include "MEDFileEntities.hxx" #include "MEDFileMeshReadSelector.hxx" #include "MEDFileFieldOverView.hxx" +#include "MEDCouplingTypemaps.i" #include "MEDLoaderTypemaps.i" #include "SauvReader.hxx" #include "SauvWriter.hxx" +#include "MeshFormatReader.hxx" +#include "MeshFormatWriter.hxx" using namespace MEDCoupling; %} @@ -121,6 +122,7 @@ using namespace MEDCoupling; %newobject MEDCoupling::MEDFileUMesh::getDirectUndergroundSingleGeoTypeMesh; %newobject MEDCoupling::MEDFileUMesh::extractFamilyFieldOnGeoType; %newobject MEDCoupling::MEDFileUMesh::extractNumberFieldOnGeoType; +%newobject MEDCoupling::MEDFileUMesh::computeFetchedNodeIds; %newobject MEDCoupling::MEDFileUMesh::zipCoords; %newobject MEDCoupling::MEDFileUMesh::deduceNodeSubPartFromCellSubPart; %newobject MEDCoupling::MEDFileUMesh::extractPart; @@ -162,6 +164,7 @@ using namespace MEDCoupling; %newobject MEDCoupling::MEDFileFields::partOfThisOnStructureElements; %newobject MEDCoupling::MEDFileFields::__iter__; %newobject MEDCoupling::MEDFileFields::extractPart; +%newobject MEDCoupling::MEDFileFields::linearToQuadratic; %newobject MEDCoupling::MEDFileWritableStandAlone::serialize; %newobject MEDCoupling::MEDFileAnyTypeFieldMultiTS::New; @@ -182,16 +185,27 @@ using namespace MEDCoupling; %newobject MEDCoupling::MEDFileFieldMultiTS::getFieldAtLevelOld; %newobject MEDCoupling::MEDFileFieldMultiTS::getUndergroundDataArray; %newobject MEDCoupling::MEDFileFieldMultiTS::convertToInt; - -%newobject MEDCoupling::MEDFileIntFieldMultiTS::New; -%newobject MEDCoupling::MEDFileIntFieldMultiTS::field; -%newobject MEDCoupling::MEDFileIntFieldMultiTS::LoadSpecificEntities; -%newobject MEDCoupling::MEDFileIntFieldMultiTS::getUndergroundDataArray; -%newobject MEDCoupling::MEDFileIntFieldMultiTS::convertToDouble; -%newobject MEDCoupling::MEDFileIntFieldMultiTS::getFieldAtLevel; -%newobject MEDCoupling::MEDFileIntFieldMultiTS::getFieldAtTopLevel; -%newobject MEDCoupling::MEDFileIntFieldMultiTS::getFieldOnMeshAtLevel; -%newobject MEDCoupling::MEDFileIntFieldMultiTS::getFieldAtLevelOld; +%newobject MEDCoupling::MEDFileFieldMultiTS::Aggregate; + +%newobject MEDCoupling::MEDFileInt32FieldMultiTS::New; +%newobject MEDCoupling::MEDFileInt32FieldMultiTS::field; +%newobject MEDCoupling::MEDFileInt32FieldMultiTS::LoadSpecificEntities; +%newobject MEDCoupling::MEDFileInt32FieldMultiTS::getUndergroundDataArray; +%newobject MEDCoupling::MEDFileInt32FieldMultiTS::convertToDouble; +%newobject MEDCoupling::MEDFileInt32FieldMultiTS::getFieldAtLevel; +%newobject MEDCoupling::MEDFileInt32FieldMultiTS::getFieldAtTopLevel; +%newobject MEDCoupling::MEDFileInt32FieldMultiTS::getFieldOnMeshAtLevel; +%newobject MEDCoupling::MEDFileInt32FieldMultiTS::getFieldAtLevelOld; + +%newobject MEDCoupling::MEDFileInt64FieldMultiTS::New; +%newobject MEDCoupling::MEDFileInt64FieldMultiTS::field; +%newobject MEDCoupling::MEDFileInt64FieldMultiTS::LoadSpecificEntities; +%newobject MEDCoupling::MEDFileInt64FieldMultiTS::getUndergroundDataArray; +%newobject MEDCoupling::MEDFileInt64FieldMultiTS::convertToDouble; +%newobject MEDCoupling::MEDFileInt64FieldMultiTS::getFieldAtLevel; +%newobject MEDCoupling::MEDFileInt64FieldMultiTS::getFieldAtTopLevel; +%newobject MEDCoupling::MEDFileInt64FieldMultiTS::getFieldOnMeshAtLevel; +%newobject MEDCoupling::MEDFileInt64FieldMultiTS::getFieldAtLevelOld; %newobject MEDCoupling::MEDFileFloatFieldMultiTS::New; %newobject MEDCoupling::MEDFileFloatFieldMultiTS::field; @@ -217,14 +231,23 @@ using namespace MEDCoupling; %newobject MEDCoupling::MEDFileField1TS::getUndergroundDataArray; %newobject MEDCoupling::MEDFileField1TS::convertToInt; -%newobject MEDCoupling::MEDFileIntField1TS::New; -%newobject MEDCoupling::MEDFileIntField1TS::field; -%newobject MEDCoupling::MEDFileIntField1TS::getFieldAtLevel; -%newobject MEDCoupling::MEDFileIntField1TS::getFieldAtTopLevel; -%newobject MEDCoupling::MEDFileIntField1TS::getFieldOnMeshAtLevel; -%newobject MEDCoupling::MEDFileIntField1TS::getFieldAtLevelOld; -%newobject MEDCoupling::MEDFileIntField1TS::getUndergroundDataArray; -%newobject MEDCoupling::MEDFileIntField1TS::convertToDouble; +%newobject MEDCoupling::MEDFileInt32Field1TS::New; +%newobject MEDCoupling::MEDFileInt32Field1TS::field; +%newobject MEDCoupling::MEDFileInt32Field1TS::getFieldAtLevel; +%newobject MEDCoupling::MEDFileInt32Field1TS::getFieldAtTopLevel; +%newobject MEDCoupling::MEDFileInt32Field1TS::getFieldOnMeshAtLevel; +%newobject MEDCoupling::MEDFileInt32Field1TS::getFieldAtLevelOld; +%newobject MEDCoupling::MEDFileInt32Field1TS::getUndergroundDataArray; +%newobject MEDCoupling::MEDFileInt32Field1TS::convertToDouble; + +%newobject MEDCoupling::MEDFileInt64Field1TS::New; +%newobject MEDCoupling::MEDFileInt64Field1TS::field; +%newobject MEDCoupling::MEDFileInt64Field1TS::getFieldAtLevel; +%newobject MEDCoupling::MEDFileInt64Field1TS::getFieldAtTopLevel; +%newobject MEDCoupling::MEDFileInt64Field1TS::getFieldOnMeshAtLevel; +%newobject MEDCoupling::MEDFileInt64Field1TS::getFieldAtLevelOld; +%newobject MEDCoupling::MEDFileInt64Field1TS::getUndergroundDataArray; +%newobject MEDCoupling::MEDFileInt64Field1TS::convertToDouble; %newobject MEDCoupling::MEDFileFloatField1TS::New; %newobject MEDCoupling::MEDFileFloatField1TS::field; @@ -289,6 +312,7 @@ using namespace MEDCoupling; %newobject MEDCoupling::SauvReader::New; %newobject MEDCoupling::SauvReader::loadInMEDFileDS; + %newobject MEDCoupling::MEDFileMeshStruct::New; %newobject MEDCoupling::MEDMeshMultiLev::prepare; %newobject MEDCoupling::MEDMeshMultiLev::buildDataArray; @@ -296,6 +320,10 @@ using namespace MEDCoupling; %newobject MEDCoupling::MEDFileFastCellSupportComparator::New; %newobject MEDCoupling::MEDFileFastCellSupportComparator::buildFromScratchDataSetSupport; +%newobject MEDCoupling::MeshFormatReader::loadInMEDFileDS; +%newobject MEDCoupling::MeshFormatReader::MeshFormatReader; +%newobject MEDCoupling::MeshFormatWriter::MeshFormatWriter; + %feature("unref") MEDFileMesh "$this->decrRef();" %feature("unref") MEDFileUMesh "$this->decrRef();" %feature("unref") MEDFileCMesh "$this->decrRef();" @@ -304,11 +332,13 @@ using namespace MEDCoupling; %feature("unref") MEDFileFieldLoc "$this->decrRef();" %feature("unref") MEDFileAnyTypeField1TS "$this->decrRef();" %feature("unref") MEDFileField1TS "$this->decrRef();" -%feature("unref") MEDFileIntField1TS "$this->decrRef();" +%feature("unref") MEDFileInt32Field1TS "$this->decrRef();" +%feature("unref") MEDFileInt64Field1TS "$this->decrRef();" %feature("unref") MEDFileFloatField1TS "$this->decrRef();" %feature("unref") MEDFileAnyTypeFieldMultiTS "$this->decrRef();" %feature("unref") MEDFileFieldMultiTS "$this->decrRef();" -%feature("unref") MEDFileIntFieldMultiTS "$this->decrRef();" +%feature("unref") MEDFileInt32FieldMultiTS "$this->decrRef();" +%feature("unref") MEDFileInt64FieldMultiTS "$this->decrRef();" %feature("unref") MEDFileFloatFieldMultiTS "$this->decrRef();" %feature("unref") MEDFileMeshSupports "$this->decrRef();" %feature("unref") MEDFileStructureElements "$this->decrRef();" @@ -341,40 +371,40 @@ using namespace MEDCoupling; namespace MEDCoupling { bool HasXDR(); - std::string MEDFileVersionStr() throw(INTERP_KERNEL::Exception); - std::string MEDFileVersionOfFileStr(const std::string& fileName) throw(INTERP_KERNEL::Exception); - void SetEpsilonForNodeComp(double val) throw(INTERP_KERNEL::Exception); - void SetCompPolicyForCell(int val) throw(INTERP_KERNEL::Exception); - void SetTooLongStrPolicy(int val) throw(INTERP_KERNEL::Exception); - void CheckFileForRead(const std::string& fileName) throw(INTERP_KERNEL::Exception); - std::vector GetMeshNames(const std::string& fileName) throw(INTERP_KERNEL::Exception); - std::vector GetMeshNamesOnField(const std::string& fileName, const std::string& fieldName) throw(INTERP_KERNEL::Exception); - std::vector GetMeshGroupsNames(const std::string& fileName, const std::string& meshName) throw(INTERP_KERNEL::Exception); - std::vector GetMeshFamiliesNames(const std::string& fileName, const std::string& meshName) throw(INTERP_KERNEL::Exception); - std::vector GetMeshFamiliesNamesOnGroup(const std::string& fileName, const std::string& meshName, const std::string& grpName) throw(INTERP_KERNEL::Exception); - std::vector GetMeshGroupsNamesOnFamily(const std::string& fileName, const std::string& meshName, const std::string& famName) throw(INTERP_KERNEL::Exception); - std::vector GetAllFieldNamesOnMesh(const std::string& fileName, const std::string& meshName) throw(INTERP_KERNEL::Exception); - std::vector GetAllFieldNames(const std::string& fileName) throw(INTERP_KERNEL::Exception); - std::vector GetFieldNamesOnMesh(MEDCoupling::TypeOfField type, const std::string& fileName, const std::string& meshName) throw(INTERP_KERNEL::Exception); - std::vector GetCellFieldNamesOnMesh(const std::string& fileName, const std::string& meshName) throw(INTERP_KERNEL::Exception); - std::vector GetNodeFieldNamesOnMesh(const std::string& fileName, const std::string& meshName) throw(INTERP_KERNEL::Exception); - double GetTimeAttachedOnFieldIteration(const std::string& fileName, const std::string& fieldName, int iteration, int order) throw(INTERP_KERNEL::Exception); - void AssignStaticWritePropertiesTo(MEDCoupling::MEDFileWritable& obj) throw(INTERP_KERNEL::Exception); - MEDCoupling::MEDCouplingMesh *ReadMeshFromFile(const std::string& fileName, const std::string& meshName, int meshDimRelToMax=0) throw(INTERP_KERNEL::Exception); - MEDCoupling::MEDCouplingMesh *ReadMeshFromFile(const std::string& fileName, int meshDimRelToMax=0) throw(INTERP_KERNEL::Exception); - MEDCoupling::MEDCouplingUMesh *ReadUMeshFromFile(const std::string& fileName, const std::string& meshName, int meshDimRelToMax=0) throw(INTERP_KERNEL::Exception); - MEDCoupling::MEDCouplingUMesh *ReadUMeshFromFile(const std::string& fileName, int meshDimRelToMax=0) throw(INTERP_KERNEL::Exception); - int ReadUMeshDimFromFile(const std::string& fileName, const std::string& meshName) throw(INTERP_KERNEL::Exception); - MEDCoupling::MEDCouplingFieldDouble *ReadFieldCell(const std::string& fileName, const std::string& meshName, int meshDimRelToMax, const std::string& fieldName, int iteration, int order) throw(INTERP_KERNEL::Exception); - MEDCoupling::MEDCouplingFieldDouble *ReadFieldNode(const std::string& fileName, const std::string& meshName, int meshDimRelToMax, const std::string& fieldName, int iteration, int order) throw(INTERP_KERNEL::Exception); - MEDCoupling::MEDCouplingFieldDouble *ReadFieldGauss(const std::string& fileName, const std::string& meshName, int meshDimRelToMax, const std::string& fieldName, int iteration, int order) throw(INTERP_KERNEL::Exception); - MEDCoupling::MEDCouplingFieldDouble *ReadFieldGaussNE(const std::string& fileName, const std::string& meshName, int meshDimRelToMax, const std::string& fieldName, int iteration, int order) throw(INTERP_KERNEL::Exception); - void WriteMesh(const std::string& fileName, const MEDCoupling::MEDCouplingMesh *mesh, bool writeFromScratch) throw(INTERP_KERNEL::Exception); - void WriteUMesh(const std::string& fileName, const MEDCoupling::MEDCouplingUMesh *mesh, bool writeFromScratch) throw(INTERP_KERNEL::Exception); - void WriteUMeshDep(const std::string& fileName, const MEDCoupling::MEDCouplingUMesh *mesh, bool writeFromScratch) throw(INTERP_KERNEL::Exception); - void WriteField(const std::string& fileName, const MEDCoupling::MEDCouplingFieldDouble *f, bool writeFromScratch) throw(INTERP_KERNEL::Exception); - void WriteFieldDep(const std::string& fileName, const MEDCoupling::MEDCouplingFieldDouble *f, bool writeFromScratch) throw(INTERP_KERNEL::Exception); - void WriteFieldUsingAlreadyWrittenMesh(const std::string& fileName, const MEDCoupling::MEDCouplingFieldDouble *f) throw(INTERP_KERNEL::Exception); + std::string MEDFileVersionStr(); + std::string MEDFileVersionOfFileStr(const std::string& fileName); + void SetEpsilonForNodeComp(double val); + void SetCompPolicyForCell(int val); + void SetTooLongStrPolicy(int val); + void CheckFileForRead(const std::string& fileName); + std::vector GetMeshNames(const std::string& fileName); + std::vector GetMeshNamesOnField(const std::string& fileName, const std::string& fieldName); + std::vector GetMeshGroupsNames(const std::string& fileName, const std::string& meshName); + std::vector GetMeshFamiliesNames(const std::string& fileName, const std::string& meshName); + std::vector GetMeshFamiliesNamesOnGroup(const std::string& fileName, const std::string& meshName, const std::string& grpName); + std::vector GetMeshGroupsNamesOnFamily(const std::string& fileName, const std::string& meshName, const std::string& famName); + std::vector GetAllFieldNamesOnMesh(const std::string& fileName, const std::string& meshName); + std::vector GetAllFieldNames(const std::string& fileName); + std::vector GetFieldNamesOnMesh(MEDCoupling::TypeOfField type, const std::string& fileName, const std::string& meshName); + std::vector GetCellFieldNamesOnMesh(const std::string& fileName, const std::string& meshName); + std::vector GetNodeFieldNamesOnMesh(const std::string& fileName, const std::string& meshName); + double GetTimeAttachedOnFieldIteration(const std::string& fileName, const std::string& fieldName, int iteration, int order); + void AssignStaticWritePropertiesTo(MEDCoupling::MEDFileWritable& obj); + MEDCoupling::MEDCouplingMesh *ReadMeshFromFile(const std::string& fileName, const std::string& meshName, int meshDimRelToMax=0); + MEDCoupling::MEDCouplingMesh *ReadMeshFromFile(const std::string& fileName, int meshDimRelToMax=0); + MEDCoupling::MEDCouplingUMesh *ReadUMeshFromFile(const std::string& fileName, const std::string& meshName, int meshDimRelToMax=0); + MEDCoupling::MEDCouplingUMesh *ReadUMeshFromFile(const std::string& fileName, int meshDimRelToMax=0); + int ReadUMeshDimFromFile(const std::string& fileName, const std::string& meshName); + MEDCoupling::MEDCouplingField *ReadFieldCell(const std::string& fileName, const std::string& meshName, int meshDimRelToMax, const std::string& fieldName, int iteration, int order); + MEDCoupling::MEDCouplingField *ReadFieldNode(const std::string& fileName, const std::string& meshName, int meshDimRelToMax, const std::string& fieldName, int iteration, int order); + MEDCoupling::MEDCouplingField *ReadFieldGauss(const std::string& fileName, const std::string& meshName, int meshDimRelToMax, const std::string& fieldName, int iteration, int order); + MEDCoupling::MEDCouplingField *ReadFieldGaussNE(const std::string& fileName, const std::string& meshName, int meshDimRelToMax, const std::string& fieldName, int iteration, int order); + void WriteMesh(const std::string& fileName, const MEDCoupling::MEDCouplingMesh *mesh, bool writeFromScratch); + void WriteUMesh(const std::string& fileName, const MEDCoupling::MEDCouplingUMesh *mesh, bool writeFromScratch); + void WriteUMeshDep(const std::string& fileName, const MEDCoupling::MEDCouplingUMesh *mesh, bool writeFromScratch); + void WriteField(const std::string& fileName, const MEDCoupling::MEDCouplingField *f, bool writeFromScratch); + void WriteFieldDep(const std::string& fileName, const MEDCoupling::MEDCouplingField *f, bool writeFromScratch); + void WriteFieldUsingAlreadyWrittenMesh(const std::string& fileName, const MEDCoupling::MEDCouplingField *f); } %rename (MEDFileVersion) MEDFileVersionSwig; @@ -392,10 +422,11 @@ namespace MEDCoupling %rename (ReadUMeshFromGroups) ReadUMeshFromGroupsSwig; %rename (ReadUMeshFromFamilies) ReadUMeshFromFamiliesSwig; %rename (ReadField) ReadFieldSwig; +%rename (GetFamiliesGroupsInfo) GetFamiliesGroupsInfoSwig; %inline { - PyObject *MEDFileVersionSwig() throw(INTERP_KERNEL::Exception) + PyObject *MEDFileVersionSwig() { int major,minor,release; MEDCoupling::MEDFileVersion(major,minor,release); @@ -406,31 +437,48 @@ namespace MEDCoupling return ret; } - MEDCoupling::MEDCouplingFieldDouble *ReadFieldSwig(const std::string& fileName) throw(INTERP_KERNEL::Exception) + int MEDFileSizeOfMedInt() + { + return 8*sizeof(med_int); + } + + PyObject *GetFamiliesGroupsInfoSwig(const std::string& fileName, const std::string& meshName) { - MCAuto ret(MEDCoupling::ReadField(fileName)); + std::map families; + std::map> groupsOnFam; + MEDCoupling::GetFamiliesGroupsInfo(fileName,meshName,families,groupsOnFam); + AutoPyPtr a(convertMapStringInt(families)),b(convertMapStringVectString(groupsOnFam)); + AutoPyPtr ret(PyTuple_New(2)); + PyTuple_SetItem(ret,0,a.retn()); + PyTuple_SetItem(ret,1,b.retn()); + return ret.retn(); + } + + MEDCoupling::MEDCouplingField *ReadFieldSwig(const std::string& fileName) + { + MCAuto ret(MEDCoupling::ReadField(fileName)); return ret.retn(); } - MEDCoupling::MEDCouplingFieldDouble *ReadFieldSwig(const std::string& fileName, const std::string& fieldName) throw(INTERP_KERNEL::Exception) + MEDCoupling::MEDCouplingField *ReadFieldSwig(const std::string& fileName, const std::string& fieldName) { - MCAuto ret(MEDCoupling::ReadField(fileName,fieldName)); + MCAuto ret(MEDCoupling::ReadField(fileName,fieldName)); return ret.retn(); } - MEDCoupling::MEDCouplingFieldDouble *ReadFieldSwig(const std::string& fileName, const std::string& fieldName, int iteration, int order) throw(INTERP_KERNEL::Exception) + MEDCoupling::MEDCouplingField *ReadFieldSwig(const std::string& fileName, const std::string& fieldName, int iteration, int order) { - MCAuto ret(MEDCoupling::ReadField(fileName,fieldName,iteration,order)); + MCAuto ret(MEDCoupling::ReadField(fileName,fieldName,iteration,order)); return ret.retn(); } - MEDCoupling::MEDCouplingFieldDouble *ReadFieldSwig(MEDCoupling::TypeOfField type, const std::string& fileName, const std::string& meshName, int meshDimRelToMax, const std::string& fieldName, int iteration, int order) throw(INTERP_KERNEL::Exception) + MEDCoupling::MEDCouplingField *ReadFieldSwig(MEDCoupling::TypeOfField type, const std::string& fileName, const std::string& meshName, int meshDimRelToMax, const std::string& fieldName, int iteration, int order) { - MCAuto ret(MEDCoupling::ReadField(type,fileName,meshName,meshDimRelToMax,fieldName,iteration,order)); + MCAuto ret(MEDCoupling::ReadField(type,fileName,meshName,meshDimRelToMax,fieldName,iteration,order)); return ret.retn(); } - PyObject *GetFieldIterationsSwig(MEDCoupling::TypeOfField type, const std::string& fileName, const std::string& meshName, const std::string& fieldName) throw(INTERP_KERNEL::Exception) + PyObject *GetFieldIterationsSwig(MEDCoupling::TypeOfField type, const std::string& fileName, const std::string& meshName, const std::string& fieldName) { std::vector< std::pair > res=MEDCoupling::GetFieldIterations(type,fileName,meshName,fieldName); PyObject *ret=PyList_New(res.size()); @@ -445,7 +493,7 @@ namespace MEDCoupling return ret; } - PyObject *GetAllFieldIterationsSwig(const std::string& fileName, const std::string& fieldName) throw(INTERP_KERNEL::Exception) + PyObject *GetAllFieldIterationsSwig(const std::string& fileName, const std::string& fieldName) { std::vector< std::pair< std::pair, double> > res=MEDCoupling::GetAllFieldIterations(fileName,fieldName); PyObject *ret=PyList_New(res.size()); @@ -461,7 +509,7 @@ namespace MEDCoupling return ret; } - PyObject *GetCellFieldIterationsSwig(const std::string& fileName, const std::string& meshName, const std::string& fieldName) throw(INTERP_KERNEL::Exception) + PyObject *GetCellFieldIterationsSwig(const std::string& fileName, const std::string& meshName, const std::string& fieldName) { std::vector< std::pair > res=MEDCoupling::GetCellFieldIterations(fileName,meshName,fieldName); PyObject *ret=PyList_New(res.size()); @@ -476,7 +524,7 @@ namespace MEDCoupling return ret; } - PyObject *GetNodeFieldIterationsSwig(const std::string& fileName, const std::string& meshName, const std::string& fieldName) throw(INTERP_KERNEL::Exception) + PyObject *GetNodeFieldIterationsSwig(const std::string& fileName, const std::string& meshName, const std::string& fieldName) { std::vector< std::pair > res=MEDCoupling::GetNodeFieldIterations(fileName,meshName,fieldName); PyObject *ret=PyList_New(res.size()); @@ -491,7 +539,7 @@ namespace MEDCoupling return ret; } - PyObject *GetComponentsNamesOfFieldSwig(const std::string& fileName, const std::string& fieldName) throw(INTERP_KERNEL::Exception) + PyObject *GetComponentsNamesOfFieldSwig(const std::string& fileName, const std::string& fieldName) { std::vector< std::pair > res=MEDCoupling::GetComponentsNamesOfField(fileName,fieldName); PyObject *ret=PyList_New(res.size()); @@ -506,9 +554,10 @@ namespace MEDCoupling return ret; } - PyObject *GetUMeshGlobalInfoSwig(const std::string& fileName, const std::string& meshName) throw(INTERP_KERNEL::Exception) + PyObject *GetUMeshGlobalInfoSwig(const std::string& fileName, const std::string& meshName) { - int meshDim,spaceDim,numberOfNodes; + int meshDim,spaceDim; + mcIdType numberOfNodes; std::vector< std::vector< std::pair > > res=MEDCoupling::GetUMeshGlobalInfo(fileName,meshName,meshDim,spaceDim,numberOfNodes); PyObject *ret=PyTuple_New(4); PyObject *elt0=PyList_New(res.size()); @@ -530,57 +579,57 @@ namespace MEDCoupling PyTuple_SetItem(ret,0,elt0); PyTuple_SetItem(ret,1,SWIG_From_int(meshDim)); PyTuple_SetItem(ret,2,SWIG_From_int(spaceDim)); - PyTuple_SetItem(ret,3,SWIG_From_int(numberOfNodes)); + PyTuple_SetItem(ret,3,SWIG_From_long(numberOfNodes)); return ret; } PyObject *ReadFieldsOnSameMeshSwig(MEDCoupling::TypeOfField type, const std::string& fileName, const std::string& meshName, int meshDimRelToMax, - const std::string& fieldName, PyObject *liIts) throw(INTERP_KERNEL::Exception) + const std::string& fieldName, PyObject *liIts) { std::vector > its=convertTimePairIdsFromPy(liIts); std::vector res=MEDCoupling::ReadFieldsOnSameMesh(type,fileName,meshName,meshDimRelToMax,fieldName,its); return convertFieldDoubleVecToPy(res); } - void WriteUMeshesPartitionSwig(const std::string& fileName, const std::string& meshName, PyObject *li, bool writeFromScratch) throw(INTERP_KERNEL::Exception) + void WriteUMeshesPartitionSwig(const std::string& fileName, const std::string& meshName, PyObject *li, bool writeFromScratch) { std::vector v; convertFromPyObjVectorOfObj(li,SWIGTYPE_p_MEDCoupling__MEDCouplingUMesh,"MEDCouplingUMesh",v); MEDCoupling::WriteUMeshesPartition(fileName,meshName,v,writeFromScratch); } - void WriteUMeshesPartitionDepSwig(const std::string& fileName, const std::string& meshName, PyObject *li, bool writeFromScratch) throw(INTERP_KERNEL::Exception) + void WriteUMeshesPartitionDepSwig(const std::string& fileName, const std::string& meshName, PyObject *li, bool writeFromScratch) { std::vector v; convertFromPyObjVectorOfObj(li,SWIGTYPE_p_MEDCoupling__MEDCouplingUMesh,"MEDCouplingUMesh",v); MEDCoupling::WriteUMeshesPartitionDep(fileName,meshName,v,writeFromScratch); } - void WriteUMeshesSwig(const std::string& fileName, PyObject *li, bool writeFromScratch) throw(INTERP_KERNEL::Exception) + void WriteUMeshesSwig(const std::string& fileName, PyObject *li, bool writeFromScratch) { std::vector v; convertFromPyObjVectorOfObj(li,SWIGTYPE_p_MEDCoupling__MEDCouplingUMesh,"MEDCouplingUMesh",v); MEDCoupling::WriteUMeshes(fileName,v,writeFromScratch); } - PyObject *GetTypesOfFieldSwig(const std::string& fileName, const std::string& meshName, const std::string& fieldName) throw(INTERP_KERNEL::Exception) + PyObject *GetTypesOfFieldSwig(const std::string& fileName, const std::string& meshName, const std::string& fieldName) { std::vector< MEDCoupling::TypeOfField > v=MEDCoupling::GetTypesOfField(fileName,meshName,fieldName); - int size=v.size(); + std::size_t size=v.size(); PyObject *ret=PyList_New(size); - for(int i=0;i grps; converPyListToVecString(li,grps); return MEDCoupling::ReadUMeshFromGroups(fileName,meshName,meshDimRelToMax,grps); } - MEDCoupling::MEDCouplingUMesh *ReadUMeshFromFamiliesSwig(const std::string& fileName, const std::string& meshName, int meshDimRelToMax, PyObject *li) throw(INTERP_KERNEL::Exception) + MEDCoupling::MEDCouplingUMesh *ReadUMeshFromFamiliesSwig(const std::string& fileName, const std::string& meshName, int meshDimRelToMax, PyObject *li) { std::vector fams; converPyListToVecString(li,fams); @@ -594,52 +643,35 @@ namespace MEDCoupling { public: void copyOptionsFrom(const MEDFileWritable& other) const; - int getTooLongStrPolicy() const throw(INTERP_KERNEL::Exception); - void setTooLongStrPolicy(int newVal) throw(INTERP_KERNEL::Exception); - int getZipConnPolicy() throw(INTERP_KERNEL::Exception); - void setZipConnPolicy(int newVal) throw(INTERP_KERNEL::Exception); + int getTooLongStrPolicy() const; + void setTooLongStrPolicy(int newVal); + int getZipConnPolicy(); + void setZipConnPolicy(int newVal); }; class MEDFileWritableStandAlone : public MEDFileWritable { public: - void write(const std::string& fileName, int mode) const throw(INTERP_KERNEL::Exception); - void write30(const std::string& fileName, int mode) const throw(INTERP_KERNEL::Exception); + void write(const std::string& fileName, int mode) const; + void write33(const std::string& fileName, int mode) const; + void write30(const std::string& fileName, int mode) const; %extend { - DataArrayByte *serialize() const throw(INTERP_KERNEL::Exception) + DataArrayByte *serialize() const { MCAuto ret(self->serialize()); return ret.retn(); } - PyObject *__getstate__() throw(INTERP_KERNEL::Exception) + PyObject *__getstate__() { PyObject *ret(PyList_New(0)); return ret; } - void __setstate__(PyObject *inp) throw(INTERP_KERNEL::Exception) + void __setstate__(PyObject *inp) { } - - PyObject *__getnewargs__() throw(INTERP_KERNEL::Exception) - { -#ifdef WITH_NUMPY - PyObject *ret(PyTuple_New(1)); - PyObject *ret0(PyDict_New()); - DataArrayByte *retCpp(MEDCoupling_MEDFileWritableStandAlone_serialize(self)); - PyObject *numpyArryObj=SWIG_NewPointerObj(SWIG_as_voidptr(retCpp),SWIGTYPE_p_MEDCoupling__DataArrayByte, SWIG_POINTER_OWN | 0 ); - {// create a dict to discriminite in __new__ if __init__ should be called. Not beautiful but not idea ... - PyObject *tmp1(PyInt_FromLong(0)); - PyDict_SetItem(ret0,tmp1,numpyArryObj); Py_DECREF(tmp1); Py_DECREF(numpyArryObj); - PyTuple_SetItem(ret,0,ret0); - } - return ret; -#else - throw INTERP_KERNEL::Exception("PyWrap of MEDFileData.__getnewargs__ : not implemented because numpy is not active in your configuration ! No serialization/unserialization available without numpy !"); -#endif - } } }; @@ -648,6 +680,8 @@ namespace MEDCoupling public: MEDFileMeshReadSelector(); MEDFileMeshReadSelector(unsigned int code); + mcIdType getNumberOfCoordsLoadSessions(); + void setNumberOfCoordsLoadSessions(mcIdType newNbOfCoordsLoadSessions); unsigned int getCode() const; void setCode(unsigned int newCode); bool isCellFamilyFieldReading() const; @@ -666,14 +700,14 @@ namespace MEDCoupling void setGlobalNodeNumFieldReading(bool b); %extend { - std::string __str__() const throw(INTERP_KERNEL::Exception) + std::string __str__() const { std::ostringstream oss; self->reprAll(oss); return oss.str(); } - std::string __repr__() const throw(INTERP_KERNEL::Exception) + std::string __repr__() const { std::ostringstream oss; oss << "MEDFileMeshReadSelector C++ instance at " << self << " (with code=" << self->getCode() << ")."; return oss.str(); @@ -684,13 +718,13 @@ namespace MEDCoupling class MEDFileJointCorrespondence : public RefCountObject, public MEDFileWritable { public: - static MEDFileJointCorrespondence *New() throw(INTERP_KERNEL::Exception); - static MEDFileJointCorrespondence *New(DataArrayInt* correspondence) // nodes - throw(INTERP_KERNEL::Exception); - static MEDFileJointCorrespondence *New(DataArrayInt* correspondence, // cells + static MEDFileJointCorrespondence *New(); + static MEDFileJointCorrespondence *New(DataArrayIdType* correspondence) // nodes + ; + static MEDFileJointCorrespondence *New(DataArrayIdType* correspondence, // cells INTERP_KERNEL::NormalizedCellType loc_geo_type, INTERP_KERNEL::NormalizedCellType rem_geo_type) - throw(INTERP_KERNEL::Exception); + ; std::vector getDirectChildrenWithNull() const; MEDFileJointCorrespondence *deepCopy() const; MEDFileJointCorrespondence *shallowCpy() const; @@ -701,37 +735,37 @@ namespace MEDCoupling INTERP_KERNEL::NormalizedCellType getLocalGeometryType() const; void setRemoteGeometryType(INTERP_KERNEL::NormalizedCellType type); INTERP_KERNEL::NormalizedCellType getRemoteGeometryType() const; - void setCorrespondence(DataArrayInt *corr) throw(INTERP_KERNEL::Exception); - void write(const std::string& fileName, int mode, const std::string& localMeshName, const std::string& jointName, int order, int iteration) const throw(INTERP_KERNEL::Exception); - std::string simpleRepr() const throw(INTERP_KERNEL::Exception); + void setCorrespondence(DataArrayIdType *corr); + void write(const std::string& fileName, int mode, const std::string& localMeshName, const std::string& jointName, int order, int iteration) const; + std::string simpleRepr() const; %extend { MEDFileJointCorrespondence() { return MEDFileJointCorrespondence::New(); } - MEDFileJointCorrespondence(DataArrayInt* correspondence) throw(INTERP_KERNEL::Exception) + MEDFileJointCorrespondence(DataArrayIdType* correspondence) { return MEDFileJointCorrespondence::New(correspondence); } - MEDFileJointCorrespondence(DataArrayInt* correspondence, // cells + MEDFileJointCorrespondence(DataArrayIdType* correspondence, // cells INTERP_KERNEL::NormalizedCellType loc_geo_type, - INTERP_KERNEL::NormalizedCellType rem_geo_type) throw(INTERP_KERNEL::Exception) + INTERP_KERNEL::NormalizedCellType rem_geo_type) { return MEDFileJointCorrespondence::New(correspondence, loc_geo_type, rem_geo_type); } - std::string __str__() const throw(INTERP_KERNEL::Exception) + std::string __str__() const { return self->simpleRepr(); } - DataArrayInt *getCorrespondence() const throw(INTERP_KERNEL::Exception) + DataArrayIdType *getCorrespondence() const { - const DataArrayInt *ret(self->getCorrespondence()); + const DataArrayIdType *ret(self->getCorrespondence()); if(ret) ret->incrRef(); - return const_cast(ret); + return const_cast(ret); } } }; @@ -739,8 +773,8 @@ namespace MEDCoupling class MEDFileJointOneStep : public RefCountObject, public MEDFileWritable { public: - static MEDFileJointOneStep *New(int dt=-1, int it=-1) throw(INTERP_KERNEL::Exception); - static MEDFileJointOneStep *New(const std::string& fileName, const std::string& mName, const std::string& jointName, int number=1) throw(INTERP_KERNEL::Exception); + static MEDFileJointOneStep *New(int dt=-1, int it=-1); + static MEDFileJointOneStep *New(const std::string& fileName, const std::string& mName, const std::string& jointName, int number=1); MEDFileJointOneStep *deepCopy() const; MEDFileJointOneStep *shallowCpy() const; bool isEqual(const MEDFileJointOneStep *other) const; @@ -750,8 +784,8 @@ namespace MEDCoupling int getIteration() const; void pushCorrespondence(MEDFileJointCorrespondence* correspondence); int getNumberOfCorrespondences() const; - void write(const std::string& fileName, int mode, const std::string& localMeshName, const std::string& jointName) const throw(INTERP_KERNEL::Exception); - std::string simpleRepr() const throw(INTERP_KERNEL::Exception); + void write(const std::string& fileName, int mode, const std::string& localMeshName, const std::string& jointName) const; + std::string simpleRepr() const; %extend { MEDFileJointOneStep() @@ -759,17 +793,17 @@ namespace MEDCoupling return MEDFileJointOneStep::New(); } - MEDFileJointOneStep(const std::string& fileName, const std::string& mName, const std::string& jointName, int number) throw(INTERP_KERNEL::Exception) + MEDFileJointOneStep(const std::string& fileName, const std::string& mName, const std::string& jointName, int number) { return MEDFileJointOneStep::New(fileName,mName,jointName,number); } - std::string __str__() const throw(INTERP_KERNEL::Exception) + std::string __str__() const { return self->simpleRepr(); } - MEDFileJointCorrespondence *getCorrespondenceAtPos(int i) const throw(INTERP_KERNEL::Exception) + MEDFileJointCorrespondence *getCorrespondenceAtPos(int i) const { MEDFileJointCorrespondence *ret(self->getCorrespondenceAtPos(i)); if(ret) @@ -777,7 +811,7 @@ namespace MEDCoupling return ret; } - MEDFileJointCorrespondence *__getitem__(int i) const throw(INTERP_KERNEL::Exception) + MEDFileJointCorrespondence *__getitem__(int i) const { return MEDCoupling_MEDFileJointOneStep_getCorrespondenceAtPos(self,i); } @@ -787,9 +821,9 @@ namespace MEDCoupling class MEDFileJoint : public RefCountObject, public MEDFileWritableStandAlone { public: - static MEDFileJoint *New() throw(INTERP_KERNEL::Exception); - static MEDFileJoint *New(const std::string& fileName, const std::string& mName, int num) throw(INTERP_KERNEL::Exception); - static MEDFileJoint *New(const std::string& jointName, const std::string& locMeshName, const std::string& remoteMeshName, int remoteMeshNum) throw(INTERP_KERNEL::Exception); + static MEDFileJoint *New(); + static MEDFileJoint *New(const std::string& fileName, const std::string& mName, int num); + static MEDFileJoint *New(const std::string& jointName, const std::string& locMeshName, const std::string& remoteMeshName, int remoteMeshNum); MEDFileJoint *deepCopy() const; MEDFileJoint *shallowCpy() const; bool isEqual(const MEDFileJoint *other) const; @@ -801,7 +835,7 @@ namespace MEDCoupling std::string getDescription() const; void setJointName(const std::string& name); std::string getJointName() const; - bool changeJointNames(const std::vector< std::pair >& modifTab) throw(INTERP_KERNEL::Exception); + bool changeJointNames(const std::vector< std::pair >& modifTab); void setDomainNumber(const int& number); int getDomainNumber() const; void pushStep(MEDFileJointOneStep* step); @@ -814,22 +848,22 @@ namespace MEDCoupling return MEDFileJoint::New(); } - MEDFileJoint(const std::string& fileName, const std::string& mName, int num) throw(INTERP_KERNEL::Exception) + MEDFileJoint(const std::string& fileName, const std::string& mName, int num) { return MEDFileJoint::New(fileName,mName,num); } - MEDFileJoint(const std::string& jointName, const std::string& locMeshName, const std::string& remoteMeshName, int remoteMeshNum) throw(INTERP_KERNEL::Exception) + MEDFileJoint(const std::string& jointName, const std::string& locMeshName, const std::string& remoteMeshName, int remoteMeshNum) { return MEDFileJoint::New(jointName,locMeshName,remoteMeshName,remoteMeshNum); } - std::string __str__() const throw(INTERP_KERNEL::Exception) + std::string __str__() const { return self->simpleRepr(); } - MEDFileJointOneStep *getStepAtPos(int i) const throw(INTERP_KERNEL::Exception) + MEDFileJointOneStep *getStepAtPos(int i) const { MEDFileJointOneStep *ret(self->getStepAtPos(i)); if(ret) @@ -837,7 +871,7 @@ namespace MEDCoupling return ret; } - MEDFileJointOneStep *__getitem__(int i) throw(INTERP_KERNEL::Exception) + MEDFileJointOneStep *__getitem__(int i) { return MEDCoupling_MEDFileJoint_getStepAtPos(self,i); } @@ -847,18 +881,18 @@ namespace MEDCoupling class MEDFileJoints : public RefCountObject, public MEDFileWritableStandAlone { public: - static MEDFileJoints *New() throw(INTERP_KERNEL::Exception); - static MEDFileJoints *New(const std::string& fileName, const std::string& meshName) throw(INTERP_KERNEL::Exception); + static MEDFileJoints *New(); + static MEDFileJoints *New(const std::string& fileName, const std::string& meshName); MEDFileJoints *deepCopy() const; std::string simpleRepr() const; std::string getMeshName() const; int getNumberOfJoints() const; std::vector getJointsNames() const; - bool changeJointNames(const std::vector< std::pair >& modifTab) throw(INTERP_KERNEL::Exception); - void resize(int newSize) throw(INTERP_KERNEL::Exception); + bool changeJointNames(const std::vector< std::pair >& modifTab); + void resize(int newSize); void pushJoint(MEDFileJoint *joint); - void setJointAtPos(int i, MEDFileJoint *joint) throw(INTERP_KERNEL::Exception); - void destroyJointAtPos(int i) throw(INTERP_KERNEL::Exception); + void setJointAtPos(int i, MEDFileJoint *joint); + void destroyJointAtPos(int i); %extend { MEDFileJoints() @@ -866,17 +900,17 @@ namespace MEDCoupling return MEDFileJoints::New(); } - MEDFileJoints(const std::string& fileName, const std::string& meshName) throw(INTERP_KERNEL::Exception) + MEDFileJoints(const std::string& fileName, const std::string& meshName) { return MEDFileJoints::New(fileName,meshName); } - std::string __str__() const throw(INTERP_KERNEL::Exception) + std::string __str__() const { return self->simpleRepr(); } - MEDFileJoint *__getitem__(PyObject *obj) throw(INTERP_KERNEL::Exception) + MEDFileJoint *__getitem__(PyObject *obj) { static const char msg[]="MEDFileJoints::__getitem__ : only integer or string with meshname supported !"; if(PyInt_Check(obj)) @@ -892,12 +926,12 @@ namespace MEDCoupling return ret; } - int __len__() const throw(INTERP_KERNEL::Exception) + int __len__() const { return self->getNumberOfJoints(); } - MEDFileJoint *getJointAtPos(int i) const throw(INTERP_KERNEL::Exception) + MEDFileJoint *getJointAtPos(int i) const { MEDFileJoint *ret=self->getJointAtPos(i); if(ret) @@ -905,7 +939,7 @@ namespace MEDCoupling return ret; } - MEDFileJoint *getJointWithName(const std::string& paramName) const throw(INTERP_KERNEL::Exception) + MEDFileJoint *getJointWithName(const std::string& paramName) const { MEDFileJoint *ret=self->getJointWithName(paramName); if(ret) @@ -926,12 +960,12 @@ namespace MEDCoupling private: MEDFileEquivalenceData(); public: - void setArray(DataArrayInt *data); + void setArray(DataArrayInt32 *data); %extend { - DataArrayInt *getArray() + DataArrayInt32 *getArray() { - DataArrayInt *ret(self->getArray()); + DataArrayInt32 *ret(self->getArray()); if(ret) ret->incrRef(); return ret; } @@ -951,18 +985,18 @@ namespace MEDCoupling public: void clear(); std::size_t size() const; - void setArray(int meshDimRelToMax, DataArrayInt *da) throw(INTERP_KERNEL::Exception); - void setArrayForType(INTERP_KERNEL::NormalizedCellType type, DataArrayInt *da) throw(INTERP_KERNEL::Exception); + void setArray(int meshDimRelToMax, DataArrayInt32 *da); + void setArrayForType(INTERP_KERNEL::NormalizedCellType type, DataArrayInt32 *da); %extend { - DataArrayInt *getArray(INTERP_KERNEL::NormalizedCellType type) throw(INTERP_KERNEL::Exception) + DataArrayInt32 *getArray(INTERP_KERNEL::NormalizedCellType type) { - DataArrayInt *ret(self->getArray(type)); + DataArrayInt32 *ret(self->getArray(type)); if(ret) ret->incrRef(); return ret; } - PyObject *getTypes() const throw(INTERP_KERNEL::Exception) + PyObject *getTypes() const { std::vector result(self->getTypes()); std::vector::const_iterator iL=result.begin(); @@ -983,7 +1017,7 @@ namespace MEDCoupling void setName(const std::string& name); std::string getDescription() const; void setDescription(const std::string& descr); - void setArray(int meshDimRelToMaxExt, DataArrayInt *da);; + void setArray(int meshDimRelToMaxExt, DataArrayInt32 *da);; %extend { MEDFileEquivalenceCell *initCell() @@ -1022,26 +1056,26 @@ namespace MEDCoupling MEDFileEquivalences(); public: int size() const; - std::vector getEquivalenceNames() const throw(INTERP_KERNEL::Exception); - void killEquivalenceWithName(const std::string& name) throw(INTERP_KERNEL::Exception); - void killEquivalenceAt(int i) throw(INTERP_KERNEL::Exception); + std::vector getEquivalenceNames() const; + void killEquivalenceWithName(const std::string& name); + void killEquivalenceAt(int i); void clear(); %extend { - MEDFileEquivalencePair *getEquivalence(int i) throw(INTERP_KERNEL::Exception) + MEDFileEquivalencePair *getEquivalence(int i) { MEDFileEquivalencePair *ret(self->getEquivalence(i)); if(ret) ret->incrRef(); return ret; } - MEDFileEquivalencePair *getEquivalenceWithName(const std::string& name) throw(INTERP_KERNEL::Exception) + MEDFileEquivalencePair *getEquivalenceWithName(const std::string& name) { MEDFileEquivalencePair *ret(self->getEquivalenceWithName(name)); if(ret) ret->incrRef(); return ret; } - MEDFileEquivalencePair *appendEmptyEquivalenceWithName(const std::string& name) throw(INTERP_KERNEL::Exception) + MEDFileEquivalencePair *appendEmptyEquivalenceWithName(const std::string& name) { MEDFileEquivalencePair *ret(self->appendEmptyEquivalenceWithName(name)); if(ret) ret->incrRef(); @@ -1053,13 +1087,13 @@ namespace MEDCoupling class MEDFileMesh : public RefCountObject, public MEDFileWritableStandAlone { public: - static MEDFileMesh *New(const std::string& fileName, MEDFileMeshReadSelector *mrs=0) throw(INTERP_KERNEL::Exception); - static MEDFileMesh *New(const std::string& fileName, const std::string& mName, int dt=-1, int it=-1, MEDFileMeshReadSelector *mrs=0) throw(INTERP_KERNEL::Exception); - static MEDFileMesh *New(DataArrayByte *db) throw(INTERP_KERNEL::Exception); - virtual MEDFileMesh *createNewEmpty() const throw(INTERP_KERNEL::Exception); - virtual MEDFileMesh *deepCopy() const throw(INTERP_KERNEL::Exception); - virtual MEDFileMesh *shallowCpy() const throw(INTERP_KERNEL::Exception); - virtual void clearNonDiscrAttributes() const throw(INTERP_KERNEL::Exception); + static MEDFileMesh *New(const std::string& fileName, MEDFileMeshReadSelector *mrs=0); + static MEDFileMesh *New(const std::string& fileName, const std::string& mName, int dt=-1, int it=-1, MEDFileMeshReadSelector *mrs=0); + static MEDFileMesh *New(DataArrayByte *db); + virtual MEDFileMesh *createNewEmpty() const; + virtual MEDFileMesh *deepCopy() const; + virtual MEDFileMesh *shallowCpy() const; + virtual void clearNonDiscrAttributes() const; void setName(const std::string& name); std::string getName(); std::string getUnivName() const; @@ -1078,127 +1112,135 @@ namespace MEDCoupling std::string getTimeUnit() const; void setAxisType(MEDCouplingAxisType at); MEDCouplingAxisType getAxisType() const; - virtual int getNumberOfNodes() const throw(INTERP_KERNEL::Exception); - virtual int getNumberOfCellsAtLevel(int meshDimRelToMaxExt) const throw(INTERP_KERNEL::Exception); - virtual bool hasImplicitPart() const throw(INTERP_KERNEL::Exception); - virtual int buildImplicitPartIfAny(INTERP_KERNEL::NormalizedCellType gt) const throw(INTERP_KERNEL::Exception); - virtual void releaseImplicitPartIfAny() const throw(INTERP_KERNEL::Exception); - virtual int getNumberOfCellsWithType(INTERP_KERNEL::NormalizedCellType ct) const throw(INTERP_KERNEL::Exception); - virtual std::vector getFamArrNonEmptyLevelsExt() const throw(INTERP_KERNEL::Exception); - virtual std::vector getNumArrNonEmptyLevelsExt() const throw(INTERP_KERNEL::Exception); - virtual std::vector getNameArrNonEmptyLevelsExt() const throw(INTERP_KERNEL::Exception); - virtual std::vector getDistributionOfTypes(int meshDimRelToMax) const throw(INTERP_KERNEL::Exception); - virtual MEDFileMesh *cartesianize() const throw(INTERP_KERNEL::Exception); - std::vector getNonEmptyLevels() const throw(INTERP_KERNEL::Exception); - std::vector getNonEmptyLevelsExt() const throw(INTERP_KERNEL::Exception); - int getSizeAtLevel(int meshDimRelToMaxExt) const throw(INTERP_KERNEL::Exception); + virtual int getNumberOfNodes() const; + virtual int getNumberOfCellsAtLevel(int meshDimRelToMaxExt) const; + virtual bool hasImplicitPart() const; + virtual int buildImplicitPartIfAny(INTERP_KERNEL::NormalizedCellType gt) const; + virtual void releaseImplicitPartIfAny() const; + virtual int getNumberOfCellsWithType(INTERP_KERNEL::NormalizedCellType ct) const; + virtual std::vector getFamArrNonEmptyLevelsExt() const; + virtual std::vector getNumArrNonEmptyLevelsExt() const; + virtual std::vector getNameArrNonEmptyLevelsExt() const; + virtual std::vector getDistributionOfTypes(int meshDimRelToMax) const; + virtual MEDFileMesh *cartesianize() const; + std::vector getNonEmptyLevels() const; + std::vector getNonEmptyLevelsExt() const; + int getSizeAtLevel(int meshDimRelToMaxExt) const; // - bool existsGroup(const std::string& groupName) const throw(INTERP_KERNEL::Exception); - bool existsFamily(int famId) const throw(INTERP_KERNEL::Exception); - bool existsFamily(const std::string& familyName) const throw(INTERP_KERNEL::Exception); - void setFamilyId(const std::string& familyName, int id) throw(INTERP_KERNEL::Exception); - void setFamilyIdUnique(const std::string& familyName, int id) throw(INTERP_KERNEL::Exception); - void addFamily(const std::string& familyName, int id) throw(INTERP_KERNEL::Exception); - void addFamilyOnGrp(const std::string& grpName, const std::string& famName) throw(INTERP_KERNEL::Exception); - virtual void createGroupOnAll(int meshDimRelToMaxExt, const std::string& groupName) throw(INTERP_KERNEL::Exception); - virtual bool keepFamIdsOnlyOnLevs(const std::vector& famIds, const std::vector& levs) throw(INTERP_KERNEL::Exception); - void copyFamGrpMapsFrom(const MEDFileMesh& other) throw(INTERP_KERNEL::Exception); - void clearGrpMap() throw(INTERP_KERNEL::Exception); - void clearFamMap() throw(INTERP_KERNEL::Exception); - void clearFamGrpMaps() throw(INTERP_KERNEL::Exception); - const std::map& getFamilyInfo() const throw(INTERP_KERNEL::Exception); - const std::map >& getGroupInfo() const throw(INTERP_KERNEL::Exception); - std::vector getFamiliesOnGroup(const std::string& name) const throw(INTERP_KERNEL::Exception); - std::vector getFamiliesOnGroups(const std::vector& grps) const throw(INTERP_KERNEL::Exception); - std::vector getFamiliesIdsOnGroup(const std::string& name) const throw(INTERP_KERNEL::Exception); - void setFamiliesOnGroup(const std::string& name, const std::vector& fams) throw(INTERP_KERNEL::Exception); - void setFamiliesIdsOnGroup(const std::string& name, const std::vector& famIds) throw(INTERP_KERNEL::Exception); - std::vector getGroupsOnFamily(const std::string& name) const throw(INTERP_KERNEL::Exception); - void setGroupsOnFamily(const std::string& famName, const std::vector& grps) throw(INTERP_KERNEL::Exception); - std::vector getGroupsNames() const throw(INTERP_KERNEL::Exception); - std::vector getFamiliesNames() const throw(INTERP_KERNEL::Exception); - std::vector getGroupsOnSpecifiedLev(int meshDimRelToMaxExt) const throw(INTERP_KERNEL::Exception); - std::vector getGrpNonEmptyLevelsExt(const std::string& grp) const throw(INTERP_KERNEL::Exception); - std::vector getGrpNonEmptyLevels(const std::string& grp) const throw(INTERP_KERNEL::Exception); - std::vector getFamsNonEmptyLevels(const std::vector& fams) const throw(INTERP_KERNEL::Exception); - std::vector getFamsNonEmptyLevelsExt(const std::vector& fams) const throw(INTERP_KERNEL::Exception); - std::vector getGrpsNonEmptyLevels(const std::vector& grps) const throw(INTERP_KERNEL::Exception); - std::vector getGrpsNonEmptyLevelsExt(const std::vector& grps) const throw(INTERP_KERNEL::Exception); - std::vector getFamNonEmptyLevels(const std::string& fam) const throw(INTERP_KERNEL::Exception); - std::vector getFamNonEmptyLevelsExt(const std::string& fam) const throw(INTERP_KERNEL::Exception); - std::vector getFamiliesNamesWithFilePointOfView() const throw(INTERP_KERNEL::Exception); + bool existsGroup(const std::string& groupName) const; + bool existsFamily(int famId) const; + bool existsFamily(const std::string& familyName) const; + void setFamilyId(const std::string& familyName, int id); + void setFamilyIdUnique(const std::string& familyName, int id); + void addFamily(const std::string& familyName, int id); + void addFamilyOnGrp(const std::string& grpName, const std::string& famName); + virtual void createGroupOnAll(int meshDimRelToMaxExt, const std::string& groupName); + virtual bool keepFamIdsOnlyOnLevs(const std::vector& famIds, const std::vector& levs); + void copyFamGrpMapsFrom(const MEDFileMesh& other); + void clearGrpMap(); + void clearFamMap(); + void clearFamGrpMaps(); + const std::map& getFamilyInfo() const; + const std::map >& getGroupInfo() const; + std::vector getFamiliesOnGroup(const std::string& name) const; + std::vector getFamiliesOnGroups(const std::vector& grps) const; + std::vector getFamiliesIdsOnGroup(const std::string& name) const; + void setFamiliesOnGroup(const std::string& name, const std::vector& fams); + void setFamiliesIdsOnGroup(const std::string& name, const std::vector& famIds); + std::vector getGroupsOnFamily(const std::string& name) const; + void setGroupsOnFamily(const std::string& famName, const std::vector& grps); + std::vector getGroupsNames() const; + std::vector getFamiliesNames() const; + std::vector getGroupsOnSpecifiedLev(int meshDimRelToMaxExt) const; + std::vector getGrpNonEmptyLevelsExt(const std::string& grp) const; + std::vector getGrpNonEmptyLevels(const std::string& grp) const; + std::vector getFamsNonEmptyLevels(const std::vector& fams) const; + std::vector getFamsNonEmptyLevelsExt(const std::vector& fams) const; + std::vector getGrpsNonEmptyLevels(const std::vector& grps) const; + std::vector getGrpsNonEmptyLevelsExt(const std::vector& grps) const; + std::vector getFamNonEmptyLevels(const std::string& fam) const; + std::vector getFamNonEmptyLevelsExt(const std::string& fam) const; + std::vector getFamiliesNamesWithFilePointOfView() const; static std::string GetMagicFamilyStr(); - void assignFamilyNameWithGroupName() throw(INTERP_KERNEL::Exception); - std::vector removeEmptyGroups() throw(INTERP_KERNEL::Exception); - void removeGroup(const std::string& name) throw(INTERP_KERNEL::Exception); - void removeFamily(const std::string& name) throw(INTERP_KERNEL::Exception); - std::vector removeOrphanGroups() throw(INTERP_KERNEL::Exception); - std::vector removeOrphanFamilies() throw(INTERP_KERNEL::Exception); - void removeFamiliesReferedByNoGroups() throw(INTERP_KERNEL::Exception); - void rearrangeFamilies() throw(INTERP_KERNEL::Exception); - void checkOrphanFamilyZero() const throw(INTERP_KERNEL::Exception); - void changeGroupName(const std::string& oldName, const std::string& newName) throw(INTERP_KERNEL::Exception); - void changeFamilyName(const std::string& oldName, const std::string& newName) throw(INTERP_KERNEL::Exception); - void changeFamilyId(int oldId, int newId) throw(INTERP_KERNEL::Exception); - void changeAllGroupsContainingFamily(const std::string& familyNameToChange, const std::vector& newFamiliesNames) throw(INTERP_KERNEL::Exception); - void setFamilyInfo(const std::map& info); + void assignFamilyNameWithGroupName(); + std::vector removeEmptyGroups(); + void removeGroupAtLevel(int meshDimRelToMaxExt, const std::string& name); + void removeGroup(const std::string& name); + void removeFamily(const std::string& name); + std::vector removeOrphanGroups(); + std::vector removeOrphanFamilies(); + void removeFamiliesReferedByNoGroups(); + void rearrangeFamilies(); + void zipFamilies(); + void checkOrphanFamilyZero() const; + void changeGroupName(const std::string& oldName, const std::string& newName); + void changeFamilyName(const std::string& oldName, const std::string& newName); + void changeFamilyId(int oldId, int newId); + void changeAllGroupsContainingFamily(const std::string& familyNameToChange, const std::vector& newFamiliesNames); + void setFamilyInfo(const std::map& info); void setGroupInfo(const std::map >&info); - int getFamilyId(const std::string& name) const throw(INTERP_KERNEL::Exception); - int getMaxAbsFamilyId() const throw(INTERP_KERNEL::Exception); - int getMaxFamilyId() const throw(INTERP_KERNEL::Exception); - int getMinFamilyId() const throw(INTERP_KERNEL::Exception); - int getTheMaxAbsFamilyId() const throw(INTERP_KERNEL::Exception); - int getTheMaxFamilyId() const throw(INTERP_KERNEL::Exception); - int getTheMinFamilyId() const throw(INTERP_KERNEL::Exception); - virtual int getMaxAbsFamilyIdInArrays() const throw(INTERP_KERNEL::Exception); - virtual int getMaxFamilyIdInArrays() const throw(INTERP_KERNEL::Exception); - virtual int getMinFamilyIdInArrays() const throw(INTERP_KERNEL::Exception); - DataArrayInt *getAllFamiliesIdsReferenced() const throw(INTERP_KERNEL::Exception); - DataArrayInt *computeAllFamilyIdsInUse() const throw(INTERP_KERNEL::Exception); - std::vector getFamiliesIds(const std::vector& famNames) const throw(INTERP_KERNEL::Exception); - std::string getFamilyNameGivenId(int id) const throw(INTERP_KERNEL::Exception); - bool ensureDifferentFamIdsPerLevel() throw(INTERP_KERNEL::Exception); - void normalizeFamIdsTrio() throw(INTERP_KERNEL::Exception); - void normalizeFamIdsMEDFile() throw(INTERP_KERNEL::Exception); - virtual int getMeshDimension() const throw(INTERP_KERNEL::Exception); - virtual std::string simpleRepr() const throw(INTERP_KERNEL::Exception); - virtual std::string advancedRepr() const throw(INTERP_KERNEL::Exception); + int getFamilyId(const std::string& name) const; + int getMaxAbsFamilyId() const; + int getMaxFamilyId() const; + int getMinFamilyId() const; + int getTheMaxAbsFamilyId() const; + int getTheMaxFamilyId() const; + int getTheMinFamilyId() const; + virtual int getMaxAbsFamilyIdInArrays() const; + virtual int getMaxFamilyIdInArrays() const; + virtual int getMinFamilyIdInArrays() const; + DataArrayIdType *getAllFamiliesIdsReferenced() const; + DataArrayIdType *computeAllFamilyIdsInUse() const; + std::vector getFamiliesIds(const std::vector& famNames) const; + std::string getFamilyNameGivenId(int id) const; + bool ensureDifferentFamIdsPerLevel(); + void normalizeFamIdsTrio(); + void normalizeFamIdsMEDFile(); + virtual int getMeshDimension() const; + virtual std::string simpleRepr() const; + virtual std::string advancedRepr() const; // - virtual MEDCouplingMesh *getMeshAtLevel(int meshDimRelToMax, bool renum=false) const throw(INTERP_KERNEL::Exception); - virtual void setFamilyFieldArr(int meshDimRelToMaxExt, DataArrayInt *famArr) throw(INTERP_KERNEL::Exception); - virtual void setRenumFieldArr(int meshDimRelToMaxExt, DataArrayInt *renumArr) throw(INTERP_KERNEL::Exception); - virtual void setNameFieldAtLevel(int meshDimRelToMaxExt, DataArrayAsciiChar *nameArr) throw(INTERP_KERNEL::Exception); - virtual void setGlobalNumFieldAtLevel(int meshDimRelToMaxExt, DataArrayInt *globalNumArr) throw(INTERP_KERNEL::Exception); - virtual void addNodeGroup(const DataArrayInt *ids) throw(INTERP_KERNEL::Exception); - virtual void addGroup(int meshDimRelToMaxExt, const DataArrayInt *ids) throw(INTERP_KERNEL::Exception); - virtual DataArrayInt *getFamiliesArr(int meshDimRelToMaxExt, const std::vector& fams, bool renum=false) const throw(INTERP_KERNEL::Exception); - virtual DataArrayInt *getGroupsArr(int meshDimRelToMaxExt, const std::vector& grps, bool renum=false) const throw(INTERP_KERNEL::Exception); - virtual DataArrayInt *getGroupArr(int meshDimRelToMaxExt, const std::string& grp, bool renum=false) const throw(INTERP_KERNEL::Exception); - virtual DataArrayInt *getFamilyArr(int meshDimRelToMaxExt, const std::string& fam, bool renum=false) const throw(INTERP_KERNEL::Exception); - virtual DataArrayInt *getNodeGroupArr(const std::string& grp, bool renum=false) const throw(INTERP_KERNEL::Exception); - virtual DataArrayInt *getNodeGroupsArr(const std::vector& grps, bool renum=false) const throw(INTERP_KERNEL::Exception); - virtual DataArrayInt *getNodeFamilyArr(const std::string& fam, bool renum=false) const throw(INTERP_KERNEL::Exception); - virtual DataArrayInt *getNodeFamiliesArr(const std::vector& fams, bool renum=false) const throw(INTERP_KERNEL::Exception); + virtual MEDCouplingMesh *getMeshAtLevel(int meshDimRelToMax, bool renum=false) const; + virtual void setFamilyFieldArr(int meshDimRelToMaxExt, DataArrayIdType *famArr); + virtual void setRenumFieldArr(int meshDimRelToMaxExt, DataArrayIdType *renumArr); + virtual void setNameFieldAtLevel(int meshDimRelToMaxExt, DataArrayAsciiChar *nameArr); + virtual void setGlobalNumFieldAtLevel(int meshDimRelToMaxExt, DataArrayIdType *globalNumArr); + virtual void addNodeGroup(const DataArrayIdType *ids); + virtual void addGroup(int meshDimRelToMaxExt, const DataArrayIdType *ids); + virtual DataArrayIdType *getFamiliesArr(int meshDimRelToMaxExt, const std::vector& fams, bool renum=false) const; + virtual DataArrayIdType *getGroupsArr(int meshDimRelToMaxExt, const std::vector& grps, bool renum=false) const; + virtual DataArrayIdType *getGroupArr(int meshDimRelToMaxExt, const std::string& grp, bool renum=false) const; + virtual DataArrayIdType *getFamilyArr(int meshDimRelToMaxExt, const std::string& fam, bool renum=false) const; + virtual DataArrayIdType *getNodeGroupArr(const std::string& grp, bool renum=false) const; + virtual DataArrayIdType *getNodeGroupsArr(const std::vector& grps, bool renum=false) const; + virtual DataArrayIdType *getNodeFamilyArr(const std::string& fam, bool renum=false) const; + virtual DataArrayIdType *getNodeFamiliesArr(const std::vector& fams, bool renum=false) const; int getNumberOfJoints(); MEDFileJoints *getJoints(); void setJoints( MEDFileJoints* joints ); void initializeEquivalences(); void killEquivalences(); - bool presenceOfStructureElements() const throw(INTERP_KERNEL::Exception); - void killStructureElements() throw(INTERP_KERNEL::Exception); + bool presenceOfStructureElements() const; + void killStructureElements(); %extend { - std::string __str__() const throw(INTERP_KERNEL::Exception) + std::string __str__() const { return self->simpleRepr(); } - MEDCouplingMesh *__getitem__(int meshDimRelToMaxExt) const throw(INTERP_KERNEL::Exception) + MEDCouplingMesh *__getitem__(int meshDimRelToMaxExt) const { return self->getMeshAtLevel(meshDimRelToMaxExt,false); } - PyObject *getTime() throw(INTERP_KERNEL::Exception) + static INTERP_KERNEL::NormalizedCellType ConvertFromMEDFileGeoType(int geoType) + { + med_geometry_type geoType2((med_geometry_type) geoType); + return MEDFileMesh::ConvertFromMEDFileGeoType(geoType2); + } + + PyObject *getTime() { int tmp1,tmp2; double tmp0=self->getTime(tmp1,tmp2); @@ -1209,7 +1251,7 @@ namespace MEDCoupling return res; } - virtual PyObject *isEqual(const MEDFileMesh *other, double eps) const throw(INTERP_KERNEL::Exception) + virtual PyObject *isEqual(const MEDFileMesh *other, double eps) const { std::string what; bool ret0=self->isEqual(other,eps,what); @@ -1221,14 +1263,14 @@ namespace MEDCoupling return res; } - void setGroupsAtLevel(int meshDimRelToMaxExt, PyObject *li, bool renum=false) throw(INTERP_KERNEL::Exception) + void setGroupsAtLevel(int meshDimRelToMaxExt, PyObject *li, bool renum=false) { - std::vector grps; - convertFromPyObjVectorOfObj(li,SWIGTYPE_p_MEDCoupling__DataArrayInt,"DataArrayInt",grps); + std::vector grps; + convertFromPyObjVectorOfObj(li,SWIGTITraits::TI,"DataArrayInt",grps); self->setGroupsAtLevel(meshDimRelToMaxExt,grps,renum); } - PyObject *areFamsEqual(const MEDFileMesh *other) const throw(INTERP_KERNEL::Exception) + PyObject *areFamsEqual(const MEDFileMesh *other) const { std::string what; bool ret0=self->areFamsEqual(other,what); @@ -1240,7 +1282,7 @@ namespace MEDCoupling return res; } - PyObject *areGrpsEqual(const MEDFileMesh *other) const throw(INTERP_KERNEL::Exception) + PyObject *areGrpsEqual(const MEDFileMesh *other) const { std::string what; bool ret0=self->areGrpsEqual(other,what); @@ -1252,7 +1294,7 @@ namespace MEDCoupling return res; } - PyObject *getAllGeoTypes() const throw(INTERP_KERNEL::Exception) + PyObject *getAllGeoTypes() const { std::vector result(self->getAllGeoTypes()); std::vector::const_iterator iL=result.begin(); @@ -1262,7 +1304,7 @@ namespace MEDCoupling return res; } - PyObject *getGeoTypesAtLevel(int meshDimRelToMax) const throw(INTERP_KERNEL::Exception) + PyObject *getGeoTypesAtLevel(int meshDimRelToMax) const { std::vector result(self->getGeoTypesAtLevel(meshDimRelToMax)); std::vector::const_iterator iL=result.begin(); @@ -1272,39 +1314,39 @@ namespace MEDCoupling return res; } - PyObject *getFamilyFieldAtLevel(int meshDimRelToMaxExt) const throw(INTERP_KERNEL::Exception) + PyObject *getFamilyFieldAtLevel(int meshDimRelToMaxExt) const { - const DataArrayInt *tmp=self->getFamilyFieldAtLevel(meshDimRelToMaxExt); + const DataArrayIdType *tmp=self->getFamilyFieldAtLevel(meshDimRelToMaxExt); if(tmp) tmp->incrRef(); - return SWIG_NewPointerObj(SWIG_as_voidptr(tmp),SWIGTYPE_p_MEDCoupling__DataArrayInt, SWIG_POINTER_OWN | 0 ); + return SWIG_NewPointerObj(SWIG_as_voidptr(tmp),SWIGTITraits::TI, SWIG_POINTER_OWN | 0 ); } - PyObject *getOrCreateAndGetFamilyFieldAtLevel(int meshDimRelToMaxExt) throw(INTERP_KERNEL::Exception) + PyObject *getOrCreateAndGetFamilyFieldAtLevel(int meshDimRelToMaxExt) { - const DataArrayInt *tmp=self->getOrCreateAndGetFamilyFieldAtLevel(meshDimRelToMaxExt); + const DataArrayIdType *tmp=self->getOrCreateAndGetFamilyFieldAtLevel(meshDimRelToMaxExt); if(tmp) tmp->incrRef(); - return SWIG_NewPointerObj(SWIG_as_voidptr(tmp),SWIGTYPE_p_MEDCoupling__DataArrayInt, SWIG_POINTER_OWN | 0 ); + return SWIG_NewPointerObj(SWIG_as_voidptr(tmp),SWIGTITraits::TI, SWIG_POINTER_OWN | 0 ); } - PyObject *getNumberFieldAtLevel(int meshDimRelToMaxExt) const throw(INTERP_KERNEL::Exception) + PyObject *getNumberFieldAtLevel(int meshDimRelToMaxExt) const { - const DataArrayInt *tmp=self->getNumberFieldAtLevel(meshDimRelToMaxExt); + const DataArrayIdType *tmp=self->getNumberFieldAtLevel(meshDimRelToMaxExt); if(tmp) tmp->incrRef(); - return SWIG_NewPointerObj(SWIG_as_voidptr(tmp),SWIGTYPE_p_MEDCoupling__DataArrayInt, SWIG_POINTER_OWN | 0 ); + return SWIG_NewPointerObj(SWIG_as_voidptr(tmp),SWIGTITraits::TI, SWIG_POINTER_OWN | 0 ); } - PyObject *getRevNumberFieldAtLevel(int meshDimRelToMaxExt) const throw(INTERP_KERNEL::Exception) + PyObject *getRevNumberFieldAtLevel(int meshDimRelToMaxExt) const { - const DataArrayInt *tmp=self->getRevNumberFieldAtLevel(meshDimRelToMaxExt); + const DataArrayIdType *tmp=self->getRevNumberFieldAtLevel(meshDimRelToMaxExt); if(tmp) tmp->incrRef(); - return SWIG_NewPointerObj(SWIG_as_voidptr(tmp),SWIGTYPE_p_MEDCoupling__DataArrayInt, SWIG_POINTER_OWN | 0 ); + return SWIG_NewPointerObj(SWIG_as_voidptr(tmp),SWIGTITraits::TI, SWIG_POINTER_OWN | 0 ); } - PyObject *getNameFieldAtLevel(int meshDimRelToMaxExt) const throw(INTERP_KERNEL::Exception) + PyObject *getNameFieldAtLevel(int meshDimRelToMaxExt) const { const DataArrayAsciiChar *tmp=self->getNameFieldAtLevel(meshDimRelToMaxExt); if(tmp) @@ -1312,7 +1354,7 @@ namespace MEDCoupling return SWIG_NewPointerObj(SWIG_as_voidptr(tmp),SWIGTYPE_p_MEDCoupling__DataArrayAsciiChar, SWIG_POINTER_OWN | 0 ); } - PyObject *findOrCreateAndGiveFamilyWithId(int id, bool& created) throw(INTERP_KERNEL::Exception) + PyObject *findOrCreateAndGiveFamilyWithId(int id, bool& created) { bool ret1; std::string ret0=self->findOrCreateAndGiveFamilyWithId(id,ret1); @@ -1322,10 +1364,10 @@ namespace MEDCoupling return ret; } - PyObject *unPolyze() throw(INTERP_KERNEL::Exception) + PyObject *unPolyze() { - DataArrayInt *ret3=0; - std::vector ret1,ret2; + DataArrayIdType *ret3=0; + std::vector ret1,ret2; bool ret0=self->unPolyze(ret1,ret2,ret3); PyObject *ret=PyTuple_New(4); PyTuple_SetItem(ret,0,SWIG_From_bool(ret0)); @@ -1334,9 +1376,9 @@ namespace MEDCoupling for(int j=0;j<(int)ret1.size()/3;j++) { PyObject *retLev2=PyList_New(3); - PyList_SetItem(retLev2,0,SWIG_From_int(ret1[3*j])); - PyList_SetItem(retLev2,1,SWIG_From_int(ret1[3*j+1])); - PyList_SetItem(retLev2,2,SWIG_From_int(ret1[3*j+2])); + PyList_SetItem(retLev2,0,PyInt_FromLong(ret1[3*j])); + PyList_SetItem(retLev2,1,PyInt_FromLong(ret1[3*j+1])); + PyList_SetItem(retLev2,2,PyInt_FromLong(ret1[3*j+2])); PyList_SetItem(retLev1_0,j,retLev2); } PyTuple_SetItem(ret,1,retLev1_0); @@ -1345,27 +1387,27 @@ namespace MEDCoupling for(int j=0;j<(int)ret2.size()/3;j++) { PyObject *retLev2=PyList_New(3); - PyList_SetItem(retLev2,0,SWIG_From_int(ret2[3*j])); - PyList_SetItem(retLev2,1,SWIG_From_int(ret2[3*j+1])); - PyList_SetItem(retLev2,2,SWIG_From_int(ret2[3*j+2])); + PyList_SetItem(retLev2,0,PyInt_FromLong(ret2[3*j])); + PyList_SetItem(retLev2,1,PyInt_FromLong(ret2[3*j+1])); + PyList_SetItem(retLev2,2,PyInt_FromLong(ret2[3*j+2])); PyList_SetItem(retLev1_1,j,retLev2); } PyTuple_SetItem(ret,2,retLev1_1); // - PyTuple_SetItem(ret,3,SWIG_NewPointerObj(SWIG_as_voidptr(ret3),SWIGTYPE_p_MEDCoupling__DataArrayInt, SWIG_POINTER_OWN | 0 )); + PyTuple_SetItem(ret,3,SWIG_NewPointerObj(SWIG_as_voidptr(ret3),SWIGTITraits::TI, SWIG_POINTER_OWN | 0 )); return ret; } - MEDFileEquivalences *getEquivalences() throw(INTERP_KERNEL::Exception) + MEDFileEquivalences *getEquivalences() { MEDFileEquivalences *ret(self->getEquivalences()); if(ret) ret->incrRef(); return ret; } - virtual DataArrayInt *getGlobalNumFieldAtLevel(int meshDimRelToMaxExt) const throw(INTERP_KERNEL::Exception) + virtual DataArrayIdType *getGlobalNumFieldAtLevel(int meshDimRelToMaxExt) const { - MCAuto ret(self->getGlobalNumFieldAtLevel(meshDimRelToMaxExt)); + MCAuto ret(self->getGlobalNumFieldAtLevel(meshDimRelToMaxExt)); return ret.retn(); } } @@ -1374,63 +1416,65 @@ namespace MEDCoupling class MEDFileUMesh : public MEDFileMesh { public: - static MEDFileUMesh *New(const std::string& fileName, const std::string& mName, int dt=-1, int it=-1, MEDFileMeshReadSelector *mrs=0) throw(INTERP_KERNEL::Exception); - static MEDFileUMesh *New(const std::string& fileName, MEDFileMeshReadSelector *mrs=0) throw(INTERP_KERNEL::Exception); - static MEDFileUMesh *New(const MEDCouplingMappedExtrudedMesh *mem) throw(INTERP_KERNEL::Exception); - static MEDFileUMesh *New(DataArrayByte *db) throw(INTERP_KERNEL::Exception); + static MEDFileUMesh *New(const std::string& fileName, const std::string& mName, int dt=-1, int it=-1, MEDFileMeshReadSelector *mrs=0); + static MEDFileUMesh *New(const std::string& fileName, MEDFileMeshReadSelector *mrs=0); + static MEDFileUMesh *New(const MEDCouplingMappedExtrudedMesh *mem); + static MEDFileUMesh *New(DataArrayByte *db); static MEDFileUMesh *New(); static const char *GetSpeStr4ExtMesh(); ~MEDFileUMesh(); - int getSpaceDimension() const throw(INTERP_KERNEL::Exception); - int getRelativeLevOnGeoType(INTERP_KERNEL::NormalizedCellType gt) const throw(INTERP_KERNEL::Exception); - void checkConsistency() const throw(INTERP_KERNEL::Exception); - void checkSMESHConsistency() const throw(INTERP_KERNEL::Exception); + int getSpaceDimension() const; + int getRelativeLevOnGeoType(INTERP_KERNEL::NormalizedCellType gt) const; + void checkConsistency() const; + void checkSMESHConsistency() const; void clearNodeAndCellNumbers(); // - MEDCouplingUMesh *getGroup(int meshDimRelToMaxExt, const std::string& grp, bool renum=false) const throw(INTERP_KERNEL::Exception); - MEDCouplingUMesh *getGroups(int meshDimRelToMaxExt, const std::vector& grps, bool renum=false) const throw(INTERP_KERNEL::Exception); - MEDCouplingUMesh *getFamily(int meshDimRelToMaxExt, const std::string& fam, bool renum=false) const throw(INTERP_KERNEL::Exception); - MEDCouplingUMesh *getFamilies(int meshDimRelToMaxExt, const std::vector& fams, bool renum=false) const throw(INTERP_KERNEL::Exception); - DataArrayInt *getNodeGroupsArr(const std::vector& grps, bool renum=false) const throw(INTERP_KERNEL::Exception); - MEDCouplingUMesh *getLevel0Mesh(bool renum=false) const throw(INTERP_KERNEL::Exception); - MEDCouplingUMesh *getLevelM1Mesh(bool renum=false) const throw(INTERP_KERNEL::Exception); - MEDCouplingUMesh *getLevelM2Mesh(bool renum=false) const throw(INTERP_KERNEL::Exception); - MEDCouplingUMesh *getLevelM3Mesh(bool renum=false) const throw(INTERP_KERNEL::Exception); - void forceComputationOfParts() const throw(INTERP_KERNEL::Exception); + MEDCouplingUMesh *getGroup(int meshDimRelToMaxExt, const std::string& grp, bool renum=false) const; + MEDCouplingUMesh *getGroups(int meshDimRelToMaxExt, const std::vector& grps, bool renum=false) const; + MEDCouplingUMesh *getFamily(int meshDimRelToMaxExt, const std::string& fam, bool renum=false) const; + MEDCouplingUMesh *getFamilies(int meshDimRelToMaxExt, const std::vector& fams, bool renum=false) const; + DataArrayIdType *getNodeGroupsArr(const std::vector& grps, bool renum=false) const; + MEDCouplingUMesh *getLevel0Mesh(bool renum=false) const; + MEDCouplingUMesh *getLevelM1Mesh(bool renum=false) const; + MEDCouplingUMesh *getLevelM2Mesh(bool renum=false) const; + MEDCouplingUMesh *getLevelM3Mesh(bool renum=false) const; + void forceComputationOfParts() const; + void computeRevNum() const; // - void setFamilyNameAttachedOnId(int id, const std::string& newFamName) throw(INTERP_KERNEL::Exception); - void setCoords(DataArrayDouble *coords) throw(INTERP_KERNEL::Exception); - void setCoordsForced(DataArrayDouble *coords) throw(INTERP_KERNEL::Exception); - void eraseGroupsAtLevel(int meshDimRelToMaxExt) throw(INTERP_KERNEL::Exception); - void removeMeshAtLevel(int meshDimRelToMax) throw(INTERP_KERNEL::Exception); - void setMeshAtLevel(int meshDimRelToMax, MEDCoupling1GTUMesh *m) throw(INTERP_KERNEL::Exception); - void setMeshAtLevel(int meshDimRelToMax, MEDCouplingUMesh *m, bool newOrOld=false) throw(INTERP_KERNEL::Exception); - void optimizeFamilies() throw(INTERP_KERNEL::Exception); - DataArrayInt *zipCoords() throw(INTERP_KERNEL::Exception); - DataArrayInt *extractFamilyFieldOnGeoType(INTERP_KERNEL::NormalizedCellType gt) const throw(INTERP_KERNEL::Exception); - DataArrayInt *extractNumberFieldOnGeoType(INTERP_KERNEL::NormalizedCellType gt) const throw(INTERP_KERNEL::Exception); - MEDFileUMesh *buildExtrudedMesh(const MEDCouplingUMesh *m1D, int policy) const throw(INTERP_KERNEL::Exception); - MEDFileUMesh *linearToQuadratic(int conversionType=0, double eps=1e-12) const throw(INTERP_KERNEL::Exception); - MEDFileUMesh *quadraticToLinear(double eps=1e-12) const throw(INTERP_KERNEL::Exception); - MEDCouplingMappedExtrudedMesh *convertToExtrudedMesh() const throw(INTERP_KERNEL::Exception); + void setFamilyNameAttachedOnId(int id, const std::string& newFamName); + void setCoords(DataArrayDouble *coords); + void setCoordsForced(DataArrayDouble *coords); + void eraseGroupsAtLevel(int meshDimRelToMaxExt); + void removeMeshAtLevel(int meshDimRelToMax); + void setMeshAtLevel(int meshDimRelToMax, MEDCoupling1GTUMesh *m); + void setMeshAtLevel(int meshDimRelToMax, MEDCouplingUMesh *m, bool newOrOld=false); + void optimizeFamilies(); + DataArrayIdType *computeFetchedNodeIds() const; + DataArrayIdType *zipCoords(); + DataArrayIdType *extractFamilyFieldOnGeoType(INTERP_KERNEL::NormalizedCellType gt) const; + DataArrayIdType *extractNumberFieldOnGeoType(INTERP_KERNEL::NormalizedCellType gt) const; + MEDFileUMesh *buildExtrudedMesh(const MEDCouplingUMesh *m1D, int policy) const; + MEDFileUMesh *linearToQuadratic(int conversionType=0, double eps=1e-12) const; + MEDFileUMesh *quadraticToLinear(double eps=1e-12) const; + MEDCouplingMappedExtrudedMesh *convertToExtrudedMesh() const; %extend { - MEDFileUMesh(const std::string& fileName, const std::string& mName, int dt=-1, int it=-1, MEDFileMeshReadSelector *mrs=0) throw(INTERP_KERNEL::Exception) + MEDFileUMesh(const std::string& fileName, const std::string& mName, int dt=-1, int it=-1, MEDFileMeshReadSelector *mrs=0) { return MEDFileUMesh::New(fileName,mName,dt,it,mrs); } - MEDFileUMesh(const std::string& fileName, MEDFileMeshReadSelector *mrs=0) throw(INTERP_KERNEL::Exception) + MEDFileUMesh(const std::string& fileName, MEDFileMeshReadSelector *mrs=0) { return MEDFileUMesh::New(fileName,mrs); } - MEDFileUMesh(const MEDCouplingMappedExtrudedMesh *mem) throw(INTERP_KERNEL::Exception) + MEDFileUMesh(const MEDCouplingMappedExtrudedMesh *mem) { return MEDFileUMesh::New(mem); } - MEDFileUMesh(DataArrayByte *db) throw(INTERP_KERNEL::Exception) + MEDFileUMesh(DataArrayByte *db) { return MEDFileUMesh::New(db); } @@ -1440,13 +1484,7 @@ namespace MEDCoupling return MEDFileUMesh::New(); } - // serialization - static PyObject *___new___(PyObject *cls, PyObject *args) throw(INTERP_KERNEL::Exception) - { - return NewMethWrapCallInitOnlyIfEmptyDictInInput(cls,args,"MEDFileUMesh"); - } - - static MEDFileUMesh *LoadPartOf(const std::string& fileName, const std::string& mName, PyObject *types, const std::vector& slicPerTyp, int dt=-1, int it=-1, MEDFileMeshReadSelector *mrs=0) throw(INTERP_KERNEL::Exception) + static MEDFileUMesh *LoadPartOf(const std::string& fileName, const std::string& mName, PyObject *types, const std::vector& slicPerTyp, int dt=-1, int it=-1, MEDFileMeshReadSelector *mrs=0) { std::vector typesCpp1; convertPyToNewIntArr3(types,typesCpp1); @@ -1457,38 +1495,46 @@ namespace MEDCoupling return MEDFileUMesh::LoadPartOf(fileName,mName,typesCpp2,slicPerTyp,dt,it,mrs); } - PyObject *__getnewargs__() throw(INTERP_KERNEL::Exception) - {// put an empty dict in input to say to __new__ to call __init__... - PyObject *ret(PyTuple_New(1)); - PyObject *ret0(PyDict_New()); - PyTuple_SetItem(ret,0,ret0); + static PyObject *LoadPartCoords(const std::string& fileName, const std::string& mName, int dt, int it, const std::vector& infosOnComp, mcIdType startNodeId, mcIdType stopNodeId) + { + MCAuto coords; + MCAuto partCoords; + MCAuto famCoords,numCoords; + MCAuto nameCoord; + MEDFileUMesh::LoadPartCoords(fileName,mName,dt,it,infosOnComp,startNodeId,stopNodeId,coords,partCoords,famCoords,numCoords,nameCoord); + PyObject *ret(PyTuple_New(5)); + PyTuple_SetItem(ret,0,SWIG_NewPointerObj(SWIG_as_voidptr(coords.retn()),SWIGTYPE_p_MEDCoupling__DataArrayDouble, SWIG_POINTER_OWN | 0 )); + PyTuple_SetItem(ret,1,convertPartDefinition(partCoords.retn(),SWIG_POINTER_OWN | 0)); + PyTuple_SetItem(ret,2,SWIG_NewPointerObj(SWIG_as_voidptr(famCoords.retn()),SWIGTITraits::TI, SWIG_POINTER_OWN | 0 )); + PyTuple_SetItem(ret,3,SWIG_NewPointerObj(SWIG_as_voidptr(numCoords.retn()),SWIGTITraits::TI, SWIG_POINTER_OWN | 0 )); + PyTuple_SetItem(ret,4,SWIG_NewPointerObj(SWIG_as_voidptr(nameCoord.retn()),SWIGTYPE_p_MEDCoupling__DataArrayAsciiChar, SWIG_POINTER_OWN | 0 )); return ret; } - PyObject *__getstate__() throw(INTERP_KERNEL::Exception) + PyObject *__getstate__() { std::vector a0; - std::vector a1; + std::vector a1; std::vector a2; - std::vector< MCAuto > a3; + std::vector< MCAuto > a3; MCAuto a4; self->serialize(a0,a1,a2,a3,a4); PyObject *ret(PyTuple_New(5)); PyTuple_SetItem(ret,0,convertDblArrToPyList2(a0)); PyTuple_SetItem(ret,1,convertIntArrToPyList2(a1)); - int sz(a2.size()); + std::size_t sz(a2.size()); PyObject *ret2(PyList_New(sz)); - for(int i=0;iincrRef(); - PyList_SetItem(ret3,i,SWIG_NewPointerObj(SWIG_as_voidptr(elt),SWIGTYPE_p_MEDCoupling__DataArrayInt, SWIG_POINTER_OWN | 0 )); + PyList_SetItem(ret3,i,SWIG_NewPointerObj(SWIG_as_voidptr(elt),SWIGTITraits::TI, SWIG_POINTER_OWN | 0 )); } PyTuple_SetItem(ret,3,ret3); DataArrayDouble *ret4(a4); @@ -1498,22 +1544,22 @@ namespace MEDCoupling return ret; } - void __setstate__(PyObject *inp) throw(INTERP_KERNEL::Exception) + void __setstate__(PyObject *inp) { static const char MSG[]="MEDFileUMesh.__setstate__ : expected input is a tuple of size 4 !"; if(!PyTuple_Check(inp)) throw INTERP_KERNEL::Exception(MSG); - int sz(PyTuple_Size(inp)); + std::size_t sz(PyTuple_Size(inp)); if(sz!=5) throw INTERP_KERNEL::Exception(MSG); std::vector a0; - std::vector a1; + std::vector a1; std::vector a2; - std::vector< MCAuto > a3; + std::vector< MCAuto > a3; MCAuto a4; // PyObject *a0py(PyTuple_GetItem(inp,0)),*a1py(PyTuple_GetItem(inp,1)),*a2py(PyTuple_GetItem(inp,2)); - int tmp(-1); + mcIdType tmp(-1); fillArrayWithPyListDbl3(a0py,tmp,a0); convertPyToNewIntArr3(a1py,a1); fillStringVector(a2py,a2); @@ -1527,8 +1573,8 @@ namespace MEDCoupling if((DataArrayDouble *)a4) a4->incrRef(); { - std::vector< DataArrayInt * > a3Tmp; - convertFromPyObjVectorOfObj(b0py,SWIGTYPE_p_MEDCoupling__DataArrayInt,"DataArrayInt",a3Tmp); + std::vector< DataArrayIdType * > a3Tmp; + convertFromPyObjVectorOfObj(b0py,SWIGTITraits::TI,"DataArrayInt",a3Tmp); std::size_t sz(a3Tmp.size()); a3.resize(sz); for(std::size_t i=0;iremoveMeshAtLevel(meshDimRelToMax); } - MEDFileUMesh *symmetry3DPlane(PyObject *point, PyObject *normalVector) const throw(INTERP_KERNEL::Exception) + MEDFileUMesh *symmetry3DPlane(PyObject *point, PyObject *normalVector) const { const char msg[]="Python wrap of MEDFileUMesh::symmetry3DPlane : "; double val,val2; DataArrayDouble *a,*a2; DataArrayDoubleTuple *aa,*aa2; std::vector bb,bb2; - int sw; + mcIdType sw; const double *centerPtr(convertObjToPossibleCpp5_Safe(point,sw,val,a,aa,bb,msg,1,3,true)); const double *vectorPtr(convertObjToPossibleCpp5_Safe(normalVector,sw,val2,a2,aa2,bb2,msg,1,3,true)); MCAuto ret(self->symmetry3DPlane(centerPtr,vectorPtr)); return ret.retn(); } - static MEDFileUMesh *Aggregate(PyObject *meshes) throw(INTERP_KERNEL::Exception) + static MEDFileUMesh *Aggregate(PyObject *meshes) { std::vector meshesCpp; convertFromPyObjVectorOfObj(meshes,SWIGTYPE_p_MEDCoupling__MEDFileUMesh,"MEDFileUMesh",meshesCpp); @@ -1587,48 +1633,48 @@ namespace MEDCoupling return ret.retn(); } - PyObject *getAllDistributionOfTypes() const throw(INTERP_KERNEL::Exception) + PyObject *getAllDistributionOfTypes() const { - std::vector< std::pair > ret(self->getAllDistributionOfTypes()); + std::vector< std::pair > ret(self->getAllDistributionOfTypes()); return convertVecPairIntToPy(ret); } - DataArrayInt *deduceNodeSubPartFromCellSubPart(PyObject *extractDef) const throw(INTERP_KERNEL::Exception) + DataArrayIdType *deduceNodeSubPartFromCellSubPart(PyObject *extractDef) const { - std::map > extractDefCpp; + std::map > extractDefCpp; convertToMapIntDataArrayInt(extractDef,extractDefCpp); return self->deduceNodeSubPartFromCellSubPart(extractDefCpp); } - MEDFileUMesh *extractPart(PyObject *extractDef) const throw(INTERP_KERNEL::Exception) + MEDFileUMesh *extractPart(PyObject *extractDef) const { - std::map > extractDefCpp; + std::map > extractDefCpp; convertToMapIntDataArrayInt(extractDef,extractDefCpp); return self->extractPart(extractDefCpp); } - void setMeshes(PyObject *li, bool renum=false) throw(INTERP_KERNEL::Exception) + void setMeshes(PyObject *li, bool renum=false) { std::vector ms; convertFromPyObjVectorOfObj(li,SWIGTYPE_p_MEDCoupling__MEDCouplingUMesh,"MEDCouplingUMesh",ms); self->setMeshes(ms,renum); } - void setGroupsFromScratch(int meshDimRelToMax, PyObject *li, bool renum=false) throw(INTERP_KERNEL::Exception) + void setGroupsFromScratch(int meshDimRelToMax, PyObject *li, bool renum=false) { std::vector ms; convertFromPyObjVectorOfObj(li,SWIGTYPE_p_MEDCoupling__MEDCouplingUMesh,"MEDCouplingUMesh",ms); self->setGroupsFromScratch(meshDimRelToMax,ms,renum); } - void setGroupsOnSetMesh(int meshDimRelToMax, PyObject *li, bool renum=false) throw(INTERP_KERNEL::Exception) + void setGroupsOnSetMesh(int meshDimRelToMax, PyObject *li, bool renum=false) { std::vector ms; convertFromPyObjVectorOfObj(li,SWIGTYPE_p_MEDCoupling__MEDCouplingUMesh,"MEDCouplingUMesh",ms); self->setGroupsOnSetMesh(meshDimRelToMax,ms,renum); } - DataArrayDouble *getCoords() const throw(INTERP_KERNEL::Exception) + DataArrayDouble *getCoords() const { DataArrayDouble *ret=self->getCoords(); if(ret) @@ -1636,7 +1682,7 @@ namespace MEDCoupling return ret; } - PartDefinition *getPartDefAtLevel(int meshDimRelToMaxExt, INTERP_KERNEL::NormalizedCellType gt=INTERP_KERNEL::NORM_ERROR) const throw(INTERP_KERNEL::Exception) + PartDefinition *getPartDefAtLevel(int meshDimRelToMaxExt, INTERP_KERNEL::NormalizedCellType gt=INTERP_KERNEL::NORM_ERROR) const { const PartDefinition *ret(self->getPartDefAtLevel(meshDimRelToMaxExt,gt)); if(ret) @@ -1644,18 +1690,18 @@ namespace MEDCoupling return const_cast(ret); } - PyObject *buildInnerBoundaryAlongM1Group(const std::string& grpNameM1) throw(INTERP_KERNEL::Exception) + PyObject *buildInnerBoundaryAlongM1Group(const std::string& grpNameM1) { - DataArrayInt *ret0=0,*ret1=0,*ret2=0; + DataArrayIdType *ret0=0,*ret1=0,*ret2=0; self->buildInnerBoundaryAlongM1Group(grpNameM1,ret0,ret1,ret2); PyObject *ret=PyTuple_New(3); - PyTuple_SetItem(ret,0,SWIG_NewPointerObj(SWIG_as_voidptr(ret0),SWIGTYPE_p_MEDCoupling__DataArrayInt, SWIG_POINTER_OWN | 0 )); - PyTuple_SetItem(ret,1,SWIG_NewPointerObj(SWIG_as_voidptr(ret1),SWIGTYPE_p_MEDCoupling__DataArrayInt, SWIG_POINTER_OWN | 0 )); - PyTuple_SetItem(ret,2,SWIG_NewPointerObj(SWIG_as_voidptr(ret2),SWIGTYPE_p_MEDCoupling__DataArrayInt, SWIG_POINTER_OWN | 0 )); + PyTuple_SetItem(ret,0,SWIG_NewPointerObj(SWIG_as_voidptr(ret0),SWIGTITraits::TI, SWIG_POINTER_OWN | 0 )); + PyTuple_SetItem(ret,1,SWIG_NewPointerObj(SWIG_as_voidptr(ret1),SWIGTITraits::TI, SWIG_POINTER_OWN | 0 )); + PyTuple_SetItem(ret,2,SWIG_NewPointerObj(SWIG_as_voidptr(ret2),SWIGTITraits::TI, SWIG_POINTER_OWN | 0 )); return ret; } - MEDCoupling1GTUMesh *getDirectUndergroundSingleGeoTypeMesh(INTERP_KERNEL::NormalizedCellType gt) const throw(INTERP_KERNEL::Exception) + MEDCoupling1GTUMesh *getDirectUndergroundSingleGeoTypeMesh(INTERP_KERNEL::NormalizedCellType gt) const { MEDCoupling1GTUMesh *ret(self->getDirectUndergroundSingleGeoTypeMesh(gt)); if(ret) @@ -1663,7 +1709,7 @@ namespace MEDCoupling return ret; } - PyObject *getDirectUndergroundSingleGeoTypeMeshes(int meshDimRelToMax) const throw(INTERP_KERNEL::Exception) + PyObject *getDirectUndergroundSingleGeoTypeMeshes(int meshDimRelToMax) const { std::vector tmp(self->getDirectUndergroundSingleGeoTypeMeshes(meshDimRelToMax)); std::size_t sz(tmp.size()); @@ -1684,7 +1730,7 @@ namespace MEDCoupling public: %extend { - MEDCoupling1SGTUMesh *getImplicitFaceMesh() const throw(INTERP_KERNEL::Exception) + MEDCoupling1SGTUMesh *getImplicitFaceMesh() const { MEDCoupling1SGTUMesh *ret(self->getImplicitFaceMesh()); if(ret) @@ -1698,11 +1744,11 @@ namespace MEDCoupling { public: static MEDFileCMesh *New(); - static MEDFileCMesh *New(DataArrayByte *db) throw(INTERP_KERNEL::Exception); - static MEDFileCMesh *New(const std::string& fileName, MEDFileMeshReadSelector *mrs=0) throw(INTERP_KERNEL::Exception); - static MEDFileCMesh *New(const std::string& fileName, const std::string& mName, int dt=-1, int it=-1, MEDFileMeshReadSelector *mrs=0) throw(INTERP_KERNEL::Exception); - void setMesh(MEDCouplingCMesh *m) throw(INTERP_KERNEL::Exception); - int getSpaceDimension() const throw(INTERP_KERNEL::Exception); + static MEDFileCMesh *New(DataArrayByte *db); + static MEDFileCMesh *New(const std::string& fileName, MEDFileMeshReadSelector *mrs=0); + static MEDFileCMesh *New(const std::string& fileName, const std::string& mName, int dt=-1, int it=-1, MEDFileMeshReadSelector *mrs=0); + void setMesh(MEDCouplingCMesh *m); + int getSpaceDimension() const; %extend { MEDFileCMesh() @@ -1710,28 +1756,22 @@ namespace MEDCoupling return MEDFileCMesh::New(); } - MEDFileCMesh(const std::string& fileName, MEDFileMeshReadSelector *mrs=0) throw(INTERP_KERNEL::Exception) + MEDFileCMesh(const std::string& fileName, MEDFileMeshReadSelector *mrs=0) { return MEDFileCMesh::New(fileName,mrs); } - MEDFileCMesh(const std::string& fileName, const std::string& mName, int dt=-1, int it=-1, MEDFileMeshReadSelector *mrs=0) throw(INTERP_KERNEL::Exception) + MEDFileCMesh(const std::string& fileName, const std::string& mName, int dt=-1, int it=-1, MEDFileMeshReadSelector *mrs=0) { return MEDFileCMesh::New(fileName,mName,dt,it,mrs); } - MEDFileCMesh(DataArrayByte *db) throw(INTERP_KERNEL::Exception) + MEDFileCMesh(DataArrayByte *db) { return MEDFileCMesh::New(db); } - - // serialization - static PyObject *___new___(PyObject *cls, PyObject *args) throw(INTERP_KERNEL::Exception) - { - return NewMethWrapCallInitOnlyIfDictWithSingleEltInInput(cls,args,"MEDFileCMesh"); - } - PyObject *getMesh() const throw(INTERP_KERNEL::Exception) + PyObject *getMesh() const { const MEDCouplingCMesh *tmp=self->getMesh(); if(tmp) @@ -1745,10 +1785,12 @@ namespace MEDCoupling { public: static MEDFileCurveLinearMesh *New(); - static MEDFileCurveLinearMesh *New(DataArrayByte *db) throw(INTERP_KERNEL::Exception); - static MEDFileCurveLinearMesh *New(const std::string& fileName, MEDFileMeshReadSelector *mrs=0) throw(INTERP_KERNEL::Exception); - static MEDFileCurveLinearMesh *New(const std::string& fileName, const std::string& mName, int dt=-1, int it=-1, MEDFileMeshReadSelector *mrs=0) throw(INTERP_KERNEL::Exception); - void setMesh(MEDCouplingCurveLinearMesh *m) throw(INTERP_KERNEL::Exception); + static MEDFileCurveLinearMesh *New(DataArrayByte *db); + static MEDFileCurveLinearMesh *New(const std::string& fileName, MEDFileMeshReadSelector *mrs=0); + static MEDFileCurveLinearMesh *New(const std::string& fileName, const std::string& mName, int dt=-1, int it=-1, MEDFileMeshReadSelector *mrs=0); + void setMesh(MEDCouplingCurveLinearMesh *m); + int getSpaceDimension() const; + int getMeshDimension() const; %extend { MEDFileCurveLinearMesh() @@ -1756,28 +1798,22 @@ namespace MEDCoupling return MEDFileCurveLinearMesh::New(); } - MEDFileCurveLinearMesh(const std::string& fileName, MEDFileMeshReadSelector *mrs=0) throw(INTERP_KERNEL::Exception) + MEDFileCurveLinearMesh(const std::string& fileName, MEDFileMeshReadSelector *mrs=0) { return MEDFileCurveLinearMesh::New(fileName,mrs); } - MEDFileCurveLinearMesh(const std::string& fileName, const std::string& mName, int dt=-1, int it=-1, MEDFileMeshReadSelector *mrs=0) throw(INTERP_KERNEL::Exception) + MEDFileCurveLinearMesh(const std::string& fileName, const std::string& mName, int dt=-1, int it=-1, MEDFileMeshReadSelector *mrs=0) { return MEDFileCurveLinearMesh::New(fileName,mName,dt,it,mrs); } - MEDFileCurveLinearMesh(DataArrayByte *db) throw(INTERP_KERNEL::Exception) + MEDFileCurveLinearMesh(DataArrayByte *db) { return MEDFileCurveLinearMesh::New(db); } - - // serialization - static PyObject *___new___(PyObject *cls, PyObject *args) throw(INTERP_KERNEL::Exception) - { - return NewMethWrapCallInitOnlyIfDictWithSingleEltInInput(cls,args,"MEDFileCurveLinearMesh"); - } - PyObject *getMesh() const throw(INTERP_KERNEL::Exception) + PyObject *getMesh() const { const MEDCouplingCurveLinearMesh *tmp=self->getMesh(); if(tmp) @@ -1791,12 +1827,12 @@ namespace MEDCoupling { public: static MEDFileMeshMultiTS *New(); - static MEDFileMeshMultiTS *New(const std::string& fileName) throw(INTERP_KERNEL::Exception); - static MEDFileMeshMultiTS *New(const std::string& fileName, const std::string& mName) throw(INTERP_KERNEL::Exception); - MEDFileMeshMultiTS *deepCopy() const throw(INTERP_KERNEL::Exception); - std::string getName() const throw(INTERP_KERNEL::Exception); - void setOneTimeStep(MEDFileMesh *mesh1TimeStep) throw(INTERP_KERNEL::Exception); - void cartesianizeMe() throw(INTERP_KERNEL::Exception); + static MEDFileMeshMultiTS *New(const std::string& fileName); + static MEDFileMeshMultiTS *New(const std::string& fileName, const std::string& mName); + MEDFileMeshMultiTS *deepCopy() const; + std::string getName() const; + void setOneTimeStep(MEDFileMesh *mesh1TimeStep); + void cartesianizeMe(); %extend { MEDFileMeshMultiTS() @@ -1804,17 +1840,17 @@ namespace MEDCoupling return MEDFileMeshMultiTS::New(); } - MEDFileMeshMultiTS(const std::string& fileName) throw(INTERP_KERNEL::Exception) + MEDFileMeshMultiTS(const std::string& fileName) { return MEDFileMeshMultiTS::New(fileName); } - MEDFileMeshMultiTS(const std::string& fileName, const std::string& mName) throw(INTERP_KERNEL::Exception) + MEDFileMeshMultiTS(const std::string& fileName, const std::string& mName) { return MEDFileMeshMultiTS::New(fileName,mName); } - MEDFileMesh *getOneTimeStep() const throw(INTERP_KERNEL::Exception) + MEDFileMesh *getOneTimeStep() const { MEDFileMesh *ret=self->getOneTimeStep(); if(ret) @@ -1829,7 +1865,7 @@ namespace MEDCoupling public: %extend { - PyObject *next() throw(INTERP_KERNEL::Exception) + PyObject *next() { MEDFileMesh *ret=self->nextt(); if(ret) @@ -1850,18 +1886,18 @@ namespace MEDCoupling { public: static MEDFileMeshes *New(); - static MEDFileMeshes *New(DataArrayByte *db) throw(INTERP_KERNEL::Exception); - MEDFileMeshes *deepCopy() const throw(INTERP_KERNEL::Exception); - int getNumberOfMeshes() const throw(INTERP_KERNEL::Exception); - std::vector getMeshesNames() const throw(INTERP_KERNEL::Exception); + static MEDFileMeshes *New(DataArrayByte *db); + MEDFileMeshes *deepCopy() const; + int getNumberOfMeshes() const; + std::vector getMeshesNames() const; // - void resize(int newSize) throw(INTERP_KERNEL::Exception); - void pushMesh(MEDFileMesh *mesh) throw(INTERP_KERNEL::Exception); - void setMeshAtPos(int i, MEDFileMesh *mesh) throw(INTERP_KERNEL::Exception); - void destroyMeshAtPos(int i) throw(INTERP_KERNEL::Exception); - void cartesianizeMe() throw(INTERP_KERNEL::Exception); - bool presenceOfStructureElements() const throw(INTERP_KERNEL::Exception); - void killStructureElements() throw(INTERP_KERNEL::Exception); + void resize(int newSize); + void pushMesh(MEDFileMesh *mesh); + void setMeshAtPos(int i, MEDFileMesh *mesh); + void destroyMeshAtPos(int i); + void cartesianizeMe(); + bool presenceOfStructureElements() const; + void killStructureElements(); %extend { MEDFileMeshes() @@ -1869,28 +1905,22 @@ namespace MEDCoupling return MEDFileMeshes::New(); } - MEDFileMeshes(const std::string& fileName) throw(INTERP_KERNEL::Exception) + MEDFileMeshes(const std::string& fileName) { return MEDFileMeshes::New(fileName); } - MEDFileMeshes(DataArrayByte *db) throw(INTERP_KERNEL::Exception) + MEDFileMeshes(DataArrayByte *db) { return MEDFileMeshes::New(db); } - // serialization - static PyObject *___new___(PyObject *cls, PyObject *args) throw(INTERP_KERNEL::Exception) - { - return NewMethWrapCallInitOnlyIfDictWithSingleEltInInput(cls,args,"MEDFileMeshes"); - } - - std::string __str__() const throw(INTERP_KERNEL::Exception) + std::string __str__() const { return self->simpleRepr(); } - MEDFileMesh *__getitem__(PyObject *obj) throw(INTERP_KERNEL::Exception) + MEDFileMesh *__getitem__(PyObject *obj) { static const char msg[]="MEDFileMeshes::__getitem__ : only integer or string with meshname supported !"; if(PyInt_Check(obj)) @@ -1906,30 +1936,30 @@ namespace MEDCoupling return ret; } - MEDFileMeshes *__setitem__(int obj, MEDFileMesh *mesh) throw(INTERP_KERNEL::Exception) + MEDFileMeshes *__setitem__(int obj, MEDFileMesh *mesh) { self->setMeshAtPos(obj,mesh); return self; } - MEDFileMeshesIterator *__iter__() throw(INTERP_KERNEL::Exception) + MEDFileMeshesIterator *__iter__() { return self->iterator(); } - int __len__() const throw(INTERP_KERNEL::Exception) + int __len__() const { return self->getNumberOfMeshes(); } - MEDFileMesh *getMeshAtPos(int i) const throw(INTERP_KERNEL::Exception) + MEDFileMesh *getMeshAtPos(int i) const { MEDFileMesh *ret=self->getMeshAtPos(i); if(ret) ret->incrRef(); return ret; } - MEDFileMesh *getMeshWithName(const std::string& mname) const throw(INTERP_KERNEL::Exception) + MEDFileMesh *getMeshWithName(const std::string& mname) const { MEDFileMesh *ret=self->getMeshWithName(mname); if(ret) @@ -1949,10 +1979,10 @@ namespace MEDCoupling const std::vector& getRefCoords() const; const std::vector& getGaussCoords() const; const std::vector& getGaussWeights() const; - bool isEqual(const MEDFileFieldLoc& other, double eps) const throw(INTERP_KERNEL::Exception); + bool isEqual(const MEDFileFieldLoc& other, double eps) const; %extend { - std::string __str__() const throw(INTERP_KERNEL::Exception) + std::string __str__() const { return self->repr(); } @@ -1963,52 +1993,53 @@ namespace MEDCoupling { public: void resetContent(); - void shallowCpyGlobs(const MEDFileFieldGlobsReal& other) throw(INTERP_KERNEL::Exception); - void deepCpyGlobs(const MEDFileFieldGlobsReal& other) throw(INTERP_KERNEL::Exception); - void shallowCpyOnlyUsedGlobs(const MEDFileFieldGlobsReal& other) throw(INTERP_KERNEL::Exception); - void deepCpyOnlyUsedGlobs(const MEDFileFieldGlobsReal& other) throw(INTERP_KERNEL::Exception); - void appendGlobs(const MEDFileFieldGlobsReal& other, double eps) throw(INTERP_KERNEL::Exception); - void checkGlobsCoherency() const throw(INTERP_KERNEL::Exception); - void checkGlobsPflsPartCoherency() const throw(INTERP_KERNEL::Exception); - void checkGlobsLocsPartCoherency() const throw(INTERP_KERNEL::Exception); - std::vector getPfls() const throw(INTERP_KERNEL::Exception); - std::vector getLocs() const throw(INTERP_KERNEL::Exception); - bool existsPfl(const std::string& pflName) const throw(INTERP_KERNEL::Exception); - bool existsLoc(const std::string& locName) const throw(INTERP_KERNEL::Exception); - std::string createNewNameOfPfl() const throw(INTERP_KERNEL::Exception); - std::string createNewNameOfLoc() const throw(INTERP_KERNEL::Exception); - std::vector< std::vector > whichAreEqualProfiles() const throw(INTERP_KERNEL::Exception); - std::vector< std::vector > whichAreEqualLocs(double eps) const throw(INTERP_KERNEL::Exception); - virtual std::vector getPflsReallyUsed() const throw(INTERP_KERNEL::Exception); - virtual std::vector getLocsReallyUsed() const throw(INTERP_KERNEL::Exception); - virtual std::vector getPflsReallyUsedMulti() const throw(INTERP_KERNEL::Exception); - virtual std::vector getLocsReallyUsedMulti() const throw(INTERP_KERNEL::Exception); - void killProfileIds(const std::vector& pflIds) throw(INTERP_KERNEL::Exception); - void killLocalizationIds(const std::vector& locIds) throw(INTERP_KERNEL::Exception); - void changePflName(const std::string& oldName, const std::string& newName) throw(INTERP_KERNEL::Exception); - void changeLocName(const std::string& oldName, const std::string& newName) throw(INTERP_KERNEL::Exception); - int getNbOfGaussPtPerCell(int locId) const throw(INTERP_KERNEL::Exception); - int getLocalizationId(const std::string& loc) const throw(INTERP_KERNEL::Exception); - void killStructureElementsInGlobs() throw(INTERP_KERNEL::Exception); + void shallowCpyGlobs(const MEDFileFieldGlobsReal& other); + void deepCpyGlobs(const MEDFileFieldGlobsReal& other); + void shallowCpyOnlyUsedGlobs(const MEDFileFieldGlobsReal& other); + void deepCpyOnlyUsedGlobs(const MEDFileFieldGlobsReal& other); + void appendGlobs(const MEDFileFieldGlobsReal& other, double eps); + void checkGlobsCoherency() const; + void checkGlobsPflsPartCoherency() const; + void checkGlobsLocsPartCoherency() const; + std::vector getPfls() const; + std::vector getLocs() const; + bool existsPfl(const std::string& pflName) const; + bool existsLoc(const std::string& locName) const; + std::string createNewNameOfPfl() const; + std::string createNewNameOfLoc() const; + std::vector< std::vector > whichAreEqualProfiles() const; + std::vector< std::vector > whichAreEqualLocs(double eps) const; + virtual std::vector getPflsReallyUsed() const; + virtual std::vector getLocsReallyUsed() const; + virtual std::vector getPflsReallyUsedMulti() const; + virtual std::vector getLocsReallyUsedMulti() const; + void killProfileIds(const std::vector& pflIds); + void killLocalizationIds(const std::vector& locIds); + void changePflName(const std::string& oldName, const std::string& newName); + void changeLocName(const std::string& oldName, const std::string& newName); + int getNbOfGaussPtPerCell(int locId) const; + int getLocalizationId(const std::string& loc) const; + int getProfileId(const std::string& pfl) const; + void killStructureElementsInGlobs(); %extend { - PyObject *getProfile(const std::string& pflName) const throw(INTERP_KERNEL::Exception) + PyObject *getProfile(const std::string& pflName) const { - const DataArrayInt *ret=self->getProfile(pflName); + const DataArrayIdType *ret=self->getProfile(pflName); if(ret) ret->incrRef(); - return SWIG_NewPointerObj(SWIG_as_voidptr(ret),SWIGTYPE_p_MEDCoupling__DataArrayInt, SWIG_POINTER_OWN | 0 ); + return SWIG_NewPointerObj(SWIG_as_voidptr(ret),SWIGTITraits::TI, SWIG_POINTER_OWN | 0 ); } - PyObject *getProfileFromId(int pflId) const throw(INTERP_KERNEL::Exception) + PyObject *getProfileFromId(int pflId) const { - const DataArrayInt *ret=self->getProfileFromId(pflId); + const DataArrayIdType *ret=self->getProfileFromId(pflId); if(ret) ret->incrRef(); - return SWIG_NewPointerObj(SWIG_as_voidptr(ret),SWIGTYPE_p_MEDCoupling__DataArrayInt, SWIG_POINTER_OWN | 0 ); + return SWIG_NewPointerObj(SWIG_as_voidptr(ret),SWIGTITraits::TI, SWIG_POINTER_OWN | 0 ); } - PyObject *getLocalizationFromId(int locId) const throw(INTERP_KERNEL::Exception) + PyObject *getLocalizationFromId(int locId) const { const MEDFileFieldLoc *loc=&self->getLocalizationFromId(locId); if(loc) @@ -2016,7 +2047,7 @@ namespace MEDCoupling return SWIG_NewPointerObj(SWIG_as_voidptr(loc),SWIGTYPE_p_MEDCoupling__MEDFileFieldLoc, SWIG_POINTER_OWN | 0 ); } - PyObject *getLocalization(const std::string& locName) const throw(INTERP_KERNEL::Exception) + PyObject *getLocalization(const std::string& locName) const { const MEDFileFieldLoc *loc=&self->getLocalization(locName); if(loc) @@ -2024,55 +2055,55 @@ namespace MEDCoupling return SWIG_NewPointerObj(SWIG_as_voidptr(loc),SWIGTYPE_p_MEDCoupling__MEDFileFieldLoc, SWIG_POINTER_OWN | 0 ); } - PyObject *zipPflsNames() throw(INTERP_KERNEL::Exception) + PyObject *zipPflsNames() { std::vector< std::pair, std::string > > ret=self->zipPflsNames(); return convertVecPairVecStToPy(ret); } - PyObject *zipLocsNames(double eps) throw(INTERP_KERNEL::Exception) + PyObject *zipLocsNames(double eps) { std::vector< std::pair, std::string > > ret=self->zipLocsNames(eps); return convertVecPairVecStToPy(ret); } - void changePflsNames(PyObject *li) throw(INTERP_KERNEL::Exception) + void changePflsNames(PyObject *li) { std::vector< std::pair, std::string > > v=convertVecPairVecStFromPy(li); self->changePflsNames(v); } - void changePflsRefsNamesGen(PyObject *li) throw(INTERP_KERNEL::Exception) + void changePflsRefsNamesGen(PyObject *li) { std::vector< std::pair, std::string > > v=convertVecPairVecStFromPy(li); self->changePflsRefsNamesGen(v); } - void changePflsNamesInStruct(PyObject *li) throw(INTERP_KERNEL::Exception) + void changePflsNamesInStruct(PyObject *li) { std::vector< std::pair, std::string > > v=convertVecPairVecStFromPy(li); self->changePflsNamesInStruct(v); } - void changeLocsNames(PyObject *li) throw(INTERP_KERNEL::Exception) + void changeLocsNames(PyObject *li) { std::vector< std::pair, std::string > > v=convertVecPairVecStFromPy(li); self->changeLocsNames(v); } - void changeLocsRefsNamesGen(PyObject *li) throw(INTERP_KERNEL::Exception) + void changeLocsRefsNamesGen(PyObject *li) { std::vector< std::pair, std::string > > v=convertVecPairVecStFromPy(li); self->changeLocsRefsNamesGen(v); } - void changeLocsNamesInStruct(PyObject *li) throw(INTERP_KERNEL::Exception) + void changeLocsNamesInStruct(PyObject *li) { std::vector< std::pair, std::string > > v=convertVecPairVecStFromPy(li); self->changeLocsNamesInStruct(v); } - std::string simpleReprGlobs() const throw(INTERP_KERNEL::Exception) + std::string simpleReprGlobs() const { std::ostringstream oss; self->simpleReprGlobs(oss); @@ -2086,7 +2117,7 @@ namespace MEDCoupling public: %extend { - static MEDFileEntities *BuildFrom(PyObject *entities) throw(INTERP_KERNEL::Exception) + static MEDFileEntities *BuildFrom(PyObject *entities) { std::vector< std::pair > inp; std::vector< std::pair > inp0(convertTimePairIdsFromPy(entities)); @@ -2106,36 +2137,36 @@ namespace MEDCoupling class MEDFileAnyTypeField1TS : public RefCountObject, public MEDFileFieldGlobsReal, public MEDFileWritableStandAlone { public: - static MEDFileAnyTypeField1TS *New(const std::string& fileName, bool loadAll=true) throw(INTERP_KERNEL::Exception); - static MEDFileAnyTypeField1TS *New(const std::string& fileName, const std::string& fieldName, bool loadAll=true) throw(INTERP_KERNEL::Exception); - static MEDFileAnyTypeField1TS *New(const std::string& fileName, const std::string& fieldName, int iteration, int order, bool loadAll=true) throw(INTERP_KERNEL::Exception); - static MEDFileAnyTypeField1TS *NewAdv(const std::string& fileName, const std::string& fieldName, int iteration, int order, bool loadAll, const MEDFileEntities *entities) throw(INTERP_KERNEL::Exception); - void loadArrays() throw(INTERP_KERNEL::Exception); - void loadArraysIfNecessary() throw(INTERP_KERNEL::Exception); - void unloadArrays() throw(INTERP_KERNEL::Exception); - void unloadArraysWithoutDataLoss() throw(INTERP_KERNEL::Exception); - int getDimension() const throw(INTERP_KERNEL::Exception); - int getIteration() const throw(INTERP_KERNEL::Exception); - int getOrder() const throw(INTERP_KERNEL::Exception); - std::string getName() throw(INTERP_KERNEL::Exception); - void setName(const std::string& name) throw(INTERP_KERNEL::Exception); - std::string getMeshName() throw(INTERP_KERNEL::Exception); - void setMeshName(const std::string& newMeshName) throw(INTERP_KERNEL::Exception); - int getMeshIteration() const throw(INTERP_KERNEL::Exception); - int getMeshOrder() const throw(INTERP_KERNEL::Exception); - int getNumberOfComponents() const throw(INTERP_KERNEL::Exception); - bool isDealingTS(int iteration, int order) const throw(INTERP_KERNEL::Exception); - void setInfo(const std::vector& infos) throw(INTERP_KERNEL::Exception); - const std::vector& getInfo() const throw(INTERP_KERNEL::Exception); - bool presenceOfMultiDiscPerGeoType() const throw(INTERP_KERNEL::Exception); - void setTime(int iteration, int order, double val) throw(INTERP_KERNEL::Exception); - virtual MEDFileAnyTypeField1TS *shallowCpy() const throw(INTERP_KERNEL::Exception); - MEDFileAnyTypeField1TS *deepCopy() const throw(INTERP_KERNEL::Exception); - std::string getDtUnit() const throw(INTERP_KERNEL::Exception); - void setDtUnit(const std::string& dtUnit) throw(INTERP_KERNEL::Exception); + static MEDFileAnyTypeField1TS *New(const std::string& fileName, bool loadAll=true); + static MEDFileAnyTypeField1TS *New(const std::string& fileName, const std::string& fieldName, bool loadAll=true); + static MEDFileAnyTypeField1TS *New(const std::string& fileName, const std::string& fieldName, int iteration, int order, bool loadAll=true); + static MEDFileAnyTypeField1TS *NewAdv(const std::string& fileName, const std::string& fieldName, int iteration, int order, bool loadAll, const MEDFileEntities *entities); + void loadArrays(); + void loadArraysIfNecessary(); + void unloadArrays(); + void unloadArraysWithoutDataLoss(); + int getDimension() const; + int getIteration() const; + int getOrder() const; + std::string getName(); + void setName(const std::string& name); + std::string getMeshName(); + void setMeshName(const std::string& newMeshName); + int getMeshIteration() const; + int getMeshOrder() const; + int getNumberOfComponents() const; + bool isDealingTS(int iteration, int order) const; + void setInfo(const std::vector& infos); + const std::vector& getInfo() const; + bool presenceOfMultiDiscPerGeoType() const; + void setTime(int iteration, int order, double val); + virtual MEDFileAnyTypeField1TS *shallowCpy() const; + MEDFileAnyTypeField1TS *deepCopy() const; + std::string getDtUnit() const; + void setDtUnit(const std::string& dtUnit); %extend { - PyObject *getTime() throw(INTERP_KERNEL::Exception) + PyObject *getTime() { int tmp1,tmp2; double tmp0=self->getTime(tmp1,tmp2); @@ -2146,7 +2177,7 @@ namespace MEDCoupling return res; } - PyObject *getDtIt() const throw(INTERP_KERNEL::Exception) + PyObject *getDtIt() const { std::pair res=self->getDtIt(); PyObject *elt=PyTuple_New(2); @@ -2155,23 +2186,23 @@ namespace MEDCoupling return elt; } - void setProfileNameOnLeaf(INTERP_KERNEL::NormalizedCellType typ, int locId, const std::string& newPflName, bool forceRenameOnGlob=false) throw(INTERP_KERNEL::Exception) + void setProfileNameOnLeaf(INTERP_KERNEL::NormalizedCellType typ, int locId, const std::string& newPflName, bool forceRenameOnGlob=false) { self->setProfileNameOnLeaf(0,typ,locId,newPflName,forceRenameOnGlob); } - void setLocNameOnLeaf(INTERP_KERNEL::NormalizedCellType typ, int locId, const std::string& newLocName, bool forceRenameOnGlob=false) throw(INTERP_KERNEL::Exception) + void setLocNameOnLeaf(INTERP_KERNEL::NormalizedCellType typ, int locId, const std::string& newLocName, bool forceRenameOnGlob=false) { self->setLocNameOnLeaf(0,typ,locId,newLocName,forceRenameOnGlob); } - bool changeMeshNames(PyObject *li) throw(INTERP_KERNEL::Exception) + bool changeMeshNames(PyObject *li) { std::vector< std::pair > modifTab=convertVecPairStStFromPy(li); return self->changeMeshNames(modifTab); } - PyObject *getTypesOfFieldAvailable() const throw(INTERP_KERNEL::Exception) + PyObject *getTypesOfFieldAvailable() const { std::vector ret=self->getTypesOfFieldAvailable(); PyObject *ret2=PyList_New(ret.size()); @@ -2180,7 +2211,7 @@ namespace MEDCoupling return ret2; } - PyObject *getNonEmptyLevels(const std::string& mname=std::string()) const throw(INTERP_KERNEL::Exception) + PyObject *getNonEmptyLevels(const std::string& mname=std::string()) const { std::vector ret1; int ret0=self->getNonEmptyLevels(mname,ret1); @@ -2190,30 +2221,30 @@ namespace MEDCoupling return elt; } - PyObject *getFieldSplitedByType(const std::string& mname=std::string()) const throw(INTERP_KERNEL::Exception) + PyObject *getFieldSplitedByType(const std::string& mname=std::string()) const { std::vector types; std::vector< std::vector > typesF; std::vector< std::vector > pfls; std::vector< std::vector > locs; - std::vector< std::vector< std::pair > > ret=self->getFieldSplitedByType(mname,types,typesF,pfls,locs); - int sz=ret.size(); + std::vector< std::vector< std::pair > > ret=self->getFieldSplitedByType(mname,types,typesF,pfls,locs); + std::size_t sz=ret.size(); PyObject *ret2=PyList_New(sz); - for(int i=0;i >& dadsI=ret[i]; + const std::vector< std::pair >& dadsI=ret[i]; const std::vector& typesFI=typesF[i]; const std::vector& pflsI=pfls[i]; const std::vector& locsI=locs[i]; PyObject *elt=PyTuple_New(2); PyTuple_SetItem(elt,0,SWIG_From_int(types[i])); - int sz2=ret[i].size(); + std::size_t sz2=ret[i].size(); PyObject *elt2=PyList_New(sz2); - for(int j=0;j > ret=self->splitComponents(); std::size_t sz=ret.size(); @@ -2235,7 +2266,7 @@ namespace MEDCoupling return retPy; } - PyObject *splitDiscretizations() const throw(INTERP_KERNEL::Exception) + PyObject *splitDiscretizations() const { std::vector< MCAuto< MEDFileAnyTypeField1TS > > ret=self->splitDiscretizations(); std::size_t sz=ret.size(); @@ -2245,7 +2276,7 @@ namespace MEDCoupling return retPy; } - PyObject *splitMultiDiscrPerGeoTypes() const throw(INTERP_KERNEL::Exception) + PyObject *splitMultiDiscrPerGeoTypes() const { std::vector< MCAuto< MEDFileAnyTypeField1TS > > ret=self->splitMultiDiscrPerGeoTypes(); std::size_t sz=ret.size(); @@ -2255,9 +2286,9 @@ namespace MEDCoupling return retPy; } - MEDFileAnyTypeField1TS *extractPart(PyObject *extractDef, MEDFileMesh *mm) const throw(INTERP_KERNEL::Exception) + MEDFileAnyTypeField1TS *extractPart(PyObject *extractDef, MEDFileMesh *mm) const { - std::map > extractDefCpp; + std::map > extractDefCpp; convertToMapIntDataArrayInt(extractDef,extractDefCpp); return self->extractPart(extractDefCpp,mm); } @@ -2267,41 +2298,43 @@ namespace MEDCoupling class MEDFileField1TS : public MEDFileAnyTypeField1TS { public: - static MEDFileField1TS *New(const std::string& fileName, const std::string& fieldName, int iteration, int order, bool loadAll=true) throw(INTERP_KERNEL::Exception); - static MEDFileField1TS *New(const std::string& fileName, const std::string& fieldName, bool loadAll=true) throw(INTERP_KERNEL::Exception); - static MEDFileField1TS *New(const std::string& fileName, bool loadAll=true) throw(INTERP_KERNEL::Exception); - static MEDFileField1TS *New(DataArrayByte *db) throw(INTERP_KERNEL::Exception); + static MEDFileField1TS *New(const std::string& fileName, const std::string& fieldName, int iteration, int order, bool loadAll=true); + static MEDFileField1TS *New(const std::string& fileName, const std::string& fieldName, bool loadAll=true); + static MEDFileField1TS *New(const std::string& fileName, bool loadAll=true); + static MEDFileField1TS *New(DataArrayByte *db); static MEDFileField1TS *New(); - MEDCoupling::MEDFileIntField1TS *convertToInt(bool isDeepCpyGlobs=true) const throw(INTERP_KERNEL::Exception); - MEDCouplingFieldDouble *field(const MEDFileMesh *mesh) const throw(INTERP_KERNEL::Exception); - MEDCouplingFieldDouble *getFieldAtLevel(TypeOfField type, int meshDimRelToMax, int renumPol=0) const throw(INTERP_KERNEL::Exception); - MEDCouplingFieldDouble *getFieldAtTopLevel(TypeOfField type, int renumPol=0) const throw(INTERP_KERNEL::Exception); - MEDCouplingFieldDouble *getFieldOnMeshAtLevel(TypeOfField type, const MEDCouplingMesh *mesh, int renumPol=0) const throw(INTERP_KERNEL::Exception); - MEDCouplingFieldDouble *getFieldOnMeshAtLevel(TypeOfField type, int meshDimRelToMax, const MEDFileMesh *mesh, int renumPol=0) const throw(INTERP_KERNEL::Exception); - MEDCouplingFieldDouble *getFieldAtLevelOld(TypeOfField type, const std::string& mname, int meshDimRelToMax, int renumPol=0) const throw(INTERP_KERNEL::Exception); + MEDCoupling::MEDFileInt32Field1TS *convertToInt(bool isDeepCpyGlobs=true) const; + void copyTimeInfoFrom(MEDCouplingFieldDouble *mcf); + MEDCouplingFieldDouble *field(const MEDFileMesh *mesh) const; + MEDCouplingFieldDouble *getFieldAtLevel(TypeOfField type, int meshDimRelToMax, int renumPol=0) const; + MEDCouplingFieldDouble *getFieldAtTopLevel(TypeOfField type, int renumPol=0) const; + MEDCouplingFieldDouble *getFieldOnMeshAtLevel(TypeOfField type, const MEDCouplingMesh *mesh, int renumPol=0) const; + MEDCouplingFieldDouble *getFieldOnMeshAtLevel(TypeOfField type, int meshDimRelToMax, const MEDFileMesh *mesh, int renumPol=0) const; + MEDCouplingFieldDouble *getFieldAtLevelOld(TypeOfField type, const std::string& mname, int meshDimRelToMax, int renumPol=0) const; // - void setFieldNoProfileSBT(const MEDCouplingFieldDouble *field) throw(INTERP_KERNEL::Exception); - void setFieldProfile(const MEDCouplingFieldDouble *field, const MEDFileMesh *mesh, int meshDimRelToMax, const DataArrayInt *profile) throw(INTERP_KERNEL::Exception); - void setProfileNameOnLeaf(const std::string& mName, INTERP_KERNEL::NormalizedCellType typ, int locId, const std::string& newPflName, bool forceRenameOnGlob=false) throw(INTERP_KERNEL::Exception); - void setLocNameOnLeaf(const std::string& mName, INTERP_KERNEL::NormalizedCellType typ, int locId, const std::string& newLocName, bool forceRenameOnGlob=false) throw(INTERP_KERNEL::Exception); + void setFieldNoProfileSBT(const MEDCouplingFieldDouble *field); + void setFieldProfile(const MEDCouplingFieldDouble *field, const MEDFileMesh *mesh, int meshDimRelToMax, const DataArrayIdType *profile); + void setFieldProfileFlatly(const MEDCouplingFieldDouble *field, const MEDFileMesh *mesh, int meshDimRelToMax, const DataArrayIdType *profile); + void setProfileNameOnLeaf(const std::string& mName, INTERP_KERNEL::NormalizedCellType typ, int locId, const std::string& newPflName, bool forceRenameOnGlob=false); + void setLocNameOnLeaf(const std::string& mName, INTERP_KERNEL::NormalizedCellType typ, int locId, const std::string& newLocName, bool forceRenameOnGlob=false); %extend { - MEDFileField1TS(const std::string& fileName, bool loadAll=true) throw(INTERP_KERNEL::Exception) + MEDFileField1TS(const std::string& fileName, bool loadAll=true) { return MEDFileField1TS::New(fileName,loadAll); } - MEDFileField1TS(const std::string& fileName, const std::string& fieldName, bool loadAll=true) throw(INTERP_KERNEL::Exception) + MEDFileField1TS(const std::string& fileName, const std::string& fieldName, bool loadAll=true) { return MEDFileField1TS::New(fileName,fieldName,loadAll); } - MEDFileField1TS(const std::string& fileName, const std::string& fieldName, int iteration, int order, bool loadAll=true) throw(INTERP_KERNEL::Exception) + MEDFileField1TS(const std::string& fileName, const std::string& fieldName, int iteration, int order, bool loadAll=true) { return MEDFileField1TS::New(fileName,fieldName,iteration,order,loadAll); } - MEDFileField1TS(DataArrayByte *db) throw(INTERP_KERNEL::Exception) + MEDFileField1TS(DataArrayByte *db) { return MEDFileField1TS::New(db); } @@ -2310,14 +2343,8 @@ namespace MEDCoupling { return MEDFileField1TS::New(); } - - // serialization - static PyObject *___new___(PyObject *cls, PyObject *args) throw(INTERP_KERNEL::Exception) - { - return NewMethWrapCallInitOnlyIfDictWithSingleEltInInput(cls,args,"MEDFileField1TS"); - } - void copyTinyInfoFrom(const MEDCouplingFieldDouble *field) throw(INTERP_KERNEL::Exception) + void copyTinyInfoFrom(const MEDCouplingFieldDouble *field) { const DataArrayDouble *arr=0; if(field) @@ -2325,26 +2352,26 @@ namespace MEDCoupling self->copyTinyInfoFrom(field,arr); } - std::string __str__() const throw(INTERP_KERNEL::Exception) + std::string __str__() const { return self->simpleRepr(); } - PyObject *getFieldWithProfile(TypeOfField type, int meshDimRelToMax, const MEDFileMesh *mesh) const throw(INTERP_KERNEL::Exception) + PyObject *getFieldWithProfile(TypeOfField type, int meshDimRelToMax, const MEDFileMesh *mesh) const { return MEDFileField1TS_getFieldWithProfile(self,type,meshDimRelToMax,mesh); } - PyObject *getFieldSplitedByType2(const std::string& mname=std::string()) const throw(INTERP_KERNEL::Exception) + PyObject *getFieldSplitedByType2(const std::string& mname=std::string()) const { std::vector types; std::vector< std::vector > typesF; std::vector< std::vector > pfls; std::vector< std::vector > locs; std::vector< std::vector > ret=self->getFieldSplitedByType2(mname,types,typesF,pfls,locs); - int sz=ret.size(); + std::size_t sz=ret.size(); PyObject *ret2=PyList_New(sz); - for(int i=0;i& dadsI=ret[i]; const std::vector& typesFI=typesF[i]; @@ -2352,9 +2379,9 @@ namespace MEDCoupling const std::vector& locsI=locs[i]; PyObject *elt=PyTuple_New(2); PyTuple_SetItem(elt,0,SWIG_From_int(types[i])); - int sz2=ret[i].size(); + std::size_t sz2=ret[i].size(); PyObject *elt2=PyList_New(sz2); - for(int j=0;jgetUndergroundDataArray(); if(ret) @@ -2377,103 +2404,154 @@ namespace MEDCoupling return ret; } - PyObject *getUndergroundDataArrayExt() const throw(INTERP_KERNEL::Exception) + PyObject *getUndergroundDataArrayExt() const { - std::vector< std::pair,std::pair > > elt1Cpp; - DataArrayDouble *elt0=self->getUndergroundDataArrayExt(elt1Cpp); - if(elt0) - elt0->incrRef(); - PyObject *ret=PyTuple_New(2); - PyTuple_SetItem(ret,0,SWIG_NewPointerObj(SWIG_as_voidptr(elt0),SWIGTYPE_p_MEDCoupling__DataArrayDouble, SWIG_POINTER_OWN | 0 )); - std::size_t sz=elt1Cpp.size(); - PyObject *elt=PyList_New(sz); - for(std::size_t i=0;i(self); } } }; - class MEDFileIntField1TS : public MEDFileAnyTypeField1TS + class MEDFileInt32Field1TS : public MEDFileAnyTypeField1TS { public: - static MEDFileIntField1TS *New(); - static MEDFileIntField1TS *New(const std::string& fileName, bool loadAll=true) throw(INTERP_KERNEL::Exception); - static MEDFileIntField1TS *New(DataArrayByte *db) throw(INTERP_KERNEL::Exception); - static MEDFileIntField1TS *New(const std::string& fileName, const std::string& fieldName, bool loadAll=true) throw(INTERP_KERNEL::Exception); - static MEDFileIntField1TS *New(const std::string& fileName, const std::string& fieldName, int iteration, int order, bool loadAll=true) throw(INTERP_KERNEL::Exception); - MEDCoupling::MEDFileField1TS *convertToDouble(bool isDeepCpyGlobs=true) const throw(INTERP_KERNEL::Exception); + static MEDFileInt32Field1TS *New(); + static MEDFileInt32Field1TS *New(const std::string& fileName, bool loadAll=true); + static MEDFileInt32Field1TS *New(DataArrayByte *db); + static MEDFileInt32Field1TS *New(const std::string& fileName, const std::string& fieldName, bool loadAll=true); + static MEDFileInt32Field1TS *New(const std::string& fileName, const std::string& fieldName, int iteration, int order, bool loadAll=true); + MEDCoupling::MEDFileField1TS *convertToDouble(bool isDeepCpyGlobs=true) const; // - void setFieldNoProfileSBT(const MEDCouplingFieldInt *field) throw(INTERP_KERNEL::Exception); - void setFieldProfile(const MEDCouplingFieldInt *field, const MEDFileMesh *mesh, int meshDimRelToMax, const DataArrayInt *profile) throw(INTERP_KERNEL::Exception); - MEDCouplingFieldInt *field(const MEDFileMesh *mesh) const throw(INTERP_KERNEL::Exception); - MEDCouplingFieldInt *getFieldAtLevel(TypeOfField type, int meshDimRelToMax, int renumPol=0) const throw(INTERP_KERNEL::Exception); - MEDCouplingFieldInt *getFieldAtTopLevel(TypeOfField type, int renumPol=0) const throw(INTERP_KERNEL::Exception); - MEDCouplingFieldInt *getFieldOnMeshAtLevel(TypeOfField type, int meshDimRelToMax, const MEDFileMesh *mesh, int renumPol=0) const throw(INTERP_KERNEL::Exception); - MEDCouplingFieldInt *getFieldOnMeshAtLevel(TypeOfField type, const MEDCouplingMesh *mesh, int renumPol=0) const throw(INTERP_KERNEL::Exception); - MEDCouplingFieldInt *getFieldAtLevelOld(TypeOfField type, const std::string& mname, int meshDimRelToMax, int renumPol=0) const throw(INTERP_KERNEL::Exception); + void setFieldNoProfileSBT(const MEDCouplingFieldInt32 *field); + void setFieldProfile(const MEDCouplingFieldInt32 *field, const MEDFileMesh *mesh, int meshDimRelToMax, const DataArrayIdType *profile); + void setFieldProfileFlatly(const MEDCouplingFieldInt32 *field, const MEDFileMesh *mesh, int meshDimRelToMax, const DataArrayIdType *profile); + void copyTimeInfoFrom(MEDCouplingFieldInt32 *mcf); + MEDCouplingFieldInt32 *field(const MEDFileMesh *mesh) const; + MEDCouplingFieldInt32 *getFieldAtLevel(TypeOfField type, int meshDimRelToMax, int renumPol=0) const; + MEDCouplingFieldInt32 *getFieldAtTopLevel(TypeOfField type, int renumPol=0) const; + MEDCouplingFieldInt32 *getFieldOnMeshAtLevel(TypeOfField type, int meshDimRelToMax, const MEDFileMesh *mesh, int renumPol=0) const; + MEDCouplingFieldInt32 *getFieldOnMeshAtLevel(TypeOfField type, const MEDCouplingMesh *mesh, int renumPol=0) const; + MEDCouplingFieldInt32 *getFieldAtLevelOld(TypeOfField type, const std::string& mname, int meshDimRelToMax, int renumPol=0) const; %extend { - MEDFileIntField1TS() throw(INTERP_KERNEL::Exception) + MEDFileInt32Field1TS() + { + return MEDFileInt32Field1TS::New(); + } + + MEDFileInt32Field1TS(const std::string& fileName, bool loadAll=true) + { + return MEDFileInt32Field1TS::New(fileName,loadAll); + } + + MEDFileInt32Field1TS(const std::string& fileName, const std::string& fieldName, bool loadAll=true) + { + return MEDFileInt32Field1TS::New(fileName,fieldName,loadAll); + } + + MEDFileInt32Field1TS(const std::string& fileName, const std::string& fieldName, int iteration, int order, bool loadAll=true) { - return MEDFileIntField1TS::New(); + return MEDFileInt32Field1TS::New(fileName,fieldName,iteration,order,loadAll); } - MEDFileIntField1TS(const std::string& fileName, bool loadAll=true) throw(INTERP_KERNEL::Exception) + MEDFileInt32Field1TS(DataArrayByte *db) { - return MEDFileIntField1TS::New(fileName,loadAll); + return MEDFileInt32Field1TS::New(db); } - MEDFileIntField1TS(const std::string& fileName, const std::string& fieldName, bool loadAll=true) throw(INTERP_KERNEL::Exception) + std::string __str__() const + { + return self->simpleRepr(); + } + + PyObject *getFieldWithProfile(TypeOfField type, int meshDimRelToMax, const MEDFileMesh *mesh) const + { + return MEDFileField1TS_getFieldWithProfile(self,type,meshDimRelToMax,mesh); + } + + DataArrayInt32 *getUndergroundDataArray() const + { + DataArrayInt32 *ret=self->getUndergroundDataArray(); + if(ret) + ret->incrRef(); + return ret; + } + + PyObject *getUndergroundDataArrayExt() const + { + return MEDFileField1TS_getUndergroundDataArrayExt(self); + } + } + }; + + class MEDFileInt64Field1TS : public MEDFileAnyTypeField1TS + { + public: + static MEDFileInt64Field1TS *New(); + static MEDFileInt64Field1TS *New(const std::string& fileName, bool loadAll=true); + static MEDFileInt64Field1TS *New(DataArrayByte *db); + static MEDFileInt64Field1TS *New(const std::string& fileName, const std::string& fieldName, bool loadAll=true); + static MEDFileInt64Field1TS *New(const std::string& fileName, const std::string& fieldName, int iteration, int order, bool loadAll=true); + MEDCoupling::MEDFileField1TS *convertToDouble(bool isDeepCpyGlobs=true) const; + // + void setFieldNoProfileSBT(const MEDCouplingFieldInt64 *field); + void setFieldProfile(const MEDCouplingFieldInt64 *field, const MEDFileMesh *mesh, int meshDimRelToMax, const DataArrayIdType *profile); + void setFieldProfileFlatly(const MEDCouplingFieldInt64 *field, const MEDFileMesh *mesh, int meshDimRelToMax, const DataArrayIdType *profile); + void copyTimeInfoFrom(MEDCouplingFieldInt64 *mcf); + MEDCouplingFieldInt64 *field(const MEDFileMesh *mesh) const; + MEDCouplingFieldInt64 *getFieldAtLevel(TypeOfField type, int meshDimRelToMax, int renumPol=0) const; + MEDCouplingFieldInt64 *getFieldAtTopLevel(TypeOfField type, int renumPol=0) const; + MEDCouplingFieldInt64 *getFieldOnMeshAtLevel(TypeOfField type, int meshDimRelToMax, const MEDFileMesh *mesh, int renumPol=0) const; + MEDCouplingFieldInt64 *getFieldOnMeshAtLevel(TypeOfField type, const MEDCouplingMesh *mesh, int renumPol=0) const; + MEDCouplingFieldInt64 *getFieldAtLevelOld(TypeOfField type, const std::string& mname, int meshDimRelToMax, int renumPol=0) const; + %extend + { + MEDFileInt64Field1TS() { - return MEDFileIntField1TS::New(fileName,fieldName,loadAll); + return MEDFileInt64Field1TS::New(); } - MEDFileIntField1TS(const std::string& fileName, const std::string& fieldName, int iteration, int order, bool loadAll=true) throw(INTERP_KERNEL::Exception) + MEDFileInt64Field1TS(const std::string& fileName, bool loadAll=true) { - return MEDFileIntField1TS::New(fileName,fieldName,iteration,order,loadAll); + return MEDFileInt64Field1TS::New(fileName,loadAll); } - MEDFileIntField1TS(DataArrayByte *db) throw(INTERP_KERNEL::Exception) + MEDFileInt64Field1TS(const std::string& fileName, const std::string& fieldName, bool loadAll=true) { - return MEDFileIntField1TS::New(db); + return MEDFileInt64Field1TS::New(fileName,fieldName,loadAll); } - // serialization - static PyObject *___new___(PyObject *cls, PyObject *args) throw(INTERP_KERNEL::Exception) + MEDFileInt64Field1TS(const std::string& fileName, const std::string& fieldName, int iteration, int order, bool loadAll=true) { - return NewMethWrapCallInitOnlyIfDictWithSingleEltInInput(cls,args,"MEDFileIntField1TS"); + return MEDFileInt64Field1TS::New(fileName,fieldName,iteration,order,loadAll); } - std::string __str__() const throw(INTERP_KERNEL::Exception) + MEDFileInt64Field1TS(DataArrayByte *db) + { + return MEDFileInt64Field1TS::New(db); + } + + std::string __str__() const { return self->simpleRepr(); } - PyObject *getFieldWithProfile(TypeOfField type, int meshDimRelToMax, const MEDFileMesh *mesh) const throw(INTERP_KERNEL::Exception) + PyObject *getFieldWithProfile(TypeOfField type, int meshDimRelToMax, const MEDFileMesh *mesh) const { - return MEDFileField1TS_getFieldWithProfile(self,type,meshDimRelToMax,mesh); + return MEDFileField1TS_getFieldWithProfile(self,type,meshDimRelToMax,mesh); } - DataArrayInt *getUndergroundDataArray() const throw(INTERP_KERNEL::Exception) + DataArrayInt64 *getUndergroundDataArray() const { - DataArrayInt *ret=self->getUndergroundDataArray(); + DataArrayInt64 *ret=self->getUndergroundDataArray(); if(ret) ret->incrRef(); return ret; } + + PyObject *getUndergroundDataArrayExt() const + { + return MEDFileField1TS_getUndergroundDataArrayExt(self); + } } }; @@ -2481,70 +2559,71 @@ namespace MEDCoupling { public: static MEDFileFloatField1TS *New(); - static MEDFileFloatField1TS *New(const std::string& fileName, bool loadAll=true) throw(INTERP_KERNEL::Exception); - static MEDFileFloatField1TS *New(DataArrayByte *db) throw(INTERP_KERNEL::Exception); - static MEDFileFloatField1TS *New(const std::string& fileName, const std::string& fieldName, bool loadAll=true) throw(INTERP_KERNEL::Exception); - static MEDFileFloatField1TS *New(const std::string& fileName, const std::string& fieldName, int iteration, int order, bool loadAll=true) throw(INTERP_KERNEL::Exception); - MEDCoupling::MEDFileField1TS *convertToDouble(bool isDeepCpyGlobs=true) const throw(INTERP_KERNEL::Exception); + static MEDFileFloatField1TS *New(const std::string& fileName, bool loadAll=true); + static MEDFileFloatField1TS *New(DataArrayByte *db); + static MEDFileFloatField1TS *New(const std::string& fileName, const std::string& fieldName, bool loadAll=true); + static MEDFileFloatField1TS *New(const std::string& fileName, const std::string& fieldName, int iteration, int order, bool loadAll=true); + MEDCoupling::MEDFileField1TS *convertToDouble(bool isDeepCpyGlobs=true) const; // - void setFieldNoProfileSBT(const MEDCouplingFieldFloat *field) throw(INTERP_KERNEL::Exception); - void setFieldProfile(const MEDCouplingFieldFloat *field, const MEDFileMesh *mesh, int meshDimRelToMax, const DataArrayInt *profile) throw(INTERP_KERNEL::Exception); - MEDCouplingFieldFloat *field(const MEDFileMesh *mesh) const throw(INTERP_KERNEL::Exception); - MEDCouplingFieldFloat *getFieldAtLevel(TypeOfField type, int meshDimRelToMax, int renumPol=0) const throw(INTERP_KERNEL::Exception); - MEDCouplingFieldFloat *getFieldAtTopLevel(TypeOfField type, int renumPol=0) const throw(INTERP_KERNEL::Exception); - MEDCouplingFieldFloat *getFieldOnMeshAtLevel(TypeOfField type, int meshDimRelToMax, const MEDFileMesh *mesh, int renumPol=0) const throw(INTERP_KERNEL::Exception); - MEDCouplingFieldFloat *getFieldOnMeshAtLevel(TypeOfField type, const MEDCouplingMesh *mesh, int renumPol=0) const throw(INTERP_KERNEL::Exception); - MEDCouplingFieldFloat *getFieldAtLevelOld(TypeOfField type, const std::string& mname, int meshDimRelToMax, int renumPol=0) const throw(INTERP_KERNEL::Exception); + void setFieldNoProfileSBT(const MEDCouplingFieldFloat *field); + void setFieldProfile(const MEDCouplingFieldFloat *field, const MEDFileMesh *mesh, int meshDimRelToMax, const DataArrayIdType *profile); + void setFieldProfileFlatly(const MEDCouplingFieldFloat *field, const MEDFileMesh *mesh, int meshDimRelToMax, const DataArrayIdType *profile); + void copyTimeInfoFrom(MEDCouplingFieldFloat *mcf); + MEDCouplingFieldFloat *field(const MEDFileMesh *mesh) const; + MEDCouplingFieldFloat *getFieldAtLevel(TypeOfField type, int meshDimRelToMax, int renumPol=0) const; + MEDCouplingFieldFloat *getFieldAtTopLevel(TypeOfField type, int renumPol=0) const; + MEDCouplingFieldFloat *getFieldOnMeshAtLevel(TypeOfField type, int meshDimRelToMax, const MEDFileMesh *mesh, int renumPol=0) const; + MEDCouplingFieldFloat *getFieldOnMeshAtLevel(TypeOfField type, const MEDCouplingMesh *mesh, int renumPol=0) const; + MEDCouplingFieldFloat *getFieldAtLevelOld(TypeOfField type, const std::string& mname, int meshDimRelToMax, int renumPol=0) const; %extend { - MEDFileFloatField1TS() throw(INTERP_KERNEL::Exception) + MEDFileFloatField1TS() { return MEDFileFloatField1TS::New(); } - MEDFileFloatField1TS(const std::string& fileName, bool loadAll=true) throw(INTERP_KERNEL::Exception) + MEDFileFloatField1TS(const std::string& fileName, bool loadAll=true) { return MEDFileFloatField1TS::New(fileName,loadAll); } - MEDFileFloatField1TS(const std::string& fileName, const std::string& fieldName, bool loadAll=true) throw(INTERP_KERNEL::Exception) + MEDFileFloatField1TS(const std::string& fileName, const std::string& fieldName, bool loadAll=true) { return MEDFileFloatField1TS::New(fileName,fieldName,loadAll); } - MEDFileFloatField1TS(const std::string& fileName, const std::string& fieldName, int iteration, int order, bool loadAll=true) throw(INTERP_KERNEL::Exception) + MEDFileFloatField1TS(const std::string& fileName, const std::string& fieldName, int iteration, int order, bool loadAll=true) { return MEDFileFloatField1TS::New(fileName,fieldName,iteration,order,loadAll); } - MEDFileFloatField1TS(DataArrayByte *db) throw(INTERP_KERNEL::Exception) + MEDFileFloatField1TS(DataArrayByte *db) { return MEDFileFloatField1TS::New(db); } - // serialization - static PyObject *___new___(PyObject *cls, PyObject *args) throw(INTERP_KERNEL::Exception) - { - return NewMethWrapCallInitOnlyIfDictWithSingleEltInInput(cls,args,"MEDFileFloatField1TS"); - } - - std::string __str__() const throw(INTERP_KERNEL::Exception) + std::string __str__() const { return self->simpleRepr(); } - PyObject *getFieldWithProfile(TypeOfField type, int meshDimRelToMax, const MEDFileMesh *mesh) const throw(INTERP_KERNEL::Exception) + PyObject *getFieldWithProfile(TypeOfField type, int meshDimRelToMax, const MEDFileMesh *mesh) const { return MEDFileField1TS_getFieldWithProfile(self,type,meshDimRelToMax,mesh); } - DataArrayFloat *getUndergroundDataArray() const throw(INTERP_KERNEL::Exception) + DataArrayFloat *getUndergroundDataArray() const { DataArrayFloat *ret=self->getUndergroundDataArray(); if(ret) ret->incrRef(); return ret; } + + PyObject *getUndergroundDataArrayExt() const + { + return MEDFileField1TS_getUndergroundDataArrayExt(self); + } } }; @@ -2553,7 +2632,7 @@ namespace MEDCoupling public: %extend { - PyObject *next() throw(INTERP_KERNEL::Exception) + PyObject *next() { MEDFileAnyTypeField1TS *ret=self->nextt(); if(ret) @@ -2570,46 +2649,46 @@ namespace MEDCoupling class MEDFileAnyTypeFieldMultiTS : public RefCountObject, public MEDFileFieldGlobsReal, public MEDFileWritableStandAlone { public: - static MEDFileAnyTypeFieldMultiTS *New(const std::string& fileName, bool loadAll=true) throw(INTERP_KERNEL::Exception); - static MEDFileAnyTypeFieldMultiTS *New(const std::string& fileName, const std::string& fieldName, bool loadAll=true) throw(INTERP_KERNEL::Exception); - MEDFileAnyTypeFieldMultiTS *deepCopy() const throw(INTERP_KERNEL::Exception); - virtual MEDFileAnyTypeFieldMultiTS *shallowCpy() const throw(INTERP_KERNEL::Exception); - std::string getName() const throw(INTERP_KERNEL::Exception); - void setName(const std::string& name) throw(INTERP_KERNEL::Exception); - std::string getDtUnit() const throw(INTERP_KERNEL::Exception); - void setDtUnit(const std::string& dtUnit) throw(INTERP_KERNEL::Exception); - std::string getMeshName() const throw(INTERP_KERNEL::Exception); - void setMeshName(const std::string& newMeshName) throw(INTERP_KERNEL::Exception); - const std::vector& getInfo() const throw(INTERP_KERNEL::Exception); - bool presenceOfMultiDiscPerGeoType() const throw(INTERP_KERNEL::Exception); - int getNumberOfComponents() const throw(INTERP_KERNEL::Exception); - int getNumberOfTS() const throw(INTERP_KERNEL::Exception); - void eraseEmptyTS() throw(INTERP_KERNEL::Exception); - int getPosOfTimeStep(int iteration, int order) const throw(INTERP_KERNEL::Exception); - int getPosGivenTime(double time, double eps=1e-8) const throw(INTERP_KERNEL::Exception); - void loadArrays() throw(INTERP_KERNEL::Exception); - void loadArraysIfNecessary() throw(INTERP_KERNEL::Exception); - void unloadArrays() throw(INTERP_KERNEL::Exception); - void unloadArraysWithoutDataLoss() throw(INTERP_KERNEL::Exception); + static MEDFileAnyTypeFieldMultiTS *New(const std::string& fileName, bool loadAll=true); + static MEDFileAnyTypeFieldMultiTS *New(const std::string& fileName, const std::string& fieldName, bool loadAll=true); + MEDFileAnyTypeFieldMultiTS *deepCopy() const; + virtual MEDFileAnyTypeFieldMultiTS *shallowCpy() const; + std::string getName() const; + void setName(const std::string& name); + std::string getDtUnit() const; + void setDtUnit(const std::string& dtUnit); + std::string getMeshName() const; + void setMeshName(const std::string& newMeshName); + const std::vector& getInfo() const; + bool presenceOfMultiDiscPerGeoType() const; + int getNumberOfComponents() const; + int getNumberOfTS() const; + void eraseEmptyTS(); + int getPosOfTimeStep(int iteration, int order) const; + int getPosGivenTime(double time, double eps=1e-8) const; + void loadArrays(); + void loadArraysIfNecessary(); + void unloadArrays(); + void unloadArraysWithoutDataLoss(); // - virtual MEDFileAnyTypeField1TS *getTimeStepAtPos(int pos) const throw(INTERP_KERNEL::Exception); - MEDFileAnyTypeField1TS *getTimeStep(int iteration, int order) const throw(INTERP_KERNEL::Exception); - MEDFileAnyTypeField1TS *getTimeStepGivenTime(double time, double eps=1e-8) const throw(INTERP_KERNEL::Exception); - void pushBackTimeStep(MEDFileAnyTypeField1TS *f1ts) throw(INTERP_KERNEL::Exception); - void synchronizeNameScope() throw(INTERP_KERNEL::Exception); - MEDFileAnyTypeFieldMultiTS *buildNewEmpty() const throw(INTERP_KERNEL::Exception); + virtual MEDFileAnyTypeField1TS *getTimeStepAtPos(int pos) const; + MEDFileAnyTypeField1TS *getTimeStep(int iteration, int order) const; + MEDFileAnyTypeField1TS *getTimeStepGivenTime(double time, double eps=1e-8) const; + void pushBackTimeStep(MEDFileAnyTypeField1TS *f1ts); + void synchronizeNameScope(); + MEDFileAnyTypeFieldMultiTS *buildNewEmpty() const; %extend { - int __len__() const throw(INTERP_KERNEL::Exception) + int __len__() const { return self->getNumberOfTS(); } - int getTimeId(PyObject *elt0) const throw(INTERP_KERNEL::Exception) + int getTimeId(PyObject *elt0) const { if(elt0 && PyInt_Check(elt0)) {//fmts[3] - int pos=PyInt_AS_LONG(elt0); + int pos=(int)PyInt_AS_LONG(elt0); return pos; } else if(elt0 && PyTuple_Check(elt0)) @@ -2620,8 +2699,8 @@ namespace MEDCoupling PyObject *o1=PyTuple_GetItem(elt0,1); if(PyInt_Check(o0) && PyInt_Check(o1)) {//fmts(1,-1) - int iter=PyInt_AS_LONG(o0); - int order=PyInt_AS_LONG(o1); + int iter=(int)PyInt_AS_LONG(o0); + int order=(int)PyInt_AS_LONG(o1); return self->getPosOfTimeStep(iter,order); } else @@ -2639,13 +2718,13 @@ namespace MEDCoupling throw INTERP_KERNEL::Exception("MEDFileAnyTypeFieldMultiTS::__getitem__ : invalid input params ! expected fmts[int], fmts[int,int] or fmts[double] to request time step !"); } - PyObject *getIterations() const throw(INTERP_KERNEL::Exception) + PyObject *getIterations() const { std::vector< std::pair > res(self->getIterations()); return convertVecPairIntToPy(res); } - PyObject *getTimeSteps() const throw(INTERP_KERNEL::Exception) + PyObject *getTimeSteps() const { std::vector ret1; std::vector< std::pair > ret=self->getTimeSteps(ret1); @@ -2662,7 +2741,7 @@ namespace MEDCoupling return ret2; } - PyObject *getTypesOfFieldAvailable() const throw(INTERP_KERNEL::Exception) + PyObject *getTypesOfFieldAvailable() const { std::vector< std::vector > ret=self->getTypesOfFieldAvailable(); PyObject *ret2=PyList_New(ret.size()); @@ -2677,7 +2756,7 @@ namespace MEDCoupling return ret2; } - PyObject *getNonEmptyLevels(int iteration, int order, const std::string& mname=std::string()) const throw(INTERP_KERNEL::Exception) + PyObject *getNonEmptyLevels(int iteration, int order, const std::string& mname=std::string()) const { std::vector ret1; int ret0=self->getNonEmptyLevels(iteration,order,mname,ret1); @@ -2687,30 +2766,30 @@ namespace MEDCoupling return elt; } - PyObject *getFieldSplitedByType(int iteration, int order, const std::string& mname=std::string()) const throw(INTERP_KERNEL::Exception) + PyObject *getFieldSplitedByType(int iteration, int order, const std::string& mname=std::string()) const { std::vector types; std::vector< std::vector > typesF; std::vector< std::vector > pfls; std::vector< std::vector > locs; - std::vector< std::vector< std::pair > > ret=self->getFieldSplitedByType(iteration,order,mname,types,typesF,pfls,locs); - int sz=ret.size(); + std::vector< std::vector< std::pair > > ret=self->getFieldSplitedByType(iteration,order,mname,types,typesF,pfls,locs); + std::size_t sz=ret.size(); PyObject *ret2=PyList_New(sz); - for(int i=0;i >& dadsI=ret[i]; + const std::vector< std::pair >& dadsI=ret[i]; const std::vector& typesFI=typesF[i]; const std::vector& pflsI=pfls[i]; const std::vector& locsI=locs[i]; PyObject *elt=PyTuple_New(2); PyTuple_SetItem(elt,0,SWIG_From_int(types[i])); - int sz2=ret[i].size(); + std::size_t sz2=ret[i].size(); PyObject *elt2=PyList_New(sz2); - for(int j=0;j getTimeIds(PyObject *elts) const throw(INTERP_KERNEL::Exception) + std::vector getTimeIds(PyObject *elts) const { if(PyList_Check(elts)) { - int sz=PyList_Size(elts); + std::size_t sz=PyList_Size(elts); std::vector ret(sz); - for(int i=0;igetNumberOfTS(),&strt,&stp,&step,"MEDFileAnyTypeFieldMultiTS.__delitem__ : error in input slice !"); - self->eraseTimeStepIds2(strt,stp,step); + self->eraseTimeStepIds2((int)strt,(int)stp,(int)step); } else { @@ -2759,12 +2838,12 @@ namespace MEDCoupling } } - void eraseTimeStepIds(PyObject *li) throw(INTERP_KERNEL::Exception) + void eraseTimeStepIds(PyObject *li) { - int sw; + mcIdType sw; int pos1; std::vector pos2; - DataArrayInt *pos3=0; + DataArrayInt32 *pos3=0; DataArrayIntTuple *pos4=0; convertIntStarLikePyObjToCpp(li,sw,pos1,pos2,pos3,pos4); switch(sw) @@ -2791,19 +2870,19 @@ namespace MEDCoupling } } - MEDFileAnyTypeFieldMultiTSIterator *__iter__() throw(INTERP_KERNEL::Exception) + MEDFileAnyTypeFieldMultiTSIterator *__iter__() { return self->iterator(); } - PyObject *__getitem__(PyObject *elt0) const throw(INTERP_KERNEL::Exception) + PyObject *__getitem__(PyObject *elt0) const { if(elt0 && PyList_Check(elt0)) { - int sz=PyList_Size(elt0); - MCAuto da=DataArrayInt::New(); da->alloc(sz,1); + std::size_t sz=PyList_Size(elt0); + MCAuto da=DataArrayInt32::New(); da->alloc(sz,1); int *pt=da->getPointer(); - for(int i=0;igetNumberOfTS(),&strt,&stp,&step,"MEDFileAnyTypeFieldMultiTS.__getitem__ : error in input slice !"); - return convertMEDFileFieldMultiTS(self->buildSubPartSlice(strt,stp,step),SWIG_POINTER_OWN | 0); + return convertMEDFileFieldMultiTS(self->buildSubPartSlice((int)strt,(int)stp,(int)step),SWIG_POINTER_OWN | 0); } else return convertMEDFileField1TS(self->getTimeStepAtPos(MEDFileAnyTypeFieldMultiTSgetitemSingleTS__(self,elt0)),SWIG_POINTER_OWN | 0); } - bool changeMeshNames(PyObject *li) throw(INTERP_KERNEL::Exception) + bool changeMeshNames(PyObject *li) { std::vector< std::pair > modifTab=convertVecPairStStFromPy(li); return self->changeMeshNames(modifTab); } - PyObject *splitComponents() const throw(INTERP_KERNEL::Exception) + PyObject *splitComponents() const { std::vector< MCAuto< MEDFileAnyTypeFieldMultiTS > > ret=self->splitComponents(); std::size_t sz=ret.size(); @@ -2836,7 +2915,7 @@ namespace MEDCoupling return retPy; } - PyObject *splitDiscretizations() const throw(INTERP_KERNEL::Exception) + PyObject *splitDiscretizations() const { std::vector< MCAuto< MEDFileAnyTypeFieldMultiTS > > ret=self->splitDiscretizations(); std::size_t sz=ret.size(); @@ -2846,7 +2925,7 @@ namespace MEDCoupling return retPy; } - PyObject *splitMultiDiscrPerGeoTypes() const throw(INTERP_KERNEL::Exception) + PyObject *splitMultiDiscrPerGeoTypes() const { std::vector< MCAuto< MEDFileAnyTypeFieldMultiTS > > ret=self->splitMultiDiscrPerGeoTypes(); std::size_t sz=ret.size(); @@ -2856,7 +2935,7 @@ namespace MEDCoupling return retPy; } - void pushBackTimeSteps(PyObject *li) throw(INTERP_KERNEL::Exception) + void pushBackTimeSteps(PyObject *li) { void *argp(0); int status(SWIG_ConvertPtr(li,&argp,SWIGTYPE_p_MEDCoupling__MEDFileAnyTypeFieldMultiTS,0|0)); @@ -2872,14 +2951,14 @@ namespace MEDCoupling } } - MEDFileAnyTypeFieldMultiTS *extractPart(PyObject *extractDef, MEDFileMesh *mm) const throw(INTERP_KERNEL::Exception) + MEDFileAnyTypeFieldMultiTS *extractPart(PyObject *extractDef, MEDFileMesh *mm) const { - std::map > extractDefCpp; + std::map > extractDefCpp; convertToMapIntDataArrayInt(extractDef,extractDefCpp); return self->extractPart(extractDefCpp,mm); } - static PyObject *MEDFileAnyTypeFieldMultiTS::SplitIntoCommonTimeSeries(PyObject *li) throw(INTERP_KERNEL::Exception) + static PyObject *MEDFileAnyTypeFieldMultiTS::SplitIntoCommonTimeSeries(PyObject *li) { std::vector vectFMTS; convertFromPyObjVectorOfObj(li,SWIGTYPE_p_MEDCoupling__MEDFileAnyTypeFieldMultiTS,"MEDFileAnyTypeFieldMultiTS",vectFMTS); @@ -2902,7 +2981,7 @@ namespace MEDCoupling return retPy; } - static PyObject *MEDFileAnyTypeFieldMultiTS::SplitPerCommonSupport(PyObject *li, const MEDFileMesh *mesh) throw(INTERP_KERNEL::Exception) + static PyObject *MEDFileAnyTypeFieldMultiTS::SplitPerCommonSupport(PyObject *li, const MEDFileMesh *mesh) { std::vector vectFMTS; convertFromPyObjVectorOfObj(li,SWIGTYPE_p_MEDCoupling__MEDFileAnyTypeFieldMultiTS,"MEDFileAnyTypeFieldMultiTS",vectFMTS); @@ -2936,53 +3015,59 @@ namespace MEDCoupling } }; - class MEDFileIntFieldMultiTS; + class MEDFileInt32FieldMultiTS; + class MEDFileInt64FieldMultiTS; class MEDFileFieldMultiTS : public MEDFileAnyTypeFieldMultiTS { public: - static MEDFileFieldMultiTS *New() throw(INTERP_KERNEL::Exception); - static MEDFileFieldMultiTS *New(const std::string& fileName, bool loadAll=true) throw(INTERP_KERNEL::Exception); - static MEDFileFieldMultiTS *New(const std::string& fileName, const std::string& fieldName, bool loadAll=true) throw(INTERP_KERNEL::Exception); - static MEDFileFieldMultiTS *New(DataArrayByte *db) throw(INTERP_KERNEL::Exception); + static MEDFileFieldMultiTS *New(); + static MEDFileFieldMultiTS *New(const std::string& fileName, bool loadAll=true); + static MEDFileFieldMultiTS *New(const std::string& fileName, const std::string& fieldName, bool loadAll=true); + static MEDFileFieldMultiTS *New(DataArrayByte *db); // - MEDCouplingFieldDouble *field(int iteration, int order, const MEDFileMesh *mesh) const throw(INTERP_KERNEL::Exception); - MEDCouplingFieldDouble *getFieldAtLevel(TypeOfField type, int iteration, int order, int meshDimRelToMax, int renumPol=0) const throw(INTERP_KERNEL::Exception); - MEDCouplingFieldDouble *getFieldAtTopLevel(TypeOfField type, int iteration, int order, int renumPol=0) const throw(INTERP_KERNEL::Exception); - MEDCouplingFieldDouble *getFieldOnMeshAtLevel(TypeOfField type, int iteration, int order, int meshDimRelToMax, const MEDFileMesh *mesh, int renumPol=0) const throw(INTERP_KERNEL::Exception); - MEDCouplingFieldDouble *getFieldOnMeshAtLevel(TypeOfField type, int iteration, int order, const MEDCouplingMesh *mesh, int renumPol=0) const throw(INTERP_KERNEL::Exception); - MEDCouplingFieldDouble *getFieldAtLevelOld(TypeOfField type, int iteration, int order, const std::string& mname, int meshDimRelToMax, int renumPol=0) const throw(INTERP_KERNEL::Exception); + MEDCouplingFieldDouble *field(int iteration, int order, const MEDFileMesh *mesh) const; + MEDCouplingFieldDouble *getFieldAtLevel(TypeOfField type, int iteration, int order, int meshDimRelToMax, int renumPol=0) const; + MEDCouplingFieldDouble *getFieldAtTopLevel(TypeOfField type, int iteration, int order, int renumPol=0) const; + MEDCouplingFieldDouble *getFieldOnMeshAtLevel(TypeOfField type, int iteration, int order, int meshDimRelToMax, const MEDFileMesh *mesh, int renumPol=0) const; + MEDCouplingFieldDouble *getFieldOnMeshAtLevel(TypeOfField type, int iteration, int order, const MEDCouplingMesh *mesh, int renumPol=0) const; + MEDCouplingFieldDouble *getFieldAtLevelOld(TypeOfField type, int iteration, int order, const std::string& mname, int meshDimRelToMax, int renumPol=0) const; // - void appendFieldNoProfileSBT(const MEDCouplingFieldDouble *field) throw(INTERP_KERNEL::Exception); - void appendFieldProfile(const MEDCouplingFieldDouble *field, const MEDFileMesh *mesh, int meshDimRelToMax, const DataArrayInt *profile) throw(INTERP_KERNEL::Exception); - MEDFileIntFieldMultiTS *convertToInt(bool isDeepCpyGlobs=true) const throw(INTERP_KERNEL::Exception); + void appendFieldNoProfileSBT(const MEDCouplingFieldDouble *field); + void appendFieldProfile(const MEDCouplingFieldDouble *field, const MEDFileMesh *mesh, int meshDimRelToMax, const DataArrayIdType *profile); + MEDFileInt32FieldMultiTS *convertToInt(bool isDeepCpyGlobs=true) const; %extend { + static MEDFileAnyTypeFieldMultiTS *Aggregate(PyObject *fmtssPy, PyObject *dtsPy) + { + std::vector fmtss; + convertFromPyObjVectorOfObj(fmtssPy,SWIGTYPE_p_MEDCoupling__MEDFileAnyTypeFieldMultiTS,"MEDFileAnyTypeFieldMultiTS",fmtss); + std::vector< std::vector< std::pair > > dts2; + convertPyToVectorVectorPairInt(dtsPy,dts2); + std::vector< std::vector< std::pair > > dts(MEDVectorVectorMIIterator(0,dts2),MEDVectorVectorMIIterator(dts2.size(),dts2)); + MCAuto ret = MEDFileFieldMultiTS::Aggregate(fmtss,dts); + return ret.retn(); + } + MEDFileFieldMultiTS() { return MEDFileFieldMultiTS::New(); } - MEDFileFieldMultiTS(const std::string& fileName, bool loadAll=true) throw(INTERP_KERNEL::Exception) + MEDFileFieldMultiTS(const std::string& fileName, bool loadAll=true) { return MEDFileFieldMultiTS::New(fileName,loadAll); } - MEDFileFieldMultiTS(const std::string& fileName, const std::string& fieldName, bool loadAll=true) throw(INTERP_KERNEL::Exception) + MEDFileFieldMultiTS(const std::string& fileName, const std::string& fieldName, bool loadAll=true) { return MEDFileFieldMultiTS::New(fileName,fieldName,loadAll); } - MEDFileFieldMultiTS(DataArrayByte *db) throw(INTERP_KERNEL::Exception) + MEDFileFieldMultiTS(DataArrayByte *db) { return MEDFileFieldMultiTS::New(db); } - - // serialization - static PyObject *___new___(PyObject *cls, PyObject *args) throw(INTERP_KERNEL::Exception) - { - return NewMethWrapCallInitOnlyIfDictWithSingleEltInInput(cls,args,"MEDFileFieldMultiTS"); - } static MEDFileFieldMultiTS *LoadSpecificEntities(const std::string& fileName, const std::string& fieldName, PyObject *entities, bool loadAll=true) { @@ -2997,31 +3082,31 @@ namespace MEDCoupling return MEDFileFieldMultiTS::LoadSpecificEntities(fileName,fieldName,entitiesCpp,loadAll); } - std::string __str__() const throw(INTERP_KERNEL::Exception) + std::string __str__() const { return self->simpleRepr(); } - PyObject *getFieldWithProfile(TypeOfField type, int iteration, int order, int meshDimRelToMax, const MEDFileMesh *mesh) const throw(INTERP_KERNEL::Exception) + PyObject *getFieldWithProfile(TypeOfField type, int iteration, int order, int meshDimRelToMax, const MEDFileMesh *mesh) const { - DataArrayInt *ret1=0; + DataArrayIdType *ret1=0; DataArrayDouble *ret0=self->getFieldWithProfile(type,iteration,order,meshDimRelToMax,mesh,ret1); PyObject *ret=PyTuple_New(2); PyTuple_SetItem(ret,0,SWIG_NewPointerObj(SWIG_as_voidptr(ret0),SWIGTYPE_p_MEDCoupling__DataArrayDouble, SWIG_POINTER_OWN | 0 )); - PyTuple_SetItem(ret,1,SWIG_NewPointerObj(SWIG_as_voidptr(ret1),SWIGTYPE_p_MEDCoupling__DataArrayInt, SWIG_POINTER_OWN | 0 )); + PyTuple_SetItem(ret,1,SWIG_NewPointerObj(SWIG_as_voidptr(ret1),SWIGTITraits::TI, SWIG_POINTER_OWN | 0 )); return ret; } - PyObject *getFieldSplitedByType2(int iteration, int order, const std::string& mname=std::string()) const throw(INTERP_KERNEL::Exception) + PyObject *getFieldSplitedByType2(int iteration, int order, const std::string& mname=std::string()) const { std::vector types; std::vector< std::vector > typesF; std::vector< std::vector > pfls; std::vector< std::vector > locs; std::vector< std::vector > ret=self->getFieldSplitedByType2(iteration,order,mname,types,typesF,pfls,locs); - int sz=ret.size(); + std::size_t sz=ret.size(); PyObject *ret2=PyList_New(sz); - for(int i=0;i& dadsI=ret[i]; const std::vector& typesFI=typesF[i]; @@ -3029,9 +3114,9 @@ namespace MEDCoupling const std::vector& locsI=locs[i]; PyObject *elt=PyTuple_New(2); PyTuple_SetItem(elt,0,SWIG_From_int(types[i])); - int sz2=ret[i].size(); + std::size_t sz2=ret[i].size(); PyObject *elt2=PyList_New(sz2); - for(int j=0;jgetUndergroundDataArray(iteration,order); if(ret) @@ -3053,9 +3138,9 @@ namespace MEDCoupling return ret; } - PyObject *getUndergroundDataArrayExt(int iteration, int order) const throw(INTERP_KERNEL::Exception) + PyObject *getUndergroundDataArrayExt(int iteration, int order) const { - std::vector< std::pair,std::pair > > elt1Cpp; + std::vector< std::pair,std::pair > > elt1Cpp; DataArrayDouble *elt0=self->getUndergroundDataArrayExt(iteration,order,elt1Cpp); if(elt0) elt0->incrRef(); @@ -3070,8 +3155,8 @@ namespace MEDCoupling PyTuple_SetItem(elt2,0,SWIG_From_int(elt1Cpp[i].first.first)); PyTuple_SetItem(elt2,1,SWIG_From_int(elt1Cpp[i].first.second)); PyObject *elt3=PyTuple_New(2); - PyTuple_SetItem(elt3,0,SWIG_From_int(elt1Cpp[i].second.first)); - PyTuple_SetItem(elt3,1,SWIG_From_int(elt1Cpp[i].second.second)); + PyTuple_SetItem(elt3,0,PyInt_FromLong(elt1Cpp[i].second.first)); + PyTuple_SetItem(elt3,1,PyInt_FromLong(elt1Cpp[i].second.second)); PyTuple_SetItem(elt1,0,elt2); PyTuple_SetItem(elt1,1,elt3); PyList_SetItem(elt,i,elt1); @@ -3087,7 +3172,7 @@ namespace MEDCoupling public: %extend { - PyObject *next() throw(INTERP_KERNEL::Exception) + PyObject *next() { MEDFileAnyTypeFieldMultiTS *ret=self->nextt(); if(ret) @@ -3101,76 +3186,141 @@ namespace MEDCoupling } }; - class MEDFileIntFieldMultiTS : public MEDFileAnyTypeFieldMultiTS + class MEDFileInt32FieldMultiTS : public MEDFileAnyTypeFieldMultiTS { public: - static MEDFileIntFieldMultiTS *New(); - static MEDFileIntFieldMultiTS *New(const std::string& fileName, bool loadAll=true) throw(INTERP_KERNEL::Exception); - static MEDFileIntFieldMultiTS *New(const std::string& fileName, const std::string& fieldName, bool loadAll=true) throw(INTERP_KERNEL::Exception); - static MEDFileIntFieldMultiTS *New(DataArrayByte *db) throw(INTERP_KERNEL::Exception); + static MEDFileInt32FieldMultiTS *New(); + static MEDFileInt32FieldMultiTS *New(const std::string& fileName, bool loadAll=true); + static MEDFileInt32FieldMultiTS *New(const std::string& fileName, const std::string& fieldName, bool loadAll=true); + static MEDFileInt32FieldMultiTS *New(DataArrayByte *db); // - void appendFieldNoProfileSBT(const MEDCouplingFieldInt *field) throw(INTERP_KERNEL::Exception); - void appendFieldProfile(const MEDCouplingFieldInt *field, const MEDFileMesh *mesh, int meshDimRelToMax, const DataArrayInt *profile) throw(INTERP_KERNEL::Exception); - MEDCoupling::MEDFileFieldMultiTS *convertToDouble(bool isDeepCpyGlobs=true) const throw(INTERP_KERNEL::Exception); - MEDCouplingFieldInt *field(int iteration, int order, const MEDFileMesh *mesh) const throw(INTERP_KERNEL::Exception); - MEDCouplingFieldInt *getFieldAtLevel(TypeOfField type, int iteration, int order, int meshDimRelToMax, int renumPol=0) const throw(INTERP_KERNEL::Exception); - MEDCouplingFieldInt *getFieldAtTopLevel(TypeOfField type, int iteration, int order, int renumPol=0) const throw(INTERP_KERNEL::Exception); - MEDCouplingFieldInt *getFieldOnMeshAtLevel(TypeOfField type, int iteration, int order, int meshDimRelToMax, const MEDFileMesh *mesh, int renumPol=0) const throw(INTERP_KERNEL::Exception); - MEDCouplingFieldInt *getFieldOnMeshAtLevel(TypeOfField type, int iteration, int order, const MEDCouplingMesh *mesh, int renumPol=0) const throw(INTERP_KERNEL::Exception); - MEDCouplingFieldInt *getFieldAtLevelOld(TypeOfField type, int iteration, int order, const std::string& mname, int meshDimRelToMax, int renumPol=0) const throw(INTERP_KERNEL::Exception); + void appendFieldNoProfileSBT(const MEDCouplingFieldInt32 *field); + void appendFieldProfile(const MEDCouplingFieldInt32 *field, const MEDFileMesh *mesh, int meshDimRelToMax, const DataArrayIdType *profile); + MEDCoupling::MEDFileFieldMultiTS *convertToDouble(bool isDeepCpyGlobs=true) const; + MEDCouplingFieldInt32 *field(int iteration, int order, const MEDFileMesh *mesh) const; + MEDCouplingFieldInt32 *getFieldAtLevel(TypeOfField type, int iteration, int order, int meshDimRelToMax, int renumPol=0) const; + MEDCouplingFieldInt32 *getFieldAtTopLevel(TypeOfField type, int iteration, int order, int renumPol=0) const; + MEDCouplingFieldInt32 *getFieldOnMeshAtLevel(TypeOfField type, int iteration, int order, int meshDimRelToMax, const MEDFileMesh *mesh, int renumPol=0) const; + MEDCouplingFieldInt32 *getFieldOnMeshAtLevel(TypeOfField type, int iteration, int order, const MEDCouplingMesh *mesh, int renumPol=0) const; + MEDCouplingFieldInt32 *getFieldAtLevelOld(TypeOfField type, int iteration, int order, const std::string& mname, int meshDimRelToMax, int renumPol=0) const; %extend { - MEDFileIntFieldMultiTS() + MEDFileInt32FieldMultiTS() { - return MEDFileIntFieldMultiTS::New(); + return MEDFileInt32FieldMultiTS::New(); } - MEDFileIntFieldMultiTS(const std::string& fileName, bool loadAll=true) throw(INTERP_KERNEL::Exception) + MEDFileInt32FieldMultiTS(const std::string& fileName, bool loadAll=true) { - return MEDFileIntFieldMultiTS::New(fileName,loadAll); + return MEDFileInt32FieldMultiTS::New(fileName,loadAll); } - MEDFileIntFieldMultiTS(const std::string& fileName, const std::string& fieldName, bool loadAll=true) throw(INTERP_KERNEL::Exception) + MEDFileInt32FieldMultiTS(const std::string& fileName, const std::string& fieldName, bool loadAll=true) { - return MEDFileIntFieldMultiTS::New(fileName,fieldName,loadAll); + return MEDFileInt32FieldMultiTS::New(fileName,fieldName,loadAll); } - MEDFileIntFieldMultiTS(DataArrayByte *db) throw(INTERP_KERNEL::Exception) + MEDFileInt32FieldMultiTS(DataArrayByte *db) { - return MEDFileIntFieldMultiTS::New(db); + return MEDFileInt32FieldMultiTS::New(db); } - // serialization - static PyObject *___new___(PyObject *cls, PyObject *args) throw(INTERP_KERNEL::Exception) + static MEDFileInt32FieldMultiTS *LoadSpecificEntities(const std::string& fileName, const std::string& fieldName, PyObject *entities, bool loadAll=true) { - return NewMethWrapCallInitOnlyIfDictWithSingleEltInInput(cls,args,"MEDFileIntFieldMultiTS"); + std::vector > tmp(convertTimePairIdsFromPy(entities)); + std::vector< std::pair > entitiesCpp(convertVecPairIntToVecPairTOFCT(tmp)); + return MEDFileInt32FieldMultiTS::LoadSpecificEntities(fileName,fieldName,entitiesCpp,loadAll); + } + + std::string __str__() const + { + return self->simpleRepr(); + } + + PyObject *getFieldWithProfile(TypeOfField type, int iteration, int order, int meshDimRelToMax, const MEDFileMesh *mesh) const + { + DataArrayIdType *ret1=0; + DataArrayInt32 *ret0=self->getFieldWithProfile(type,iteration,order,meshDimRelToMax,mesh,ret1); + PyObject *ret=PyTuple_New(2); + PyTuple_SetItem(ret,0,SWIG_NewPointerObj(SWIG_as_voidptr(ret0),SWIGTITraits::TI, SWIG_POINTER_OWN | 0 )); + PyTuple_SetItem(ret,1,SWIG_NewPointerObj(SWIG_as_voidptr(ret1),SWIGTITraits::TI, SWIG_POINTER_OWN | 0 )); + return ret; + } + + DataArrayInt32 *getUndergroundDataArray(int iteration, int order) const + { + DataArrayInt32 *ret=self->getUndergroundDataArray(iteration,order); + if(ret) + ret->incrRef(); + return ret; + } + } + }; + + class MEDFileInt64FieldMultiTS : public MEDFileAnyTypeFieldMultiTS + { + public: + static MEDFileInt64FieldMultiTS *New(); + static MEDFileInt64FieldMultiTS *New(const std::string& fileName, bool loadAll=true); + static MEDFileInt64FieldMultiTS *New(const std::string& fileName, const std::string& fieldName, bool loadAll=true); + static MEDFileInt64FieldMultiTS *New(DataArrayByte *db); + // + void appendFieldNoProfileSBT(const MEDCouplingFieldInt64 *field); + void appendFieldProfile(const MEDCouplingFieldInt64 *field, const MEDFileMesh *mesh, int meshDimRelToMax, const DataArrayIdType *profile); + MEDCoupling::MEDFileFieldMultiTS *convertToDouble(bool isDeepCpyGlobs=true) const; + MEDCouplingFieldInt64 *field(int iteration, int order, const MEDFileMesh *mesh) const; + MEDCouplingFieldInt64 *getFieldAtLevel(TypeOfField type, int iteration, int order, int meshDimRelToMax, int renumPol=0) const; + MEDCouplingFieldInt64 *getFieldAtTopLevel(TypeOfField type, int iteration, int order, int renumPol=0) const; + MEDCouplingFieldInt64 *getFieldOnMeshAtLevel(TypeOfField type, int iteration, int order, int meshDimRelToMax, const MEDFileMesh *mesh, int renumPol=0) const; + MEDCouplingFieldInt64 *getFieldOnMeshAtLevel(TypeOfField type, int iteration, int order, const MEDCouplingMesh *mesh, int renumPol=0) const; + MEDCouplingFieldInt64 *getFieldAtLevelOld(TypeOfField type, int iteration, int order, const std::string& mname, int meshDimRelToMax, int renumPol=0) const; + %extend + { + MEDFileInt64FieldMultiTS() + { + return MEDFileInt64FieldMultiTS::New(); } - static MEDFileIntFieldMultiTS *LoadSpecificEntities(const std::string& fileName, const std::string& fieldName, PyObject *entities, bool loadAll=true) + MEDFileInt64FieldMultiTS(const std::string& fileName, bool loadAll=true) + { + return MEDFileInt64FieldMultiTS::New(fileName,loadAll); + } + + MEDFileInt64FieldMultiTS(const std::string& fileName, const std::string& fieldName, bool loadAll=true) + { + return MEDFileInt64FieldMultiTS::New(fileName,fieldName,loadAll); + } + + MEDFileInt64FieldMultiTS(DataArrayByte *db) + { + return MEDFileInt64FieldMultiTS::New(db); + } + + static MEDFileInt64FieldMultiTS *LoadSpecificEntities(const std::string& fileName, const std::string& fieldName, PyObject *entities, bool loadAll=true) { std::vector > tmp(convertTimePairIdsFromPy(entities)); std::vector< std::pair > entitiesCpp(convertVecPairIntToVecPairTOFCT(tmp)); - return MEDFileIntFieldMultiTS::LoadSpecificEntities(fileName,fieldName,entitiesCpp,loadAll); + return MEDFileInt64FieldMultiTS::LoadSpecificEntities(fileName,fieldName,entitiesCpp,loadAll); } - std::string __str__() const throw(INTERP_KERNEL::Exception) + std::string __str__() const { return self->simpleRepr(); } - PyObject *getFieldWithProfile(TypeOfField type, int iteration, int order, int meshDimRelToMax, const MEDFileMesh *mesh) const throw(INTERP_KERNEL::Exception) + PyObject *getFieldWithProfile(TypeOfField type, int iteration, int order, int meshDimRelToMax, const MEDFileMesh *mesh) const { - DataArrayInt *ret1=0; - DataArrayInt *ret0=self->getFieldWithProfile(type,iteration,order,meshDimRelToMax,mesh,ret1); + DataArrayIdType *ret1=0; + DataArrayInt64 *ret0=self->getFieldWithProfile(type,iteration,order,meshDimRelToMax,mesh,ret1); PyObject *ret=PyTuple_New(2); - PyTuple_SetItem(ret,0,SWIG_NewPointerObj(SWIG_as_voidptr(ret0),SWIGTYPE_p_MEDCoupling__DataArrayInt, SWIG_POINTER_OWN | 0 )); - PyTuple_SetItem(ret,1,SWIG_NewPointerObj(SWIG_as_voidptr(ret1),SWIGTYPE_p_MEDCoupling__DataArrayInt, SWIG_POINTER_OWN | 0 )); + PyTuple_SetItem(ret,0,SWIG_NewPointerObj(SWIG_as_voidptr(ret0),SWIGTITraits::TI, SWIG_POINTER_OWN | 0 )); + PyTuple_SetItem(ret,1,SWIG_NewPointerObj(SWIG_as_voidptr(ret1),SWIGTITraits::TI, SWIG_POINTER_OWN | 0 )); return ret; } - DataArrayInt *getUndergroundDataArray(int iteration, int order) const throw(INTERP_KERNEL::Exception) + DataArrayInt64 *getUndergroundDataArray(int iteration, int order) const { - DataArrayInt *ret=self->getUndergroundDataArray(iteration,order); + DataArrayInt64 *ret=self->getUndergroundDataArray(iteration,order); if(ret) ret->incrRef(); return ret; @@ -3182,19 +3332,19 @@ namespace MEDCoupling { public: static MEDFileFloatFieldMultiTS *New(); - static MEDFileFloatFieldMultiTS *New(const std::string& fileName, bool loadAll=true) throw(INTERP_KERNEL::Exception); - static MEDFileFloatFieldMultiTS *New(const std::string& fileName, const std::string& fieldName, bool loadAll=true) throw(INTERP_KERNEL::Exception); - static MEDFileFloatFieldMultiTS *New(DataArrayByte *db) throw(INTERP_KERNEL::Exception); + static MEDFileFloatFieldMultiTS *New(const std::string& fileName, bool loadAll=true); + static MEDFileFloatFieldMultiTS *New(const std::string& fileName, const std::string& fieldName, bool loadAll=true); + static MEDFileFloatFieldMultiTS *New(DataArrayByte *db); // - void appendFieldNoProfileSBT(const MEDCouplingFieldFloat *field) throw(INTERP_KERNEL::Exception); - void appendFieldProfile(const MEDCouplingFieldFloat *field, const MEDFileMesh *mesh, int meshDimRelToMax, const DataArrayInt *profile) throw(INTERP_KERNEL::Exception); - MEDCoupling::MEDFileFieldMultiTS *convertToDouble(bool isDeepCpyGlobs=true) const throw(INTERP_KERNEL::Exception); - MEDCouplingFieldFloat *field(int iteration, int order, const MEDFileMesh *mesh) const throw(INTERP_KERNEL::Exception); - MEDCouplingFieldFloat *getFieldAtLevel(TypeOfField type, int iteration, int order, int meshDimRelToMax, int renumPol=0) const throw(INTERP_KERNEL::Exception); - MEDCouplingFieldFloat *getFieldAtTopLevel(TypeOfField type, int iteration, int order, int renumPol=0) const throw(INTERP_KERNEL::Exception); - MEDCouplingFieldFloat *getFieldOnMeshAtLevel(TypeOfField type, int iteration, int order, int meshDimRelToMax, const MEDFileMesh *mesh, int renumPol=0) const throw(INTERP_KERNEL::Exception); - MEDCouplingFieldFloat *getFieldOnMeshAtLevel(TypeOfField type, int iteration, int order, const MEDCouplingMesh *mesh, int renumPol=0) const throw(INTERP_KERNEL::Exception); - MEDCouplingFieldFloat *getFieldAtLevelOld(TypeOfField type, int iteration, int order, const std::string& mname, int meshDimRelToMax, int renumPol=0) const throw(INTERP_KERNEL::Exception); + void appendFieldNoProfileSBT(const MEDCouplingFieldFloat *field); + void appendFieldProfile(const MEDCouplingFieldFloat *field, const MEDFileMesh *mesh, int meshDimRelToMax, const DataArrayIdType *profile); + MEDCoupling::MEDFileFieldMultiTS *convertToDouble(bool isDeepCpyGlobs=true) const; + MEDCouplingFieldFloat *field(int iteration, int order, const MEDFileMesh *mesh) const; + MEDCouplingFieldFloat *getFieldAtLevel(TypeOfField type, int iteration, int order, int meshDimRelToMax, int renumPol=0) const; + MEDCouplingFieldFloat *getFieldAtTopLevel(TypeOfField type, int iteration, int order, int renumPol=0) const; + MEDCouplingFieldFloat *getFieldOnMeshAtLevel(TypeOfField type, int iteration, int order, int meshDimRelToMax, const MEDFileMesh *mesh, int renumPol=0) const; + MEDCouplingFieldFloat *getFieldOnMeshAtLevel(TypeOfField type, int iteration, int order, const MEDCouplingMesh *mesh, int renumPol=0) const; + MEDCouplingFieldFloat *getFieldAtLevelOld(TypeOfField type, int iteration, int order, const std::string& mname, int meshDimRelToMax, int renumPol=0) const; %extend { MEDFileFloatFieldMultiTS() @@ -3202,27 +3352,21 @@ namespace MEDCoupling return MEDFileFloatFieldMultiTS::New(); } - MEDFileFloatFieldMultiTS(const std::string& fileName, bool loadAll=true) throw(INTERP_KERNEL::Exception) + MEDFileFloatFieldMultiTS(const std::string& fileName, bool loadAll=true) { return MEDFileFloatFieldMultiTS::New(fileName,loadAll); } - MEDFileFloatFieldMultiTS(const std::string& fileName, const std::string& fieldName, bool loadAll=true) throw(INTERP_KERNEL::Exception) + MEDFileFloatFieldMultiTS(const std::string& fileName, const std::string& fieldName, bool loadAll=true) { return MEDFileFloatFieldMultiTS::New(fileName,fieldName,loadAll); } - MEDFileFloatFieldMultiTS(DataArrayByte *db) throw(INTERP_KERNEL::Exception) + MEDFileFloatFieldMultiTS(DataArrayByte *db) { return MEDFileFloatFieldMultiTS::New(db); } - // serialization - static PyObject *___new___(PyObject *cls, PyObject *args) throw(INTERP_KERNEL::Exception) - { - return NewMethWrapCallInitOnlyIfDictWithSingleEltInInput(cls,args,"MEDFileFloatFieldMultiTS"); - } - static MEDFileFloatFieldMultiTS *LoadSpecificEntities(const std::string& fileName, const std::string& fieldName, PyObject *entities, bool loadAll=true) { std::vector > tmp(convertTimePairIdsFromPy(entities)); @@ -3230,22 +3374,22 @@ namespace MEDCoupling return MEDFileFloatFieldMultiTS::LoadSpecificEntities(fileName,fieldName,entitiesCpp,loadAll); } - std::string __str__() const throw(INTERP_KERNEL::Exception) + std::string __str__() const { return self->simpleRepr(); } - PyObject *getFieldWithProfile(TypeOfField type, int iteration, int order, int meshDimRelToMax, const MEDFileMesh *mesh) const throw(INTERP_KERNEL::Exception) + PyObject *getFieldWithProfile(TypeOfField type, int iteration, int order, int meshDimRelToMax, const MEDFileMesh *mesh) const { - DataArrayInt *ret1=0; + DataArrayIdType *ret1=0; DataArrayFloat *ret0=self->getFieldWithProfile(type,iteration,order,meshDimRelToMax,mesh,ret1); PyObject *ret=PyTuple_New(2); PyTuple_SetItem(ret,0,SWIG_NewPointerObj(SWIG_as_voidptr(ret0),SWIGTYPE_p_MEDCoupling__DataArrayFloat, SWIG_POINTER_OWN | 0 )); - PyTuple_SetItem(ret,1,SWIG_NewPointerObj(SWIG_as_voidptr(ret1),SWIGTYPE_p_MEDCoupling__DataArrayInt, SWIG_POINTER_OWN | 0 )); + PyTuple_SetItem(ret,1,SWIG_NewPointerObj(SWIG_as_voidptr(ret1),SWIGTITraits::TI, SWIG_POINTER_OWN | 0 )); return ret; } - DataArrayFloat *getUndergroundDataArray(int iteration, int order) const throw(INTERP_KERNEL::Exception) + DataArrayFloat *getUndergroundDataArray(int iteration, int order) const { DataArrayFloat *ret=self->getUndergroundDataArray(iteration,order); if(ret) @@ -3258,11 +3402,11 @@ namespace MEDCoupling class MEDFileMeshSupports : public RefCountObject, public MEDFileWritableStandAlone { public: - static MEDFileMeshSupports *New(const std::string& fileName) throw(INTERP_KERNEL::Exception); - std::vector getSupMeshNames() const throw(INTERP_KERNEL::Exception); + static MEDFileMeshSupports *New(const std::string& fileName); + std::vector getSupMeshNames() const; %extend { - MEDFileUMesh *getSupMeshWithName(const std::string& name) const throw(INTERP_KERNEL::Exception) + MEDFileUMesh *getSupMeshWithName(const std::string& name) const { const MEDFileUMesh *ret(self->getSupMeshWithName(name)); MEDFileUMesh *ret2(const_cast(ret)); @@ -3276,7 +3420,7 @@ namespace MEDCoupling class MEDFileStructureElements : public RefCountObject, public MEDFileWritableStandAlone { public: - static MEDFileStructureElements *New(const std::string& fileName, const MEDFileMeshSupports *ms) throw(INTERP_KERNEL::Exception); + static MEDFileStructureElements *New(const std::string& fileName, const MEDFileMeshSupports *ms); private: MEDFileStructureElements(); }; @@ -3284,37 +3428,37 @@ namespace MEDCoupling class MEDFileFields : public RefCountObject, public MEDFileFieldGlobsReal, public MEDFileWritableStandAlone { public: - static MEDFileFields *New() throw(INTERP_KERNEL::Exception); - static MEDFileFields *New(const std::string& fileName, bool loadAll=true) throw(INTERP_KERNEL::Exception); - static MEDFileFields *New(DataArrayByte *db) throw(INTERP_KERNEL::Exception); - static MEDFileFields *NewAdv(const std::string& fileName, bool loadAll, const MEDFileEntities *entities) throw(INTERP_KERNEL::Exception); - static MEDFileFields *LoadPartOf(const std::string& fileName, bool loadAll=true, const MEDFileMeshes *ms=0) throw(INTERP_KERNEL::Exception); - static MEDFileFields *NewWithDynGT(const std::string& fileName, const MEDFileStructureElements *se, bool loadAll=true) throw(INTERP_KERNEL::Exception); - MEDFileFields *deepCopy() const throw(INTERP_KERNEL::Exception); - MEDFileFields *shallowCpy() const throw(INTERP_KERNEL::Exception); - void loadArrays() throw(INTERP_KERNEL::Exception); - void loadArraysIfNecessary() throw(INTERP_KERNEL::Exception); - void unloadArrays() throw(INTERP_KERNEL::Exception); - void unloadArraysWithoutDataLoss() throw(INTERP_KERNEL::Exception); + static MEDFileFields *New(); + static MEDFileFields *New(const std::string& fileName, bool loadAll=true); + static MEDFileFields *New(DataArrayByte *db); + static MEDFileFields *NewAdv(const std::string& fileName, bool loadAll, const MEDFileEntities *entities); + static MEDFileFields *LoadPartOf(const std::string& fileName, bool loadAll=true, const MEDFileMeshes *ms=0); + static MEDFileFields *NewWithDynGT(const std::string& fileName, const MEDFileStructureElements *se, bool loadAll=true); + MEDFileFields *deepCopy() const; + MEDFileFields *shallowCpy() const; + void loadArrays(); + void loadArraysIfNecessary(); + void unloadArrays(); + void unloadArraysWithoutDataLoss(); int getNumberOfFields() const; - std::vector getFieldsNames() const throw(INTERP_KERNEL::Exception); - std::vector getMeshesNames() const throw(INTERP_KERNEL::Exception); + std::vector getFieldsNames() const; + std::vector getMeshesNames() const; // - void resize(int newSize) throw(INTERP_KERNEL::Exception); - void pushField(MEDFileAnyTypeFieldMultiTS *field) throw(INTERP_KERNEL::Exception); - void setFieldAtPos(int i, MEDFileAnyTypeFieldMultiTS *field) throw(INTERP_KERNEL::Exception); - int getPosFromFieldName(const std::string& fieldName) const throw(INTERP_KERNEL::Exception); - MEDFileAnyTypeFieldMultiTS *getFieldAtPos(int i) const throw(INTERP_KERNEL::Exception); - MEDFileAnyTypeFieldMultiTS *getFieldWithName(const std::string& fieldName) const throw(INTERP_KERNEL::Exception); - MEDFileFields *partOfThisLyingOnSpecifiedMeshName(const std::string& meshName) const throw(INTERP_KERNEL::Exception); - bool presenceOfStructureElements() const throw(INTERP_KERNEL::Exception); - void aggregate(const MEDFileFields& other) throw(INTERP_KERNEL::Exception); - void killStructureElements() throw(INTERP_KERNEL::Exception); - void keepOnlyStructureElements() throw(INTERP_KERNEL::Exception); - void keepOnlyOnMeshSE(const std::string& meshName, const std::string& seName) throw(INTERP_KERNEL::Exception); - void blowUpSE(MEDFileMeshes *ms, const MEDFileStructureElements *ses) throw(INTERP_KERNEL::Exception); - void destroyFieldAtPos(int i) throw(INTERP_KERNEL::Exception); - bool removeFieldsWithoutAnyTimeStep() throw(INTERP_KERNEL::Exception); + void resize(int newSize); + void pushField(MEDFileAnyTypeFieldMultiTS *field); + void setFieldAtPos(int i, MEDFileAnyTypeFieldMultiTS *field); + int getPosFromFieldName(const std::string& fieldName) const; + MEDFileAnyTypeFieldMultiTS *getFieldAtPos(int i) const; + MEDFileAnyTypeFieldMultiTS *getFieldWithName(const std::string& fieldName) const; + MEDFileFields *partOfThisLyingOnSpecifiedMeshName(const std::string& meshName) const; + bool presenceOfStructureElements() const; + void aggregate(const MEDFileFields& other); + void killStructureElements(); + void keepOnlyStructureElements(); + void keepOnlyOnMeshSE(const std::string& meshName, const std::string& seName); + void blowUpSE(MEDFileMeshes *ms, const MEDFileStructureElements *ses); + void destroyFieldAtPos(int i); + bool removeFieldsWithoutAnyTimeStep(); %extend { MEDFileFields() @@ -3322,45 +3466,39 @@ namespace MEDCoupling return MEDFileFields::New(); } - MEDFileFields(const std::string& fileName, bool loadAll=true) throw(INTERP_KERNEL::Exception) + MEDFileFields(const std::string& fileName, bool loadAll=true) { return MEDFileFields::New(fileName,loadAll); } - MEDFileFields(DataArrayByte *db) throw(INTERP_KERNEL::Exception) + MEDFileFields(DataArrayByte *db) { return MEDFileFields::New(db); } - MEDFileFields(const std::string& fileName, bool loadAll, const MEDFileEntities *entities) throw(INTERP_KERNEL::Exception) + MEDFileFields(const std::string& fileName, bool loadAll, const MEDFileEntities *entities) { return MEDFileFields::NewAdv(fileName,loadAll,entities); } - // serialization - static PyObject *___new___(PyObject *cls, PyObject *args) throw(INTERP_KERNEL::Exception) - { - return NewMethWrapCallInitOnlyIfDictWithSingleEltInInput(cls,args,"MEDFileFields"); - } - - std::string __str__() const throw(INTERP_KERNEL::Exception) + std::string __str__() const { return self->simpleRepr(); } - MEDFileFields *partOfThisOnStructureElements() const throw(INTERP_KERNEL::Exception) + MEDFileFields *partOfThisOnStructureElements() const { MCAuto ret(self->partOfThisOnStructureElements()); return ret.retn(); } - MEDFileFields *partOfThisLyingOnSpecifiedMeshSEName(const std::string& meshName, const std::string& seName) const throw(INTERP_KERNEL::Exception) + MEDFileFields *partOfThisLyingOnSpecifiedMeshSEName(const std::string& meshName, const std::string& seName) const { MCAuto ret(self->partOfThisLyingOnSpecifiedMeshSEName(meshName,seName)); return ret.retn(); } - static MEDFileFields *LoadSpecificEntities(const std::string& fileName, PyObject *entities, bool loadAll=true) throw(INTERP_KERNEL::Exception) + static MEDFileFields *LoadSpecificEntities(const std::string& fileName, PyObject *entities, bool loadAll=true) { std::vector > tmp(convertTimePairIdsFromPy(entities)); std::size_t sz(tmp.size()); @@ -3373,14 +3511,14 @@ namespace MEDCoupling return MEDFileFields::LoadSpecificEntities(fileName,entitiesCpp,loadAll); } - PyObject *getMeshSENames() const throw(INTERP_KERNEL::Exception) + PyObject *getMeshSENames() const { std::vector< std::pair > ps; self->getMeshSENames(ps); return convertVectPairStToPy(ps); } - PyObject *getCommonIterations() const throw(INTERP_KERNEL::Exception) + PyObject *getCommonIterations() const { bool ret1; std::vector< std::pair > ret0=self->getCommonIterations(ret1); @@ -3400,26 +3538,26 @@ namespace MEDCoupling return ret; } - MEDFileFields *partOfThisLyingOnSpecifiedTimeSteps(PyObject *timeSteps) const throw(INTERP_KERNEL::Exception) + MEDFileFields *partOfThisLyingOnSpecifiedTimeSteps(PyObject *timeSteps) const { std::vector< std::pair > ts=convertTimePairIdsFromPy(timeSteps); return self->partOfThisLyingOnSpecifiedTimeSteps(ts); } - MEDFileFields *partOfThisNotLyingOnSpecifiedTimeSteps(PyObject *timeSteps) const throw(INTERP_KERNEL::Exception) + MEDFileFields *partOfThisNotLyingOnSpecifiedTimeSteps(PyObject *timeSteps) const { std::vector< std::pair > ts=convertTimePairIdsFromPy(timeSteps); return self->partOfThisNotLyingOnSpecifiedTimeSteps(ts); } - PyObject *__getitem__(PyObject *obj) throw(INTERP_KERNEL::Exception) + PyObject *__getitem__(PyObject *obj) { if(obj && PyList_Check(obj)) { - int sz=PyList_Size(obj); + std::size_t sz=PyList_Size(obj); MCAuto da=DataArrayInt::New(); da->alloc(sz,1); int *pt=da->getPointer(); - for(int i=0;igetFieldAtPos(MEDFileFieldsgetitemSingleTS__(self,obj)), SWIG_POINTER_OWN | 0 ); } - MEDFileFields *__setitem__(int obj, MEDFileFieldMultiTS *field) throw(INTERP_KERNEL::Exception) + MEDFileFields *__setitem__(int obj, MEDFileFieldMultiTS *field) { self->setFieldAtPos(obj,field); return self; } - int __len__() const throw(INTERP_KERNEL::Exception) + int __len__() const { return self->getNumberOfFields(); } - MEDFileFieldsIterator *__iter__() throw(INTERP_KERNEL::Exception) + MEDFileFieldsIterator *__iter__() { return self->iterator(); } - bool changeMeshNames(PyObject *li) throw(INTERP_KERNEL::Exception) + bool changeMeshNames(PyObject *li) { std::vector< std::pair > modifTab=convertVecPairStStFromPy(li); return self->changeMeshNames(modifTab); } - int getPosOfField(PyObject *elt0) const throw(INTERP_KERNEL::Exception) + int getPosOfField(PyObject *elt0) const { static const char msg[]="MEDFileFields::getPosOfField : invalid input params ! expected fields[int], fields[string_of_field_name] !"; if(!elt0) throw INTERP_KERNEL::Exception(msg); if(PyInt_Check(elt0)) {//fmts[3] - return PyInt_AS_LONG(elt0); + return (int)PyInt_AS_LONG(elt0); } return self->getPosFromFieldName(convertPyObjectToStr(elt0,msg)); } - std::vector getPosOfFields(PyObject *elts) const throw(INTERP_KERNEL::Exception) + std::vector getPosOfFields(PyObject *elts) const { if(PyList_Check(elts)) { - int sz=PyList_Size(elts); + std::size_t sz=PyList_Size(elts); std::vector ret(sz); - for(int i=0;i tmp; convertFromPyObjVectorOfObj(fields,SWIGTYPE_p_MEDCoupling__MEDFileAnyTypeFieldMultiTS,"MEDFileAnyTypeFieldMultiTS",tmp); self->pushFields(tmp); } - void __delitem__(PyObject *elts) throw(INTERP_KERNEL::Exception) + void __delitem__(PyObject *elts) { if(elts && PySlice_Check(elts)) { Py_ssize_t strt=2,stp=2,step=2; GetIndicesOfSlice(elts,self->getNumberOfFields(),&strt,&stp,&step,"MEDFileFields.__delitem__ : error in input slice !"); - self->destroyFieldsAtPos2(strt,stp,step); + self->destroyFieldsAtPos2((int)strt,(int)stp,(int)step); } else { @@ -3508,12 +3646,18 @@ namespace MEDCoupling } } - MEDFileFields *extractPart(PyObject *extractDef, MEDFileMesh *mm) const throw(INTERP_KERNEL::Exception) + MEDFileFields *extractPart(PyObject *extractDef, MEDFileMesh *mm) const { - std::map > extractDefCpp; + std::map > extractDefCpp; convertToMapIntDataArrayInt(extractDef,extractDefCpp); return self->extractPart(extractDefCpp,mm); } + + MEDFileFields *linearToQuadratic(const MEDFileMeshes *oldLin, const MEDFileMeshes *newQuad) const + { + MCAuto ret(self->linearToQuadratic(oldLin,newQuad)); + return ret.retn(); + } } }; @@ -3533,12 +3677,12 @@ namespace MEDCoupling class MEDFileParameterDouble1TSWTI : public MEDFileParameter1TS { public: - void setValue(double val) throw(INTERP_KERNEL::Exception); - double getValue() const throw(INTERP_KERNEL::Exception); - std::string simpleRepr() const throw(INTERP_KERNEL::Exception); + void setValue(double val); + double getValue() const; + std::string simpleRepr() const; %extend { - std::string __str__() const throw(INTERP_KERNEL::Exception) + std::string __str__() const { return self->simpleRepr(); } @@ -3558,14 +3702,14 @@ namespace MEDCoupling { public: static MEDFileParameterDouble1TS *New(); - static MEDFileParameterDouble1TS *New(const std::string& fileName) throw(INTERP_KERNEL::Exception); - static MEDFileParameterDouble1TS *New(const std::string& fileName, const std::string& paramName) throw(INTERP_KERNEL::Exception); - static MEDFileParameterDouble1TS *New(const std::string& fileName, const std::string& paramName, int dt, int it) throw(INTERP_KERNEL::Exception); - virtual MEDFileParameter1TS *deepCopy() const throw(INTERP_KERNEL::Exception); - virtual std::string simpleRepr() const throw(INTERP_KERNEL::Exception); - void setName(const std::string& name) throw(INTERP_KERNEL::Exception); - std::string getName() const throw(INTERP_KERNEL::Exception); - void write(const std::string& fileName, int mode) const throw(INTERP_KERNEL::Exception); + static MEDFileParameterDouble1TS *New(const std::string& fileName); + static MEDFileParameterDouble1TS *New(const std::string& fileName, const std::string& paramName); + static MEDFileParameterDouble1TS *New(const std::string& fileName, const std::string& paramName, int dt, int it); + virtual MEDFileParameter1TS *deepCopy() const; + virtual std::string simpleRepr() const; + void setName(const std::string& name); + std::string getName() const; + void write(const std::string& fileName, int mode) const; %extend { MEDFileParameterDouble1TS() @@ -3573,27 +3717,27 @@ namespace MEDCoupling return MEDFileParameterDouble1TS::New(); } - MEDFileParameterDouble1TS(const std::string& fileName) throw(INTERP_KERNEL::Exception) + MEDFileParameterDouble1TS(const std::string& fileName) { return MEDFileParameterDouble1TS::New(fileName); } - MEDFileParameterDouble1TS(const std::string& fileName, const std::string& paramName) throw(INTERP_KERNEL::Exception) + MEDFileParameterDouble1TS(const std::string& fileName, const std::string& paramName) { return MEDFileParameterDouble1TS::New(fileName,paramName); } - MEDFileParameterDouble1TS(const std::string& fileName, const std::string& paramName, int dt, int it) throw(INTERP_KERNEL::Exception) + MEDFileParameterDouble1TS(const std::string& fileName, const std::string& paramName, int dt, int it) { return MEDFileParameterDouble1TS::New(fileName,paramName,dt,it); } - std::string __str__() const throw(INTERP_KERNEL::Exception) + std::string __str__() const { return self->simpleRepr(); } - PyObject *isEqual(const MEDFileParameter1TS *other, double eps) const throw(INTERP_KERNEL::Exception) + PyObject *isEqual(const MEDFileParameter1TS *other, double eps) const { std::string what; bool ret0=self->isEqual(other,eps,what); @@ -3611,18 +3755,18 @@ namespace MEDCoupling { public: static MEDFileParameterMultiTS *New(); - static MEDFileParameterMultiTS *New(const std::string& fileName) throw(INTERP_KERNEL::Exception); - static MEDFileParameterMultiTS *New(const std::string& fileName, const std::string& paramName) throw(INTERP_KERNEL::Exception); + static MEDFileParameterMultiTS *New(const std::string& fileName); + static MEDFileParameterMultiTS *New(const std::string& fileName, const std::string& paramName); std::string getName() const; void setName(const std::string& name); - MEDFileParameterMultiTS *deepCopy() const throw(INTERP_KERNEL::Exception); - void write(const std::string& fileName, int mode) const throw(INTERP_KERNEL::Exception); - std::string simpleRepr() const throw(INTERP_KERNEL::Exception); - void appendValue(int dt, int it, double time, double val) throw(INTERP_KERNEL::Exception); - double getDoubleValue(int iteration, int order) const throw(INTERP_KERNEL::Exception); - int getPosOfTimeStep(int iteration, int order) const throw(INTERP_KERNEL::Exception); - int getPosGivenTime(double time, double eps=1e-8) const throw(INTERP_KERNEL::Exception); - int getNumberOfTS() const throw(INTERP_KERNEL::Exception); + MEDFileParameterMultiTS *deepCopy() const; + void write(const std::string& fileName, int mode) const; + std::string simpleRepr() const; + void appendValue(int dt, int it, double time, double val); + double getDoubleValue(int iteration, int order) const; + int getPosOfTimeStep(int iteration, int order) const; + int getPosGivenTime(double time, double eps=1e-8) const; + int getNumberOfTS() const; %extend { MEDFileParameterMultiTS() @@ -3640,12 +3784,12 @@ namespace MEDCoupling return MEDFileParameterMultiTS::New(fileName,paramName); } - std::string __str__() const throw(INTERP_KERNEL::Exception) + std::string __str__() const { return self->simpleRepr(); } - PyObject *isEqual(const MEDFileParameterMultiTS *other, double eps) const throw(INTERP_KERNEL::Exception) + PyObject *isEqual(const MEDFileParameterMultiTS *other, double eps) const { std::string what; bool ret0=self->isEqual(other,eps,what); @@ -3657,9 +3801,9 @@ namespace MEDCoupling return res; } - void eraseTimeStepIds(PyObject *ids) throw(INTERP_KERNEL::Exception) + void eraseTimeStepIds(PyObject *ids) { - int sw; + mcIdType sw; int pos1; std::vector pos2; DataArrayInt *pos3=0; @@ -3689,7 +3833,7 @@ namespace MEDCoupling } } - int getTimeStepId(PyObject *elt0) const throw(INTERP_KERNEL::Exception) + int getTimeStepId(PyObject *elt0) const { if(elt0 && PyInt_Check(elt0)) {//fmts[3] @@ -3704,8 +3848,8 @@ namespace MEDCoupling PyObject *o1=PyTuple_GetItem(elt0,1); if(PyInt_Check(o0) && PyInt_Check(o1)) {//fmts(1,-1) - int iter=PyInt_AS_LONG(o0); - int order=PyInt_AS_LONG(o1); + int iter=(int)PyInt_AS_LONG(o0); + int order=(int)PyInt_AS_LONG(o1); return self->getPosOfTimeStep(iter,order); } else @@ -3723,7 +3867,7 @@ namespace MEDCoupling throw INTERP_KERNEL::Exception("MEDFileParameterMultiTS::getTimeStepId : invalid input params ! expected fmts[int], fmts[int,int] or fmts[double] to request time step !"); } - MEDFileParameter1TS *__getitem__(PyObject *elt0) const throw(INTERP_KERNEL::Exception) + MEDFileParameter1TS *__getitem__(PyObject *elt0) const { MEDFileParameter1TS *ret=self->getTimeStepAtPos(MEDCoupling_MEDFileParameterMultiTS_getTimeStepId(self,elt0)); if(ret) @@ -3731,13 +3875,13 @@ namespace MEDCoupling return ret; } - std::vector getTimeStepIds(PyObject *elts) const throw(INTERP_KERNEL::Exception) + std::vector getTimeStepIds(PyObject *elts) const { if(PyList_Check(elts)) { - int sz=PyList_Size(elts); + std::size_t sz=PyList_Size(elts); std::vector ret(sz); - for(int i=0;i idsToRemove=MEDCoupling_MEDFileParameterMultiTS_getTimeStepIds(self,elts); if(!idsToRemove.empty()) self->eraseTimeStepIds(&idsToRemove[0],&idsToRemove[0]+idsToRemove.size()); } - MEDFileParameter1TS *getTimeStepAtPos(int posId) const throw(INTERP_KERNEL::Exception) + MEDFileParameter1TS *getTimeStepAtPos(int posId) const { MEDFileParameter1TS *ret=self->getTimeStepAtPos(posId); if(ret) @@ -3767,7 +3911,7 @@ namespace MEDCoupling return ret; } - PyObject *getIterations() const throw(INTERP_KERNEL::Exception) + PyObject *getIterations() const { std::vector< std::pair > res=self->getIterations(); PyObject *ret=PyList_New(res.size()); @@ -3782,7 +3926,7 @@ namespace MEDCoupling return ret; } - PyObject *getTimeSteps() const throw(INTERP_KERNEL::Exception) + PyObject *getTimeSteps() const { std::vector res2; std::vector< std::pair > res=self->getTimeSteps(res2); @@ -3805,17 +3949,17 @@ namespace MEDCoupling { public: static MEDFileParameters *New(); - static MEDFileParameters *New(const std::string& fileName) throw(INTERP_KERNEL::Exception); - static MEDFileParameters *New(DataArrayByte *db) throw(INTERP_KERNEL::Exception); - MEDFileParameters *deepCopy() const throw(INTERP_KERNEL::Exception); - std::vector getParamsNames() const throw(INTERP_KERNEL::Exception); - std::string simpleRepr() const throw(INTERP_KERNEL::Exception); - void resize(int newSize) throw(INTERP_KERNEL::Exception); - void pushParam(MEDFileParameterMultiTS *param) throw(INTERP_KERNEL::Exception); - void setParamAtPos(int i, MEDFileParameterMultiTS *param) throw(INTERP_KERNEL::Exception); - void destroyParamAtPos(int i) throw(INTERP_KERNEL::Exception); - int getPosFromParamName(const std::string& paramName) const throw(INTERP_KERNEL::Exception); - int getNumberOfParams() const throw(INTERP_KERNEL::Exception); + static MEDFileParameters *New(const std::string& fileName); + static MEDFileParameters *New(DataArrayByte *db); + MEDFileParameters *deepCopy() const; + std::vector getParamsNames() const; + std::string simpleRepr() const; + void resize(int newSize); + void pushParam(MEDFileParameterMultiTS *param); + void setParamAtPos(int i, MEDFileParameterMultiTS *param); + void destroyParamAtPos(int i); + int getPosFromParamName(const std::string& paramName) const; + int getNumberOfParams() const; %extend { MEDFileParameters() @@ -3828,23 +3972,17 @@ namespace MEDCoupling return MEDFileParameters::New(fileName); } - MEDFileParameters(DataArrayByte *db) throw(INTERP_KERNEL::Exception) + MEDFileParameters(DataArrayByte *db) { return MEDFileParameters::New(db); } - - // serialization - static PyObject *___new___(PyObject *cls, PyObject *args) throw(INTERP_KERNEL::Exception) - { - return NewMethWrapCallInitOnlyIfDictWithSingleEltInInput(cls,args,"MEDFileParameters"); - } - std::string __str__() const throw(INTERP_KERNEL::Exception) + std::string __str__() const { return self->simpleRepr(); } - MEDFileParameterMultiTS *__getitem__(PyObject *obj) throw(INTERP_KERNEL::Exception) + MEDFileParameterMultiTS *__getitem__(PyObject *obj) { static const char msg[]="MEDFileParameters::__getitem__ : only integer or string with meshname supported !"; if(PyInt_Check(obj)) @@ -3860,12 +3998,12 @@ namespace MEDCoupling return ret; } - int __len__() const throw(INTERP_KERNEL::Exception) + int __len__() const { return self->getNumberOfParams(); } - MEDFileParameterMultiTS *getParamAtPos(int i) const throw(INTERP_KERNEL::Exception) + MEDFileParameterMultiTS *getParamAtPos(int i) const { MEDFileParameterMultiTS *ret=self->getParamAtPos(i); if(ret) @@ -3873,7 +4011,7 @@ namespace MEDCoupling return ret; } - MEDFileParameterMultiTS *getParamWithName(const std::string& paramName) const throw(INTERP_KERNEL::Exception) + MEDFileParameterMultiTS *getParamWithName(const std::string& paramName) const { MEDFileParameterMultiTS *ret=self->getParamWithName(paramName); if(ret) @@ -3881,7 +4019,7 @@ namespace MEDCoupling return ret; } - PyObject *isEqual(const MEDFileParameters *other, double eps) const throw(INTERP_KERNEL::Exception) + PyObject *isEqual(const MEDFileParameters *other, double eps) const { std::string what; bool ret0=self->isEqual(other,eps,what); @@ -3898,31 +4036,31 @@ namespace MEDCoupling class MEDFileData : public RefCountObject, public MEDFileWritableStandAlone { public: - static MEDFileData *New(DataArrayByte *db) throw(INTERP_KERNEL::Exception); - static MEDFileData *New(const std::string& fileName) throw(INTERP_KERNEL::Exception); + static MEDFileData *New(DataArrayByte *db); + static MEDFileData *New(const std::string& fileName); static MEDFileData *New(); - MEDFileData *deepCopy() const throw(INTERP_KERNEL::Exception); - void setFields(MEDFileFields *fields) throw(INTERP_KERNEL::Exception); - void setMeshes(MEDFileMeshes *meshes) throw(INTERP_KERNEL::Exception); - void setParams(MEDFileParameters *params) throw(INTERP_KERNEL::Exception); - int getNumberOfFields() const throw(INTERP_KERNEL::Exception); - int getNumberOfMeshes() const throw(INTERP_KERNEL::Exception); - int getNumberOfParams() const throw(INTERP_KERNEL::Exception); + MEDFileData *deepCopy() const; + void setFields(MEDFileFields *fields); + void setMeshes(MEDFileMeshes *meshes); + void setParams(MEDFileParameters *params); + int getNumberOfFields() const; + int getNumberOfMeshes() const; + int getNumberOfParams() const; // - bool changeMeshName(const std::string& oldMeshName, const std::string& newMeshName) throw(INTERP_KERNEL::Exception); - bool unPolyzeMeshes() throw(INTERP_KERNEL::Exception); - void dealWithStructureElements() throw(INTERP_KERNEL::Exception); - std::string getHeader() const throw(INTERP_KERNEL::Exception); - void setHeader(const std::string& header) throw(INTERP_KERNEL::Exception); + bool changeMeshName(const std::string& oldMeshName, const std::string& newMeshName); + bool unPolyzeMeshes(); + void dealWithStructureElements(); + std::string getHeader() const; + void setHeader(const std::string& header); // %extend { - MEDFileData(const std::string& fileName) throw(INTERP_KERNEL::Exception) + MEDFileData(const std::string& fileName) { return MEDFileData::New(fileName); } - MEDFileData(DataArrayByte *db) throw(INTERP_KERNEL::Exception) + MEDFileData(DataArrayByte *db) { return MEDFileData::New(db); } @@ -3932,12 +4070,12 @@ namespace MEDCoupling return MEDFileData::New(); } - std::string __str__() const throw(INTERP_KERNEL::Exception) + std::string __str__() const { return self->simpleRepr(); } - MEDFileMeshes *getMeshes() const throw(INTERP_KERNEL::Exception) + MEDFileMeshes *getMeshes() const { MEDFileMeshes *ret=self->getMeshes(); if(ret) @@ -3945,7 +4083,7 @@ namespace MEDCoupling return ret; } - MEDFileParameters *getParams() const throw(INTERP_KERNEL::Exception) + MEDFileParameters *getParams() const { MEDFileParameters *ret=self->getParams(); if(ret) @@ -3953,7 +4091,7 @@ namespace MEDCoupling return ret; } - MEDFileFields *getFields() const throw(INTERP_KERNEL::Exception) + MEDFileFields *getFields() const { MEDFileFields *ret=self->getFields(); if(ret) @@ -3961,36 +4099,30 @@ namespace MEDCoupling return ret; } - bool changeMeshNames(PyObject *li) throw(INTERP_KERNEL::Exception) + bool changeMeshNames(PyObject *li) { std::vector< std::pair > modifTab=convertVecPairStStFromPy(li); return self->changeMeshNames(modifTab); } - static MEDFileData *Aggregate(PyObject *mfds) throw(INTERP_KERNEL::Exception) + static MEDFileData *Aggregate(PyObject *mfds) { std::vector mfdsCpp; convertFromPyObjVectorOfObj(mfds,SWIGTYPE_p_MEDCoupling__MEDFileData,"MEDFileData",mfdsCpp); MCAuto ret(MEDFileData::Aggregate(mfdsCpp)); return ret.retn(); } - - // serialization - static PyObject *___new___(PyObject *cls, PyObject *args) throw(INTERP_KERNEL::Exception) - { - return NewMethWrapCallInitOnlyIfDictWithSingleEltInInput(cls,args,"MEDFileData"); - } } }; class SauvReader : public RefCountObject { public: - static SauvReader* New(const std::string& fileName) throw(INTERP_KERNEL::Exception); - MEDFileData * loadInMEDFileDS() throw(INTERP_KERNEL::Exception); + static SauvReader* New(const std::string& fileName); + MEDFileData * loadInMEDFileDS(); %extend { - SauvReader(const std::string& fileName) throw(INTERP_KERNEL::Exception) + SauvReader(const std::string& fileName) { return SauvReader::New(fileName); } @@ -4001,13 +4133,13 @@ namespace MEDCoupling { public: static SauvWriter * New(); - void setMEDFileDS(const MEDFileData* medData, unsigned meshIndex = 0) throw(INTERP_KERNEL::Exception); - void write(const std::string& fileName) throw(INTERP_KERNEL::Exception); - void setCpyGrpIfOnASingleFamilyStatus(bool status) throw(INTERP_KERNEL::Exception); - bool getCpyGrpIfOnASingleFamilyStatus() const throw(INTERP_KERNEL::Exception); + void setMEDFileDS(const MEDFileData* medData, unsigned meshIndex = 0); + void write(const std::string& fileName); + void setCpyGrpIfOnASingleFamilyStatus(bool status); + bool getCpyGrpIfOnASingleFamilyStatus() const; %extend { - SauvWriter() throw(INTERP_KERNEL::Exception) + SauvWriter() { return SauvWriter::New(); } @@ -4021,13 +4153,13 @@ namespace MEDCoupling class MEDFileField1TSStructItem { public: - static MEDFileField1TSStructItem BuildItemFrom(const MEDFileAnyTypeField1TS *ref, const MEDFileMeshStruct *meshSt) throw(INTERP_KERNEL::Exception); + static MEDFileField1TSStructItem BuildItemFrom(const MEDFileAnyTypeField1TS *ref, const MEDFileMeshStruct *meshSt); }; class MEDFileMeshStruct : public RefCountObject { public: - static MEDFileMeshStruct *New(const MEDFileMesh *mesh) throw(INTERP_KERNEL::Exception); + static MEDFileMeshStruct *New(const MEDFileMesh *mesh); protected: ~MEDFileMeshStruct(); }; @@ -4035,67 +4167,67 @@ namespace MEDCoupling class MEDMeshMultiLev : public RefCountObject { public: - virtual MEDMeshMultiLev *prepare() const throw(INTERP_KERNEL::Exception); - DataArray *buildDataArray(const MEDFileField1TSStructItem& fst, const MEDFileFieldGlobsReal *globs, const DataArray *vals) const throw(INTERP_KERNEL::Exception); - DataArrayInt *retrieveGlobalNodeIdsIfAny() const throw(INTERP_KERNEL::Exception); + virtual MEDMeshMultiLev *prepare() const; + DataArray *buildDataArray(const MEDFileField1TSStructItem& fst, const MEDFileFieldGlobsReal *globs, const DataArray *vals) const; + DataArrayIdType *retrieveGlobalNodeIdsIfAny() const; protected: ~MEDMeshMultiLev(); public: %extend { - PyObject *retrieveFamilyIdsOnCells() const throw(INTERP_KERNEL::Exception) + PyObject *retrieveFamilyIdsOnCells() const { - DataArrayInt *famIds(0); + DataArrayIdType *famIds(0); bool isWithoutCopy(false); self->retrieveFamilyIdsOnCells(famIds,isWithoutCopy); PyObject *ret=PyTuple_New(2); PyObject *ret1Py=isWithoutCopy?Py_True:Py_False; Py_XINCREF(ret1Py); - PyTuple_SetItem(ret,0,SWIG_NewPointerObj(SWIG_as_voidptr(famIds),SWIGTYPE_p_MEDCoupling__DataArrayInt, SWIG_POINTER_OWN | 0 )); + PyTuple_SetItem(ret,0,SWIG_NewPointerObj(SWIG_as_voidptr(famIds),SWIGTITraits::TI, SWIG_POINTER_OWN | 0 )); PyTuple_SetItem(ret,1,ret1Py); return ret; } - PyObject *retrieveNumberIdsOnCells() const throw(INTERP_KERNEL::Exception) + PyObject *retrieveNumberIdsOnCells() const { - DataArrayInt *numIds(0); + DataArrayIdType *numIds(0); bool isWithoutCopy(false); self->retrieveNumberIdsOnCells(numIds,isWithoutCopy); PyObject *ret=PyTuple_New(2); PyObject *ret1Py=isWithoutCopy?Py_True:Py_False; Py_XINCREF(ret1Py); - PyTuple_SetItem(ret,0,SWIG_NewPointerObj(SWIG_as_voidptr(numIds),SWIGTYPE_p_MEDCoupling__DataArrayInt, SWIG_POINTER_OWN | 0 )); + PyTuple_SetItem(ret,0,SWIG_NewPointerObj(SWIG_as_voidptr(numIds),SWIGTITraits::TI, SWIG_POINTER_OWN | 0 )); PyTuple_SetItem(ret,1,ret1Py); return ret; } - PyObject *retrieveFamilyIdsOnNodes() const throw(INTERP_KERNEL::Exception) + PyObject *retrieveFamilyIdsOnNodes() const { - DataArrayInt *famIds(0); + DataArrayIdType *famIds(0); bool isWithoutCopy(false); self->retrieveFamilyIdsOnNodes(famIds,isWithoutCopy); PyObject *ret=PyTuple_New(2); PyObject *ret1Py=isWithoutCopy?Py_True:Py_False; Py_XINCREF(ret1Py); - PyTuple_SetItem(ret,0,SWIG_NewPointerObj(SWIG_as_voidptr(famIds),SWIGTYPE_p_MEDCoupling__DataArrayInt, SWIG_POINTER_OWN | 0 )); + PyTuple_SetItem(ret,0,SWIG_NewPointerObj(SWIG_as_voidptr(famIds),SWIGTITraits::TI, SWIG_POINTER_OWN | 0 )); PyTuple_SetItem(ret,1,ret1Py); return ret; } - PyObject *retrieveNumberIdsOnNodes() const throw(INTERP_KERNEL::Exception) + PyObject *retrieveNumberIdsOnNodes() const { - DataArrayInt *numIds(0); + DataArrayIdType *numIds(0); bool isWithoutCopy(false); self->retrieveNumberIdsOnNodes(numIds,isWithoutCopy); PyObject *ret=PyTuple_New(2); PyObject *ret1Py=isWithoutCopy?Py_True:Py_False; Py_XINCREF(ret1Py); - PyTuple_SetItem(ret,0,SWIG_NewPointerObj(SWIG_as_voidptr(numIds),SWIGTYPE_p_MEDCoupling__DataArrayInt, SWIG_POINTER_OWN | 0 )); + PyTuple_SetItem(ret,0,SWIG_NewPointerObj(SWIG_as_voidptr(numIds),SWIGTITraits::TI, SWIG_POINTER_OWN | 0 )); PyTuple_SetItem(ret,1,ret1Py); return ret; } - PyObject *getGeoTypes() const throw(INTERP_KERNEL::Exception) + PyObject *getGeoTypes() const { std::vector< INTERP_KERNEL::NormalizedCellType > result(self->getGeoTypes()); std::vector< INTERP_KERNEL::NormalizedCellType >::const_iterator iL(result.begin()); @@ -4114,9 +4246,9 @@ namespace MEDCoupling public: %extend { - PyObject *buildVTUArrays() const throw(INTERP_KERNEL::Exception) + PyObject *buildVTUArrays() const { - DataArrayDouble *coords(0); DataArrayByte *types(0); DataArrayInt *cellLocations(0),*cells(0),*faceLocations(0),*faces(0); + DataArrayDouble *coords(0); DataArrayByte *types(0); DataArrayIdType *cellLocations(0),*cells(0),*faceLocations(0),*faces(0); bool ncc(self->buildVTUArrays(coords,types,cellLocations,cells,faceLocations,faces)); PyObject *ret0Py=ncc?Py_True:Py_False; Py_XINCREF(ret0Py); @@ -4124,10 +4256,10 @@ namespace MEDCoupling PyTuple_SetItem(ret,0,ret0Py); PyTuple_SetItem(ret,1,SWIG_NewPointerObj(SWIG_as_voidptr(coords),SWIGTYPE_p_MEDCoupling__DataArrayDouble, SWIG_POINTER_OWN | 0 )); PyTuple_SetItem(ret,2,SWIG_NewPointerObj(SWIG_as_voidptr(types),SWIGTYPE_p_MEDCoupling__DataArrayByte, SWIG_POINTER_OWN | 0 )); - PyTuple_SetItem(ret,3,SWIG_NewPointerObj(SWIG_as_voidptr(cellLocations),SWIGTYPE_p_MEDCoupling__DataArrayInt, SWIG_POINTER_OWN | 0 )); - PyTuple_SetItem(ret,4,SWIG_NewPointerObj(SWIG_as_voidptr(cells),SWIGTYPE_p_MEDCoupling__DataArrayInt, SWIG_POINTER_OWN | 0 )); - PyTuple_SetItem(ret,5,SWIG_NewPointerObj(SWIG_as_voidptr(faceLocations),SWIGTYPE_p_MEDCoupling__DataArrayInt, SWIG_POINTER_OWN | 0 )); - PyTuple_SetItem(ret,6,SWIG_NewPointerObj(SWIG_as_voidptr(faces),SWIGTYPE_p_MEDCoupling__DataArrayInt, SWIG_POINTER_OWN | 0 )); + PyTuple_SetItem(ret,3,SWIG_NewPointerObj(SWIG_as_voidptr(cellLocations),SWIGTITraits::TI, SWIG_POINTER_OWN | 0 )); + PyTuple_SetItem(ret,4,SWIG_NewPointerObj(SWIG_as_voidptr(cells),SWIGTITraits::TI, SWIG_POINTER_OWN | 0 )); + PyTuple_SetItem(ret,5,SWIG_NewPointerObj(SWIG_as_voidptr(faceLocations),SWIGTITraits::TI, SWIG_POINTER_OWN | 0 )); + PyTuple_SetItem(ret,6,SWIG_NewPointerObj(SWIG_as_voidptr(faces),SWIGTITraits::TI, SWIG_POINTER_OWN | 0 )); return ret; } } @@ -4146,7 +4278,7 @@ namespace MEDCoupling public: %extend { - PyObject *buildVTUArrays() const throw(INTERP_KERNEL::Exception) + PyObject *buildVTUArrays() const { bool isInternal; std::vector< DataArrayDouble * > objs(self->buildVTUArrays(isInternal)); @@ -4171,10 +4303,10 @@ namespace MEDCoupling public: %extend { - PyObject *buildVTUArrays() const throw(INTERP_KERNEL::Exception) + PyObject *buildVTUArrays() const { DataArrayDouble *ret0(0); - std::vector ret1; + std::vector ret1; bool ret2; self->buildVTUArrays(ret0,ret1,ret2); std::size_t sz(ret1.size()); @@ -4182,7 +4314,7 @@ namespace MEDCoupling PyTuple_SetItem(ret,0,SWIG_NewPointerObj(SWIG_as_voidptr(ret0),SWIGTYPE_p_MEDCoupling__DataArrayDouble, SWIG_POINTER_OWN | 0 )); PyObject *ret1Py=PyList_New(sz); for(std::size_t i=0;i result(self->getGeoTypesAt(timeStepId,m)); std::vector< INTERP_KERNEL::NormalizedCellType >::const_iterator iL(result.begin()); @@ -4215,4 +4347,49 @@ namespace MEDCoupling } } }; + + class MeshFormatReader + { + public: + MeshFormatReader(const std::string& meshFileName, const std::vector& fieldFileName); + MeshFormatReader(); + MEDFileData* loadInMedFileDS(); + void setMeshName(const std::string& theMeshName); + std::string getMeshName() const; + void setFile(const std::string& theFileName); + void setFieldFileNames(const std::vector& theFieldFileNames); + std::vector getFieldFileNames() const; + }; + class MeshFormatWriter + { + public: + MeshFormatWriter(const std::string& meshFileName, const std::vector& fieldFileNames); + MeshFormatWriter(); + void setMeshFileName(const std::string& meshFileName); + std::string getMeshFileName() const; + void setFieldFileNames(const std::vector& fieldFileNames); + std::vector getFieldFileNames() const; + void setMEDFileDS(MEDCoupling::MEDFileData* mfd); + void write(); + }; + } + +%pythoncode %{ +def enter1TS(self): + self.loadArrays() + pass +def exit1TS(self, exctype, exc, tb): + self.unloadArrays() + pass +MEDFileAnyTypeField1TS.__enter__=enter1TS +MEDFileAnyTypeField1TS.__exit__=exit1TS +MEDFileIntField1TS = MEDFileInt32Field1TS +MEDFileIntFieldMultiTS = MEDFileInt32FieldMultiTS +if MEDCouplingUse64BitIDs(): + MEDFileIDField1TS = MEDFileInt64Field1TS + MEDFileIDFieldMultiTS = MEDFileInt64FieldMultiTS +else: + MEDFileIDField1TS = MEDFileInt32Field1TS + MEDFileIDFieldMultiTS = MEDFileInt32FieldMultiTS +%}