From 5ff195de939dbcf8b66c33216cd2ddc117337ac8 Mon Sep 17 00:00:00 2001 From: jfa Date: Thu, 9 Aug 2012 10:34:41 +0000 Subject: [PATCH] Mantis issue 0021668: [CEA 564] MED2.1 to MED2.3 --- src/INTERP_KERNELTest/Makefile.am | 2 -- src/MEDMEM/MEDMEM_Field.hxx | 4 ---- src/MEDMEM/MEDMEM_Mesh.hxx | 4 ---- src/MEDSPLITTER/Test/Makefile.am | 9 ++++----- src/MEDWrapper/CMakeLists.txt | 1 - src/MEDWrapper/Factory/MED_Factory.cxx | 12 ++++-------- src/MEDWrapper/Factory/MED_Factory.hxx | 6 ------ src/MEDWrapper/Factory/Makefile.am | 8 ++++---- src/MEDWrapper/Makefile.am | 7 +++---- src/RENUMBER/Makefile.am | 9 ++++----- 10 files changed, 19 insertions(+), 43 deletions(-) diff --git a/src/INTERP_KERNELTest/Makefile.am b/src/INTERP_KERNELTest/Makefile.am index 93dc410d7..547bcfa35 100644 --- a/src/INTERP_KERNELTest/Makefile.am +++ b/src/INTERP_KERNELTest/Makefile.am @@ -94,11 +94,9 @@ if !MED_ENABLE_MICROMED libInterpKernelTest_la_CPPFLAGS += \ -DDISABLE_MICROMED \ $(MED3_INCLUDES) $(HDF5_INCLUDES) \ - -I$(srcdir)/../MEDWrapper/V2_1/Core \ -I$(srcdir)/../MEDMEM libInterpKernelTest_la_LDFLAGS += \ - ../MEDWrapper/V2_1/Core/libmed_V2_1.la \ ../MEDMEM/libmedmem.la -lm endif diff --git a/src/MEDMEM/MEDMEM_Field.hxx b/src/MEDMEM/MEDMEM_Field.hxx index 8196a1c29..7ec168e12 100644 --- a/src/MEDMEM/MEDMEM_Field.hxx +++ b/src/MEDMEM/MEDMEM_Field.hxx @@ -18,7 +18,6 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// /* File Field.hxx @@ -352,9 +351,6 @@ protected: public: - friend class MED_MED_RDONLY_DRIVER21; - friend class MED_MED_WRONLY_DRIVER21; - friend class MED_MED_RDWR_DRIVER21; friend class MED_MED_RDONLY_DRIVER22; friend class MED_MED_WRONLY_DRIVER22; friend class MED_MED_RDWR_DRIVER22; diff --git a/src/MEDMEM/MEDMEM_Mesh.hxx b/src/MEDMEM/MEDMEM_Mesh.hxx index a77cbac28..c5deaf1e7 100644 --- a/src/MEDMEM/MEDMEM_Mesh.hxx +++ b/src/MEDMEM/MEDMEM_Mesh.hxx @@ -18,7 +18,6 @@ // 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 MESH_HXX #define MESH_HXX @@ -92,9 +91,6 @@ protected : friend class MED_MESH_RDONLY_DRIVER; friend class MED_MESH_WRONLY_DRIVER; - friend class MED_MED_RDONLY_DRIVER21; - friend class MED_MED_WRONLY_DRIVER21; - friend class MED_MED_RDWR_DRIVER21; friend class MED_MED_RDONLY_DRIVER22; friend class MED_MED_WRONLY_DRIVER22; friend class MED_MED_RDWR_DRIVER22; diff --git a/src/MEDSPLITTER/Test/Makefile.am b/src/MEDSPLITTER/Test/Makefile.am index ae378542a..1a4735921 100644 --- a/src/MEDSPLITTER/Test/Makefile.am +++ b/src/MEDSPLITTER/Test/Makefile.am @@ -15,10 +15,9 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# # SALOMELocalTrace : log on local machine -# + include $(top_srcdir)/adm_local/unix/make_common_starter.am lib_LTLIBRARIES = libMEDSPLITTERTest.la @@ -45,7 +44,7 @@ salomeinclude_HEADERS = \ libMEDSPLITTERTest_la_CPPFLAGS= $(MPI_INCLUDES) @CPPUNIT_INCLUDES@ $(MED3_INCLUDES) \ $(HDF5_INCLUDES) $(BOOST_CPPFLAGS) $(LIBXML_CXXFLAGS) \ - -I$(srcdir)/.. -I$(srcdir)/../../MEDWrapper/V2_1/Core -I$(srcdir)/../../MEDMEM \ + -I$(srcdir)/.. -I$(srcdir)/../../MEDMEM \ -I$(srcdir)/../../MEDMEMCppTest -I$(srcdir)/../../INTERP_KERNEL/Bases \ -I$(srcdir)/../../INTERP_KERNEL/GaussPoints \ -I$(srcdir)/../../INTERP_KERNEL @@ -80,7 +79,7 @@ if MED_ENABLE_PARMETIS TestParaMEDSPLITTER_CPPFLAGS = $(TestMEDSPLITTER_CPPFLAGS) $(MPI_INCLUDES) TestParaMEDSPLITTER_CXXFLAGS = @CXXTMPDPTHFLAGS@ TestParaMEDSPLITTER_LDADD = $(MED3_LIBS_C_ONLY) $(libMEDSPLITTERTest_la_LDFLAGS) -lm \ - libMEDSPLITTERTest.la ../../MEDWrapper/V2_1/Core/libmed_V2_1.la \ + libMEDSPLITTERTest.la \ ../../MEDMEM/libmedmem.la ../../INTERP_KERNEL/libinterpkernel.la \ ../libmedsplitter.la $(HDF5_LIBS) $(MPI_LIBS) @CPPUNIT_LIBS@ dist_salomescript_DATA += testParaMEDSPLITTER.py @@ -98,7 +97,7 @@ TestMEDSPLITTER_SOURCES= TestMEDSPLITTER.cxx TestMEDSPLITTER_CPPFLAGS= $(libMEDSPLITTERTest_la_CPPFLAGS) TestMEDSPLITTER_CXXFLAGS = @CXXTMPDPTHFLAGS@ TestMEDSPLITTER_LDADD= $(MED3_LIBS_C_ONLY) $(libMEDSPLITTERTest_la_LDFLAGS) -lm \ - libMEDSPLITTERTest.la ../../MEDWrapper/V2_1/Core/libmed_V2_1.la \ + libMEDSPLITTERTest.la \ ../../MEDMEM/libmedmem.la ../../INTERP_KERNEL/libinterpkernel.la \ ../libmedsplitter.la # TESTS = TestMEDSPLITTER diff --git a/src/MEDWrapper/CMakeLists.txt b/src/MEDWrapper/CMakeLists.txt index c07bedcc6..70f6ca703 100644 --- a/src/MEDWrapper/CMakeLists.txt +++ b/src/MEDWrapper/CMakeLists.txt @@ -18,6 +18,5 @@ # ADD_SUBDIRECTORY(Base) -ADD_SUBDIRECTORY(V2_1) ADD_SUBDIRECTORY(V2_2) ADD_SUBDIRECTORY(Factory) diff --git a/src/MEDWrapper/Factory/MED_Factory.cxx b/src/MEDWrapper/Factory/MED_Factory.cxx index 3c0069b38..d605507f3 100644 --- a/src/MEDWrapper/Factory/MED_Factory.cxx +++ b/src/MEDWrapper/Factory/MED_Factory.cxx @@ -18,16 +18,10 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// -// File : -// Author : -// Module : -// #include "MED_Factory.hxx" #include "MED_Utilities.hxx" #include "MED_V2_2_Wrapper.hxx" -#include "MED_V2_1_Wrapper.hxx" #include #include @@ -136,7 +130,8 @@ namespace MED aWrapper.reset(new MED::V2_2::TVWrapper(theFileName)); break; case eV2_1: - aWrapper.reset(new MED::V2_1::TVWrapper(theFileName)); + EXCEPTION(std::runtime_error,"Cannot open file '"<