From: ageay Date: Fri, 28 Jun 2013 08:55:31 +0000 (+0000) Subject: Suppression of useless methods X-Git-Tag: B4CMakeModifs~21 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=69003fcd72e577ff0eccb3937a18324dd8a0e29a;p=modules%2Fmed.git Suppression of useless methods --- diff --git a/src/MEDLoader/MEDFileField.cxx b/src/MEDLoader/MEDFileField.cxx index 03b2a848c..5f392a203 100644 --- a/src/MEDLoader/MEDFileField.cxx +++ b/src/MEDLoader/MEDFileField.cxx @@ -587,17 +587,6 @@ const DataArray *MEDFileFieldPerMeshPerTypePerDisc::getArray() const return fath->getArray(); } -DataArrayDouble *MEDFileFieldPerMeshPerTypePerDisc::getArrayDouble() -{ - return _father->getArrayDouble(); -} - -const DataArrayDouble *MEDFileFieldPerMeshPerTypePerDisc::getArrayDouble() const -{ - const MEDFileFieldPerMeshPerType *fath=_father; - return fath->getArrayDouble(); -} - const std::vector& MEDFileFieldPerMeshPerTypePerDisc::getInfo() const { return _father->getInfo(); @@ -1267,17 +1256,6 @@ const DataArray *MEDFileFieldPerMeshPerType::getArray() const return fath->getArray(); } -DataArrayDouble *MEDFileFieldPerMeshPerType::getArrayDouble() -{ - return _father->getArrayDouble(); -} - -const DataArrayDouble *MEDFileFieldPerMeshPerType::getArrayDouble() const -{ - const MEDFileFieldPerMesh *fath=_father; - return fath->getArrayDouble(); -} - const std::vector& MEDFileFieldPerMeshPerType::getInfo() const { return _father->getInfo(); @@ -1677,22 +1655,6 @@ const DataArray *MEDFileFieldPerMesh::getArray() const return _father->getOrCreateAndGetArray(); } -DataArrayDouble *MEDFileFieldPerMesh::getArrayDouble() -{ - MEDFileField1TSWithoutSDA *fatherC=dynamic_cast(_father); - if(!fatherC) - throw INTERP_KERNEL::Exception("MEDFileFieldPerMesh::getArrayDouble : Expected to be called on double array !"); - return fatherC->getOrCreateAndGetArrayDouble(); -} - -const DataArrayDouble *MEDFileFieldPerMesh::getArrayDouble() const -{ - const MEDFileField1TSWithoutSDA *fatherC=dynamic_cast(_father); - if(!fatherC) - throw INTERP_KERNEL::Exception("MEDFileFieldPerMesh::getArrayDouble : Expected to be called on double array !"); - return fatherC->getOrCreateAndGetArrayDouble(); -} - const std::vector& MEDFileFieldPerMesh::getInfo() const { return _father->getInfo(); @@ -1859,7 +1821,12 @@ bool MEDFileFieldPerMesh::renumberEntitiesLyingOnMesh(const char *meshName, cons std::vector< const MEDFileFieldPerMeshPerTypePerDisc *> entriesKept; std::vector< const MEDFileFieldPerMeshPerTypePerDisc *> otherEntries; getUndergroundDataArrayExt(entries); - DataArrayDouble *arr=getArrayDouble(); + DataArray *arr0=getArray();//tony + if(!arr0) + throw INTERP_KERNEL::Exception("MEDFileFieldPerMesh::renumberEntitiesLyingOnMesh : DataArray storing values of field is null !"); + DataArrayDouble *arr=dynamic_cast(arr0);//tony + if(!arr0) + throw INTERP_KERNEL::Exception("MEDFileFieldPerMesh::renumberEntitiesLyingOnMesh : DataArray storing values is double ! Not managed for the moment !"); int sz=0; if(!arr) throw INTERP_KERNEL::Exception("MEDFileFieldPerMesh::renumberEntitiesLyingOnMesh : DataArrayDouble storing values of field is null !"); diff --git a/src/MEDLoader/MEDFileField.hxx b/src/MEDLoader/MEDFileField.hxx index 31f4dcead..44ada6414 100644 --- a/src/MEDLoader/MEDFileField.hxx +++ b/src/MEDLoader/MEDFileField.hxx @@ -122,8 +122,6 @@ namespace ParaMEDMEM int getStart() const { return _start; } DataArray *getArray(); const DataArray *getArray() const; - const DataArrayDouble *getArrayDouble() const; - DataArrayDouble *getArrayDouble(); const std::vector& getInfo() const; std::string getProfile() const; void setProfile(const char *newPflName); @@ -195,8 +193,6 @@ namespace ParaMEDMEM int getNumberOfComponents() const; DataArray *getArray(); const DataArray *getArray() const; - const DataArrayDouble *getArrayDouble() const; - DataArrayDouble *getArrayDouble(); const std::vector& getInfo() const; std::vector getPflsReallyUsed() const; std::vector getLocsReallyUsed() const; @@ -251,8 +247,6 @@ namespace ParaMEDMEM int getNumberOfComponents() const; DataArray *getArray(); const DataArray *getArray() const; - DataArrayDouble *getArrayDouble(); - const DataArrayDouble *getArrayDouble() const; const std::vector& getInfo() const; std::vector getPflsReallyUsed() const; std::vector getLocsReallyUsed() const;