From 59bf6285f97fe4f583c5dcc62e353cf967993d8e Mon Sep 17 00:00:00 2001
From: ludovic noels <l.noels@ulg.ac.be>
Date: Sun, 12 Nov 2017 18:29:49 +0100
Subject: [PATCH] propagate gmsh changes

---
 NonLinearSolver/CMakeLists.txt                         |  4 ++--
 cm3apps/install.txt                                    | 10 +++++-----
 cm3apps/nightly/cm3_nightly.ctest                      |  4 ++--
 dG3D/CMakeLists.txt                                    |  4 ++--
 dG3D/benchmarks/AnisotropicRandomField/Stoch_Sample.py |  2 +-
 dG3D/benchmarks/CG_Parallel_TET4/twoHole.py            |  2 +-
 dG3D/benchmarks/CohesiveBand_Plate/notchedPlate.py     |  2 +-
 dG3D/benchmarks/CohesiveBand_cube/cube.py              |  2 +-
 dG3D/benchmarks/CrackCompositeFailure/composite.py     |  2 +-
 .../composite.py                                       |  2 +-
 .../CrackCompositeFailurePRI6MPI/composite.py          |  2 +-
 .../composite.py                                       |  2 +-
 dG3D/benchmarks/DG_HEX8_PRI6/twoHole.py                |  2 +-
 dG3D/benchmarks/DG_PRI18/twoHole.py                    |  2 +-
 dG3D/benchmarks/DG_PRI6/twoHole.py                     |  2 +-
 dG3D/benchmarks/DG_PRI6_DiriToNeum/twoHole.py          |  2 +-
 dG3D/benchmarks/DG_PRI6_resetBC/twoHole.py             |  2 +-
 dG3D/benchmarks/DG_PRI6_smallStrain/twoHole.py         |  2 +-
 dG3D/benchmarks/DG_TET4/twoHole.py                     |  2 +-
 dG3D/benchmarks/Gurson_Cube/cube.py                    |  2 +-
 dG3D/benchmarks/Gurson_TwoHole/twoHole.py              |  2 +-
 dG3D/benchmarks/HighOrderElementCG/cubeTetCGStat.py    |  2 +-
 dG3D/benchmarks/HighOrderElementDG/cubeTetDGStat.py    |  2 +-
 .../HighOrderElementDGExpMPI/cubeTetDGExp.py           |  2 +-
 dG3D/benchmarks/J2plasticExtractCohesiveLaw/RVE1.py    |  2 +-
 dG3D/benchmarks/MFH_2EVP_Czarnota/cube.py              |  2 +-
 dG3D/benchmarks/MFH_EP_SEC/cube.py                     |  2 +-
 dG3D/benchmarks/MFH_EVP_Creep/cube.py                  |  2 +-
 dG3D/benchmarks/MFH_EVP_Cube/cube.py                   |  2 +-
 dG3D/benchmarks/MFH_EVP_Czarnota/cube.py               |  2 +-
 dG3D/benchmarks/MFH_EVP_Lahellec/cube.py               |  2 +-
 dG3D/benchmarks/MFH_EVP_Mercier/cube.py                |  2 +-
 dG3D/benchmarks/MFH_EVP_Pierard/cube.py                |  2 +-
 dG3D/benchmarks/MFH_FiniteStrain/cube.py               |  2 +-
 dG3D/benchmarks/MFH_Stoch_Ply/Stoch_Sample.py          |  2 +-
 .../PureThermoPBC/thermoMecPolycrystalCondensation.py  |  2 +-
 .../cubeTransverseAnisotropy.py                        |  2 +-
 .../TransverseAnisotropicCurvature/cubeAni.py          |  2 +-
 .../cubeTransverseAnisotropy.py                        |  2 +-
 .../cubeTransverseAnisotropy.py                        |  2 +-
 dG3D/benchmarks/axisymmetricNonLocalTest/model.py      |  2 +-
 dG3D/benchmarks/axisymmetricTest/model.py              |  2 +-
 dG3D/benchmarks/compRVE/RVE.py                         |  2 +-
 dG3D/benchmarks/compositeHyperDamage/Window.py         |  2 +-
 dG3D/benchmarks/compositeNonLocalRVECG/RVE.py          |  2 +-
 dG3D/benchmarks/compositeNonLocalRVEDG/RVE.py          |  2 +-
 dG3D/benchmarks/conden_ldbc/run.py                     |  2 +-
 dG3D/benchmarks/conden_ldbc_DG/run.py                  |  2 +-
 dG3D/benchmarks/conden_ldbc_SecondOrder/run.py         |  2 +-
 dG3D/benchmarks/conden_mixedBC_DG/run.py               |  2 +-
 dG3D/benchmarks/conden_mkbc/run.py                     |  2 +-
 dG3D/benchmarks/conden_mkbc_DG/run.py                  |  2 +-
 dG3D/benchmarks/conden_mkbc_SecondOrder/run.py         |  2 +-
 dG3D/benchmarks/conden_pbc/run.py                      |  2 +-
 dG3D/benchmarks/conden_pbc_SecondOrder/run.py          |  2 +-
 dG3D/benchmarks/conden_pbc_project/run.py              |  2 +-
 .../cylinderPlaneFrictionContact/cylinder.py           |  2 +-
 dG3D/benchmarks/elasticFE2/macro.py                    |  2 +-
 .../electroThermoLaminate/electroThermoLaminate.py     |  2 +-
 .../electroThermoLaminateFtFv/electroThermoLaminate.py |  2 +-
 dG3D/benchmarks/electroThermoSMP/electroThermoSMP.py   |  2 +-
 dG3D/benchmarks/fullThermoMecaMicro/run.py             |  2 +-
 dG3D/benchmarks/fullTwoField_PRI6/twoHole.py           |  2 +-
 dG3D/benchmarks/hyperViscoElastic/cylinder.py          |  2 +-
 dG3D/benchmarks/incrementalSecantTest/RVE1.py          |  2 +-
 dG3D/benchmarks/incrementalSecantTest2/RVE2.py         |  2 +-
 dG3D/benchmarks/interpolationPBC/idealHole.py          |  2 +-
 .../benchmarks/interpolationPBC_2DShifted/idealHole.py |  2 +-
 dG3D/benchmarks/interpolationPBC_FE1/idealHole.py      |  2 +-
 dG3D/benchmarks/interpolationPBC_FE2/idealHole.py      |  2 +-
 dG3D/benchmarks/interpolationPBC_Lagrange/idealHole.py |  2 +-
 .../interpolationPBC_SecondOrder/idealHole.py          |  2 +-
 .../idealHole.py                                       |  2 +-
 dG3D/benchmarks/microBC_reset/run.py                   |  2 +-
 dG3D/benchmarks/microNonLocalDamage/idealHole.py       |  2 +-
 dG3D/benchmarks/mixedmodeDelamination/delam.py         |  2 +-
 dG3D/benchmarks/mixedmodeDelaminationExpoLaw/delam.py  |  2 +-
 .../mixedmodeDelaminationPathFollowing/delam.py        |  2 +-
 dG3D/benchmarks/multiscale2DThermoMechanics/macro.py   |  2 +-
 dG3D/benchmarks/multiscaleAdhesiveTest2D/model.py      |  2 +-
 dG3D/benchmarks/multiscaleCohesiveTest2D/model.py      |  2 +-
 .../multiscaleCohesiveTest2D_fullDG/model.py           |  2 +-
 .../model.py                                           |  2 +-
 .../model.py                                           |  2 +-
 .../multiscaleCohesiveTest2D_fullDG_rotateRVE/model.py |  2 +-
 .../multiscaleCohesiveTest2D_fullDG_shiftedBC/model.py |  2 +-
 .../multiscaleCohesiveTest2D_mixedMode/model.py        |  2 +-
 .../model.py                                           |  2 +-
 .../multiscaleCohesiveTest2D_tangentByPert/model.py    |  2 +-
 .../multiscaleCohesiveTest2D_unloading/model.py        |  2 +-
 .../multiscaleCohesiveTest2D_unloadingElastic/model.py |  2 +-
 .../multiscaleDomNonMultiscaleDomInterface/model.py    |  2 +-
 dG3D/benchmarks/multiscaleEnforceCrackPath/model.py    |  2 +-
 dG3D/benchmarks/multiscaleEnhanceStrain/model.py       |  2 +-
 .../multiscale_1order_shearlayer/shearlayer.py         |  2 +-
 .../multiscale_2order_3Dsimple/multiscale.py           |  2 +-
 .../multiscale_2order_shearlayer/shearlayer.py         |  2 +-
 dG3D/benchmarks/multiscale_interface/model.py          |  2 +-
 dG3D/benchmarks/nonLinearMixedBC_2D/idealHole_mixBC.py |  2 +-
 .../idealHole_mixBC.py                                 |  2 +-
 .../nonLinearMixedBC_2D_withPBC/idealHole_mixBC.py     |  2 +-
 dG3D/benchmarks/nonLinearMixedBC_3D/idealHole_mixBC.py |  2 +-
 dG3D/benchmarks/nonLinearMixedBC_3D_SecondOrder/rve.py |  2 +-
 dG3D/benchmarks/nonLocalDamageMFH/RVESec.py            |  2 +-
 dG3D/benchmarks/nonLocalDamageMFHInc/RVEInc.py         |  2 +-
 dG3D/benchmarks/nonLocalDamageParallel/RVE.py          |  2 +-
 dG3D/benchmarks/nonLocalDamageToCrack/twoHole.py       |  2 +-
 dG3D/benchmarks/nonLocalElasticDamage/twoHole.py       |  2 +-
 dG3D/benchmarks/nonLocalJ2/twoHole.py                  |  2 +-
 dG3D/benchmarks/nonLocalJ2_Erosion/twoHole.py          |  2 +-
 .../cubeNonLocalJ2Hyper.py                             |  2 +-
 dG3D/benchmarks/nonLocalMFH/RVESuquet.py               |  2 +-
 dG3D/benchmarks/pathFollowing/arch3D.py                |  2 +-
 .../pathFollowingAutomaticIncrement/arch3D.py          |  2 +-
 dG3D/benchmarks/pathFollowingEnergyBased/arch3D.py     |  2 +-
 .../pathFollowingEnergyBased_plastic/arch3D.py         |  2 +-
 dG3D/benchmarks/pathFollowingMultiscale/model.py       |  2 +-
 dG3D/benchmarks/pathFollowing_TrueSnapback/twoHole.py  |  2 +-
 dG3D/benchmarks/pathFollowing_cohesive/model.py        |  2 +-
 dG3D/benchmarks/pathFollowing_snapback/twoHole.py      |  2 +-
 .../powerYieldViscoElastoPlastic/cylinder.py           |  2 +-
 .../powerYieldViscoElastoPlasticFullFailure/model.py   |  2 +-
 .../cylinder.py                                        |  2 +-
 .../secondOrderElasticShearlayer3D/shearlayer3D.py     |  2 +-
 dG3D/benchmarks/seebeck/seebeck.py                     |  2 +-
 dG3D/benchmarks/seebeckMPI/seebeck.py                  |  2 +-
 dG3D/benchmarks/shearTest_PBC/run.py                   |  2 +-
 dG3D/benchmarks/shiftedPBC_2D/idealHole_mixBC.py       |  2 +-
 dG3D/benchmarks/smpT22/SMP.py                          |  2 +-
 dG3D/benchmarks/smpT22Mechanism2/SMP.py                |  2 +-
 dG3D/benchmarks/smpT58/SMP.py                          |  2 +-
 dG3D/benchmarks/taylor/taylorTetDGDyn.py               |  2 +-
 dG3D/benchmarks/taylorMPI/taylorCG.py                  |  2 +-
 dG3D/benchmarks/thermoCylinder/cylindreLinearTM.py     |  2 +-
 dG3D/benchmarks/thermoFlux/cube_flux.py                |  2 +-
 dG3D/benchmarks/thermoMecPBC/thermoMecPolycrystal.py   |  2 +-
 .../thermoMecPolycrystalCondensation.py                |  2 +-
 .../thermoMecPolycrystalCondensation.py                |  2 +-
 .../thermoMecPolycrystalCondensation.py                |  2 +-
 .../thermoMecPBCPertElim/thermoMecPolycrystal.py       |  2 +-
 dG3D/benchmarks/thermomecSupport/supportFull.py        |  2 +-
 .../transverseAnisotropy/cubeTransverseAnisotropy.py   |  2 +-
 dG3D/benchmarks/twoField_HEX8_PRI6/twoHole.py          |  2 +-
 dG3D/benchmarks/twoField_PRI6/twoHole.py               |  2 +-
 dG3D/benchmarks/twoField_TET4/twoHole.py               |  2 +-
 dG3D/benchmarks/twoHole/twoHole.py                     |  2 +-
 dG3D/benchmarks/uniaxialTest_PBC/run.py                |  2 +-
 dgshell/CMakeLists.txt                                 |  4 ++--
 dgshell/benchmarks/MEMS/beam-9dom.py                   |  2 +-
 dgshell/benchmarks/MEMS/test.py                        |  2 +-
 dgshell/benchmarks/archshell/arch.py                   |  2 +-
 dgshell/benchmarks/beam/beam.py                        |  2 +-
 dgshell/benchmarks/beamfractureOrder3/beam.py          |  2 +-
 dgshell/benchmarks/cylinder/cylinder.py                |  2 +-
 dgshell/benchmarks/explicitBeam/beam.py                |  2 +-
 dgshell/benchmarks/explicitContactBeam/beam.py         |  2 +-
 dgshell/benchmarks/hemisphere/sphere.py                |  2 +-
 dgshell/benchmarks/implicitContactBeam/beam.py         |  2 +-
 dgshell/benchmarks/inter/beam.py                       |  2 +-
 dgshell/benchmarks/multiBeam/beam.py                   |  2 +-
 dgshell/benchmarks/multiBeamMPI/beam.py                |  2 +-
 dgshell/benchmarks/nlbeam/beam.py                      |  2 +-
 dgshell/benchmarks/plate/TwoOpposingEdgesClamped.py    |  2 +-
 dgshell/benchmarks/pressurizedCylinder/cylinder.py     |  2 +-
 dgshell/benchmarks/switch/beam.py                      |  2 +-
 dgshell/benchmarks/switchImplExpl/beam.py              |  2 +-
 166 files changed, 174 insertions(+), 174 deletions(-)

diff --git a/NonLinearSolver/CMakeLists.txt b/NonLinearSolver/CMakeLists.txt
index db97f69c6..1b6b991a3 100644
--- a/NonLinearSolver/CMakeLists.txt
+++ b/NonLinearSolver/CMakeLists.txt
@@ -91,10 +91,10 @@ materialLaw Domain BoundaryConditions nlTerms field space periodicBC restart nlm
 ${CMAKE_CURRENT_BINARY_DIR} $ENV{NLSMPIINC})
 
 # To have the possibility to use python function in the code
-if(ENABLE_WRAP_PYTHON_DEPRECATED)
+if(ENABLE_WRAP_PYTHON)
   include_directories(${PYTHON_INCLUDE_DIR})
   add_definitions(-DNLS_WITH_PYTHON)
-endif(ENABLE_WRAP_PYTHON_DEPRECATED)
+endif(ENABLE_WRAP_PYTHON)
 
 file(GLOB HDR RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.h)
 
diff --git a/cm3apps/install.txt b/cm3apps/install.txt
index d758caa99..4f616fd4c 100644
--- a/cm3apps/install.txt
+++ b/cm3apps/install.txt
@@ -280,7 +280,7 @@ alredy in your .bashrc
 	  export PATH=$PATH:$HOME/gmsh/projects/dG3D/release
 	  export PATH=$PATH:$HOME/gmsh/projects/dG3D/release/NonLinearSolver/gmsh
 
-	  export PYTHONPATH=$PYTHONPATH:$HOME/gmsh/projects/dG3D/release:$HOME/gmsh/projects/dG3D/release/NonLinearSolver/gmsh/wrappers
+	  export PYTHONPATH=$PYTHONPATH:$HOME/gmsh/projects/dG3D/release:$HOME/gmsh/projects/dG3D/release/NonLinearSolver/gmsh
      
           !!!! USE ENABLE_CXX11=OFF; for old version :in CMakeList of dG3D and NonLinearSolver, replate std=c++11 by std=c++0x to get set(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -DNONLOCALGMSH -std=c++0x")	
 	  !!!! if gmsh run error related to metis, compile gmsh without METIS
@@ -312,7 +312,7 @@ alredy in your .bashrc
 	  export PATH=$PATH:$HOME/gmsh/projects/dG3D/release
 	  export PATH=$PATH:$HOME/gmsh/projects/dG3D/release/NonLinearSolver/gmsh
 
-	  export PYTHONPATH=$PYTHONPATH:$HOME/gmsh/projects/dG3D/release:$HOME/gmsh/projects/dG3D/release/NonLinearSolver/gmsh/wrappers
+	  export PYTHONPATH=$PYTHONPATH:$HOME/gmsh/projects/dG3D/release:$HOME/gmsh/projects/dG3D/release/NonLinearSolver/gmsh
 
           !!!! USE ENABLE_CXX11=OFF; for old version : in CMakeList of dG3D and NonLinearSolver, replate std=c++11 by std=c++0x to get set(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -DNONLOCALGMSH -std=c++0x")
 
@@ -455,8 +455,8 @@ C) Now you can install your project(s) (dgshell and/or dG3D and/or msch), NonLin
               export PATH=$PATH:$HOME/cm3Libraries/dgshell/release/NonLinearSolver/gmsh
               export PATH=$PATH:$HOME/cm3Libraries/dG3D/debug/NonLinearSolver/gmsh
               export PATH=$PATH:$HOME/cm3Libraries/dG3D/release/NonLinearSolver/gmsh
-              export PYTHONPATH=$PYTHONPATH:$HOME/cm3Libraries/dgshell/release:$HOME/cm3Libraries/dgshell/release/dG3D:$HOME/cm3Libraries/dgshell/debug/NonLinearSolver/gmsh/wrappers:$HOME/cm3Libraries/dgshell/release/NonLinearSolver/gmsh/wrappers
-              export PYTHONPATH=$PYTHONPATH:$HOME/cm3Libraries/dG3D/release:$HOME/cm3Libraries/dG3D/debug:$HOME/cm3Libraries/dG3D/debug/NonLinearSolver/gmsh/wrappers:$HOME/cm3Libraries/dG3D/release/NonLinearSolver/gmsh/wrappers
+              export PYTHONPATH=$PYTHONPATH:$HOME/cm3Libraries/dgshell/release:$HOME/cm3Libraries/dgshell/release/dG3D:$HOME/cm3Libraries/dgshell/debug/NonLinearSolver/gmsh:$HOME/cm3Libraries/dgshell/release/NonLinearSolver/gmsh
+              export PYTHONPATH=$PYTHONPATH:$HOME/cm3Libraries/dG3D/release:$HOME/cm3Libraries/dG3D/debug:$HOME/cm3Libraries/dG3D/debug/NonLinearSolver/gmsh:$HOME/cm3Libraries/dG3D/release/NonLinearSolver/gmsh
 
           (reload bashrc)
             exit the terminal and loggin again (to reload your .bashrc file)
@@ -490,7 +490,7 @@ C) Now you can install your project(s) (dgshell and/or dG3D and/or msch), NonLin
              ENABLE_MUMPS=ON 
              ENABLE_NUMPY=ON 
              ENABLE_GMM=OFF 
-             ENABLE_WRAP_PYTHON_DEPRECATED=ON
+             ENABLE_WRAP_PYTHON=ON
 
              if you use cm3apps you have to put ON the projects you want to install (no projects install by default except the solver)
              ENABLE_DGSHELL = OFF/OFF
diff --git a/cm3apps/nightly/cm3_nightly.ctest b/cm3apps/nightly/cm3_nightly.ctest
index 9bef787e1..c61003f5d 100644
--- a/cm3apps/nightly/cm3_nightly.ctest
+++ b/cm3apps/nightly/cm3_nightly.ctest
@@ -40,7 +40,7 @@ set(CTEST_MFH_NAME "cm3MFH")
 set(CTEST_MFH_SOURCE_DIRECTORY "$ENV{HOME}/nightly_gmsh/${CTEST_MFH_NAME}")
 
 # options
-# cmake -DCMAKE_BUILD_TYPE:STRING=release -DENABLE_DGSHELL=ON -DENABLE_DG3D=ON  -DENABLE_MPI=ON -DENABLE_WRAP_PYTHON_DEPRECATED=ON -DDISABLE_WARNINGS=ON -DENABLE_NETGEN=OFF <compilation_dir>
+# cmake -DCMAKE_BUILD_TYPE:STRING=release -DENABLE_DGSHELL=ON -DENABLE_DG3D=ON  -DENABLE_MPI=ON -DENABLE_WRAP_PYTHON=ON -DDISABLE_WARNINGS=ON -DENABLE_NETGEN=OFF <compilation_dir>
 set(CTEST_CONFIGURE_COMMAND "${CTEST_CMAKE_COMMAND} -DCMAKE_BUILD_TYPE:STRING=${CTEST_BUILD_CONFIGURATION}")
 set(CTEST_CONFIGURE_COMMAND "${CTEST_CONFIGURE_COMMAND} -DENABLE_BUILD_DYNAMIC=ON")
 #set(CTEST_CONFIGURE_COMMAND "${CTEST_CONFIGURE_COMMAND} -DMPIEXEC=/usr/lib64/mpi/gcc/openmpi/bin/mpiexec")
@@ -48,7 +48,7 @@ set(CTEST_CONFIGURE_COMMAND "${CTEST_CONFIGURE_COMMAND} -DMPIEXEC=/usr/bin/mpiex
 set(CTEST_CONFIGURE_COMMAND "${CTEST_CONFIGURE_COMMAND} -DENABLE_DGSHELL=ON")
 set(CTEST_CONFIGURE_COMMAND "${CTEST_CONFIGURE_COMMAND} -DENABLE_DG3D=ON")
 set(CTEST_CONFIGURE_COMMAND "${CTEST_CONFIGURE_COMMAND} -DENABLE_MPI=ON")
-set(CTEST_CONFIGURE_COMMAND "${CTEST_CONFIGURE_COMMAND} -DENABLE_WRAP_PYTHON_DEPRECATED=ON")
+set(CTEST_CONFIGURE_COMMAND "${CTEST_CONFIGURE_COMMAND} -DENABLE_WRAP_PYTHON=ON")
 # segfault when cleaning if compile with netgen
 set(CTEST_CONFIGURE_COMMAND "${CTEST_CONFIGURE_COMMAND} -DENABLE_NETGEN=OFF")
 set(CTEST_CONFIGURE_COMMAND "${CTEST_CONFIGURE_COMMAND} \"${CTEST_CM3_SOURCE}\"")
diff --git a/dG3D/CMakeLists.txt b/dG3D/CMakeLists.txt
index 703d7bcbf..466046d8d 100644
--- a/dG3D/CMakeLists.txt
+++ b/dG3D/CMakeLists.txt
@@ -72,7 +72,7 @@ else()
   target_link_libraries(dG3D ${EXTERNAL_LIBRARIES} shared nlsolver)
 endif(INDEBUG AND NOT CM3APPS)
 
-if(ENABLE_WRAP_PYTHON_DEPRECATED)
+if(ENABLE_WRAP_PYTHON)
   find_package(SWIG REQUIRED)
   include(${SWIG_USE_FILE})
   find_package(PythonLibs)
@@ -88,5 +88,5 @@ if(ENABLE_WRAP_PYTHON_DEPRECATED)
     swig_link_libraries(${LIBDG3DNAME} ${PYTHON_LIBRARIES} dG3D)
   endif(INDEBUG AND NOT CM3APPS)
   add_custom_command(TARGET _${LIBDG3DNAME} PRE_BUILD COMMAND ${CMAKE_COMMAND} -E remove ${CMAKE_CURRENT_BINARY_DIR}/dG3DpyPYTHON_wrap.cxx)
-endif(ENABLE_WRAP_PYTHON_DEPRECATED)
+endif(ENABLE_WRAP_PYTHON)
 
diff --git a/dG3D/benchmarks/AnisotropicRandomField/Stoch_Sample.py b/dG3D/benchmarks/AnisotropicRandomField/Stoch_Sample.py
index 071f99409..3c2db25d6 100644
--- a/dG3D/benchmarks/AnisotropicRandomField/Stoch_Sample.py
+++ b/dG3D/benchmarks/AnisotropicRandomField/Stoch_Sample.py
@@ -1,7 +1,7 @@
 #coding-Utf-8-*-
 import numpy as npy
 import scipy as spy
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 import sys
 import pickle
diff --git a/dG3D/benchmarks/CG_Parallel_TET4/twoHole.py b/dG3D/benchmarks/CG_Parallel_TET4/twoHole.py
index e8bf1e707..78dd78bc8 100644
--- a/dG3D/benchmarks/CG_Parallel_TET4/twoHole.py
+++ b/dG3D/benchmarks/CG_Parallel_TET4/twoHole.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/CohesiveBand_Plate/notchedPlate.py b/dG3D/benchmarks/CohesiveBand_Plate/notchedPlate.py
index 2e17eb5a8..83b98b76c 100755
--- a/dG3D/benchmarks/CohesiveBand_Plate/notchedPlate.py
+++ b/dG3D/benchmarks/CohesiveBand_Plate/notchedPlate.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import*
+from gmsh.py import*
 #from dG3DpyDebug import*
 from dG3Dpy import*
 
diff --git a/dG3D/benchmarks/CohesiveBand_cube/cube.py b/dG3D/benchmarks/CohesiveBand_cube/cube.py
index bc7231082..2d962bed8 100755
--- a/dG3D/benchmarks/CohesiveBand_cube/cube.py
+++ b/dG3D/benchmarks/CohesiveBand_cube/cube.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import*
+from gmsh.py import*
 #from dG3DpyDebug import*
 from dG3Dpy import*
 
diff --git a/dG3D/benchmarks/CrackCompositeFailure/composite.py b/dG3D/benchmarks/CrackCompositeFailure/composite.py
index 68ee27b74..17b03eae4 100644
--- a/dG3D/benchmarks/CrackCompositeFailure/composite.py
+++ b/dG3D/benchmarks/CrackCompositeFailure/composite.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/CrackCompositeFailureHEX8MPI_forceIEBreakFirstIP/composite.py b/dG3D/benchmarks/CrackCompositeFailureHEX8MPI_forceIEBreakFirstIP/composite.py
index dbb0a3e93..e7f9de774 100644
--- a/dG3D/benchmarks/CrackCompositeFailureHEX8MPI_forceIEBreakFirstIP/composite.py
+++ b/dG3D/benchmarks/CrackCompositeFailureHEX8MPI_forceIEBreakFirstIP/composite.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/CrackCompositeFailurePRI6MPI/composite.py b/dG3D/benchmarks/CrackCompositeFailurePRI6MPI/composite.py
index 6c53ffa64..3196aa552 100644
--- a/dG3D/benchmarks/CrackCompositeFailurePRI6MPI/composite.py
+++ b/dG3D/benchmarks/CrackCompositeFailurePRI6MPI/composite.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/CrackCompositeFailurePRI6MPI_forceIEBreakFirstIP/composite.py b/dG3D/benchmarks/CrackCompositeFailurePRI6MPI_forceIEBreakFirstIP/composite.py
index 37918ecfa..0d39bc690 100644
--- a/dG3D/benchmarks/CrackCompositeFailurePRI6MPI_forceIEBreakFirstIP/composite.py
+++ b/dG3D/benchmarks/CrackCompositeFailurePRI6MPI_forceIEBreakFirstIP/composite.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/DG_HEX8_PRI6/twoHole.py b/dG3D/benchmarks/DG_HEX8_PRI6/twoHole.py
index f03d5b5ae..814cb7f74 100644
--- a/dG3D/benchmarks/DG_HEX8_PRI6/twoHole.py
+++ b/dG3D/benchmarks/DG_HEX8_PRI6/twoHole.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/DG_PRI18/twoHole.py b/dG3D/benchmarks/DG_PRI18/twoHole.py
index d231823c1..a64ab996a 100644
--- a/dG3D/benchmarks/DG_PRI18/twoHole.py
+++ b/dG3D/benchmarks/DG_PRI18/twoHole.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/DG_PRI6/twoHole.py b/dG3D/benchmarks/DG_PRI6/twoHole.py
index 1138e961d..967f1d813 100644
--- a/dG3D/benchmarks/DG_PRI6/twoHole.py
+++ b/dG3D/benchmarks/DG_PRI6/twoHole.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/DG_PRI6_DiriToNeum/twoHole.py b/dG3D/benchmarks/DG_PRI6_DiriToNeum/twoHole.py
index e3c452706..1f3faeec8 100644
--- a/dG3D/benchmarks/DG_PRI6_DiriToNeum/twoHole.py
+++ b/dG3D/benchmarks/DG_PRI6_DiriToNeum/twoHole.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/DG_PRI6_resetBC/twoHole.py b/dG3D/benchmarks/DG_PRI6_resetBC/twoHole.py
index bef45c3ef..e02e39fda 100644
--- a/dG3D/benchmarks/DG_PRI6_resetBC/twoHole.py
+++ b/dG3D/benchmarks/DG_PRI6_resetBC/twoHole.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/DG_PRI6_smallStrain/twoHole.py b/dG3D/benchmarks/DG_PRI6_smallStrain/twoHole.py
index b9454f503..e6bf91fec 100644
--- a/dG3D/benchmarks/DG_PRI6_smallStrain/twoHole.py
+++ b/dG3D/benchmarks/DG_PRI6_smallStrain/twoHole.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/DG_TET4/twoHole.py b/dG3D/benchmarks/DG_TET4/twoHole.py
index b69ed1efc..adfec9604 100644
--- a/dG3D/benchmarks/DG_TET4/twoHole.py
+++ b/dG3D/benchmarks/DG_TET4/twoHole.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/Gurson_Cube/cube.py b/dG3D/benchmarks/Gurson_Cube/cube.py
index ad528e935..9eef51f7c 100755
--- a/dG3D/benchmarks/Gurson_Cube/cube.py
+++ b/dG3D/benchmarks/Gurson_Cube/cube.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import*
+from gmsh.py import*
 #from dG3DpyDebug import*
 from dG3Dpy import*
 
diff --git a/dG3D/benchmarks/Gurson_TwoHole/twoHole.py b/dG3D/benchmarks/Gurson_TwoHole/twoHole.py
index f0f27614a..ef32971ba 100644
--- a/dG3D/benchmarks/Gurson_TwoHole/twoHole.py
+++ b/dG3D/benchmarks/Gurson_TwoHole/twoHole.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import*
+from gmsh.py import*
 #from dG3DpyDebug import*
 from dG3Dpy import*
 
diff --git a/dG3D/benchmarks/HighOrderElementCG/cubeTetCGStat.py b/dG3D/benchmarks/HighOrderElementCG/cubeTetCGStat.py
index 6e3e6f763..cbbdac939 100644
--- a/dG3D/benchmarks/HighOrderElementCG/cubeTetCGStat.py
+++ b/dG3D/benchmarks/HighOrderElementCG/cubeTetCGStat.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/HighOrderElementDG/cubeTetDGStat.py b/dG3D/benchmarks/HighOrderElementDG/cubeTetDGStat.py
index a0ddbcb46..3c91db659 100644
--- a/dG3D/benchmarks/HighOrderElementDG/cubeTetDGStat.py
+++ b/dG3D/benchmarks/HighOrderElementDG/cubeTetDGStat.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/HighOrderElementDGExpMPI/cubeTetDGExp.py b/dG3D/benchmarks/HighOrderElementDGExpMPI/cubeTetDGExp.py
index cbc76f31e..73264e0a4 100644
--- a/dG3D/benchmarks/HighOrderElementDGExpMPI/cubeTetDGExp.py
+++ b/dG3D/benchmarks/HighOrderElementDGExpMPI/cubeTetDGExp.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/J2plasticExtractCohesiveLaw/RVE1.py b/dG3D/benchmarks/J2plasticExtractCohesiveLaw/RVE1.py
index 6117ff499..41d152701 100644
--- a/dG3D/benchmarks/J2plasticExtractCohesiveLaw/RVE1.py
+++ b/dG3D/benchmarks/J2plasticExtractCohesiveLaw/RVE1.py
@@ -1,6 +1,6 @@
 #coding-Utf-8-*-
 
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/MFH_2EVP_Czarnota/cube.py b/dG3D/benchmarks/MFH_2EVP_Czarnota/cube.py
index 8247cd919..6edda898c 100644
--- a/dG3D/benchmarks/MFH_2EVP_Czarnota/cube.py
+++ b/dG3D/benchmarks/MFH_2EVP_Czarnota/cube.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 #from dG3DpyDebug import*
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/MFH_EP_SEC/cube.py b/dG3D/benchmarks/MFH_EP_SEC/cube.py
index d59f6d46e..fef5ff9a4 100644
--- a/dG3D/benchmarks/MFH_EP_SEC/cube.py
+++ b/dG3D/benchmarks/MFH_EP_SEC/cube.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 #from dG3DpyDebug import*
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/MFH_EVP_Creep/cube.py b/dG3D/benchmarks/MFH_EVP_Creep/cube.py
index 43280104d..eef6f9402 100644
--- a/dG3D/benchmarks/MFH_EVP_Creep/cube.py
+++ b/dG3D/benchmarks/MFH_EVP_Creep/cube.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 import shutil
 import os
diff --git a/dG3D/benchmarks/MFH_EVP_Cube/cube.py b/dG3D/benchmarks/MFH_EVP_Cube/cube.py
index 2075bcaca..5918f4822 100644
--- a/dG3D/benchmarks/MFH_EVP_Cube/cube.py
+++ b/dG3D/benchmarks/MFH_EVP_Cube/cube.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 #from dG3DpyDebug import*
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/MFH_EVP_Czarnota/cube.py b/dG3D/benchmarks/MFH_EVP_Czarnota/cube.py
index 5b6111d76..d8ef5a7e3 100644
--- a/dG3D/benchmarks/MFH_EVP_Czarnota/cube.py
+++ b/dG3D/benchmarks/MFH_EVP_Czarnota/cube.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 #from dG3DpyDebug import*
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/MFH_EVP_Lahellec/cube.py b/dG3D/benchmarks/MFH_EVP_Lahellec/cube.py
index d8edc15a1..204f57cc2 100644
--- a/dG3D/benchmarks/MFH_EVP_Lahellec/cube.py
+++ b/dG3D/benchmarks/MFH_EVP_Lahellec/cube.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 #from dG3DpyDebug import*
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/MFH_EVP_Mercier/cube.py b/dG3D/benchmarks/MFH_EVP_Mercier/cube.py
index 23f7192eb..0f9404c6e 100644
--- a/dG3D/benchmarks/MFH_EVP_Mercier/cube.py
+++ b/dG3D/benchmarks/MFH_EVP_Mercier/cube.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 #from dG3DpyDebug import*
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/MFH_EVP_Pierard/cube.py b/dG3D/benchmarks/MFH_EVP_Pierard/cube.py
index f1222211f..54533beb1 100644
--- a/dG3D/benchmarks/MFH_EVP_Pierard/cube.py
+++ b/dG3D/benchmarks/MFH_EVP_Pierard/cube.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 #from dG3DpyDebug import*
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/MFH_FiniteStrain/cube.py b/dG3D/benchmarks/MFH_FiniteStrain/cube.py
index 821e3e44e..bc4dc07c1 100644
--- a/dG3D/benchmarks/MFH_FiniteStrain/cube.py
+++ b/dG3D/benchmarks/MFH_FiniteStrain/cube.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 #from dG3DpyDebug import*
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/MFH_Stoch_Ply/Stoch_Sample.py b/dG3D/benchmarks/MFH_Stoch_Ply/Stoch_Sample.py
index e26f33bc2..2c55e6599 100644
--- a/dG3D/benchmarks/MFH_Stoch_Ply/Stoch_Sample.py
+++ b/dG3D/benchmarks/MFH_Stoch_Ply/Stoch_Sample.py
@@ -1,7 +1,7 @@
 #coding-Utf-8-*-
 import numpy as npy
 import scipy as spy
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 import sys
 import pickle
diff --git a/dG3D/benchmarks/PureThermoPBC/thermoMecPolycrystalCondensation.py b/dG3D/benchmarks/PureThermoPBC/thermoMecPolycrystalCondensation.py
index 0e51f692e..77e64e324 100644
--- a/dG3D/benchmarks/PureThermoPBC/thermoMecPolycrystalCondensation.py
+++ b/dG3D/benchmarks/PureThermoPBC/thermoMecPolycrystalCondensation.py
@@ -2,7 +2,7 @@
 import numpy as npy
 import scipy as spy
 #import matplotlib
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import *
 import os
 import sys
diff --git a/dG3D/benchmarks/TransverseAnisotropicCZM/cubeTransverseAnisotropy.py b/dG3D/benchmarks/TransverseAnisotropicCZM/cubeTransverseAnisotropy.py
index 161c0f58a..624ca734c 100644
--- a/dG3D/benchmarks/TransverseAnisotropicCZM/cubeTransverseAnisotropy.py
+++ b/dG3D/benchmarks/TransverseAnisotropicCZM/cubeTransverseAnisotropy.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/TransverseAnisotropicCurvature/cubeAni.py b/dG3D/benchmarks/TransverseAnisotropicCurvature/cubeAni.py
index 3604e1d4c..73815815f 100644
--- a/dG3D/benchmarks/TransverseAnisotropicCurvature/cubeAni.py
+++ b/dG3D/benchmarks/TransverseAnisotropicCurvature/cubeAni.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/TransverseAnisotropicCurvatureCZM/cubeTransverseAnisotropy.py b/dG3D/benchmarks/TransverseAnisotropicCurvatureCZM/cubeTransverseAnisotropy.py
index fce990842..bb947bba9 100644
--- a/dG3D/benchmarks/TransverseAnisotropicCurvatureCZM/cubeTransverseAnisotropy.py
+++ b/dG3D/benchmarks/TransverseAnisotropicCurvatureCZM/cubeTransverseAnisotropy.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/TransverseAnisotropicThermoMec/cubeTransverseAnisotropy.py b/dG3D/benchmarks/TransverseAnisotropicThermoMec/cubeTransverseAnisotropy.py
index b4f02b7ec..556dd562b 100644
--- a/dG3D/benchmarks/TransverseAnisotropicThermoMec/cubeTransverseAnisotropy.py
+++ b/dG3D/benchmarks/TransverseAnisotropicThermoMec/cubeTransverseAnisotropy.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with Debuga python script
diff --git a/dG3D/benchmarks/axisymmetricNonLocalTest/model.py b/dG3D/benchmarks/axisymmetricNonLocalTest/model.py
index 187718551..f14bb1d02 100644
--- a/dG3D/benchmarks/axisymmetricNonLocalTest/model.py
+++ b/dG3D/benchmarks/axisymmetricNonLocalTest/model.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/axisymmetricTest/model.py b/dG3D/benchmarks/axisymmetricTest/model.py
index 06d5dd90c..74786f426 100644
--- a/dG3D/benchmarks/axisymmetricTest/model.py
+++ b/dG3D/benchmarks/axisymmetricTest/model.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/compRVE/RVE.py b/dG3D/benchmarks/compRVE/RVE.py
index 65c132d23..2668d82cd 100644
--- a/dG3D/benchmarks/compRVE/RVE.py
+++ b/dG3D/benchmarks/compRVE/RVE.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 #from dG3DpyDebug import*
 from dG3Dpy import*
 
diff --git a/dG3D/benchmarks/compositeHyperDamage/Window.py b/dG3D/benchmarks/compositeHyperDamage/Window.py
index c7494cd4a..7f044b19e 100644
--- a/dG3D/benchmarks/compositeHyperDamage/Window.py
+++ b/dG3D/benchmarks/compositeHyperDamage/Window.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/compositeNonLocalRVECG/RVE.py b/dG3D/benchmarks/compositeNonLocalRVECG/RVE.py
index baf166a6d..e658bfea2 100644
--- a/dG3D/benchmarks/compositeNonLocalRVECG/RVE.py
+++ b/dG3D/benchmarks/compositeNonLocalRVECG/RVE.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 #from dG3DpyDebug import*
 
diff --git a/dG3D/benchmarks/compositeNonLocalRVEDG/RVE.py b/dG3D/benchmarks/compositeNonLocalRVEDG/RVE.py
index 3f12563c0..c167438c1 100644
--- a/dG3D/benchmarks/compositeNonLocalRVEDG/RVE.py
+++ b/dG3D/benchmarks/compositeNonLocalRVEDG/RVE.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 #from dG3DpyDebug import*
 
diff --git a/dG3D/benchmarks/conden_ldbc/run.py b/dG3D/benchmarks/conden_ldbc/run.py
index 34a4e0ef9..b7efc28a3 100644
--- a/dG3D/benchmarks/conden_ldbc/run.py
+++ b/dG3D/benchmarks/conden_ldbc/run.py
@@ -1,6 +1,6 @@
 #coding-Utf-8-*-
 
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/conden_ldbc_DG/run.py b/dG3D/benchmarks/conden_ldbc_DG/run.py
index 33f4fba69..ed6806938 100644
--- a/dG3D/benchmarks/conden_ldbc_DG/run.py
+++ b/dG3D/benchmarks/conden_ldbc_DG/run.py
@@ -1,6 +1,6 @@
 #coding-Utf-8-*-
 
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/conden_ldbc_SecondOrder/run.py b/dG3D/benchmarks/conden_ldbc_SecondOrder/run.py
index 89aad7710..971c12f85 100644
--- a/dG3D/benchmarks/conden_ldbc_SecondOrder/run.py
+++ b/dG3D/benchmarks/conden_ldbc_SecondOrder/run.py
@@ -1,6 +1,6 @@
 #coding-Utf-8-*-
 
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/conden_mixedBC_DG/run.py b/dG3D/benchmarks/conden_mixedBC_DG/run.py
index beb27d66f..f33b4511d 100644
--- a/dG3D/benchmarks/conden_mixedBC_DG/run.py
+++ b/dG3D/benchmarks/conden_mixedBC_DG/run.py
@@ -1,6 +1,6 @@
 #coding-Utf-8-*-
 
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/conden_mkbc/run.py b/dG3D/benchmarks/conden_mkbc/run.py
index 582011e1f..84739f196 100644
--- a/dG3D/benchmarks/conden_mkbc/run.py
+++ b/dG3D/benchmarks/conden_mkbc/run.py
@@ -1,6 +1,6 @@
 #coding-Utf-8-*-
 
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/conden_mkbc_DG/run.py b/dG3D/benchmarks/conden_mkbc_DG/run.py
index 729626c8b..121a60d14 100644
--- a/dG3D/benchmarks/conden_mkbc_DG/run.py
+++ b/dG3D/benchmarks/conden_mkbc_DG/run.py
@@ -1,6 +1,6 @@
 #coding-Utf-8-*-
 
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/conden_mkbc_SecondOrder/run.py b/dG3D/benchmarks/conden_mkbc_SecondOrder/run.py
index 3079029c2..e7487c6a8 100644
--- a/dG3D/benchmarks/conden_mkbc_SecondOrder/run.py
+++ b/dG3D/benchmarks/conden_mkbc_SecondOrder/run.py
@@ -1,6 +1,6 @@
 #coding-Utf-8-*-
 
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/conden_pbc/run.py b/dG3D/benchmarks/conden_pbc/run.py
index 8a72e1aea..807f665ec 100644
--- a/dG3D/benchmarks/conden_pbc/run.py
+++ b/dG3D/benchmarks/conden_pbc/run.py
@@ -1,6 +1,6 @@
 #coding-Utf-8-*-
 
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/conden_pbc_SecondOrder/run.py b/dG3D/benchmarks/conden_pbc_SecondOrder/run.py
index 116bcaa3c..401343175 100644
--- a/dG3D/benchmarks/conden_pbc_SecondOrder/run.py
+++ b/dG3D/benchmarks/conden_pbc_SecondOrder/run.py
@@ -1,6 +1,6 @@
 #coding-Utf-8-*-
 
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 
diff --git a/dG3D/benchmarks/conden_pbc_project/run.py b/dG3D/benchmarks/conden_pbc_project/run.py
index c8b9f12cd..557e46bb5 100644
--- a/dG3D/benchmarks/conden_pbc_project/run.py
+++ b/dG3D/benchmarks/conden_pbc_project/run.py
@@ -1,6 +1,6 @@
 #coding-Utf-8-*-
 
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/cylinderPlaneFrictionContact/cylinder.py b/dG3D/benchmarks/cylinderPlaneFrictionContact/cylinder.py
index f261602f1..906b02fb5 100644
--- a/dG3D/benchmarks/cylinderPlaneFrictionContact/cylinder.py
+++ b/dG3D/benchmarks/cylinderPlaneFrictionContact/cylinder.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/elasticFE2/macro.py b/dG3D/benchmarks/elasticFE2/macro.py
index cbb45e859..06734521c 100644
--- a/dG3D/benchmarks/elasticFE2/macro.py
+++ b/dG3D/benchmarks/elasticFE2/macro.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/electroThermoLaminate/electroThermoLaminate.py b/dG3D/benchmarks/electroThermoLaminate/electroThermoLaminate.py
index 2a964abbf..6831186d0 100644
--- a/dG3D/benchmarks/electroThermoLaminate/electroThermoLaminate.py
+++ b/dG3D/benchmarks/electroThermoLaminate/electroThermoLaminate.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 
 #from dG3DpyDebug import*
 from dG3Dpy import*
diff --git a/dG3D/benchmarks/electroThermoLaminateFtFv/electroThermoLaminate.py b/dG3D/benchmarks/electroThermoLaminateFtFv/electroThermoLaminate.py
index 4c8628503..f474d8a11 100644
--- a/dG3D/benchmarks/electroThermoLaminateFtFv/electroThermoLaminate.py
+++ b/dG3D/benchmarks/electroThermoLaminateFtFv/electroThermoLaminate.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 
 #from dG3DpyDebug import*
 from dG3Dpy import*
diff --git a/dG3D/benchmarks/electroThermoSMP/electroThermoSMP.py b/dG3D/benchmarks/electroThermoSMP/electroThermoSMP.py
index 622be8b52..1253b4c26 100644
--- a/dG3D/benchmarks/electroThermoSMP/electroThermoSMP.py
+++ b/dG3D/benchmarks/electroThermoSMP/electroThermoSMP.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 
 #from dG3DpyDebug import*
 from dG3Dpy import *
diff --git a/dG3D/benchmarks/fullThermoMecaMicro/run.py b/dG3D/benchmarks/fullThermoMecaMicro/run.py
index 708824c6b..f70f43e61 100644
--- a/dG3D/benchmarks/fullThermoMecaMicro/run.py
+++ b/dG3D/benchmarks/fullThermoMecaMicro/run.py
@@ -1,6 +1,6 @@
 #coding-Utf-8-*-
 
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/fullTwoField_PRI6/twoHole.py b/dG3D/benchmarks/fullTwoField_PRI6/twoHole.py
index b69736b99..88123ad09 100644
--- a/dG3D/benchmarks/fullTwoField_PRI6/twoHole.py
+++ b/dG3D/benchmarks/fullTwoField_PRI6/twoHole.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/hyperViscoElastic/cylinder.py b/dG3D/benchmarks/hyperViscoElastic/cylinder.py
index d0093db7d..17a87e301 100644
--- a/dG3D/benchmarks/hyperViscoElastic/cylinder.py
+++ b/dG3D/benchmarks/hyperViscoElastic/cylinder.py
@@ -1,6 +1,6 @@
 #coding-Utf-8-*-
 
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 from math import*
diff --git a/dG3D/benchmarks/incrementalSecantTest/RVE1.py b/dG3D/benchmarks/incrementalSecantTest/RVE1.py
index 385fcb497..a4402cb97 100644
--- a/dG3D/benchmarks/incrementalSecantTest/RVE1.py
+++ b/dG3D/benchmarks/incrementalSecantTest/RVE1.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 #from dG3DpyDebug import*
 
diff --git a/dG3D/benchmarks/incrementalSecantTest2/RVE2.py b/dG3D/benchmarks/incrementalSecantTest2/RVE2.py
index 0964e80dc..589d9af3f 100644
--- a/dG3D/benchmarks/incrementalSecantTest2/RVE2.py
+++ b/dG3D/benchmarks/incrementalSecantTest2/RVE2.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 #from dG3DpyDebug import*
 
diff --git a/dG3D/benchmarks/interpolationPBC/idealHole.py b/dG3D/benchmarks/interpolationPBC/idealHole.py
index c1b30d474..efb586718 100644
--- a/dG3D/benchmarks/interpolationPBC/idealHole.py
+++ b/dG3D/benchmarks/interpolationPBC/idealHole.py
@@ -1,6 +1,6 @@
 #coding-Utf-8-*-
 
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/interpolationPBC_2DShifted/idealHole.py b/dG3D/benchmarks/interpolationPBC_2DShifted/idealHole.py
index 59db9c999..ad26eacf0 100644
--- a/dG3D/benchmarks/interpolationPBC_2DShifted/idealHole.py
+++ b/dG3D/benchmarks/interpolationPBC_2DShifted/idealHole.py
@@ -1,6 +1,6 @@
 #coding-Utf-8-*-
 
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 from math import*
 
diff --git a/dG3D/benchmarks/interpolationPBC_FE1/idealHole.py b/dG3D/benchmarks/interpolationPBC_FE1/idealHole.py
index d0ea28e7e..6af0df613 100644
--- a/dG3D/benchmarks/interpolationPBC_FE1/idealHole.py
+++ b/dG3D/benchmarks/interpolationPBC_FE1/idealHole.py
@@ -1,6 +1,6 @@
 #coding-Utf-8-*-
 
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/interpolationPBC_FE2/idealHole.py b/dG3D/benchmarks/interpolationPBC_FE2/idealHole.py
index 96c95e8c8..567569598 100644
--- a/dG3D/benchmarks/interpolationPBC_FE2/idealHole.py
+++ b/dG3D/benchmarks/interpolationPBC_FE2/idealHole.py
@@ -1,6 +1,6 @@
 #coding-Utf-8-*-
 
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/interpolationPBC_Lagrange/idealHole.py b/dG3D/benchmarks/interpolationPBC_Lagrange/idealHole.py
index 3082f227c..85202c56d 100644
--- a/dG3D/benchmarks/interpolationPBC_Lagrange/idealHole.py
+++ b/dG3D/benchmarks/interpolationPBC_Lagrange/idealHole.py
@@ -1,6 +1,6 @@
 #coding-Utf-8-*-
 
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/interpolationPBC_SecondOrder/idealHole.py b/dG3D/benchmarks/interpolationPBC_SecondOrder/idealHole.py
index cf26e3e97..f305bd969 100644
--- a/dG3D/benchmarks/interpolationPBC_SecondOrder/idealHole.py
+++ b/dG3D/benchmarks/interpolationPBC_SecondOrder/idealHole.py
@@ -1,6 +1,6 @@
 #coding-Utf-8-*-
 
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/interpolationPBC_SecondOrder_insysElim/idealHole.py b/dG3D/benchmarks/interpolationPBC_SecondOrder_insysElim/idealHole.py
index 76525178e..8174c4369 100644
--- a/dG3D/benchmarks/interpolationPBC_SecondOrder_insysElim/idealHole.py
+++ b/dG3D/benchmarks/interpolationPBC_SecondOrder_insysElim/idealHole.py
@@ -1,6 +1,6 @@
 #coding-Utf-8-*-
 
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/microBC_reset/run.py b/dG3D/benchmarks/microBC_reset/run.py
index bf4ed24ac..a4328a0da 100644
--- a/dG3D/benchmarks/microBC_reset/run.py
+++ b/dG3D/benchmarks/microBC_reset/run.py
@@ -1,6 +1,6 @@
 #coding-Utf-8-*-
 
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/microNonLocalDamage/idealHole.py b/dG3D/benchmarks/microNonLocalDamage/idealHole.py
index 2a7627184..b31d9a878 100644
--- a/dG3D/benchmarks/microNonLocalDamage/idealHole.py
+++ b/dG3D/benchmarks/microNonLocalDamage/idealHole.py
@@ -1,6 +1,6 @@
 #coding-Utf-8-*-
 
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/mixedmodeDelamination/delam.py b/dG3D/benchmarks/mixedmodeDelamination/delam.py
index ace750b1a..5a1934122 100644
--- a/dG3D/benchmarks/mixedmodeDelamination/delam.py
+++ b/dG3D/benchmarks/mixedmodeDelamination/delam.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/mixedmodeDelaminationExpoLaw/delam.py b/dG3D/benchmarks/mixedmodeDelaminationExpoLaw/delam.py
index 7dd189094..5dd08ee27 100644
--- a/dG3D/benchmarks/mixedmodeDelaminationExpoLaw/delam.py
+++ b/dG3D/benchmarks/mixedmodeDelaminationExpoLaw/delam.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/mixedmodeDelaminationPathFollowing/delam.py b/dG3D/benchmarks/mixedmodeDelaminationPathFollowing/delam.py
index f0724963f..69c6136dc 100644
--- a/dG3D/benchmarks/mixedmodeDelaminationPathFollowing/delam.py
+++ b/dG3D/benchmarks/mixedmodeDelaminationPathFollowing/delam.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/multiscale2DThermoMechanics/macro.py b/dG3D/benchmarks/multiscale2DThermoMechanics/macro.py
index 6530aaaa6..32dfeecac 100644
--- a/dG3D/benchmarks/multiscale2DThermoMechanics/macro.py
+++ b/dG3D/benchmarks/multiscale2DThermoMechanics/macro.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/multiscaleAdhesiveTest2D/model.py b/dG3D/benchmarks/multiscaleAdhesiveTest2D/model.py
index cb39d0975..bb9015ff3 100644
--- a/dG3D/benchmarks/multiscaleAdhesiveTest2D/model.py
+++ b/dG3D/benchmarks/multiscaleAdhesiveTest2D/model.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/multiscaleCohesiveTest2D/model.py b/dG3D/benchmarks/multiscaleCohesiveTest2D/model.py
index 1a8975abe..98e721f59 100644
--- a/dG3D/benchmarks/multiscaleCohesiveTest2D/model.py
+++ b/dG3D/benchmarks/multiscaleCohesiveTest2D/model.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/multiscaleCohesiveTest2D_fullDG/model.py b/dG3D/benchmarks/multiscaleCohesiveTest2D_fullDG/model.py
index 9a9fdb676..8d287e94f 100644
--- a/dG3D/benchmarks/multiscaleCohesiveTest2D_fullDG/model.py
+++ b/dG3D/benchmarks/multiscaleCohesiveTest2D_fullDG/model.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/multiscaleCohesiveTest2D_fullDG_changeBCAfterFailure/model.py b/dG3D/benchmarks/multiscaleCohesiveTest2D_fullDG_changeBCAfterFailure/model.py
index 792eef93a..64f0c1e51 100644
--- a/dG3D/benchmarks/multiscaleCohesiveTest2D_fullDG_changeBCAfterFailure/model.py
+++ b/dG3D/benchmarks/multiscaleCohesiveTest2D_fullDG_changeBCAfterFailure/model.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/multiscaleCohesiveTest2D_fullDG_microPathFollowing/model.py b/dG3D/benchmarks/multiscaleCohesiveTest2D_fullDG_microPathFollowing/model.py
index 965bfa6f6..91e08d0e9 100644
--- a/dG3D/benchmarks/multiscaleCohesiveTest2D_fullDG_microPathFollowing/model.py
+++ b/dG3D/benchmarks/multiscaleCohesiveTest2D_fullDG_microPathFollowing/model.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/multiscaleCohesiveTest2D_fullDG_rotateRVE/model.py b/dG3D/benchmarks/multiscaleCohesiveTest2D_fullDG_rotateRVE/model.py
index 1d4f0a51c..cd6f525b6 100644
--- a/dG3D/benchmarks/multiscaleCohesiveTest2D_fullDG_rotateRVE/model.py
+++ b/dG3D/benchmarks/multiscaleCohesiveTest2D_fullDG_rotateRVE/model.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/multiscaleCohesiveTest2D_fullDG_shiftedBC/model.py b/dG3D/benchmarks/multiscaleCohesiveTest2D_fullDG_shiftedBC/model.py
index 09358fd25..8e1c50f6a 100644
--- a/dG3D/benchmarks/multiscaleCohesiveTest2D_fullDG_shiftedBC/model.py
+++ b/dG3D/benchmarks/multiscaleCohesiveTest2D_fullDG_shiftedBC/model.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/multiscaleCohesiveTest2D_mixedMode/model.py b/dG3D/benchmarks/multiscaleCohesiveTest2D_mixedMode/model.py
index 71d4cbd51..f56ed4abd 100644
--- a/dG3D/benchmarks/multiscaleCohesiveTest2D_mixedMode/model.py
+++ b/dG3D/benchmarks/multiscaleCohesiveTest2D_mixedMode/model.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/multiscaleCohesiveTest2D_mixedMode_compression/model.py b/dG3D/benchmarks/multiscaleCohesiveTest2D_mixedMode_compression/model.py
index ae147bc79..e45c8b075 100644
--- a/dG3D/benchmarks/multiscaleCohesiveTest2D_mixedMode_compression/model.py
+++ b/dG3D/benchmarks/multiscaleCohesiveTest2D_mixedMode_compression/model.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/multiscaleCohesiveTest2D_tangentByPert/model.py b/dG3D/benchmarks/multiscaleCohesiveTest2D_tangentByPert/model.py
index 6d022582c..a85a4a0ce 100644
--- a/dG3D/benchmarks/multiscaleCohesiveTest2D_tangentByPert/model.py
+++ b/dG3D/benchmarks/multiscaleCohesiveTest2D_tangentByPert/model.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/multiscaleCohesiveTest2D_unloading/model.py b/dG3D/benchmarks/multiscaleCohesiveTest2D_unloading/model.py
index 6faf6de9c..257ec2238 100644
--- a/dG3D/benchmarks/multiscaleCohesiveTest2D_unloading/model.py
+++ b/dG3D/benchmarks/multiscaleCohesiveTest2D_unloading/model.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/multiscaleCohesiveTest2D_unloadingElastic/model.py b/dG3D/benchmarks/multiscaleCohesiveTest2D_unloadingElastic/model.py
index 596affe92..3f4a53ba3 100644
--- a/dG3D/benchmarks/multiscaleCohesiveTest2D_unloadingElastic/model.py
+++ b/dG3D/benchmarks/multiscaleCohesiveTest2D_unloadingElastic/model.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/multiscaleDomNonMultiscaleDomInterface/model.py b/dG3D/benchmarks/multiscaleDomNonMultiscaleDomInterface/model.py
index 59b64004f..d240416a0 100644
--- a/dG3D/benchmarks/multiscaleDomNonMultiscaleDomInterface/model.py
+++ b/dG3D/benchmarks/multiscaleDomNonMultiscaleDomInterface/model.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 #from dG3DpyDebug import*
 
diff --git a/dG3D/benchmarks/multiscaleEnforceCrackPath/model.py b/dG3D/benchmarks/multiscaleEnforceCrackPath/model.py
index 43ab8b5d9..f01a0ede2 100644
--- a/dG3D/benchmarks/multiscaleEnforceCrackPath/model.py
+++ b/dG3D/benchmarks/multiscaleEnforceCrackPath/model.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/multiscaleEnhanceStrain/model.py b/dG3D/benchmarks/multiscaleEnhanceStrain/model.py
index bdb2b95d3..3fd46441c 100644
--- a/dG3D/benchmarks/multiscaleEnhanceStrain/model.py
+++ b/dG3D/benchmarks/multiscaleEnhanceStrain/model.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/multiscale_1order_shearlayer/shearlayer.py b/dG3D/benchmarks/multiscale_1order_shearlayer/shearlayer.py
index 63a3e3834..942399976 100644
--- a/dG3D/benchmarks/multiscale_1order_shearlayer/shearlayer.py
+++ b/dG3D/benchmarks/multiscale_1order_shearlayer/shearlayer.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/multiscale_2order_3Dsimple/multiscale.py b/dG3D/benchmarks/multiscale_2order_3Dsimple/multiscale.py
index ea0e2c74b..a08a32564 100644
--- a/dG3D/benchmarks/multiscale_2order_3Dsimple/multiscale.py
+++ b/dG3D/benchmarks/multiscale_2order_3Dsimple/multiscale.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/multiscale_2order_shearlayer/shearlayer.py b/dG3D/benchmarks/multiscale_2order_shearlayer/shearlayer.py
index f9fedfea1..953e3c003 100644
--- a/dG3D/benchmarks/multiscale_2order_shearlayer/shearlayer.py
+++ b/dG3D/benchmarks/multiscale_2order_shearlayer/shearlayer.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/multiscale_interface/model.py b/dG3D/benchmarks/multiscale_interface/model.py
index b4dfbeb25..d9edb4ecf 100644
--- a/dG3D/benchmarks/multiscale_interface/model.py
+++ b/dG3D/benchmarks/multiscale_interface/model.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/nonLinearMixedBC_2D/idealHole_mixBC.py b/dG3D/benchmarks/nonLinearMixedBC_2D/idealHole_mixBC.py
index 3a83ec32b..8ce6581a9 100644
--- a/dG3D/benchmarks/nonLinearMixedBC_2D/idealHole_mixBC.py
+++ b/dG3D/benchmarks/nonLinearMixedBC_2D/idealHole_mixBC.py
@@ -1,6 +1,6 @@
 #coding-Utf-8-*-
 
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/nonLinearMixedBC_2D_DirectionFollowing/idealHole_mixBC.py b/dG3D/benchmarks/nonLinearMixedBC_2D_DirectionFollowing/idealHole_mixBC.py
index 55f919f2b..e4ad91c44 100644
--- a/dG3D/benchmarks/nonLinearMixedBC_2D_DirectionFollowing/idealHole_mixBC.py
+++ b/dG3D/benchmarks/nonLinearMixedBC_2D_DirectionFollowing/idealHole_mixBC.py
@@ -1,6 +1,6 @@
 #coding-Utf-8-*-
 
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 from math import*
 
diff --git a/dG3D/benchmarks/nonLinearMixedBC_2D_withPBC/idealHole_mixBC.py b/dG3D/benchmarks/nonLinearMixedBC_2D_withPBC/idealHole_mixBC.py
index ab21149c2..6fec1f2ca 100644
--- a/dG3D/benchmarks/nonLinearMixedBC_2D_withPBC/idealHole_mixBC.py
+++ b/dG3D/benchmarks/nonLinearMixedBC_2D_withPBC/idealHole_mixBC.py
@@ -1,6 +1,6 @@
 #coding-Utf-8-*-
 
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/nonLinearMixedBC_3D/idealHole_mixBC.py b/dG3D/benchmarks/nonLinearMixedBC_3D/idealHole_mixBC.py
index 05d5f2664..d745b5511 100644
--- a/dG3D/benchmarks/nonLinearMixedBC_3D/idealHole_mixBC.py
+++ b/dG3D/benchmarks/nonLinearMixedBC_3D/idealHole_mixBC.py
@@ -1,6 +1,6 @@
 #coding-Utf-8-*-
 
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/nonLinearMixedBC_3D_SecondOrder/rve.py b/dG3D/benchmarks/nonLinearMixedBC_3D_SecondOrder/rve.py
index adf2d2bf9..1ec631cee 100644
--- a/dG3D/benchmarks/nonLinearMixedBC_3D_SecondOrder/rve.py
+++ b/dG3D/benchmarks/nonLinearMixedBC_3D_SecondOrder/rve.py
@@ -1,6 +1,6 @@
 #coding-Utf-8-*-
 
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/nonLocalDamageMFH/RVESec.py b/dG3D/benchmarks/nonLocalDamageMFH/RVESec.py
index 94fe7dce0..3f254d3cc 100644
--- a/dG3D/benchmarks/nonLocalDamageMFH/RVESec.py
+++ b/dG3D/benchmarks/nonLocalDamageMFH/RVESec.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 #from dG3DpyDebug import*
 
diff --git a/dG3D/benchmarks/nonLocalDamageMFHInc/RVEInc.py b/dG3D/benchmarks/nonLocalDamageMFHInc/RVEInc.py
index c02e7ae3d..cae4257b8 100644
--- a/dG3D/benchmarks/nonLocalDamageMFHInc/RVEInc.py
+++ b/dG3D/benchmarks/nonLocalDamageMFHInc/RVEInc.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 #from dG3DpyDebug import*
 
diff --git a/dG3D/benchmarks/nonLocalDamageParallel/RVE.py b/dG3D/benchmarks/nonLocalDamageParallel/RVE.py
index a1e3c7024..2cbb37718 100644
--- a/dG3D/benchmarks/nonLocalDamageParallel/RVE.py
+++ b/dG3D/benchmarks/nonLocalDamageParallel/RVE.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 #from dG3DpyDebug import*
 from dG3Dpy import*
 
diff --git a/dG3D/benchmarks/nonLocalDamageToCrack/twoHole.py b/dG3D/benchmarks/nonLocalDamageToCrack/twoHole.py
index 27e3d055d..373ed0210 100644
--- a/dG3D/benchmarks/nonLocalDamageToCrack/twoHole.py
+++ b/dG3D/benchmarks/nonLocalDamageToCrack/twoHole.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/nonLocalElasticDamage/twoHole.py b/dG3D/benchmarks/nonLocalElasticDamage/twoHole.py
index e1a0ec4cf..a62f18aa9 100644
--- a/dG3D/benchmarks/nonLocalElasticDamage/twoHole.py
+++ b/dG3D/benchmarks/nonLocalElasticDamage/twoHole.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/nonLocalJ2/twoHole.py b/dG3D/benchmarks/nonLocalJ2/twoHole.py
index 7a23c6a80..bb826febb 100644
--- a/dG3D/benchmarks/nonLocalJ2/twoHole.py
+++ b/dG3D/benchmarks/nonLocalJ2/twoHole.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/nonLocalJ2_Erosion/twoHole.py b/dG3D/benchmarks/nonLocalJ2_Erosion/twoHole.py
index ee04734fc..6a8c5070d 100644
--- a/dG3D/benchmarks/nonLocalJ2_Erosion/twoHole.py
+++ b/dG3D/benchmarks/nonLocalJ2_Erosion/twoHole.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/nonLocalLemaitreChabocheCube/cubeNonLocalJ2Hyper.py b/dG3D/benchmarks/nonLocalLemaitreChabocheCube/cubeNonLocalJ2Hyper.py
index ca60daf01..e0bd18714 100644
--- a/dG3D/benchmarks/nonLocalLemaitreChabocheCube/cubeNonLocalJ2Hyper.py
+++ b/dG3D/benchmarks/nonLocalLemaitreChabocheCube/cubeNonLocalJ2Hyper.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/nonLocalMFH/RVESuquet.py b/dG3D/benchmarks/nonLocalMFH/RVESuquet.py
index be056c10f..38a6512c0 100644
--- a/dG3D/benchmarks/nonLocalMFH/RVESuquet.py
+++ b/dG3D/benchmarks/nonLocalMFH/RVESuquet.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 #from dG3DpyDebug import*
 
diff --git a/dG3D/benchmarks/pathFollowing/arch3D.py b/dG3D/benchmarks/pathFollowing/arch3D.py
index 5c022b57f..f408ff571 100644
--- a/dG3D/benchmarks/pathFollowing/arch3D.py
+++ b/dG3D/benchmarks/pathFollowing/arch3D.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/pathFollowingAutomaticIncrement/arch3D.py b/dG3D/benchmarks/pathFollowingAutomaticIncrement/arch3D.py
index 112e33d82..a9f2071e7 100644
--- a/dG3D/benchmarks/pathFollowingAutomaticIncrement/arch3D.py
+++ b/dG3D/benchmarks/pathFollowingAutomaticIncrement/arch3D.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/pathFollowingEnergyBased/arch3D.py b/dG3D/benchmarks/pathFollowingEnergyBased/arch3D.py
index 8a527a4b1..de83753be 100644
--- a/dG3D/benchmarks/pathFollowingEnergyBased/arch3D.py
+++ b/dG3D/benchmarks/pathFollowingEnergyBased/arch3D.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/pathFollowingEnergyBased_plastic/arch3D.py b/dG3D/benchmarks/pathFollowingEnergyBased_plastic/arch3D.py
index 712da7ec1..70dd63a01 100644
--- a/dG3D/benchmarks/pathFollowingEnergyBased_plastic/arch3D.py
+++ b/dG3D/benchmarks/pathFollowingEnergyBased_plastic/arch3D.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/pathFollowingMultiscale/model.py b/dG3D/benchmarks/pathFollowingMultiscale/model.py
index 76eeeb0a3..84216daa3 100644
--- a/dG3D/benchmarks/pathFollowingMultiscale/model.py
+++ b/dG3D/benchmarks/pathFollowingMultiscale/model.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/pathFollowing_TrueSnapback/twoHole.py b/dG3D/benchmarks/pathFollowing_TrueSnapback/twoHole.py
index 655b6439c..c3bdad47d 100644
--- a/dG3D/benchmarks/pathFollowing_TrueSnapback/twoHole.py
+++ b/dG3D/benchmarks/pathFollowing_TrueSnapback/twoHole.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/pathFollowing_cohesive/model.py b/dG3D/benchmarks/pathFollowing_cohesive/model.py
index 83b77c189..fe79325dc 100644
--- a/dG3D/benchmarks/pathFollowing_cohesive/model.py
+++ b/dG3D/benchmarks/pathFollowing_cohesive/model.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/pathFollowing_snapback/twoHole.py b/dG3D/benchmarks/pathFollowing_snapback/twoHole.py
index 9b4dfe0f4..3464a8218 100644
--- a/dG3D/benchmarks/pathFollowing_snapback/twoHole.py
+++ b/dG3D/benchmarks/pathFollowing_snapback/twoHole.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/powerYieldViscoElastoPlastic/cylinder.py b/dG3D/benchmarks/powerYieldViscoElastoPlastic/cylinder.py
index 2e237130e..bb5291af7 100644
--- a/dG3D/benchmarks/powerYieldViscoElastoPlastic/cylinder.py
+++ b/dG3D/benchmarks/powerYieldViscoElastoPlastic/cylinder.py
@@ -1,6 +1,6 @@
 #coding-Utf-8-*-
 
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 from math import*
diff --git a/dG3D/benchmarks/powerYieldViscoElastoPlasticFullFailure/model.py b/dG3D/benchmarks/powerYieldViscoElastoPlasticFullFailure/model.py
index 56555e49e..a187f0302 100644
--- a/dG3D/benchmarks/powerYieldViscoElastoPlasticFullFailure/model.py
+++ b/dG3D/benchmarks/powerYieldViscoElastoPlasticFullFailure/model.py
@@ -1,6 +1,6 @@
 #coding-Utf-8-*-
 
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 from math import*
diff --git a/dG3D/benchmarks/powerYieldViscoElastoPlasticSaturationDamage/cylinder.py b/dG3D/benchmarks/powerYieldViscoElastoPlasticSaturationDamage/cylinder.py
index 315ba33fc..d1bb5a83f 100644
--- a/dG3D/benchmarks/powerYieldViscoElastoPlasticSaturationDamage/cylinder.py
+++ b/dG3D/benchmarks/powerYieldViscoElastoPlasticSaturationDamage/cylinder.py
@@ -1,6 +1,6 @@
 #coding-Utf-8-*-
 
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 from math import*
diff --git a/dG3D/benchmarks/secondOrderElasticShearlayer3D/shearlayer3D.py b/dG3D/benchmarks/secondOrderElasticShearlayer3D/shearlayer3D.py
index a49602599..410e69025 100644
--- a/dG3D/benchmarks/secondOrderElasticShearlayer3D/shearlayer3D.py
+++ b/dG3D/benchmarks/secondOrderElasticShearlayer3D/shearlayer3D.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/seebeck/seebeck.py b/dG3D/benchmarks/seebeck/seebeck.py
index 076af4883..59e36edb4 100644
--- a/dG3D/benchmarks/seebeck/seebeck.py
+++ b/dG3D/benchmarks/seebeck/seebeck.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 
 #from dG3DpyDebug import*
 from dG3Dpy import*
diff --git a/dG3D/benchmarks/seebeckMPI/seebeck.py b/dG3D/benchmarks/seebeckMPI/seebeck.py
index 330180701..3df34fd6d 100644
--- a/dG3D/benchmarks/seebeckMPI/seebeck.py
+++ b/dG3D/benchmarks/seebeckMPI/seebeck.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 
 #from dG3DpyDebug import*
 from dG3Dpy import*
diff --git a/dG3D/benchmarks/shearTest_PBC/run.py b/dG3D/benchmarks/shearTest_PBC/run.py
index a5e78147a..cbb56286a 100644
--- a/dG3D/benchmarks/shearTest_PBC/run.py
+++ b/dG3D/benchmarks/shearTest_PBC/run.py
@@ -1,6 +1,6 @@
 #coding-Utf-8-*-
 
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/shiftedPBC_2D/idealHole_mixBC.py b/dG3D/benchmarks/shiftedPBC_2D/idealHole_mixBC.py
index 5db7d2b29..833233e22 100644
--- a/dG3D/benchmarks/shiftedPBC_2D/idealHole_mixBC.py
+++ b/dG3D/benchmarks/shiftedPBC_2D/idealHole_mixBC.py
@@ -1,6 +1,6 @@
 #coding-Utf-8-*-
 
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 from math import*
 
diff --git a/dG3D/benchmarks/smpT22/SMP.py b/dG3D/benchmarks/smpT22/SMP.py
index 36c13608b..ae75a43d3 100644
--- a/dG3D/benchmarks/smpT22/SMP.py
+++ b/dG3D/benchmarks/smpT22/SMP.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 
 #from dG3DpyDebug import*
 from dG3Dpy import *
diff --git a/dG3D/benchmarks/smpT22Mechanism2/SMP.py b/dG3D/benchmarks/smpT22Mechanism2/SMP.py
index f6e74ae3d..e5576bde4 100644
--- a/dG3D/benchmarks/smpT22Mechanism2/SMP.py
+++ b/dG3D/benchmarks/smpT22Mechanism2/SMP.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 
 #from dG3DpyDebug import*
 from dG3Dpy import *
diff --git a/dG3D/benchmarks/smpT58/SMP.py b/dG3D/benchmarks/smpT58/SMP.py
index 68be13381..f215cbc7a 100644
--- a/dG3D/benchmarks/smpT58/SMP.py
+++ b/dG3D/benchmarks/smpT58/SMP.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 
 #from dG3DpyDebug import*
 from dG3Dpy import *
diff --git a/dG3D/benchmarks/taylor/taylorTetDGDyn.py b/dG3D/benchmarks/taylor/taylorTetDGDyn.py
index 9873e44ed..9029da6ff 100644
--- a/dG3D/benchmarks/taylor/taylorTetDGDyn.py
+++ b/dG3D/benchmarks/taylor/taylorTetDGDyn.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/taylorMPI/taylorCG.py b/dG3D/benchmarks/taylorMPI/taylorCG.py
index 8e1da6558..b881e3d3d 100644
--- a/dG3D/benchmarks/taylorMPI/taylorCG.py
+++ b/dG3D/benchmarks/taylorMPI/taylorCG.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/thermoCylinder/cylindreLinearTM.py b/dG3D/benchmarks/thermoCylinder/cylindreLinearTM.py
index c2383198f..5521c3643 100755
--- a/dG3D/benchmarks/thermoCylinder/cylindreLinearTM.py
+++ b/dG3D/benchmarks/thermoCylinder/cylindreLinearTM.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 #from dG3DpyDebug import*
 from dG3Dpy import*
 import math
diff --git a/dG3D/benchmarks/thermoFlux/cube_flux.py b/dG3D/benchmarks/thermoFlux/cube_flux.py
index 19b80f3d4..1f1a04b04 100644
--- a/dG3D/benchmarks/thermoFlux/cube_flux.py
+++ b/dG3D/benchmarks/thermoFlux/cube_flux.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/thermoMecPBC/thermoMecPolycrystal.py b/dG3D/benchmarks/thermoMecPBC/thermoMecPolycrystal.py
index 74c069bcf..7e0643ea1 100644
--- a/dG3D/benchmarks/thermoMecPBC/thermoMecPolycrystal.py
+++ b/dG3D/benchmarks/thermoMecPBC/thermoMecPolycrystal.py
@@ -1,7 +1,7 @@
 #coding-Utf-8-*-
 import numpy as npy
 #import matplotlib
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import *
 import os
 import sys
diff --git a/dG3D/benchmarks/thermoMecPBCCondensation/thermoMecPolycrystalCondensation.py b/dG3D/benchmarks/thermoMecPBCCondensation/thermoMecPolycrystalCondensation.py
index 8dd04e62b..5d779b508 100644
--- a/dG3D/benchmarks/thermoMecPBCCondensation/thermoMecPolycrystalCondensation.py
+++ b/dG3D/benchmarks/thermoMecPBCCondensation/thermoMecPolycrystalCondensation.py
@@ -1,6 +1,6 @@
 #coding-Utf-8-*-
 import numpy as npy
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import *
 import os
 import sys
diff --git a/dG3D/benchmarks/thermoMecPBCInSystemCondensation/thermoMecPolycrystalCondensation.py b/dG3D/benchmarks/thermoMecPBCInSystemCondensation/thermoMecPolycrystalCondensation.py
index 4e8530028..29671e085 100644
--- a/dG3D/benchmarks/thermoMecPBCInSystemCondensation/thermoMecPolycrystalCondensation.py
+++ b/dG3D/benchmarks/thermoMecPBCInSystemCondensation/thermoMecPolycrystalCondensation.py
@@ -1,7 +1,7 @@
 #coding-Utf-8-*-
 import numpy as npy
 #import matplotlib
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import *
 import os
 import sys
diff --git a/dG3D/benchmarks/thermoMecPBCInSystemCondensationElim/thermoMecPolycrystalCondensation.py b/dG3D/benchmarks/thermoMecPBCInSystemCondensationElim/thermoMecPolycrystalCondensation.py
index 106218afe..fd557ffab 100644
--- a/dG3D/benchmarks/thermoMecPBCInSystemCondensationElim/thermoMecPolycrystalCondensation.py
+++ b/dG3D/benchmarks/thermoMecPBCInSystemCondensationElim/thermoMecPolycrystalCondensation.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import *
 import os
 import sys
diff --git a/dG3D/benchmarks/thermoMecPBCPertElim/thermoMecPolycrystal.py b/dG3D/benchmarks/thermoMecPBCPertElim/thermoMecPolycrystal.py
index e3dccd0f3..a4e8a4ca8 100644
--- a/dG3D/benchmarks/thermoMecPBCPertElim/thermoMecPolycrystal.py
+++ b/dG3D/benchmarks/thermoMecPBCPertElim/thermoMecPolycrystal.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import *
 import os
 import sys
diff --git a/dG3D/benchmarks/thermomecSupport/supportFull.py b/dG3D/benchmarks/thermomecSupport/supportFull.py
index 13e309150..b68141b92 100644
--- a/dG3D/benchmarks/thermomecSupport/supportFull.py
+++ b/dG3D/benchmarks/thermomecSupport/supportFull.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 import math
diff --git a/dG3D/benchmarks/transverseAnisotropy/cubeTransverseAnisotropy.py b/dG3D/benchmarks/transverseAnisotropy/cubeTransverseAnisotropy.py
index 6edcb8868..1ad20f9ab 100644
--- a/dG3D/benchmarks/transverseAnisotropy/cubeTransverseAnisotropy.py
+++ b/dG3D/benchmarks/transverseAnisotropy/cubeTransverseAnisotropy.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/twoField_HEX8_PRI6/twoHole.py b/dG3D/benchmarks/twoField_HEX8_PRI6/twoHole.py
index 6c18a2c0b..8494ac4b4 100644
--- a/dG3D/benchmarks/twoField_HEX8_PRI6/twoHole.py
+++ b/dG3D/benchmarks/twoField_HEX8_PRI6/twoHole.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/twoField_PRI6/twoHole.py b/dG3D/benchmarks/twoField_PRI6/twoHole.py
index 325d05b1d..bfef2b781 100644
--- a/dG3D/benchmarks/twoField_PRI6/twoHole.py
+++ b/dG3D/benchmarks/twoField_PRI6/twoHole.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/twoField_TET4/twoHole.py b/dG3D/benchmarks/twoField_TET4/twoHole.py
index 43bfaf78d..5cfa81210 100644
--- a/dG3D/benchmarks/twoField_TET4/twoHole.py
+++ b/dG3D/benchmarks/twoField_TET4/twoHole.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/twoHole/twoHole.py b/dG3D/benchmarks/twoHole/twoHole.py
index 437745151..a0c3d1ce8 100644
--- a/dG3D/benchmarks/twoHole/twoHole.py
+++ b/dG3D/benchmarks/twoHole/twoHole.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/uniaxialTest_PBC/run.py b/dG3D/benchmarks/uniaxialTest_PBC/run.py
index 29f739608..1f4f92a0a 100644
--- a/dG3D/benchmarks/uniaxialTest_PBC/run.py
+++ b/dG3D/benchmarks/uniaxialTest_PBC/run.py
@@ -1,6 +1,6 @@
 #coding-Utf-8-*-
 
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dgshell/CMakeLists.txt b/dgshell/CMakeLists.txt
index cdb01727d..ca1db56af 100644
--- a/dgshell/CMakeLists.txt
+++ b/dgshell/CMakeLists.txt
@@ -75,7 +75,7 @@ endif(INDEBUG AND NOT CM3APPS)
 #  set_target_properties(dgshared PROPERTIES LINK_FLAGS ${LAPACK_FLAGS})
 #endif(HAVE_LAPACK AND LAPACK_FLAGS)
 
-if(ENABLE_WRAP_PYTHON_DEPRECATED)
+if(ENABLE_WRAP_PYTHON)
   find_package(SWIG REQUIRED)
   include(${SWIG_USE_FILE})
  
@@ -91,5 +91,5 @@ if(ENABLE_WRAP_PYTHON_DEPRECATED)
     swig_link_libraries(${LIBDGSHELLNAME} ${PYTHON_LIBRARIES} dgshell)
   endif(INDEBUG AND NOT CM3APPS)
   add_custom_command(TARGET _${LIBDGSHELLNAME} PRE_BUILD COMMAND ${CMAKE_COMMAND} -E remove ${CMAKE_CURRENT_BINARY_DIR}/dgshellpyPYTHON_wrap.cxx)
-endif(ENABLE_WRAP_PYTHON_DEPRECATED)
+endif(ENABLE_WRAP_PYTHON)
 
diff --git a/dgshell/benchmarks/MEMS/beam-9dom.py b/dgshell/benchmarks/MEMS/beam-9dom.py
index e63a3fdf2..5d20a4130 100644
--- a/dgshell/benchmarks/MEMS/beam-9dom.py
+++ b/dgshell/benchmarks/MEMS/beam-9dom.py
@@ -1,5 +1,5 @@
 #-*-coding:Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 #from dgshellpyDebug import *
 from dgshellpy import *
 #script to launch beam problem with a lua script
diff --git a/dgshell/benchmarks/MEMS/test.py b/dgshell/benchmarks/MEMS/test.py
index d7be8ddaa..70235bc8e 100644
--- a/dgshell/benchmarks/MEMS/test.py
+++ b/dgshell/benchmarks/MEMS/test.py
@@ -1,5 +1,5 @@
 #-*-coding:Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dgshellpyDebug import *
 
 #script to launch beam problem with a lua script
diff --git a/dgshell/benchmarks/archshell/arch.py b/dgshell/benchmarks/archshell/arch.py
index 683262ff8..998d2ec63 100644
--- a/dgshell/benchmarks/archshell/arch.py
+++ b/dgshell/benchmarks/archshell/arch.py
@@ -1,6 +1,6 @@
 #-*-coding:Utf-8-*-
 from dgshellpy import *
-from gmshpy import*
+from gmsh.py import*
 import sys
 # arch in bending
 #material law
diff --git a/dgshell/benchmarks/beam/beam.py b/dgshell/benchmarks/beam/beam.py
index fa32848d6..feadd5bdf 100644
--- a/dgshell/benchmarks/beam/beam.py
+++ b/dgshell/benchmarks/beam/beam.py
@@ -1,5 +1,5 @@
 #-*-coding:Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dgshellpy import *
 # bending beam
 
diff --git a/dgshell/benchmarks/beamfractureOrder3/beam.py b/dgshell/benchmarks/beamfractureOrder3/beam.py
index 1ec6be377..a02043e8c 100644
--- a/dgshell/benchmarks/beamfractureOrder3/beam.py
+++ b/dgshell/benchmarks/beamfractureOrder3/beam.py
@@ -1,5 +1,5 @@
 #-*-coding:Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dgshellpy import *
 #script to launch beam problem with a python script
 
diff --git a/dgshell/benchmarks/cylinder/cylinder.py b/dgshell/benchmarks/cylinder/cylinder.py
index 2c8ad7ee6..b0604677b 100644
--- a/dgshell/benchmarks/cylinder/cylinder.py
+++ b/dgshell/benchmarks/cylinder/cylinder.py
@@ -1,5 +1,5 @@
 #-*-coding:Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dgshellpy import *
 
 #script for pinched cylinder benchmark
diff --git a/dgshell/benchmarks/explicitBeam/beam.py b/dgshell/benchmarks/explicitBeam/beam.py
index 3f0bb1156..d091d8e44 100644
--- a/dgshell/benchmarks/explicitBeam/beam.py
+++ b/dgshell/benchmarks/explicitBeam/beam.py
@@ -1,5 +1,5 @@
 #-*-coding:Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dgshellpy import *
 
 #script to launch beam problem with a python script
diff --git a/dgshell/benchmarks/explicitContactBeam/beam.py b/dgshell/benchmarks/explicitContactBeam/beam.py
index 44925d057..e7f75cc44 100644
--- a/dgshell/benchmarks/explicitContactBeam/beam.py
+++ b/dgshell/benchmarks/explicitContactBeam/beam.py
@@ -1,5 +1,5 @@
 #-*-coding:Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dgshellpy import *
 
 #script to launch beam contact problem with a python script
diff --git a/dgshell/benchmarks/hemisphere/sphere.py b/dgshell/benchmarks/hemisphere/sphere.py
index 2f38a6696..fc9e1bce7 100644
--- a/dgshell/benchmarks/hemisphere/sphere.py
+++ b/dgshell/benchmarks/hemisphere/sphere.py
@@ -1,5 +1,5 @@
 #-*-coding:Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dgshellpy import *
 #  Script for open hemisphere benchmark
 
diff --git a/dgshell/benchmarks/implicitContactBeam/beam.py b/dgshell/benchmarks/implicitContactBeam/beam.py
index a2bfab84b..54fd0bff8 100644
--- a/dgshell/benchmarks/implicitContactBeam/beam.py
+++ b/dgshell/benchmarks/implicitContactBeam/beam.py
@@ -1,5 +1,5 @@
 #-*-coding:Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dgshellpy import *
 
 #script to launch beam problem with a lua script
diff --git a/dgshell/benchmarks/inter/beam.py b/dgshell/benchmarks/inter/beam.py
index 18520ab1e..88f6512c9 100644
--- a/dgshell/benchmarks/inter/beam.py
+++ b/dgshell/benchmarks/inter/beam.py
@@ -1,5 +1,5 @@
 #-*-coding:Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dgshellpy import *
 
 #script to launch beam problem with a lua script
diff --git a/dgshell/benchmarks/multiBeam/beam.py b/dgshell/benchmarks/multiBeam/beam.py
index 25fcc9928..c11597674 100644
--- a/dgshell/benchmarks/multiBeam/beam.py
+++ b/dgshell/benchmarks/multiBeam/beam.py
@@ -1,5 +1,5 @@
 #-*-coding:Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dgshellpy import *
 #script to launch beam problem with a python script
 
diff --git a/dgshell/benchmarks/multiBeamMPI/beam.py b/dgshell/benchmarks/multiBeamMPI/beam.py
index 6f03902c7..5530a76ff 100644
--- a/dgshell/benchmarks/multiBeamMPI/beam.py
+++ b/dgshell/benchmarks/multiBeamMPI/beam.py
@@ -1,5 +1,5 @@
 #-*-coding:Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dgshellpy import *
 #script to launch beam problem with a python script
 
diff --git a/dgshell/benchmarks/nlbeam/beam.py b/dgshell/benchmarks/nlbeam/beam.py
index fc2876b84..a1ab999a5 100644
--- a/dgshell/benchmarks/nlbeam/beam.py
+++ b/dgshell/benchmarks/nlbeam/beam.py
@@ -1,5 +1,5 @@
 #-*-coding:Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dgshellpy import *
 # bending beam
 
diff --git a/dgshell/benchmarks/plate/TwoOpposingEdgesClamped.py b/dgshell/benchmarks/plate/TwoOpposingEdgesClamped.py
index 1249bed8a..9290c5275 100644
--- a/dgshell/benchmarks/plate/TwoOpposingEdgesClamped.py
+++ b/dgshell/benchmarks/plate/TwoOpposingEdgesClamped.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dgshellpy import*
 
 #script to launch beam problem with a python script
diff --git a/dgshell/benchmarks/pressurizedCylinder/cylinder.py b/dgshell/benchmarks/pressurizedCylinder/cylinder.py
index 61867efe5..2cb611d44 100644
--- a/dgshell/benchmarks/pressurizedCylinder/cylinder.py
+++ b/dgshell/benchmarks/pressurizedCylinder/cylinder.py
@@ -1,5 +1,5 @@
 #-*-coding:Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dgshellpy import *
 
 # script for pressurized cylinder 
diff --git a/dgshell/benchmarks/switch/beam.py b/dgshell/benchmarks/switch/beam.py
index c6f0fe5b8..6d36dc5d1 100644
--- a/dgshell/benchmarks/switch/beam.py
+++ b/dgshell/benchmarks/switch/beam.py
@@ -1,5 +1,5 @@
 #-*-coding:Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dgshellpy import *
 # bending beam
 
diff --git a/dgshell/benchmarks/switchImplExpl/beam.py b/dgshell/benchmarks/switchImplExpl/beam.py
index 3a3f9c9b7..a41f49f77 100644
--- a/dgshell/benchmarks/switchImplExpl/beam.py
+++ b/dgshell/benchmarks/switchImplExpl/beam.py
@@ -1,5 +1,5 @@
 #-*-coding:Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dgshellpy import *
 # bending beam
 
-- 
GitLab