Mantis issue 0021668: [CEA 564] MED2.1 to MED2.3

diff --git a/src/INTERP_KERNELTest/Makefile.am b/src/INTERP_KERNELTest/Makefile.am
index 93dc410d70650e7a890c52d98cbbcb7cb446817b..547bcfa3515d8f021e9e0337b8ec8f4c264768e1 100644 (file)
--- 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 8196a1c29393fcb44b359efd2d96efee286d876a..7ec168e122572f7286228922019855dc44d25e73 100644 (file)
--- 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 a77cbac28b8012f3c2703635cd13601f906feaaf..c5deaf1e7a9e1f3f693a3f0a91f4bfd7d6473b78 100644 (file)
--- 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 ae378542a8a4170a2d1130d18bb3df9928cb4e5f..1a4735921a5a708c791d7e4efee6aed2a4799875 100644 (file)
--- 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 c07bedcc6fd52cadd63eee0a25fecfb6b588d161..70f6ca7030b8da316e6ad593ad1a92436587c6dd 100644 (file)
--- 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 3c0069b38d92dcd0632f928cefa8fa2a9856fcb8..d605507f398c76697d046b324eb2e15ef26ee92c 100644 (file)
--- 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 <stdio.h>
 #include <sstream>
@@ -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 '"<<theFileName<<"'. Med version 2.1 is not supported any more.");
+      //aWrapper.reset(new MED::V2_1::TVWrapper(theFileName));
       break;
     default:
       EXCEPTION(std::runtime_error,"MED::CrWrapper - theFileName = '"<<theFileName<<"'");
@@ -157,7 +152,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 '"<<theFileName<<"'. Med version 2.1 is not supported any more.");
+      //aWrapper.reset(new MED::V2_1::TVWrapper(theFileName));
       break;
     default:
       aWrapper.reset(new MED::V2_2::TVWrapper(theFileName));

diff --git a/src/MEDWrapper/Factory/MED_Factory.hxx b/src/MEDWrapper/Factory/MED_Factory.hxx
index 2e4c7cbf73c6f8f94943c13dacfcec689c159296..de2f2dc9ffc48248c1d0954ac680192e9982c8e8 100644 (file)
--- a/src/MEDWrapper/Factory/MED_Factory.hxx
+++ b/src/MEDWrapper/Factory/MED_Factory.hxx
@@ -18,13 +18,7 @@
 // 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 : 
-//  $Header$
-//
 #ifndef MED_Factory_HeaderFile
 #define MED_Factory_HeaderFile
 

diff --git a/src/MEDWrapper/Factory/Makefile.am b/src/MEDWrapper/Factory/Makefile.am
index 2e52e8d5248dccb8c387d779031ef386d333125d..871bba81062ec803fdd155d737d0b6db42df43df 100644 (file)
--- a/src/MEDWrapper/Factory/Makefile.am
+++ b/src/MEDWrapper/Factory/Makefile.am
@@ -39,18 +39,18 @@ if MED_ENABLE_KERNEL
 else
   libMEDWrapper_la_CPPFLAGS+= -I$(top_builddir)/adm_local_without_kernel/unix
 endif
-libMEDWrapper_la_CPPFLAGS+= -I$(srcdir)/../V2_1/Wrapper -I$(srcdir)/../V2_2
-libMEDWrapper_la_LDFLAGS= ../V2_2/libMEDWrapper_V2_2.la ../V2_1/Wrapper/libMEDWrapper_V2_1.la
+libMEDWrapper_la_CPPFLAGS+= -I$(srcdir)/../V2_2
+libMEDWrapper_la_LDFLAGS= ../V2_2/libMEDWrapper_V2_2.la
 
 # Executables targets
 bin_PROGRAMS = MED_Test mprint_version
 
 dist_MED_Test_SOURCES= MED_Test.cxx
 MED_Test_CPPFLAGS= $(libMEDWrapper_la_CPPFLAGS)
-MED_Test_LDADD= $(libMEDWrapper_la_LDFLAGS) ../Base/libMEDWrapperBase.la ../V2_1/Core/libmed_V2_1.la \
+MED_Test_LDADD= $(libMEDWrapper_la_LDFLAGS) ../Base/libMEDWrapperBase.la \
        $(BOOST_LIB_THREAD) libMEDWrapper.la
 
 dist_mprint_version_SOURCES= mprint_version.cxx
 mprint_version_CPPFLAGS= $(libMEDWrapper_la_CPPFLAGS)
-mprint_version_LDADD= $(libMEDWrapper_la_LDFLAGS) ../Base/libMEDWrapperBase.la ../V2_1/Core/libmed_V2_1.la \
+mprint_version_LDADD= $(libMEDWrapper_la_LDFLAGS) ../Base/libMEDWrapperBase.la \
        $(BOOST_LIB_THREAD) libMEDWrapper.la $(MED3_LIBS_C_ONLY)

diff --git a/src/MEDWrapper/Makefile.am b/src/MEDWrapper/Makefile.am
index eea7d92b166d1ae01887c60fae081da580c75a4d..066489835d05f5f68408e85e3f2a719d83e55765 100644 (file)
--- a/src/MEDWrapper/Makefile.am
+++ b/src/MEDWrapper/Makefile.am
@@ -15,15 +15,14 @@
 # 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 $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # if without KERNEL, build only med 2.1 library
 if MED_ENABLE_KERNEL
-  SUBDIRS = Base V2_1 V2_2 Factory
+  SUBDIRS = Base V2_2 Factory
 else !MED_ENABLE_KERNEL
-  SUBDIRS = Base V2_1
+  SUBDIRS = Base
 endif
 
-DIST_SUBDIRS = Base V2_1 V2_2 Factory
+DIST_SUBDIRS = Base V2_2 Factory

diff --git a/src/RENUMBER/Makefile.am b/src/RENUMBER/Makefile.am
index 021ba4b9bcd5562c6bd04e627b76ec8c8230e53a..f21d03178d34b35faf74604d8bfc947b674f8ea6 100644 (file)
--- a/src/RENUMBER/Makefile.am
+++ b/src/RENUMBER/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
-#
 
 #  MED MEDMEM : MED files in memory
-#
+
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # this directory must be recompiled before Test folder
@@ -54,13 +53,13 @@ endif
 
 librenumber_la_CPPFLAGS= $(MED3_INCLUDES) $(HDF5_INCLUDES) @CXXTMPDPTHFLAGS@ \
        $(BOOST_CPPFLAGS) \
-       -I$(srcdir)/../MEDMEM -I$(srcdir)/../MEDWrapper/V2_1/Core -I$(srcdir)/../INTERP_KERNEL/Bases \
+       -I$(srcdir)/../MEDMEM -I$(srcdir)/../INTERP_KERNEL/Bases \
        -I$(srcdir)/../INTERP_KERNEL/GaussPoints \
        -I$(srcdir)/../INTERP_KERNEL
 
 librenumber_la_LDFLAGS= 
 #libmedsplitter_la_LDFLAGS= $(MED3_LIBS_C_ONLY) $(HDF5_LIBS) $(STDLIB) \
-#      ../MEDMEM/libmedmem.la ../MEDWrapper/V2_1/Core/libmed_V2_1.la
+#      ../MEDMEM/libmedmem.la
 
 if MED_ENABLE_METIS
   librenumber_la_CPPFLAGS+= $(METIS_CPPFLAGS)
@@ -76,7 +75,7 @@ if MED_ENABLE_KERNEL
 endif
 
 librenumber_la_LDFLAGS+= $(MED3_LIBS_C_ONLY) $(HDF5_LIBS) $(STDLIB) \
-       ../MEDMEM/libmedmem.la ../MEDWrapper/V2_1/Core/libmed_V2_1.la  ../INTERP_KERNEL/libinterpkernel.la
+       ../MEDMEM/libmedmem.la ../INTERP_KERNEL/libinterpkernel.la
 
 # Executables targets
 bin_PROGRAMS= renumber