CoTech decision: move MEDWrapper from MED to SMESH

Remove dependency on MED

diff --git a/Makefile.am b/Makefile.am
index 43fe97881b2a51eb4af278d046bfb678912e5133..34261d7a0f147761874ddb88dc5ecfa8b1af1ac4 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,8 +26,7 @@
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 ACLOCAL_AMFLAGS = -I adm_local/unix/config_files \
-                  -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \
-                  -I ${MED_ROOT_DIR}/adm_local/unix/config_files
+                  -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files
 
 SUBDIRS = idl adm_local resources src bin 
 

diff --git a/build_configure b/build_configure
index c15b308c0f406e980e794c6d9b4b4bf7eac363ce..08344adab2d43c649b7b6f023c1941abd4189477 100755 (executable)
--- a/build_configure
+++ b/build_configure
@@ -46,13 +46,13 @@ fi
 #    exit
 #fi
 
-########################################################################
-# Test if the MED_ROOT_DIR is set correctly
+# ########################################################################
+# # Test if the MED_ROOT_DIR is set correctly
 
-if test ! -d "${MED_ROOT_DIR}"; then
-    echo "failed : MED_ROOT_DIR variable is not correct !"
-    exit
-fi
+# if test ! -d "${MED_ROOT_DIR}"; then
+#     echo "failed : MED_ROOT_DIR variable is not correct !"
+#     exit
+# fi
 
 cd ${CONF_DIR}
 ABS_CONF_DIR=`pwd`
@@ -69,8 +69,7 @@ ABS_CONF_DIR=`pwd`
 echo "======================================================= aclocal"
 
 aclocal -I adm_local/unix/config_files \
-        -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \
-        -I ${MED_ROOT_DIR}/adm_local/unix/config_files || exit 1
+        -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files || exit 1
 
 # ____________________________________________________________________
 # libtoolize creates some configuration files (ltmain.sh,

diff --git a/configure.ac b/configure.ac
index a351aebf961b46d155c3058825eefeca986da877..905be2e80abb2ec9914ba291c28dd13c226148bf 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -249,21 +249,21 @@ echo
 
 CHECK_HDF5
 
-echo
-echo ---------------------------------------------
-echo testing MED
-echo ---------------------------------------------
-echo
+# echo
+# echo ---------------------------------------------
+# echo testing MED
+# echo ---------------------------------------------
+# echo
 
-CHECK_MED
+# CHECK_MED
 
-echo
-echo ---------------------------------------------
-echo testing MED3
-echo ---------------------------------------------
-echo
+# echo
+# echo ---------------------------------------------
+# echo testing MED3
+# echo ---------------------------------------------
+# echo
 
-CHECK_MED3
+# CHECK_MED3
 
 echo
 echo ---------------------------------------------
@@ -296,7 +296,7 @@ echo ---------------------------------------------
 echo
 
 echo Configure
-variables="cc_ok lex_yacc_ok python_ok swig_ok threads_ok hdf5_ok med3_ok omniORB_ok occ_ok"
+variables="cc_ok lex_yacc_ok python_ok swig_ok threads_ok hdf5_ok omniORB_ok occ_ok"
 
 for var in $variables
 do

diff --git a/idl/Makefile.am b/idl/Makefile.am
index e27fa06e8b75e529ec5af1cad8bf21f3ad97c430..7bc99e8c42f19eae219c0251bca33c9126b90d52 100644 (file)
--- a/idl/Makefile.am
+++ b/idl/Makefile.am
@@ -36,8 +36,7 @@ BASEIDL_FILES = \
        TypesCheck.idl \
        DataStreamComponent.idl \
        SIGNALSComponent.idl \
-       UndefinedSymbolComponent.idl \
-       Calculator.idl
+       UndefinedSymbolComponent.idl
 
 BASEIDL_FILES_PY=$(BASEIDL_FILES:%.idl=%_idl.py)
 
@@ -60,8 +59,7 @@ BASEIDL_SOURCES =\
        TypesCheckSK.cc \
        DataStreamComponentSK.cc \
        SIGNALSComponentSK.cc \
-       UndefinedSymbolComponentSK.cc \
-       CalculatorSK.cc
+       UndefinedSymbolComponentSK.cc
 DYNIDL_SOURCES = \
        AddComponentDynSK.cc \
        AdditionComponentDynSK.cc \
@@ -74,8 +72,7 @@ DYNIDL_SOURCES = \
        TypesCheckDynSK.cc \
        DataStreamComponentDynSK.cc \
        SIGNALSComponentDynSK.cc \
-       UndefinedSymbolComponentDynSK.cc \
-       CalculatorDynSK.cc
+       UndefinedSymbolComponentDynSK.cc
 
 nodist_libSalomeIDLCOMPONENT_la_SOURCES = ${BASEIDL_SOURCES} ${DYNIDL_SOURCES}
 ${DYNIDL_SOURCES}: ${BASEIDL_SOURCES}
@@ -85,7 +82,6 @@ nodist_salomeinclude_HEADERS = $(BASEIDL_FILES:%.idl=%.hh)
 
 libSalomeIDLCOMPONENT_la_CPPFLAGS = \
        $(KERNEL_CXXFLAGS) \
-       $(MED_CXXFLAGS) \
        -I$(top_builddir)/idl \
        @CORBA_CXXFLAGS@ \
        @CORBA_INCLUDES@
@@ -93,7 +89,6 @@ libSalomeIDLCOMPONENT_la_CPPFLAGS = \
 libSalomeIDLCOMPONENT_la_LDFLAGS = -no-undefined -version-info=0:0:0
 libSalomeIDLCOMPONENT_la_LIBADD  = \
        $(KERNEL_LDFLAGS) -lSalomeIDLKernel \
-       $(MED_LDFLAGS) -lSalomeIDLMED \
        @CORBA_LIBS@
 
 # These variables defines the building process of CORBA files
@@ -102,19 +97,16 @@ OMNIORB_IDLCXXFLAGS = @OMNIORB_IDLCXXFLAGS@
 OMNIORB_IDLPYFLAGS  = \
        @OMNIORB_IDLPYFLAGS@ \
        -I$(top_builddir)/idl/salome \
-       -I$(KERNEL_ROOT_DIR)/idl/salome \
-       -I$(MED_ROOT_DIR)/idl/salome
+       -I$(KERNEL_ROOT_DIR)/idl/salome
 
 IDLCXXFLAGS = \
        -bcxx \
        @IDLCXXFLAGS@ \
        -I$(top_builddir)/idl/salome \
-       -I$(KERNEL_ROOT_DIR)/idl/salome \
-       -I$(MED_ROOT_DIR)/idl/salome
+       -I$(KERNEL_ROOT_DIR)/idl/salome
 IDLPYFLAGS  = \
        @IDLPYFLAGS@ \
-       -I$(KERNEL_ROOT_DIR)/idl/salome \
-       -I$(MED_ROOT_DIR)/idl/salome
+       -I$(KERNEL_ROOT_DIR)/idl/salome
 
 # potential problem on parallel make on the following - multiple outputs
 SUFFIXES = .idl .hh SK.cc
@@ -151,7 +143,7 @@ mostlyclean-local:
        @for dep in $^ dummy; do \
          if [ $$dep != "dummy" ]; then \
            echo Building dependencies for $$dep; \
-           $(CPP) $(C_DEPEND_FLAG) -x c -I$(srcdir) -I$(KERNEL_ROOT_DIR)/idl/salome -I$(MED_ROOT_DIR)/idl/salome $$dep 2>/dev/null | \
+           $(CPP) $(C_DEPEND_FLAG) -x c -I$(srcdir) -I$(KERNEL_ROOT_DIR)/idl/salome $$dep 2>/dev/null | \
            sed 's/\.o/\SK.cc/' >>$@; \
          fi; \
        done ;

diff --git a/resources/COMPONENTCatalog.xml.in b/resources/COMPONENTCatalog.xml.in
index 858575a64a47389a75556c788f92b0add7c7cb5f..eab95fee82ec7374fed972ef2b6f9b5526eed291 100644 (file)
--- a/resources/COMPONENTCatalog.xml.in
+++ b/resources/COMPONENTCatalog.xml.in
@@ -2130,159 +2130,6 @@
                        </component-service-list>
                </component-interface-list>
        </component>
-               <component>
-               <!-- Component identification -->
-               <component-name>Calculator</component-name>
-               <component-username>Calculator</component-username>
-               <component-type>SOLVER</component-type>
-               <component-author>LD</component-author>
-               <component-version>@VERSION@</component-version>
-               <component-comment>SuperVision test: Arithmetic operations with MED_Field</component-comment>
-               <component-multistudy>0</component-multistudy>
-               <component-impltype>1</component-impltype>
-               <constraint>hostname = localhost</constraint>
-
-               <component-interface-list>
-                       <component-interface-name>Calculator</component-interface-name>
-                       <component-interface-comment>No comment</component-interface-comment>
-
-                       <component-service-list>
-                               <component-service>
-                                       <!-- service-identification -->
-                                       <service-name>Mul</service-name>
-                                       <service-author>LD</service-author>
-                                       <service-version>1.0</service-version>
-                                       <service-comment>Multiplication of 2 fields of double</service-comment>
-                                       <service-by-default>1</service-by-default>
-                                       <!-- service-connexion -->
-                                       <inParameter-list>
-                                               <inParameter>
-              <inParameter-type>SALOME_MED/FIELDDOUBLE</inParameter-type>
-                                                       <inParameter-name>field1</inParameter-name>
-                                                       <inParameter-comment>initial field of double</inParameter-comment>
-                                               </inParameter>
-                                               <inParameter>
-                                                       <inParameter-type>double</inParameter-type>
-                                                       <inParameter-name>x1</inParameter-name>
-                                                       <inParameter-comment>multiplicator</inParameter-comment>
-                                               </inParameter>
-                                       </inParameter-list>
-                                        <outParameter-list>
-                                                 <outParameter>
-                                                   <outParameter-type>SALOME_MED/FIELDDOUBLE</outParameter-type>
-                                                        <outParameter-name>return</outParameter-name>
-                                                        <outParameter-comment>result</outParameter-comment>
-                                                 </outParameter>
-                                        </outParameter-list>
-                               </component-service>
-                               <component-service>
-                                       <!-- service-identification -->
-                                       <service-name>Add</service-name>
-                                       <service-author>LD</service-author>
-                                       <service-version>1.0</service-version>
-                                       <service-comment>Addition of 2 fields of double</service-comment>
-                                       <service-by-default>1</service-by-default>
-                                       <!-- service-connexion -->
-                                       <inParameter-list>
-                                               <inParameter>
-              <inParameter-type>SALOME_MED/FIELDDOUBLE</inParameter-type>
-                                                       <inParameter-name>field1</inParameter-name>
-                                                       <inParameter-comment>first field of double</inParameter-comment>
-                                               </inParameter>
-                                               <inParameter>
-              <inParameter-type>SALOME_MED/FIELDDOUBLE</inParameter-type>
-                                                       <inParameter-name>field2</inParameter-name>
-                                                       <inParameter-comment>second field of double</inParameter-comment>
-                                               </inParameter>
-                                       </inParameter-list>
-                                        <outParameter-list>
-                                                 <outParameter>
-                                                   <outParameter-type>SALOME_MED/FIELDDOUBLE</outParameter-type>
-                                                        <outParameter-name>return</outParameter-name>
-                                                        <outParameter-comment>result</outParameter-comment>
-                                                 </outParameter>
-                                        </outParameter-list>
-                               </component-service>
-                               <component-service>
-                                       <!-- service-identification -->
-                                       <service-name>Constant</service-name>
-                                       <service-author>LD</service-author>
-                                       <service-version>1.0</service-version>
-                                       <service-comment>Build a constant field of doubles</service-comment>
-                                       <service-by-default>1</service-by-default>
-                                       <!-- service-connexion -->
-                                       <inParameter-list>
-                                               <inParameter>
-              <inParameter-type>SALOME_MED/FIELDDOUBLE</inParameter-type>
-                                                       <inParameter-name>field1</inParameter-name>
-                                                       <inParameter-comment>allows to build the support</inParameter-comment>
-                                               </inParameter>
-                                               <inParameter>
-                                                       <inParameter-type>double</inParameter-type>
-                                                       <inParameter-name>x1</inParameter-name>
-                                                       <inParameter-comment>the constant</inParameter-comment>
-                                               </inParameter>
-                                       </inParameter-list>
-                                        <outParameter-list>
-                                                 <outParameter>
-                                                   <outParameter-type>SALOME_MED/FIELDDOUBLE</outParameter-type>
-                                                        <outParameter-name>return</outParameter-name>
-                                                        <outParameter-comment>result based on first field support</outParameter-comment>
-                                                 </outParameter>
-                                        </outParameter-list>
-                               </component-service>
-                               <component-service>
-                                       <!-- service-identification -->
-                                       <service-name>PutToStudy</service-name>
-                                       <service-author>mpv</service-author>
-                                       <service-version>1.0</service-version>
-                                       <service-comment>Put field to the study stucture</service-comment>
-                                       <service-by-default>1</service-by-default>
-                                       <!-- service-connexion -->
-                                       <inParameter-list>
-                                               <inParameter>
-              <inParameter-type>SALOME_MED/FIELDDOUBLE</inParameter-type>
-                                                       <inParameter-name>field1</inParameter-name>
-                                                       <inParameter-comment>field to put to study</inParameter-comment>
-                                               </inParameter>
-                                               <inParameter>
-                                                       <inParameter-type>long</inParameter-type>
-                                                       <inParameter-name>StudyId</inParameter-name>
-                                                       <inParameter-comment>the ID of the study</inParameter-comment>
-                                               </inParameter>
-                                       </inParameter-list>
-                                        <outParameter-list>
-                                                 <outParameter>
-                                                   <outParameter-type>SALOME_MED/FIELDDOUBLE</outParameter-type>
-                                                        <outParameter-name>return</outParameter-name>
-                                                        <outParameter-comment>the same field like in input</outParameter-comment>
-                                                 </outParameter>
-                                        </outParameter-list>
-                               </component-service>
-                               <component-service>
-                                       <!-- service-identification -->
-                                       <service-name>writeMEDfile</service-name>
-                                       <service-author>LD</service-author>
-                                       <service-version>1.0</service-version>
-                                       <service-comment>write a field in a Med file</service-comment>
-                                       <service-by-default>1</service-by-default>
-                                       <!-- service-connexion -->
-                                       <inParameter-list>
-                                               <inParameter>
-              <inParameter-type>SALOME_MED/FIELDDOUBLE</inParameter-type>
-                                                       <inParameter-name>field1</inParameter-name>
-                                                       <inParameter-comment>transient Med field</inParameter-comment>
-                                               </inParameter>
-                                               <inParameter>
-                                                       <inParameter-type>string</inParameter-type>
-                                                       <inParameter-name>filename</inParameter-name>
-                                                       <inParameter-comment>Med filename</inParameter-comment>
-                                               </inParameter>
-                                       </inParameter-list>
-                               </component-service>
-                       </component-service-list>
-               </component-interface-list>
-       </component>
         <component>
             <component-name>DataStreamFactory</component-name>
             <component-username>DataStreamFactory</component-username>