From 647970056644096b4b5a0f88fb7e1b211a5b6fe8 Mon Sep 17 00:00:00 2001 From: eap Date: Wed, 10 Aug 2011 10:13:23 +0000 Subject: [PATCH] 0020511: EDF 1101 SMESH : Add CGNS to Mesh Format Supported Remove stub files - DriverMED_R_SMDS_Mesh.cxx \ - DriverMED_R_SMESHDS_Document.cxx \ - DriverMED_W_SMDS_Mesh.cxx \ - DriverMED_W_SMESHDS_Document.cxx \ --- src/DriverMED/DriverMED_R_SMDS_Mesh.cxx | 23 ------------- src/DriverMED/DriverMED_R_SMDS_Mesh.h | 33 ------------------- .../DriverMED_R_SMESHDS_Document.cxx | 23 ------------- src/DriverMED/DriverMED_R_SMESHDS_Document.h | 33 ------------------- src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx | 1 - src/DriverMED/DriverMED_W_SMDS_Mesh.cxx | 23 ------------- src/DriverMED/DriverMED_W_SMDS_Mesh.h | 33 ------------------- .../DriverMED_W_SMESHDS_Document.cxx | 27 --------------- src/DriverMED/DriverMED_W_SMESHDS_Document.h | 33 ------------------- src/DriverMED/DriverMED_W_SMESHDS_Mesh.cxx | 6 ---- src/DriverMED/DriverMED_W_SMESHDS_Mesh.h | 2 -- src/DriverMED/Makefile.am | 8 ----- 12 files changed, 245 deletions(-) delete mode 100644 src/DriverMED/DriverMED_R_SMDS_Mesh.cxx delete mode 100644 src/DriverMED/DriverMED_R_SMDS_Mesh.h delete mode 100644 src/DriverMED/DriverMED_R_SMESHDS_Document.cxx delete mode 100644 src/DriverMED/DriverMED_R_SMESHDS_Document.h delete mode 100644 src/DriverMED/DriverMED_W_SMDS_Mesh.cxx delete mode 100644 src/DriverMED/DriverMED_W_SMDS_Mesh.h delete mode 100644 src/DriverMED/DriverMED_W_SMESHDS_Document.cxx delete mode 100644 src/DriverMED/DriverMED_W_SMESHDS_Document.h diff --git a/src/DriverMED/DriverMED_R_SMDS_Mesh.cxx b/src/DriverMED/DriverMED_R_SMDS_Mesh.cxx deleted file mode 100644 index 107fb1899..000000000 --- a/src/DriverMED/DriverMED_R_SMDS_Mesh.cxx +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE -// -// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// - -#include "DriverMED_R_SMDS_Mesh.h" diff --git a/src/DriverMED/DriverMED_R_SMDS_Mesh.h b/src/DriverMED/DriverMED_R_SMDS_Mesh.h deleted file mode 100644 index b321805ec..000000000 --- a/src/DriverMED/DriverMED_R_SMDS_Mesh.h +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE -// -// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// - -#ifndef _INCLUDE_DRIVERMED_R_SMDS_MESH -#define _INCLUDE_DRIVERMED_R_SMDS_MESH - -#include "SMESH_DriverMED.hxx" - -#include "Driver_SMDS_Mesh.h" - -class MESHDRIVERMED_EXPORT DriverMED_R_SMDS_Mesh: public Driver_SMDS_Mesh -{}; - -#endif diff --git a/src/DriverMED/DriverMED_R_SMESHDS_Document.cxx b/src/DriverMED/DriverMED_R_SMESHDS_Document.cxx deleted file mode 100644 index 4f07311eb..000000000 --- a/src/DriverMED/DriverMED_R_SMESHDS_Document.cxx +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE -// -// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// - -#include "DriverMED_R_SMESHDS_Document.h" diff --git a/src/DriverMED/DriverMED_R_SMESHDS_Document.h b/src/DriverMED/DriverMED_R_SMESHDS_Document.h deleted file mode 100644 index 77203f56c..000000000 --- a/src/DriverMED/DriverMED_R_SMESHDS_Document.h +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE -// -// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// - -#ifndef _INCLUDE_DRIVERMED_R_SMESHDS_DOCUMENT -#define _INCLUDE_DRIVERMED_R_SMESHDS_DOCUMENT - -#include "SMESH_DriverMED.hxx" - -#include "Driver_Document.h" - -class MESHDRIVERMED_EXPORT DriverMED_R_SMESHDS_Document : public Driver_Document -{}; - -#endif diff --git a/src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx b/src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx index 8ef19313c..5e15f519d 100644 --- a/src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx +++ b/src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx @@ -25,7 +25,6 @@ // Module : SMESH // #include "DriverMED_R_SMESHDS_Mesh.h" -#include "DriverMED_R_SMDS_Mesh.h" #include "SMESHDS_Mesh.hxx" #include "utilities.h" diff --git a/src/DriverMED/DriverMED_W_SMDS_Mesh.cxx b/src/DriverMED/DriverMED_W_SMDS_Mesh.cxx deleted file mode 100644 index f9beabc10..000000000 --- a/src/DriverMED/DriverMED_W_SMDS_Mesh.cxx +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE -// -// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// - -#include "DriverMED_W_SMDS_Mesh.h" diff --git a/src/DriverMED/DriverMED_W_SMDS_Mesh.h b/src/DriverMED/DriverMED_W_SMDS_Mesh.h deleted file mode 100644 index 49f75d0ae..000000000 --- a/src/DriverMED/DriverMED_W_SMDS_Mesh.h +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE -// -// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// - -#ifndef _INCLUDE_DRIVERMED_W_SMDS_MESH -#define _INCLUDE_DRIVERMED_W_SMDS_MESH - -#include "SMESH_DriverMED.hxx" - -#include "Driver_SMDS_Mesh.h" - -class MESHDRIVERMED_EXPORT DriverMED_W_SMDS_Mesh: public Driver_SMDS_Mesh -{}; - -#endif diff --git a/src/DriverMED/DriverMED_W_SMESHDS_Document.cxx b/src/DriverMED/DriverMED_W_SMESHDS_Document.cxx deleted file mode 100644 index 9c14bf710..000000000 --- a/src/DriverMED/DriverMED_W_SMESHDS_Document.cxx +++ /dev/null @@ -1,27 +0,0 @@ -// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE -// -// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// - -// SMESH DriverMED : driver to read and write 'med' files -// File : DriverMED_W_SMESHDS_Document.cxx -// Module : SMESH -// -#include "DriverMED_W_SMESHDS_Document.h" diff --git a/src/DriverMED/DriverMED_W_SMESHDS_Document.h b/src/DriverMED/DriverMED_W_SMESHDS_Document.h deleted file mode 100644 index 301540f63..000000000 --- a/src/DriverMED/DriverMED_W_SMESHDS_Document.h +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE -// -// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// - -#ifndef _INCLUDE_DRIVERMED_W_SMESHDS_DOCUMENT -#define _INCLUDE_DRIVERMED_W_SMESHDS_DOCUMENT - -#include "SMESH_DriverMED.hxx" - -#include "Driver_Document.h" - -class MESHDRIVERMED_EXPORT DriverMED_W_SMESHDS_Document : public Driver_Document -{}; - -#endif diff --git a/src/DriverMED/DriverMED_W_SMESHDS_Mesh.cxx b/src/DriverMED/DriverMED_W_SMESHDS_Mesh.cxx index d7d2d0768..2ba1663cd 100644 --- a/src/DriverMED/DriverMED_W_SMESHDS_Mesh.cxx +++ b/src/DriverMED/DriverMED_W_SMESHDS_Mesh.cxx @@ -27,7 +27,6 @@ #include #include "DriverMED_W_SMESHDS_Mesh.h" -#include "DriverMED_W_SMDS_Mesh.h" #include "DriverMED_Family.h" #include "SMESHDS_Mesh.hxx" @@ -84,11 +83,6 @@ string DriverMED_W_SMESHDS_Mesh::GetVersionString(const MED::EVersion theVersion return name.str(); } -void DriverMED_W_SMESHDS_Mesh::SetMeshName(const std::string& theMeshName) -{ - myMeshName = theMeshName; -} - void DriverMED_W_SMESHDS_Mesh::AddGroup(SMESHDS_GroupBase* theGroup) { myGroups.push_back(theGroup); diff --git a/src/DriverMED/DriverMED_W_SMESHDS_Mesh.h b/src/DriverMED/DriverMED_W_SMESHDS_Mesh.h index 8a519bebd..8d49c0831 100644 --- a/src/DriverMED/DriverMED_W_SMESHDS_Mesh.h +++ b/src/DriverMED/DriverMED_W_SMESHDS_Mesh.h @@ -59,7 +59,6 @@ class MESHDRIVERMED_EXPORT DriverMED_W_SMESHDS_Mesh: public Driver_SMESHDS_Mesh /*! functions to prepare adding one mesh */ - void SetMeshName(const std::string& theMeshName); void AddGroup(SMESHDS_GroupBase * theGroup); void AddAllSubMeshes(); void AddSubMesh(SMESHDS_SubMesh* theSubMesh, int theID); @@ -71,7 +70,6 @@ class MESHDRIVERMED_EXPORT DriverMED_W_SMESHDS_Mesh: public Driver_SMESHDS_Mesh private: MED::PWrapper myMed; - std::string myMeshName; std::list myGroups; bool myAllSubMeshes; std::map mySubMeshes; diff --git a/src/DriverMED/Makefile.am b/src/DriverMED/Makefile.am index 8570cd75a..273529a81 100644 --- a/src/DriverMED/Makefile.am +++ b/src/DriverMED/Makefile.am @@ -28,23 +28,15 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am # header files salomeinclude_HEADERS = \ - DriverMED_R_SMDS_Mesh.h \ DriverMED_R_SMESHDS_Mesh.h \ - DriverMED_R_SMESHDS_Document.h \ - DriverMED_W_SMDS_Mesh.h \ DriverMED_W_SMESHDS_Mesh.h \ - DriverMED_W_SMESHDS_Document.h \ DriverMED_Family.h \ SMESH_DriverMED.hxx # Libraries targets lib_LTLIBRARIES = libMeshDriverMED.la dist_libMeshDriverMED_la_SOURCES = \ - DriverMED_R_SMDS_Mesh.cxx \ DriverMED_R_SMESHDS_Mesh.cxx \ - DriverMED_R_SMESHDS_Document.cxx \ - DriverMED_W_SMDS_Mesh.cxx \ - DriverMED_W_SMESHDS_Document.cxx \ DriverMED_W_SMESHDS_Mesh.cxx \ DriverMED_Family.cxx -- 2.39.2