From: Anthony Geay <anthony.geay@edf.fr>
Date: Thu, 14 Dec 2017 09:02:53 +0000 (+0100)
Subject: Maybe after the 3rd attempt...
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=0a33062cd8a4d6012a539095d44b6975cd3fb0d1;p=tools%2Fmedcoupling.git

Maybe after the 3rd attempt...
---

diff --git a/src/MEDLoader/Swig/CMakeLists.txt b/src/MEDLoader/Swig/CMakeLists.txt
index 14d39353a..24923af0c 100644
--- a/src/MEDLoader/Swig/CMakeLists.txt
+++ b/src/MEDLoader/Swig/CMakeLists.txt
@@ -72,8 +72,9 @@ INSTALL(TARGETS _MEDLoader DESTINATION ${MEDCOUPLING_INSTALL_PYTHON})
 INSTALL(FILES MEDLoader.i MEDLoaderTypemaps.i MEDLoaderCommon.i DESTINATION ${MEDCOUPLING_INSTALL_HEADERS})
 
 SALOME_INSTALL_SCRIPTS(${CMAKE_CURRENT_BINARY_DIR}/MEDLoader.py ${MEDCOUPLING_INSTALL_PYTHON})
+INSTALL(MEDLoaderSplitter.py DESTINATION ${MEDCOUPLING_INSTALL_PYTHON})
 
-INSTALL(FILES MEDLoaderDataForTest.py MEDLoaderTest1.py MEDLoaderTest2.py MEDLoaderTest3.py MEDLoaderTest123.py MEDLoaderTest4.py SauvLoaderTest.py MEDLoaderExamplesTest.py MEDLoaderCouplingTrainingSession.py CaseIO.py CaseReader.py CaseWriter.py VTKReader.py MEDLoaderSplitter.py medutilities.py DESTINATION ${MEDCOUPLING_INSTALL_SCRIPT_SCRIPTS})
+INSTALL(FILES MEDLoaderDataForTest.py MEDLoaderTest1.py MEDLoaderTest2.py MEDLoaderTest3.py MEDLoaderTest123.py MEDLoaderTest4.py SauvLoaderTest.py MEDLoaderExamplesTest.py MEDLoaderCouplingTrainingSession.py CaseIO.py CaseReader.py CaseWriter.py VTKReader.py medutilities.py DESTINATION ${MEDCOUPLING_INSTALL_SCRIPT_SCRIPTS})
 INSTALL(FILES med2sauv PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ DESTINATION ${MEDCOUPLING_INSTALL_BINS} )
 INSTALL(FILES sauv2med PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ DESTINATION ${MEDCOUPLING_INSTALL_BINS} )
 INSTALL(FILES case2med PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ DESTINATION ${MEDCOUPLING_INSTALL_BINS} )
diff --git a/src/MEDLoader/Swig/MEDLoaderSplitter.py b/src/MEDLoader/Swig/MEDLoaderSplitter.py
index d0332f8c6..97db7a376 100644
--- a/src/MEDLoader/Swig/MEDLoaderSplitter.py
+++ b/src/MEDLoader/Swig/MEDLoaderSplitter.py
@@ -95,15 +95,10 @@ class MEDLoaderSplitter:
         return ret0
 
     def __splitMesh(self,mfm,idsLst):
-<<<<<<< HEAD
-        ret0=[MEDFileMeshes() for i in xrange(len(idsLst))]
-        m=mfm.getMeshAtLevel(0)
-=======
         ret0 = [MEDFileMeshes() for i in range(len(idsLst))]
         m=mfm[0]
         addlevs=list(mfm.getNonEmptyLevels())[1:]
         dAddlevs={k:mfm[k] for k in addlevs}
->>>>>>> 629c9ce... Splitter now manage all levs
         for ret,ids in zip(ret0,idsLst):
             mlPart=mfm.createNewEmpty()
             mPart=m[ids] ; trado2n=mPart.zipCoordsTraducer()