propagate gmsh changes

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)
 

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

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}\"")

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)
 

dG3D/benchmarks/AnisotropicRandomField/Stoch_Sample.py

 #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

dG3D/benchmarks/CG_Parallel_TET4/twoHole.py

 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script

dG3D/benchmarks/CohesiveBand_Plate/notchedPlate.py

 #coding-Utf-8-*-
-from gmshpy import*
+from gmsh.py import*
 #from dG3DpyDebug import*
 from dG3Dpy import*
 

dG3D/benchmarks/CohesiveBand_cube/cube.py

 #coding-Utf-8-*-
-from gmshpy import*
+from gmsh.py import*
 #from dG3DpyDebug import*
 from dG3Dpy import*
 

dG3D/benchmarks/CrackCompositeFailure/composite.py

 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script

dG3D/benchmarks/CrackCompositeFailureHEX8MPI_forceIEBreakFirstIP/composite.py

 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script

dG3D/benchmarks/CrackCompositeFailurePRI6MPI/composite.py

 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script

dG3D/benchmarks/CrackCompositeFailurePRI6MPI_forceIEBreakFirstIP/composite.py

 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script

dG3D/benchmarks/DG_HEX8_PRI6/twoHole.py

 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script

dG3D/benchmarks/DG_PRI18/twoHole.py

 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script

dG3D/benchmarks/DG_PRI6/twoHole.py

 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script

dG3D/benchmarks/DG_PRI6_DiriToNeum/twoHole.py

 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script

dG3D/benchmarks/DG_PRI6_resetBC/twoHole.py

 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script

dG3D/benchmarks/DG_PRI6_smallStrain/twoHole.py

 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script

dG3D/benchmarks/DG_TET4/twoHole.py

 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script

dG3D/benchmarks/Gurson_Cube/cube.py

 #coding-Utf-8-*-
-from gmshpy import*
+from gmsh.py import*
 #from dG3DpyDebug import*
 from dG3Dpy import*