Rename MEDCoupling to MEDCouplingCompat under Windows.

diff --git a/doc/user/images/cartesian.py b/doc/user/images/cartesian.py
index 7ac1c79d0be7f85a0c12e76f888901e8519b8834..2829dfb6345c2e3c92dfaeecdbe3e7bcd6f63ac2 100644 (file)
--- a/doc/user/images/cartesian.py
+++ b/doc/user/images/cartesian.py
@@ -64,8 +64,12 @@ ipar.append("VTKViewer_1", """<?xml version="1.0"?>
 # fill list AP_MODULES_LIST
 ipar.append("AP_MODULES_LIST", "Mesh")
 
+import sys
+if sys.platform == "win32":
+    from MEDCouplingCompat import *
+else:
+    from MEDCoupling import *
 
-from MEDCoupling import *
 from MEDLoader import WriteMesh
 
 XCoords=[-0.3,0.,0.1,0.3,0.45,0.47,0.49,1.,1.22] # 9 values along X

diff --git a/doc/user/images/convert2quadratic.py b/doc/user/images/convert2quadratic.py
index d4cb1d08fb4c38a7b50ce0e5ecae8e0bf098c03a..7bb05d06274e13a036ec78802daba1eaafb8ae12 100644 (file)
--- a/doc/user/images/convert2quadratic.py
+++ b/doc/user/images/convert2quadratic.py
@@ -64,8 +64,11 @@ ipar.append("VTKViewer_1", """<?xml version="1.0"?>
 # fill list AP_MODULES_LIST
 ipar.append("AP_MODULES_LIST", "Mesh")
 
-
-from MEDCoupling import *
+import sys
+if sys.platform == "win32":
+    from MEDCouplingCompat import *
+else:
+    from MEDCoupling import *
 from MEDLoader import WriteMesh
 
 arr=DataArrayDouble(range(2))

diff --git a/doc/user/images/curvelinear.py b/doc/user/images/curvelinear.py
index 268a8e84434a44d02e14ee72f57134e8325b3503..056cd16b5b02bec355b344243578f6ea34ddee21 100644 (file)
--- a/doc/user/images/curvelinear.py
+++ b/doc/user/images/curvelinear.py
@@ -64,8 +64,12 @@ ipar.append("VTKViewer_1", """<?xml version="1.0"?>
 # fill list AP_MODULES_LIST
 ipar.append("AP_MODULES_LIST", "Mesh")
 
+import sys
+if sys.platform == "win32":
+    from MEDCouplingCompat import *
+else:
+    from MEDCoupling import *
 
-from MEDCoupling import *
 from MEDLoader import WriteMesh
 
 m=MEDCouplingCurveLinearMesh("myCurveLinearMesh")

diff --git a/doc/user/images/explodeIntoEdges.py b/doc/user/images/explodeIntoEdges.py
index 0c626eab6e3ec2c9dee850a240a52b0de0a0ecd6..b07e658edc5a1e943eb5a8933d3ed171390b9b42 100644 (file)
--- a/doc/user/images/explodeIntoEdges.py
+++ b/doc/user/images/explodeIntoEdges.py
@@ -64,8 +64,11 @@ ipar.append("VTKViewer_1", """<?xml version="1.0"?>
 # fill list AP_MODULES_LIST
 ipar.append("AP_MODULES_LIST", "Mesh")
 
-
-from MEDCoupling import *
+import sys
+if sys.platform == "win32":
+    from MEDCouplingCompat import *
+else:
+    from MEDCoupling import *
 
 coordsArr=DataArrayDouble(range(5))
 mesh1=MEDCouplingCMesh("mesh")

diff --git a/doc/user/images/extractSlice3D.py b/doc/user/images/extractSlice3D.py
index 5d34cab18519637310f8ccdf67f626c7a0c7f68a..5b5e1c7829bc85a88d4c1863cb553d15bc23ed8b 100644 (file)
--- a/doc/user/images/extractSlice3D.py
+++ b/doc/user/images/extractSlice3D.py
@@ -26,7 +26,12 @@ ipar.append("ParaView_1", "empty")
 # fill list AP_MODULES_LIST
 ipar.append("AP_MODULES_LIST", "ParaViS")
 
-from MEDCoupling import *
+import sys
+if sys.platform == "win32":
+    from MEDCouplingCompat import *
+else:
+    from MEDCoupling import *
+
 from MEDLoader import WriteMesh, WriteFieldUsingAlreadyWrittenMesh
 
 medfile1="mesh1.med"

diff --git a/doc/user/images/extract_mesh_fetched_nodes.py b/doc/user/images/extract_mesh_fetched_nodes.py
index 2a49a353f6597b86c205e2ea0ec63ea2e765a0c2..5d94de3db0e5024bc604750fe4c1131b29d6497b 100644 (file)
--- a/doc/user/images/extract_mesh_fetched_nodes.py
+++ b/doc/user/images/extract_mesh_fetched_nodes.py
@@ -65,7 +65,10 @@ ipar.append("VTKViewer_1", """<?xml version="1.0"?>
 ipar.append("AP_MODULES_LIST", "Mesh")
 
 
-from MEDCoupling import *
+if sys.platform == "win32":
+    from MEDCouplingCompat import *
+else:
+    from MEDCoupling import *
 
 coordsArr=DataArrayDouble(range(6))
 mesh1=MEDCouplingCMesh("mesh")

diff --git a/doc/user/images/extract_mesh_ids.py b/doc/user/images/extract_mesh_ids.py
index c619c055bad6923e259be48fd06558f5023c6947..09cca9c67ffd80893acfb044e6edf72f0b42159d 100644 (file)
--- a/doc/user/images/extract_mesh_ids.py
+++ b/doc/user/images/extract_mesh_ids.py
@@ -64,8 +64,10 @@ ipar.append("VTKViewer_1", """<?xml version="1.0"?>
 # fill list AP_MODULES_LIST
 ipar.append("AP_MODULES_LIST", "Mesh")
 
-
-from MEDCoupling import *
+if sys.platform == "win32":
+    from MEDCouplingCompat import *
+else:
+    from MEDCoupling import *
 
 coordsArr=DataArrayDouble(range(6))
 mesh1=MEDCouplingCMesh("mesh")

diff --git a/doc/user/images/extrusion.py b/doc/user/images/extrusion.py
index 73f3334c42ff8f269f2ed5db0f7df7bf1b8cb655..324ed6cb3b466561bb7034c1318f6f2a73336fd7 100644 (file)
--- a/doc/user/images/extrusion.py
+++ b/doc/user/images/extrusion.py
@@ -64,8 +64,11 @@ ipar.append("VTKViewer_1", """<?xml version="1.0"?>
 # fill list AP_MODULES_LIST
 ipar.append("AP_MODULES_LIST", "Mesh")
 
-
-from MEDCoupling import *
+import sys
+if sys.platform == "win32":
+    from MEDCouplingCompat import *
+else:
+    from MEDCoupling import *
 
 coordsArr=DataArrayDouble(range(3))
 mesh1=MEDCouplingCMesh("mesh")

diff --git a/doc/user/images/intersect_2d1d.py b/doc/user/images/intersect_2d1d.py
index 62590010da1dec86f7671003e33744b94729186e..49b3d13e7d880f83b890ce814d5257cba3dc34a2 100644 (file)
--- a/doc/user/images/intersect_2d1d.py
+++ b/doc/user/images/intersect_2d1d.py
@@ -65,8 +65,10 @@ ipar.append("VTKViewer_1", """<?xml version="1.0"?>
 # fill list AP_MODULES_LIST
 ipar.append("AP_MODULES_LIST", "Mesh")
 
-
-from MEDCoupling import *
+if sys.platform == "win32":
+    from MEDCouplingCompat import *
+else:
+    from MEDCoupling import *
 
 coordsArr=DataArrayDouble(range(6))
 mesh2d=MEDCouplingCMesh("mesh2d")

diff --git a/doc/user/images/intersect_2d2d.py b/doc/user/images/intersect_2d2d.py
index 37219194cda90c42f6fb363b3d97a56bba43de69..048ba4133e80de7b86e29008dea3e4f465d6e690 100644 (file)
--- a/doc/user/images/intersect_2d2d.py
+++ b/doc/user/images/intersect_2d2d.py
@@ -65,8 +65,10 @@ ipar.append("VTKViewer_1", """<?xml version="1.0"?>
 # fill list AP_MODULES_LIST
 ipar.append("AP_MODULES_LIST", "Mesh")
 
-
-from MEDCoupling import *
+if sys.platform == "win32":
+    from MEDCouplingCompat import *
+else:
+    from MEDCoupling import *
 
 coordsArr=DataArrayDouble(range(6))
 mesh2d=MEDCouplingCMesh("mesh2")

diff --git a/doc/user/images/measure_field.py b/doc/user/images/measure_field.py
index 24cbd6497b1e50e20da2065e47a857bede995e2f..d686fbad01ef3864fcded55284787e47869b584d 100644 (file)
--- a/doc/user/images/measure_field.py
+++ b/doc/user/images/measure_field.py
@@ -10,7 +10,12 @@ import salome
 salome.salome_init()
 theStudy = salome.myStudy
 
-from MEDCoupling import *
+import sys
+if sys.platform == "win32":
+    from MEDCouplingCompat import *
+else:
+    from MEDCoupling import *
+
 from MEDLoader import WriteMesh, WriteFieldUsingAlreadyWrittenMesh
 
 medfile="mesh1.med"

diff --git a/doc/user/images/orderConsecutiveCells1D.py b/doc/user/images/orderConsecutiveCells1D.py
index 4d26fca62076e5af38cbd2eabfac59c982ef61e6..e2ca078ad17938597fa1197c6183f23b42a07b1a 100644 (file)
--- a/doc/user/images/orderConsecutiveCells1D.py
+++ b/doc/user/images/orderConsecutiveCells1D.py
@@ -65,8 +65,11 @@ ipar.append("VTKViewer_1", """<?xml version="1.0"?>
 # fill list AP_MODULES_LIST
 ipar.append("AP_MODULES_LIST", "Mesh")
 
+if sys.platform == "win32":
+    from MEDCouplingCompat import *
+else:
+    from MEDCoupling import *
 
-from MEDCoupling import *
 from MEDLoader import WriteMesh
 
 coordsArr=DataArrayDouble(range(6))

diff --git a/doc/user/images/orient_2d.py b/doc/user/images/orient_2d.py
index d6b8409a8da4bb6962529ae9c55d021b33054ecc..f5cf417fd6415f024efb960af5d24a4f7c0562c0 100644 (file)
--- a/doc/user/images/orient_2d.py
+++ b/doc/user/images/orient_2d.py
@@ -65,8 +65,10 @@ ipar.append("VTKViewer_1", """<?xml version="1.0"?>
 # fill list AP_MODULES_LIST
 ipar.append("AP_MODULES_LIST", "Mesh")
 
-
-from MEDCoupling import *
+if sys.platform == "win32":
+    from MEDCouplingCompat import *
+else:
+    from MEDCoupling import *
 from MEDLoader import WriteMesh
 
 coordsArr=DataArrayDouble(range(6))

diff --git a/doc/user/images/ortho_field.py b/doc/user/images/ortho_field.py
index 7d27868d99ac503f27a1d2958585ab294e643a29..f49bc4f783d1624d2fc3afec7fd841ddac15efc7 100644 (file)
--- a/doc/user/images/ortho_field.py
+++ b/doc/user/images/ortho_field.py
@@ -4,7 +4,11 @@
 ### This script is intended to be launched in a new SALOME study
 ###
 
-from MEDCoupling import *
+import sys
+if sys.platform == "win32":
+    from MEDCouplingCompat import *
+else:
+    from MEDCoupling import *
 
 coordsArr=DataArrayDouble(range(3))
 mesh1=MEDCouplingCMesh("mesh")

diff --git a/doc/user/images/partition.py b/doc/user/images/partition.py
index a669b82219d448dc15e576c24290d1078fff6d53..ba2cd5b99277f6dd7ef2863de6634962e191c930 100644 (file)
--- a/doc/user/images/partition.py
+++ b/doc/user/images/partition.py
@@ -68,9 +68,11 @@ ipar.append("VTKViewer_1", """<?xml version="1.0"?>
 # fill list AP_MODULES_LIST
 ipar.append("AP_MODULES_LIST", "Mesh")
 
+if sys.platform == "win32":
+    from MEDCouplingCompat import *
+else:
+    from MEDCoupling import *
 
-
-from MEDCoupling import *
 from MEDLoader import ReadMeshFromFile, WriteMesh
 
 coordsArr=DataArrayDouble(range(8))

diff --git a/doc/user/images/partition_with_layer.py b/doc/user/images/partition_with_layer.py
index e7d64c722610af5e6d467c8e4788612f03a5107b..abd4d78bdfc6f1b5b2c76361717805c01376ecb5 100644 (file)
--- a/doc/user/images/partition_with_layer.py
+++ b/doc/user/images/partition_with_layer.py
@@ -68,9 +68,11 @@ ipar.append("VTKViewer_1", """<?xml version="1.0"?>
 # fill list AP_MODULES_LIST
 ipar.append("AP_MODULES_LIST", "Mesh")
 
+if sys.platform == "win32":
+    from MEDCouplingCompat import *
+else:
+    from MEDCoupling import *
 
-
-from MEDCoupling import *
 from MEDLoader import ReadMeshFromFile, WriteMesh
 
 coordsArr=DataArrayDouble(range(8))

diff --git a/doc/user/images/projection_P0P1_dual.py b/doc/user/images/projection_P0P1_dual.py
index 59500cc7548f417d38deb55a63697f2d012a549a..2c4c0cf2ae2b8b85a4f9814e27f1f5b7a29e4cdd 100644 (file)
--- a/doc/user/images/projection_P0P1_dual.py
+++ b/doc/user/images/projection_P0P1_dual.py
@@ -64,8 +64,11 @@ ipar.append("VTKViewer_1", """<?xml version="1.0"?>
 # fill list AP_MODULES_LIST
 ipar.append("AP_MODULES_LIST", "Mesh")
 
-
-from MEDCoupling import *
+import sys
+if sys.platform == "win32":
+    from MEDCouplingCompat import *
+else:
+    from MEDCoupling import *
 
 srcCoo=DataArrayDouble([(0,0),(1,0),(3,0),(0,1),(1,1),(3,1)])
 src=MEDCouplingUMesh("src",2)

diff --git a/doc/user/images/projection_P0P1_meshes.py b/doc/user/images/projection_P0P1_meshes.py
index a26adfb7af7899b6f6dd05c47633fb6138e5f0be..92ec7ae3f8a112bee44bedd4a84da6bd768da885 100644 (file)
--- a/doc/user/images/projection_P0P1_meshes.py
+++ b/doc/user/images/projection_P0P1_meshes.py
@@ -64,8 +64,11 @@ ipar.append("VTKViewer_1", """<?xml version="1.0"?>
 # fill list AP_MODULES_LIST
 ipar.append("AP_MODULES_LIST", "Mesh")
 
-
-from MEDCoupling import *
+import sys
+if sys.platform == "win32":
+    from MEDCouplingCompat import *
+else:
+    from MEDCoupling import *
 
 srcCoo=DataArrayDouble([(0,0),(1,0),(3,0),(0,1),(1,1),(3,1)])
 src=MEDCouplingUMesh("src",2)

diff --git a/doc/user/images/projection_P1P0_dual.py b/doc/user/images/projection_P1P0_dual.py
index 4d925b927d09f97e2e92d01ebb1237ac541074ec..f9b3f9aaa39136b445dbc9e392bc70f7fe443a25 100644 (file)
--- a/doc/user/images/projection_P1P0_dual.py
+++ b/doc/user/images/projection_P1P0_dual.py
@@ -64,8 +64,11 @@ ipar.append("VTKViewer_1", """<?xml version="1.0"?>
 # fill list AP_MODULES_LIST
 ipar.append("AP_MODULES_LIST", "Mesh")
 
-
-from MEDCoupling import *
+import sys
+if sys.platform == "win32":
+    from MEDCouplingCompat import *
+else:
+    from MEDCoupling import *
 
 srcCoo=DataArrayDouble([(0,0),(1,0),(3,0),(0,1),(1,1),(3,1)])
 src=MEDCouplingUMesh("src",2)

diff --git a/doc/user/images/renumber_nodes.py b/doc/user/images/renumber_nodes.py
index 0e15ab61e5779890ce2a8a2c22ceda3cc43e8de9..ac16031033c15715e373aa38c04f3f5a43346f79 100644 (file)
--- a/doc/user/images/renumber_nodes.py
+++ b/doc/user/images/renumber_nodes.py
@@ -68,9 +68,11 @@ ipar.append("VTKViewer_1", """<?xml version="1.0"?>
 # fill list AP_MODULES_LIST
 ipar.append("AP_MODULES_LIST", "Mesh")
 
+if sys.platform == "win32":
+    from MEDCouplingCompat import *
+else:
+    from MEDCoupling import *
 
-
-from MEDCoupling import *
 from MEDLoader import WriteMesh
 
 coordsArr=DataArrayDouble(range(2))

diff --git a/doc/user/images/simplexize.py b/doc/user/images/simplexize.py
index 73a350bde5ee393889b7bb7a27bfa1178da39c2e..c5edfd6a287da54d5fc35fb6d16c212fcdbe5989 100644 (file)
--- a/doc/user/images/simplexize.py
+++ b/doc/user/images/simplexize.py
@@ -64,9 +64,11 @@ ipar.append("VTKViewer_1", """<?xml version="1.0"?>
 # fill list AP_MODULES_LIST
 ipar.append("AP_MODULES_LIST", "Mesh")
 
-
-
-from MEDCoupling import *
+import sys
+if sys.platform == "win32":
+    from MEDCouplingCompat import *
+else:
+    from MEDCoupling import *
 
 coordsArr=DataArrayDouble(range(3))
 mesh1=MEDCouplingCMesh("mesh")

diff --git a/doc/user/images/skin.py b/doc/user/images/skin.py
index be8381374dfbade3bb5dcc3959289b6a4be549ba..4a212e8b4d1dbd6e563bb00958f176e1414cd4bf 100644 (file)
--- a/doc/user/images/skin.py
+++ b/doc/user/images/skin.py
@@ -65,7 +65,11 @@ ipar.append("VTKViewer_1", """<?xml version="1.0"?>
 ipar.append("AP_MODULES_LIST", "Mesh")
 
 
-from MEDCoupling import *
+import sys
+if sys.platform == "win32":
+    from MEDCouplingCompat import *
+else:
+    from MEDCoupling import *
 
 coordsArr=DataArrayDouble(range(5))
 mesh1=MEDCouplingCMesh("mesh")

diff --git a/doc/user/images/zones.py b/doc/user/images/zones.py
index 73afd5a1779e57cd994956bce5b5db24ad87ae0e..f5e0b6bcdb902f132480a45c09dff7b0e1bf3ca8 100644 (file)
--- a/doc/user/images/zones.py
+++ b/doc/user/images/zones.py
@@ -65,7 +65,12 @@ ipar.append("VTKViewer_1", """<?xml version="1.0"?>
 ipar.append("AP_MODULES_LIST", "Mesh")
 
 
-from MEDCoupling import *
+
+import sys
+if sys.platform == "win32":
+    from MEDCouplingCompat import *
+else:
+    from MEDCoupling import *
 from MEDLoader import WriteMesh
 
 coords=DataArrayDouble(range(6))

diff --git a/src/MEDCoupling_Swig/CMakeLists.txt b/src/MEDCoupling_Swig/CMakeLists.txt
index f23027b02a025a17da907410f0153a6066a83398..d70f0c2e115b9fc0d293aa54a6bb92b389e2370c 100644 (file)
--- a/src/MEDCoupling_Swig/CMakeLists.txt
+++ b/src/MEDCoupling_Swig/CMakeLists.txt
@@ -87,14 +87,21 @@ IF(MEDCOUPLING_BUILD_DOC)
         swig_ready)
 ENDIF()
 
+IF(WIN32)
+  # Under Windows MEDCoupling conflicts wiht medcoupling from PyWrapping
+  SET(MEDCouling_target_name MEDCouplingCompat)
+ELSE()
+  SET(MEDCouling_target_name MEDCoupling)
+ENDIF()
+
 IF(${CMAKE_VERSION} VERSION_LESS "3.8.0") 
-  SWIG_ADD_MODULE(MEDCoupling python MEDCoupling.i)  
+  SWIG_ADD_MODULE(${MEDCouling_target_name} python MEDCoupling.i)  
 ELSE()
-  SWIG_ADD_LIBRARY(MEDCoupling LANGUAGE python SOURCES MEDCoupling.i)
+  SWIG_ADD_LIBRARY(${MEDCouling_target_name} LANGUAGE python SOURCES MEDCoupling.i)
 ENDIF()
 
-SWIG_LINK_LIBRARIES(MEDCoupling ${PYTHON_LIBRARIES} ${PLATFORM_LIBS} medcouplingcpp)
-SWIG_CHECK_GENERATION(MEDCoupling)
+SWIG_LINK_LIBRARIES(${MEDCouling_target_name} ${PYTHON_LIBRARIES} ${PLATFORM_LIBS} medcouplingcpp)
+SWIG_CHECK_GENERATION(${MEDCouling_target_name})
 SET_SOURCE_FILES_PROPERTIES(MEDCouplingRemapper.i PROPERTIES CPLUSPLUS ON)
 IF ("${PYTHON_VERSION_MAJOR}" STREQUAL "3")
   SET_SOURCE_FILES_PROPERTIES(MEDCouplingRemapper.i PROPERTIES SWIG_FLAGS "-py3")
@@ -119,9 +126,9 @@ SWIG_LINK_LIBRARIES(MEDCouplingRemapper ${PYTHON_LIBRARIES} medcouplingremapper)
 
 IF(WIN32)
   SET_TARGET_PROPERTIES(_MEDCouplingRemapper PROPERTIES DEBUG_OUTPUT_NAME _MEDCouplingRemapper_d)
-  SET_TARGET_PROPERTIES(_MEDCoupling PROPERTIES DEBUG_OUTPUT_NAME _MEDCoupling_d)
+  SET_TARGET_PROPERTIES(_${MEDCouling_target_name} PROPERTIES DEBUG_OUTPUT_NAME _${MEDCouling_target_name}_d)
 ENDIF(WIN32)
-INSTALL(TARGETS ${SWIG_MODULE_MEDCoupling_REAL_NAME} ${SWIG_MODULE_MEDCouplingRemapper_REAL_NAME} DESTINATION ${MEDCOUPLING_INSTALL_PYTHON})
+INSTALL(TARGETS ${SWIG_MODULE_${MEDCouling_target_name}_REAL_NAME} ${SWIG_MODULE_MEDCouplingRemapper_REAL_NAME} DESTINATION ${MEDCOUPLING_INSTALL_PYTHON})
 
 SET(PYFILES_TO_INSTALL ${CMAKE_CURRENT_BINARY_DIR}/MEDCoupling.py ${CMAKE_CURRENT_BINARY_DIR}/MEDCouplingRemapper.py)
 SALOME_INSTALL_SCRIPTS("${PYFILES_TO_INSTALL}" ${MEDCOUPLING_INSTALL_PYTHON})

diff --git a/src/MEDCoupling_Swig/MEDCouplingBasicsTest1.py b/src/MEDCoupling_Swig/MEDCouplingBasicsTest1.py
index 4d3692134593b76200104c5e8e4b4b4f04422286..f9e80cf4f0bc632489a548226466de5939869003 100644 (file)
--- a/src/MEDCoupling_Swig/MEDCouplingBasicsTest1.py
+++ b/src/MEDCoupling_Swig/MEDCouplingBasicsTest1.py
@@ -18,7 +18,12 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-from MEDCoupling import *
+import sys
+if sys.platform == "win32":
+    from MEDCouplingCompat import *
+else:
+    from MEDCoupling import *
+
 import unittest
 from math import pi,e,sqrt,cos,sin
 from datetime import datetime

diff --git a/src/MEDCoupling_Swig/MEDCouplingBasicsTest2.py b/src/MEDCoupling_Swig/MEDCouplingBasicsTest2.py
index 9589dc0deb450cedc261a642924a117c5ca2e518..bb74613adda4a5e53586566b7003d3c4acfe9666 100644 (file)
--- a/src/MEDCoupling_Swig/MEDCouplingBasicsTest2.py
+++ b/src/MEDCoupling_Swig/MEDCouplingBasicsTest2.py
@@ -18,7 +18,12 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-from MEDCoupling import *
+
+import sys
+if sys.platform == "win32":
+    from MEDCouplingCompat import *
+else:
+    from MEDCoupling import *
 import unittest
 from math import pi,e,sqrt,cos,sin
 from datetime import datetime

diff --git a/src/MEDCoupling_Swig/MEDCouplingBasicsTest3.py b/src/MEDCoupling_Swig/MEDCouplingBasicsTest3.py
index 80f5f6bb0b3382240dc2d78d50013cbb20b8dba9..8ecafdcd0fa03e5a126da428a8e4d2219fa21aff 100644 (file)
--- a/src/MEDCoupling_Swig/MEDCouplingBasicsTest3.py
+++ b/src/MEDCoupling_Swig/MEDCouplingBasicsTest3.py
@@ -18,7 +18,11 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-from MEDCoupling import *
+import sys
+if sys.platform == "win32":
+    from MEDCouplingCompat import *
+else:
+    from MEDCoupling import *
 import unittest
 from math import pi,e,sqrt,cos,sin
 from datetime import datetime

diff --git a/src/MEDCoupling_Swig/MEDCouplingBasicsTest4.py b/src/MEDCoupling_Swig/MEDCouplingBasicsTest4.py
index 00090fb60fda793a70fafda462df65cbfae4f95b..d72103bf56cb541c55aae39dea872a72835f191d 100644 (file)
--- a/src/MEDCoupling_Swig/MEDCouplingBasicsTest4.py
+++ b/src/MEDCoupling_Swig/MEDCouplingBasicsTest4.py
@@ -18,7 +18,12 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-from MEDCoupling import *
+
+import sys
+if sys.platform == "win32":
+    from MEDCouplingCompat import *
+else:
+    from MEDCoupling import *
 import unittest
 from math import pi,e,sqrt,cos,sin
 from datetime import datetime

diff --git a/src/MEDCoupling_Swig/MEDCouplingBasicsTest5.py b/src/MEDCoupling_Swig/MEDCouplingBasicsTest5.py
index b5b326bc48c68a98f60aca749294c7def4b359d0..28cfa11de0e30924369ecbd273a9ef8f4f36054e 100644 (file)
--- a/src/MEDCoupling_Swig/MEDCouplingBasicsTest5.py
+++ b/src/MEDCoupling_Swig/MEDCouplingBasicsTest5.py
@@ -17,7 +17,13 @@
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
-from MEDCoupling import *
+
+import sys
+if sys.platform == "win32":
+    from MEDCouplingCompat import *
+else:
+    from MEDCoupling import *
+
 import unittest
 from math import pi,e,sqrt,cos,sin
 from datetime import datetime

diff --git a/src/MEDCoupling_Swig/MEDCouplingBasicsTest6.py b/src/MEDCoupling_Swig/MEDCouplingBasicsTest6.py
index 30b4af3046b41c284b45cc54bbde9cd74a88e1a9..455245e49e83753f105a2aac247a4a3ba0f69b62 100644 (file)
--- a/src/MEDCoupling_Swig/MEDCouplingBasicsTest6.py
+++ b/src/MEDCoupling_Swig/MEDCouplingBasicsTest6.py
@@ -18,7 +18,12 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-from MEDCoupling import *
+
+import sys
+if sys.platform == "win32":
+    from MEDCouplingCompat import *
+else:
+    from MEDCoupling import *
 import unittest
 from math import pi,e,sqrt,cos,sin
 from datetime import datetime

diff --git a/src/MEDCoupling_Swig/MEDCouplingDataForTest.py b/src/MEDCoupling_Swig/MEDCouplingDataForTest.py
index 99f975407ea5e153ae0c9060ae64cecb9fd8bf1e..f6861f0d66fa8cbc87641e961d6a699e55a2325a 100644 (file)
--- a/src/MEDCoupling_Swig/MEDCouplingDataForTest.py
+++ b/src/MEDCoupling_Swig/MEDCouplingDataForTest.py
@@ -18,7 +18,12 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-from MEDCoupling import *
+
+import sys
+if sys.platform == "win32":
+    from MEDCouplingCompat import *
+else:
+    from MEDCoupling import *
 
 class MEDCouplingDataForTest:
     def build2DTargetMesh_1(cls):

diff --git a/src/MEDCoupling_Swig/MEDCouplingExamplesTest.py b/src/MEDCoupling_Swig/MEDCouplingExamplesTest.py
index fb60d96a8685eea9bd576cc3a69ece825e0e9e31..13cbd33426bd66ec9e1f7dd49e0cbd6aa616d3db 100644 (file)
--- a/src/MEDCoupling_Swig/MEDCouplingExamplesTest.py
+++ b/src/MEDCoupling_Swig/MEDCouplingExamplesTest.py
@@ -18,7 +18,12 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-from MEDCoupling import *
+
+import sys
+if sys.platform == "win32":
+    from MEDCouplingCompat import *
+else:
+    from MEDCoupling import *
 import unittest
 from math import pi, sqrt
 

diff --git a/src/MEDCoupling_Swig/MEDCouplingIntersectTest.py b/src/MEDCoupling_Swig/MEDCouplingIntersectTest.py
index 17acd21f92b44bfd3787ec76807c6a6aba278b78..28e92fbc4dd3bc9c810cdcc0bd94cfa65e4ecaca 100644 (file)
--- a/src/MEDCoupling_Swig/MEDCouplingIntersectTest.py
+++ b/src/MEDCoupling_Swig/MEDCouplingIntersectTest.py
@@ -18,7 +18,12 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-from MEDCoupling import *
+
+import sys
+if sys.platform == "win32":
+    from MEDCouplingCompat import *
+else:
+    from MEDCoupling import *
 import unittest
 from math import pi,e,sqrt,cos,sin
 from datetime import datetime

diff --git a/src/MEDCoupling_Swig/MEDCouplingNumPyTest.py b/src/MEDCoupling_Swig/MEDCouplingNumPyTest.py
index 90c6f5eb80a857bde13bf554f959ca0838f07b7d..0cfc225e363278a3e5f6323a0eafca90d5bfb6f3 100644 (file)
--- a/src/MEDCoupling_Swig/MEDCouplingNumPyTest.py
+++ b/src/MEDCoupling_Swig/MEDCouplingNumPyTest.py
@@ -18,7 +18,12 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-from MEDCoupling import *
+
+import sys
+if sys.platform == "win32":
+    from MEDCouplingCompat import *
+else:
+    from MEDCoupling import *
 
 if MEDCouplingHasNumPyBindings():
     from numpy import *

diff --git a/src/MEDCoupling_Swig/MEDCouplingPickleTest.py b/src/MEDCoupling_Swig/MEDCouplingPickleTest.py
index a73bb88ab849937a8a93935dff8caec0f0241e73..a8f7b3cbb801232ccff37e70eb0496fb3c1ce825 100644 (file)
--- a/src/MEDCoupling_Swig/MEDCouplingPickleTest.py
+++ b/src/MEDCoupling_Swig/MEDCouplingPickleTest.py
@@ -18,7 +18,12 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-from MEDCoupling import *
+
+import sys
+if sys.platform == "win32":
+    from MEDCouplingCompat import *
+else:
+    from MEDCoupling import *
 from MEDCouplingDataForTest import MEDCouplingDataForTest
 
 if MEDCouplingHasNumPyBindings():

diff --git a/src/MEDCoupling_Swig/UsersGuideExamplesTest.py b/src/MEDCoupling_Swig/UsersGuideExamplesTest.py
index cad12285f8f61e6221d344ec2e89f836e7fd5fac..314f5c70b5e9fb19e57bb90f08bd450642028cb5 100755 (executable)
--- a/src/MEDCoupling_Swig/UsersGuideExamplesTest.py
+++ b/src/MEDCoupling_Swig/UsersGuideExamplesTest.py
@@ -18,7 +18,12 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-from MEDCoupling import *
+
+import sys
+if sys.platform == "win32":
+    from MEDCouplingCompat import *
+else:
+    from MEDCoupling import *
 from math import pi, sqrt
 
 # ! [PySnippetUMeshStdBuild1_1]

diff --git a/src/MEDCoupling_Swig/UsersGuideExamplesTest_numpy.py b/src/MEDCoupling_Swig/UsersGuideExamplesTest_numpy.py
index ad566904a9bd0928b70e39dcbc001ae6cbf4f531..bf8506fb67e90d90ee70228f471b86062cf2f832 100644 (file)
--- a/src/MEDCoupling_Swig/UsersGuideExamplesTest_numpy.py
+++ b/src/MEDCoupling_Swig/UsersGuideExamplesTest_numpy.py
@@ -17,12 +17,20 @@
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+import sys
+if sys.platform == "win32":
+    from MEDCouplingCompat import *
+else:
+    from MEDCoupling import *
 
-from MEDCoupling import *
 from math import pi, sqrt
 
 import numpy
-import MEDCoupling
+if sys.platform == "win32":
+    import MEDCouplingCompat as MEDCoupling
+else:
+    import MEDCoupling
+
 #! [UG_DataArrayNumpy_0]
 # NumPy is an optional pre-requisite!
 assert(MEDCoupling.MEDCouplingHasNumPyBindings())

diff --git a/src/PyWrapping/CMakeLists.txt b/src/PyWrapping/CMakeLists.txt
index 3d49b5e4a184cc9d04c41650a99a9204df957708..201ca039365bf0d1e99749bbe4bb6ae754792c09 100644 (file)
--- a/src/PyWrapping/CMakeLists.txt
+++ b/src/PyWrapping/CMakeLists.txt
@@ -83,18 +83,18 @@ IF(MEDCOUPLING_USE_MPI)
 ENDIF(MEDCOUPLING_USE_MPI)
 
 IF(${CMAKE_VERSION} VERSION_LESS "3.8.0")     
-  SWIG_ADD_MODULE(medcoupling1 python medcoupling.i)
+  SWIG_ADD_MODULE(medcoupling python medcoupling.i)
 ELSE()
-  SWIG_ADD_LIBRARY(medcoupling1 LANGUAGE python SOURCES medcoupling.i)
+  SWIG_ADD_LIBRARY(medcoupling LANGUAGE python SOURCES medcoupling.i)
 ENDIF()
 
-SWIG_LINK_LIBRARIES(medcoupling1 ${medcoupling_LIB_dependancies})
-SWIG_CHECK_GENERATION(medcoupling1)
+SWIG_LINK_LIBRARIES(medcoupling ${medcoupling_LIB_dependancies})
+SWIG_CHECK_GENERATION(medcoupling)
 IF(WIN32)
-  SET_TARGET_PROPERTIES(_medcoupling1 PROPERTIES DEBUG_OUTPUT_NAME _medcoupling1_d)
+  SET_TARGET_PROPERTIES(_medcoupling PROPERTIES DEBUG_OUTPUT_NAME _medcoupling_d)
 ENDIF(WIN32)
 
-INSTALL(TARGETS _medcoupling1 DESTINATION ${MEDCOUPLING_INSTALL_PYTHON})
+INSTALL(TARGETS _medcoupling DESTINATION ${MEDCOUPLING_INSTALL_PYTHON})
 INSTALL(FILES medcoupling.i medcoupling_pycode DESTINATION ${MEDCOUPLING_INSTALL_HEADERS})
 SALOME_INSTALL_SCRIPTS(${CMAKE_CURRENT_BINARY_DIR}/medcoupling.py ${MEDCOUPLING_INSTALL_PYTHON})
 

diff --git a/src/RENUMBER_Swig/MEDRenumberTest.py b/src/RENUMBER_Swig/MEDRenumberTest.py
index 8a826141ad9b20f8e0fb6a55d6aad91cad830418..f4bb200035695a4c66335a39cc86783b32f2a6a5 100644 (file)
--- a/src/RENUMBER_Swig/MEDRenumberTest.py
+++ b/src/RENUMBER_Swig/MEDRenumberTest.py
@@ -19,12 +19,17 @@
 
 from MEDRenumber import *
 import unittest
+import sys
 
 class MEDRenumberTest(unittest.TestCase):
 
     @unittest.skipUnless("BOOST" in RenumberAvailableMethods(),"requires BOOST prerequisite !")
     def test1(self):
-        from MEDCoupling import MEDCouplingCMesh
+        if sys.platform == "win32":
+            from MEDCouplingCompat import MEDCouplingCMesh
+        else:
+            from MEDCoupling import MEDCouplingCMesh
+
         ren=RenumberingFactory("BOOST")
         arr=DataArrayDouble(10) ; arr.iota()
         c=MEDCouplingCMesh() ; c.setCoords(arr,arr)

diff --git a/src/RENUMBER_Swig/UsersGuideExamplesTest.py b/src/RENUMBER_Swig/UsersGuideExamplesTest.py
index d61b6746f564e7e6dbff757d9bab0f44b969d401..6713ba7cabe1e94e741a08f7abd724e3f942b385 100644 (file)
--- a/src/RENUMBER_Swig/UsersGuideExamplesTest.py
+++ b/src/RENUMBER_Swig/UsersGuideExamplesTest.py
@@ -18,10 +18,19 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-from MEDCoupling import *
+import sys
+
+if sys.platform == "win32":
+    from MEDCouplingCompat import *
+else:
+    from MEDCoupling import *
+
 from math import pi, sqrt
 
-import MEDCoupling
+if sys.platform == "win32":
+    import MEDCouplingCompat as MEDCoupling
+else:
+    import MEDCoupling
 
 from MEDCouplingDataForTest import MEDCouplingDataForTest
 m=MEDCouplingDataForTest.build2DTargetMesh_1();
@@ -34,7 +43,6 @@ mrenum=m[n2o]
 #! [UG_Optimization_0]
 
 #! [UG_Optimization_1]
-from MEDCoupling import MEDCouplingSkyLineArray
 import MEDPartitioner
 # prepare a MEDPartitioner
 a,b=m.computeNeighborsOfCells()