diff --git a/.gitignore b/.gitignore index aca6918..43e6d66 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /netgen-mesher-6.2.2005.tar.gz /netgen-mesher-6.2.2006.tar.gz /netgen-mesher-6.2.2007.tar.gz +/netgen-mesher-6.2.2008.tar.gz diff --git a/0002-Rename-libraries-add-library-versions.patch b/0002-Rename-libraries-add-library-versions.patch index c6f7db3..a9c54e6 100644 --- a/0002-Rename-libraries-add-library-versions.patch +++ b/0002-Rename-libraries-add-library-versions.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference netgen-6.2.2007/libsrc/csg/CMakeLists.txt netgen-6.2.2007-new/libsrc/csg/CMakeLists.txt ---- netgen-6.2.2007/libsrc/csg/CMakeLists.txt 2020-07-23 20:51:48.000000000 +0200 -+++ netgen-6.2.2007-new/libsrc/csg/CMakeLists.txt 2020-07-23 23:12:17.936198515 +0200 +diff -rupN --no-dereference netgen-6.2.2008/libsrc/csg/CMakeLists.txt netgen-6.2.2008-new/libsrc/csg/CMakeLists.txt +--- netgen-6.2.2008/libsrc/csg/CMakeLists.txt 2020-09-15 15:48:49.000000000 +0200 ++++ netgen-6.2.2008-new/libsrc/csg/CMakeLists.txt 2020-09-17 22:44:48.728982896 +0200 @@ -7,6 +7,10 @@ add_library(csg ${NG_LIB_TYPE} solid.cpp specpoin.cpp spline3d.cpp surface.cpp triapprox.cpp zrefine.cpp python_csg.cpp splinesurface.cpp @@ -23,12 +23,12 @@ diff -rupN --no-dereference netgen-6.2.2007/libsrc/csg/CMakeLists.txt netgen-6.2 if(NOT WIN32) target_link_libraries(csgvis PUBLIC csg visual) if(APPLE) -diff -rupN --no-dereference netgen-6.2.2007/libsrc/geom2d/CMakeLists.txt netgen-6.2.2007-new/libsrc/geom2d/CMakeLists.txt ---- netgen-6.2.2007/libsrc/geom2d/CMakeLists.txt 2020-07-23 20:51:48.000000000 +0200 -+++ netgen-6.2.2007-new/libsrc/geom2d/CMakeLists.txt 2020-07-23 23:12:17.937198515 +0200 +diff -rupN --no-dereference netgen-6.2.2008/libsrc/geom2d/CMakeLists.txt netgen-6.2.2008-new/libsrc/geom2d/CMakeLists.txt +--- netgen-6.2.2008/libsrc/geom2d/CMakeLists.txt 2020-09-15 15:48:49.000000000 +0200 ++++ netgen-6.2.2008-new/libsrc/geom2d/CMakeLists.txt 2020-09-17 22:44:48.728982896 +0200 @@ -1,5 +1,7 @@ add_definitions(-DNGLIB_EXPORTS) - add_library(geom2d ${NG_LIB_TYPE} genmesh2d.cpp geometry2d.cpp python_geom2d.cpp ) + add_library(geom2d ${NG_LIB_TYPE} csg2d.cpp genmesh2d.cpp geometry2d.cpp python_geom2d.cpp ) +set_target_properties(geom2d PROPERTIES OUTPUT_NAME "nggeom2d") +set_target_properties(geom2d PROPERTIES VERSION ${NETGEN_VERSION_MAJOR}.${NETGEN_VERSION_MINOR}) if(APPLE) @@ -43,9 +43,9 @@ diff -rupN --no-dereference netgen-6.2.2007/libsrc/geom2d/CMakeLists.txt netgen- if(NOT WIN32) target_link_libraries(geom2dvis PUBLIC geom2d) install( TARGETS geom2dvis ${NG_INSTALL_DIR}) -diff -rupN --no-dereference netgen-6.2.2007/libsrc/interface/CMakeLists.txt netgen-6.2.2007-new/libsrc/interface/CMakeLists.txt ---- netgen-6.2.2007/libsrc/interface/CMakeLists.txt 2020-07-23 20:51:48.000000000 +0200 -+++ netgen-6.2.2007-new/libsrc/interface/CMakeLists.txt 2020-07-23 23:12:17.937198515 +0200 +diff -rupN --no-dereference netgen-6.2.2008/libsrc/interface/CMakeLists.txt netgen-6.2.2008-new/libsrc/interface/CMakeLists.txt +--- netgen-6.2.2008/libsrc/interface/CMakeLists.txt 2020-09-15 15:48:49.000000000 +0200 ++++ netgen-6.2.2008-new/libsrc/interface/CMakeLists.txt 2020-09-17 22:44:48.728982896 +0200 @@ -9,6 +9,9 @@ add_library(interface ${NG_LIB_TYPE} target_link_libraries(interface PUBLIC mesh csg geom2d stl visual PRIVATE netgen_cgns) @@ -56,9 +56,9 @@ diff -rupN --no-dereference netgen-6.2.2007/libsrc/interface/CMakeLists.txt netg if(NOT WIN32) install( TARGETS interface ${NG_INSTALL_DIR}) endif(NOT WIN32) -diff -rupN --no-dereference netgen-6.2.2007/libsrc/meshing/CMakeLists.txt netgen-6.2.2007-new/libsrc/meshing/CMakeLists.txt ---- netgen-6.2.2007/libsrc/meshing/CMakeLists.txt 2020-07-23 20:51:48.000000000 +0200 -+++ netgen-6.2.2007-new/libsrc/meshing/CMakeLists.txt 2020-07-23 23:12:17.937198515 +0200 +diff -rupN --no-dereference netgen-6.2.2008/libsrc/meshing/CMakeLists.txt netgen-6.2.2008-new/libsrc/meshing/CMakeLists.txt +--- netgen-6.2.2008/libsrc/meshing/CMakeLists.txt 2020-09-15 15:48:49.000000000 +0200 ++++ netgen-6.2.2008-new/libsrc/meshing/CMakeLists.txt 2020-09-17 22:44:48.728982896 +0200 @@ -17,6 +17,9 @@ add_library(mesh ${NG_LIB_TYPE} ${mesh_object_libs} ) @@ -69,9 +69,9 @@ diff -rupN --no-dereference netgen-6.2.2007/libsrc/meshing/CMakeLists.txt netgen if(APPLE) set_target_properties( mesh PROPERTIES SUFFIX ".so") endif(APPLE) -diff -rupN --no-dereference netgen-6.2.2007/libsrc/occ/CMakeLists.txt netgen-6.2.2007-new/libsrc/occ/CMakeLists.txt ---- netgen-6.2.2007/libsrc/occ/CMakeLists.txt 2020-07-23 20:51:48.000000000 +0200 -+++ netgen-6.2.2007-new/libsrc/occ/CMakeLists.txt 2020-07-23 23:12:17.937198515 +0200 +diff -rupN --no-dereference netgen-6.2.2008/libsrc/occ/CMakeLists.txt netgen-6.2.2008-new/libsrc/occ/CMakeLists.txt +--- netgen-6.2.2008/libsrc/occ/CMakeLists.txt 2020-09-15 15:48:49.000000000 +0200 ++++ netgen-6.2.2008-new/libsrc/occ/CMakeLists.txt 2020-09-17 22:44:48.729982895 +0200 @@ -4,8 +4,12 @@ add_library(occ ${NG_LIB_TYPE} Partition_Loop.cxx Partition_Loop2d.cxx Partition_Loop3d.cxx Partition_Spliter.cxx occconstruction.cpp occgenmesh.cpp occgeom.cpp occmeshsurf.cpp python_occ.cpp @@ -85,9 +85,9 @@ diff -rupN --no-dereference netgen-6.2.2007/libsrc/occ/CMakeLists.txt netgen-6.2 target_link_libraries(occvis PUBLIC ngcore) endif(USE_GUI) -diff -rupN --no-dereference netgen-6.2.2007/libsrc/stlgeom/CMakeLists.txt netgen-6.2.2007-new/libsrc/stlgeom/CMakeLists.txt ---- netgen-6.2.2007/libsrc/stlgeom/CMakeLists.txt 2020-07-23 20:51:48.000000000 +0200 -+++ netgen-6.2.2007-new/libsrc/stlgeom/CMakeLists.txt 2020-07-23 23:12:17.937198515 +0200 +diff -rupN --no-dereference netgen-6.2.2008/libsrc/stlgeom/CMakeLists.txt netgen-6.2.2008-new/libsrc/stlgeom/CMakeLists.txt +--- netgen-6.2.2008/libsrc/stlgeom/CMakeLists.txt 2020-09-15 15:48:49.000000000 +0200 ++++ netgen-6.2.2008-new/libsrc/stlgeom/CMakeLists.txt 2020-09-17 22:44:48.729982895 +0200 @@ -3,6 +3,10 @@ add_library(stl ${NG_LIB_TYPE} stlgeommesh.cpp stlline.cpp stltool.cpp stltopology.cpp python_stl.cpp ) @@ -110,9 +110,9 @@ diff -rupN --no-dereference netgen-6.2.2007/libsrc/stlgeom/CMakeLists.txt netgen if(NOT WIN32) target_link_libraries( stlvis PUBLIC stl ) install( TARGETS stlvis ${NG_INSTALL_DIR}) -diff -rupN --no-dereference netgen-6.2.2007/libsrc/visualization/CMakeLists.txt netgen-6.2.2007-new/libsrc/visualization/CMakeLists.txt ---- netgen-6.2.2007/libsrc/visualization/CMakeLists.txt 2020-07-23 20:51:48.000000000 +0200 -+++ netgen-6.2.2007-new/libsrc/visualization/CMakeLists.txt 2020-07-23 23:12:17.937198515 +0200 +diff -rupN --no-dereference netgen-6.2.2008/libsrc/visualization/CMakeLists.txt netgen-6.2.2008-new/libsrc/visualization/CMakeLists.txt +--- netgen-6.2.2008/libsrc/visualization/CMakeLists.txt 2020-09-15 15:48:49.000000000 +0200 ++++ netgen-6.2.2008-new/libsrc/visualization/CMakeLists.txt 2020-09-17 22:44:48.729982895 +0200 @@ -8,6 +8,9 @@ else(USE_GUI) endif(USE_GUI) @@ -123,9 +123,9 @@ diff -rupN --no-dereference netgen-6.2.2007/libsrc/visualization/CMakeLists.txt target_link_libraries( visual PUBLIC ngcore PRIVATE netgen_python ${MPI_CXX_LIBRARIES} ${OPENGL_LIBRARIES} ) install( TARGETS visual ${NG_INSTALL_DIR}) -diff -rupN --no-dereference netgen-6.2.2007/ng/CMakeLists.txt netgen-6.2.2007-new/ng/CMakeLists.txt ---- netgen-6.2.2007/ng/CMakeLists.txt 2020-07-23 20:51:48.000000000 +0200 -+++ netgen-6.2.2007-new/ng/CMakeLists.txt 2020-07-23 23:12:17.938198515 +0200 +diff -rupN --no-dereference netgen-6.2.2008/ng/CMakeLists.txt netgen-6.2.2008-new/ng/CMakeLists.txt +--- netgen-6.2.2008/ng/CMakeLists.txt 2020-09-15 15:48:49.000000000 +0200 ++++ netgen-6.2.2008-new/ng/CMakeLists.txt 2020-09-17 22:44:48.729982895 +0200 @@ -48,6 +48,9 @@ if(USE_GUI) endif(WIN32) target_link_libraries( gui PRIVATE netgen_python ) @@ -136,9 +136,9 @@ diff -rupN --no-dereference netgen-6.2.2007/ng/CMakeLists.txt netgen-6.2.2007-ne endif(USE_GUI) if(USE_PYTHON) -diff -rupN --no-dereference netgen-6.2.2007/ng/ng.tcl netgen-6.2.2007-new/ng/ng.tcl ---- netgen-6.2.2007/ng/ng.tcl 2020-07-23 20:51:48.000000000 +0200 -+++ netgen-6.2.2007-new/ng/ng.tcl 2020-07-23 23:12:17.938198515 +0200 +diff -rupN --no-dereference netgen-6.2.2008/ng/ng.tcl netgen-6.2.2008-new/ng/ng.tcl +--- netgen-6.2.2008/ng/ng.tcl 2020-09-15 15:48:49.000000000 +0200 ++++ netgen-6.2.2008-new/ng/ng.tcl 2020-09-17 22:44:48.729982895 +0200 @@ -2,7 +2,7 @@ catch {lappend auto_path $env(NETGENDIR) catch {lappend auto_path $env(NETGENDIR)/../lib } @@ -148,9 +148,9 @@ diff -rupN --no-dereference netgen-6.2.2007/ng/ng.tcl netgen-6.2.2007-new/ng/ng. } set batchmode [Ng_GetCommandLineParameter batchmode] -diff -rupN --no-dereference netgen-6.2.2007/ng/onetcl.cpp netgen-6.2.2007-new/ng/onetcl.cpp ---- netgen-6.2.2007/ng/onetcl.cpp 2020-07-23 20:51:48.000000000 +0200 -+++ netgen-6.2.2007-new/ng/onetcl.cpp 2020-07-23 23:12:17.939198516 +0200 +diff -rupN --no-dereference netgen-6.2.2008/ng/onetcl.cpp netgen-6.2.2008-new/ng/onetcl.cpp +--- netgen-6.2.2008/ng/onetcl.cpp 2020-09-15 15:48:49.000000000 +0200 ++++ netgen-6.2.2008-new/ng/onetcl.cpp 2020-09-17 22:44:48.730982894 +0200 @@ -3,7 +3,7 @@ DLL_HEADER const char * ngscript[] = {"" ,"catch {lappend auto_path $env(NETGENDIR) }\n" ,"catch {lappend auto_path $env(NETGENDIR)/../lib }\n" @@ -160,9 +160,9 @@ diff -rupN --no-dereference netgen-6.2.2007/ng/onetcl.cpp netgen-6.2.2007-new/ng ,"}\n" ,"set batchmode [Ng_GetCommandLineParameter batchmode]\n" ,"if {$batchmode==\"undefined\"} {\n" -diff -rupN --no-dereference netgen-6.2.2007/ng/Togl2.1/CMakeLists.txt netgen-6.2.2007-new/ng/Togl2.1/CMakeLists.txt ---- netgen-6.2.2007/ng/Togl2.1/CMakeLists.txt 2020-07-23 20:51:48.000000000 +0200 -+++ netgen-6.2.2007-new/ng/Togl2.1/CMakeLists.txt 2020-07-23 23:12:17.940198516 +0200 +diff -rupN --no-dereference netgen-6.2.2008/ng/Togl2.1/CMakeLists.txt netgen-6.2.2008-new/ng/Togl2.1/CMakeLists.txt +--- netgen-6.2.2008/ng/Togl2.1/CMakeLists.txt 2020-09-15 15:48:49.000000000 +0200 ++++ netgen-6.2.2008-new/ng/Togl2.1/CMakeLists.txt 2020-09-17 22:44:48.730982894 +0200 @@ -22,6 +22,9 @@ else(WIN32) add_library(togl togl.c toglProcAddr.c toglStubInit.c) @@ -173,9 +173,9 @@ diff -rupN --no-dereference netgen-6.2.2007/ng/Togl2.1/CMakeLists.txt netgen-6.2 endif(WIN32) target_link_libraries(togl ${OPENGL_LIBRARIES}) -diff -rupN --no-dereference netgen-6.2.2007/nglib/CMakeLists.txt netgen-6.2.2007-new/nglib/CMakeLists.txt ---- netgen-6.2.2007/nglib/CMakeLists.txt 2020-07-23 20:51:48.000000000 +0200 -+++ netgen-6.2.2007-new/nglib/CMakeLists.txt 2020-07-23 23:12:17.940198516 +0200 +diff -rupN --no-dereference netgen-6.2.2008/nglib/CMakeLists.txt netgen-6.2.2008-new/nglib/CMakeLists.txt +--- netgen-6.2.2008/nglib/CMakeLists.txt 2020-09-15 15:48:49.000000000 +0200 ++++ netgen-6.2.2008-new/nglib/CMakeLists.txt 2020-09-17 22:44:48.730982894 +0200 @@ -21,6 +21,7 @@ if(WIN32) endif(WIN32) @@ -184,9 +184,9 @@ diff -rupN --no-dereference netgen-6.2.2007/nglib/CMakeLists.txt netgen-6.2.2007 if(NOT WIN32) target_link_libraries( nglib PUBLIC mesh interface geom2d csg stl visual) if(USE_GUI) -diff -rupN --no-dereference netgen-6.2.2007/python/gui.py netgen-6.2.2007-new/python/gui.py ---- netgen-6.2.2007/python/gui.py 2020-07-23 20:51:48.000000000 +0200 -+++ netgen-6.2.2007-new/python/gui.py 2020-07-23 23:12:17.940198516 +0200 +diff -rupN --no-dereference netgen-6.2.2008/python/gui.py netgen-6.2.2008-new/python/gui.py +--- netgen-6.2.2008/python/gui.py 2020-09-15 15:48:49.000000000 +0200 ++++ netgen-6.2.2008-new/python/gui.py 2020-09-17 22:44:48.731982893 +0200 @@ -8,7 +8,7 @@ def StartGUI(): win.tk.eval('lappend ::auto_path ' + netgen._netgen_lib_dir) win.tk.eval('lappend ::auto_path ' + netgen._netgen_bin_dir) diff --git a/0004-Make-some-includes-relative.patch b/0004-Make-some-includes-relative.patch index c05db3c..109820e 100644 --- a/0004-Make-some-includes-relative.patch +++ b/0004-Make-some-includes-relative.patch @@ -1,18 +1,18 @@ -diff -rupN --no-dereference netgen-6.2.2007/libsrc/include/meshing.hpp netgen-6.2.2007-new/libsrc/include/meshing.hpp ---- netgen-6.2.2007/libsrc/include/meshing.hpp 2020-07-23 20:51:48.000000000 +0200 -+++ netgen-6.2.2007-new/libsrc/include/meshing.hpp 2020-07-23 23:12:17.998198544 +0200 +diff -rupN --no-dereference netgen-6.2.2008/libsrc/include/meshing.hpp netgen-6.2.2008-new/libsrc/include/meshing.hpp +--- netgen-6.2.2008/libsrc/include/meshing.hpp 2020-09-15 15:48:49.000000000 +0200 ++++ netgen-6.2.2008-new/libsrc/include/meshing.hpp 2020-09-17 22:44:48.772982845 +0200 @@ -1 +1 @@ -#include <../meshing/meshing.hpp> +#include "../meshing/meshing.hpp" -diff -rupN --no-dereference netgen-6.2.2007/libsrc/include/myadt.hpp netgen-6.2.2007-new/libsrc/include/myadt.hpp ---- netgen-6.2.2007/libsrc/include/myadt.hpp 2020-07-23 20:51:48.000000000 +0200 -+++ netgen-6.2.2007-new/libsrc/include/myadt.hpp 2020-07-23 23:12:17.998198544 +0200 +diff -rupN --no-dereference netgen-6.2.2008/libsrc/include/myadt.hpp netgen-6.2.2008-new/libsrc/include/myadt.hpp +--- netgen-6.2.2008/libsrc/include/myadt.hpp 2020-09-15 15:48:49.000000000 +0200 ++++ netgen-6.2.2008-new/libsrc/include/myadt.hpp 2020-09-17 22:44:48.772982845 +0200 @@ -1 +1 @@ -#include <../general/myadt.hpp> +#include "../general/myadt.hpp" -diff -rupN --no-dereference netgen-6.2.2007/libsrc/include/stlgeom.hpp netgen-6.2.2007-new/libsrc/include/stlgeom.hpp ---- netgen-6.2.2007/libsrc/include/stlgeom.hpp 2020-07-23 20:51:48.000000000 +0200 -+++ netgen-6.2.2007-new/libsrc/include/stlgeom.hpp 2020-07-23 23:12:17.998198544 +0200 +diff -rupN --no-dereference netgen-6.2.2008/libsrc/include/stlgeom.hpp netgen-6.2.2008-new/libsrc/include/stlgeom.hpp +--- netgen-6.2.2008/libsrc/include/stlgeom.hpp 2020-09-15 15:48:49.000000000 +0200 ++++ netgen-6.2.2008-new/libsrc/include/stlgeom.hpp 2020-09-17 22:44:48.772982845 +0200 @@ -1 +1 @@ -#include <../stlgeom/stlgeom.hpp> +#include "../stlgeom/stlgeom.hpp" diff --git a/0009-immintrin.patch b/0009-immintrin.patch index 3a74e91..e0887a4 100644 --- a/0009-immintrin.patch +++ b/0009-immintrin.patch @@ -1,7 +1,7 @@ -diff -rupN --no-dereference netgen-6.2.2007/libsrc/core/taskmanager.cpp netgen-6.2.2007-new/libsrc/core/taskmanager.cpp ---- netgen-6.2.2007/libsrc/core/taskmanager.cpp 2020-07-23 20:51:48.000000000 +0200 -+++ netgen-6.2.2007-new/libsrc/core/taskmanager.cpp 2020-07-23 23:12:18.056198572 +0200 -@@ -212,14 +212,22 @@ namespace ngcore +diff -rupN --no-dereference netgen-6.2.2008/libsrc/core/taskmanager.cpp netgen-6.2.2008-new/libsrc/core/taskmanager.cpp +--- netgen-6.2.2008/libsrc/core/taskmanager.cpp 2020-09-15 15:48:49.000000000 +0200 ++++ netgen-6.2.2008-new/libsrc/core/taskmanager.cpp 2020-09-17 22:44:48.808982803 +0200 +@@ -201,14 +201,22 @@ namespace ngcore ; } @@ -24,7 +24,7 @@ diff -rupN --no-dereference netgen-6.2.2007/libsrc/core/taskmanager.cpp netgen-6 double delta_sec = std::chrono::duration(TClock::now()-calibrate_init_clock).count(); double frequ = (delta_sec != 0) ? delta_tsc/delta_sec : 2.7e9; -@@ -411,8 +419,10 @@ namespace ngcore +@@ -401,8 +409,10 @@ namespace ngcore for (int j = 0; j < num_nodes; j++) if (workers_on_node[j]) { @@ -36,9 +36,9 @@ diff -rupN --no-dereference netgen-6.2.2007/libsrc/core/taskmanager.cpp netgen-6 } func = nullptr; -diff -rupN --no-dereference netgen-6.2.2007/libsrc/core/utils.cpp netgen-6.2.2007-new/libsrc/core/utils.cpp ---- netgen-6.2.2007/libsrc/core/utils.cpp 2020-07-23 20:51:48.000000000 +0200 -+++ netgen-6.2.2007-new/libsrc/core/utils.cpp 2020-07-23 23:12:18.056198572 +0200 +diff -rupN --no-dereference netgen-6.2.2008/libsrc/core/utils.cpp netgen-6.2.2008-new/libsrc/core/utils.cpp +--- netgen-6.2.2008/libsrc/core/utils.cpp 2020-09-15 15:48:49.000000000 +0200 ++++ netgen-6.2.2008-new/libsrc/core/utils.cpp 2020-09-17 22:44:48.809982802 +0200 @@ -35,6 +35,7 @@ namespace ngcore double seconds_per_tick = [] () noexcept @@ -57,9 +57,9 @@ diff -rupN --no-dereference netgen-6.2.2007/libsrc/core/utils.cpp netgen-6.2.200 }(); const std::chrono::time_point wall_time_start = TClock::now(); -diff -rupN --no-dereference netgen-6.2.2007/libsrc/core/utils.hpp netgen-6.2.2007-new/libsrc/core/utils.hpp ---- netgen-6.2.2007/libsrc/core/utils.hpp 2020-07-23 20:51:48.000000000 +0200 -+++ netgen-6.2.2007-new/libsrc/core/utils.hpp 2020-07-23 23:12:18.056198572 +0200 +diff -rupN --no-dereference netgen-6.2.2008/libsrc/core/utils.hpp netgen-6.2.2008-new/libsrc/core/utils.hpp +--- netgen-6.2.2008/libsrc/core/utils.hpp 2020-09-15 15:48:49.000000000 +0200 ++++ netgen-6.2.2008-new/libsrc/core/utils.hpp 2020-09-17 22:44:48.809982802 +0200 @@ -11,7 +11,11 @@ #ifdef WIN32 #include // for __rdtsc() CPU time step counter @@ -95,9 +95,9 @@ diff -rupN --no-dereference netgen-6.2.2007/libsrc/core/utils.hpp netgen-6.2.200 } } void unlock() -diff -rupN --no-dereference netgen-6.2.2007/libsrc/general/ngsimd.hpp netgen-6.2.2007-new/libsrc/general/ngsimd.hpp ---- netgen-6.2.2007/libsrc/general/ngsimd.hpp 2020-07-23 20:51:48.000000000 +0200 -+++ netgen-6.2.2007-new/libsrc/general/ngsimd.hpp 2020-07-23 23:12:18.057198572 +0200 +diff -rupN --no-dereference netgen-6.2.2008/libsrc/general/ngsimd.hpp netgen-6.2.2008-new/libsrc/general/ngsimd.hpp +--- netgen-6.2.2008/libsrc/general/ngsimd.hpp 2020-09-15 15:48:49.000000000 +0200 ++++ netgen-6.2.2008-new/libsrc/general/ngsimd.hpp 2020-09-17 22:44:48.809982802 +0200 @@ -6,7 +6,9 @@ /* Date: 25. Mar. 16 */ /**************************************************************************/ diff --git a/0010-rename-netgen-binary.patch b/0010-rename-netgen-binary.patch index 591cd9a..0a65f4c 100644 --- a/0010-rename-netgen-binary.patch +++ b/0010-rename-netgen-binary.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference netgen-6.2.2007/ng/CMakeLists.txt netgen-6.2.2007-new/ng/CMakeLists.txt ---- netgen-6.2.2007/ng/CMakeLists.txt 2020-07-23 23:12:17.993198542 +0200 -+++ netgen-6.2.2007-new/ng/CMakeLists.txt 2020-07-23 23:12:18.114198599 +0200 +diff -rupN --no-dereference netgen-6.2.2008/ng/CMakeLists.txt netgen-6.2.2008-new/ng/CMakeLists.txt +--- netgen-6.2.2008/ng/CMakeLists.txt 2020-09-17 22:44:48.769982848 +0200 ++++ netgen-6.2.2008-new/ng/CMakeLists.txt 2020-09-17 22:44:48.848982756 +0200 @@ -23,6 +23,7 @@ if(USE_GUI) ) diff --git a/0011-system-pybind11.patch b/0011-system-pybind11.patch index 03fb13e..ee5fa75 100644 --- a/0011-system-pybind11.patch +++ b/0011-system-pybind11.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference netgen-6.2.2007/cmake/SuperBuild.cmake netgen-6.2.2007-new/cmake/SuperBuild.cmake ---- netgen-6.2.2007/cmake/SuperBuild.cmake 2020-07-23 20:51:48.000000000 +0200 -+++ netgen-6.2.2007-new/cmake/SuperBuild.cmake 2020-07-23 23:12:18.160198621 +0200 +diff -rupN --no-dereference netgen-6.2.2008/cmake/SuperBuild.cmake netgen-6.2.2008-new/cmake/SuperBuild.cmake +--- netgen-6.2.2008/cmake/SuperBuild.cmake 2020-09-15 15:48:49.000000000 +0200 ++++ netgen-6.2.2008-new/cmake/SuperBuild.cmake 2020-09-17 22:44:48.884982715 +0200 @@ -38,7 +38,7 @@ endif(NOT WIN32) ####################################################################### @@ -10,10 +10,10 @@ diff -rupN --no-dereference netgen-6.2.2007/cmake/SuperBuild.cmake netgen-6.2.20 set(NG_INSTALL_PYBIND ON) if( NOT PYBIND_INCLUDE_DIR ) # if the pybind submodule is missing, try to initialize and update all submodules -diff -rupN --no-dereference netgen-6.2.2007/CMakeLists.txt netgen-6.2.2007-new/CMakeLists.txt ---- netgen-6.2.2007/CMakeLists.txt 2020-07-23 20:51:48.000000000 +0200 -+++ netgen-6.2.2007-new/CMakeLists.txt 2020-07-23 23:12:18.161198621 +0200 -@@ -264,7 +264,7 @@ else() +diff -rupN --no-dereference netgen-6.2.2008/CMakeLists.txt netgen-6.2.2008-new/CMakeLists.txt +--- netgen-6.2.2008/CMakeLists.txt 2020-09-15 15:48:49.000000000 +0200 ++++ netgen-6.2.2008-new/CMakeLists.txt 2020-09-17 22:44:48.885982714 +0200 +@@ -265,7 +265,7 @@ else() endif() if (USE_PYTHON) @@ -22,7 +22,7 @@ diff -rupN --no-dereference netgen-6.2.2007/CMakeLists.txt netgen-6.2.2007-new/C find_path(PYBIND_INCLUDE_DIR pybind11/pybind11.h HINTS ${PYTHON_INCLUDE_DIR}) if( PYBIND_INCLUDE_DIR ) message(STATUS "Found Pybind11: ${PYBIND_INCLUDE_DIR}") -@@ -278,10 +278,6 @@ if (USE_PYTHON) +@@ -279,10 +279,6 @@ if (USE_PYTHON) target_link_libraries(netgen_python INTERFACE ${PYTHON_LIBRARIES}) endif() diff --git a/0012-cmake_fixes.patch b/0012-cmake_fixes.patch index 6b44fb6..b156e45 100644 --- a/0012-cmake_fixes.patch +++ b/0012-cmake_fixes.patch @@ -1,7 +1,7 @@ -diff -rupN --no-dereference netgen-6.2.2007/CMakeLists.txt netgen-6.2.2007-new/CMakeLists.txt ---- netgen-6.2.2007/CMakeLists.txt 2020-07-23 23:12:18.212198645 +0200 -+++ netgen-6.2.2007-new/CMakeLists.txt 2020-07-23 23:12:18.261198668 +0200 -@@ -50,14 +50,14 @@ if(INSTALL_DIR) +diff -rupN --no-dereference netgen-6.2.2008/CMakeLists.txt netgen-6.2.2008-new/CMakeLists.txt +--- netgen-6.2.2008/CMakeLists.txt 2020-09-17 22:44:48.922982671 +0200 ++++ netgen-6.2.2008-new/CMakeLists.txt 2020-09-17 22:44:48.961982625 +0200 +@@ -51,14 +51,14 @@ if(INSTALL_DIR) set(INSTALL_DIR_DEFAULT ${INSTALL_DIR}) endif(INSTALL_DIR) diff --git a/netgen-mesher.spec b/netgen-mesher.spec index 20486a3..12cd890 100644 --- a/netgen-mesher.spec +++ b/netgen-mesher.spec @@ -17,8 +17,8 @@ %global build_openmpi 1 Name: netgen-mesher -Version: 6.2.2007 -Release: 2%{?dist} +Version: 6.2.2008 +Release: 1%{?dist} Summary: Automatic mesh generation tool License: LGPLv2 @@ -121,6 +121,7 @@ Python3 interface for netgen. %package openmpi Summary: Netgen compiled against openmpi BuildRequires: openmpi-devel +BuildRequires: python3-mpi4py-openmpi # Require explicitly for dir ownership and to guarantee the pickup of the right runtime Requires: %{name}-common = %{version}-%{release} Requires: %{name}-openmpi-libs%{?_isa} = %{version}-%{release} @@ -159,6 +160,7 @@ Python3 interface for netgen compiled against openmpi. %package mpich Summary: Netgen compiled against mpich BuildRequires: mpich-devel +BuildRequires: python3-mpi4py-mpich # Require explicitly for dir ownership and to guarantee the pickup of the right runtime Requires: %{name}-common = %{version}-%{release} Requires: %{name}-mpich-libs%{?_isa} = %{version}-%{release} @@ -390,6 +392,9 @@ install -Dpm 0644 nglib/nglib.h %{buildroot}%{_includedir}/%{name}/nglib.h %changelog +* Thu Sep 17 2020 Sandro Mani - 6.2.2008-1 +- Update to 6.2.2008 + * Tue Jul 28 2020 Fedora Release Engineering - 6.2.2007-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/netgen_install-togl.patch b/netgen_install-togl.patch index 244136f..bdec98b 100644 --- a/netgen_install-togl.patch +++ b/netgen_install-togl.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference netgen-6.2.2007/ng/Togl2.1/CMakeLists.txt netgen-6.2.2007-new/ng/Togl2.1/CMakeLists.txt ---- netgen-6.2.2007/ng/Togl2.1/CMakeLists.txt 2020-07-23 23:12:17.995198543 +0200 -+++ netgen-6.2.2007-new/ng/Togl2.1/CMakeLists.txt 2020-07-23 23:12:18.215198647 +0200 +diff -rupN --no-dereference netgen-6.2.2008/ng/Togl2.1/CMakeLists.txt netgen-6.2.2008-new/ng/Togl2.1/CMakeLists.txt +--- netgen-6.2.2008/ng/Togl2.1/CMakeLists.txt 2020-09-17 22:44:48.770982847 +0200 ++++ netgen-6.2.2008-new/ng/Togl2.1/CMakeLists.txt 2020-09-17 22:44:48.924982669 +0200 @@ -25,6 +25,8 @@ else(WIN32) set_target_properties(togl PROPERTIES OUTPUT_NAME "ngtogl") diff --git a/netgen_sizet.patch b/netgen_sizet.patch index 3a08139..fb01ac2 100644 --- a/netgen_sizet.patch +++ b/netgen_sizet.patch @@ -1,7 +1,7 @@ -diff -rupN --no-dereference netgen-6.2.2007/libsrc/core/python_ngcore.hpp netgen-6.2.2007-new/libsrc/core/python_ngcore.hpp ---- netgen-6.2.2007/libsrc/core/python_ngcore.hpp 2020-07-23 20:51:48.000000000 +0200 -+++ netgen-6.2.2007-new/libsrc/core/python_ngcore.hpp 2020-07-23 23:12:18.313198693 +0200 -@@ -55,10 +55,12 @@ namespace ngcore +diff -rupN --no-dereference netgen-6.2.2008/libsrc/core/python_ngcore.hpp netgen-6.2.2008-new/libsrc/core/python_ngcore.hpp +--- netgen-6.2.2008/libsrc/core/python_ngcore.hpp 2020-09-15 15:48:49.000000000 +0200 ++++ netgen-6.2.2008-new/libsrc/core/python_ngcore.hpp 2020-09-17 22:44:48.999982581 +0200 +@@ -107,10 +107,12 @@ namespace ngcore static std::string GetName() { return "D"; } }; @@ -14,10 +14,10 @@ diff -rupN --no-dereference netgen-6.2.2007/libsrc/core/python_ngcore.hpp netgen template struct PyNameTraits> { -diff -rupN --no-dereference netgen-6.2.2007/libsrc/core/table.hpp netgen-6.2.2007-new/libsrc/core/table.hpp ---- netgen-6.2.2007/libsrc/core/table.hpp 2020-07-23 20:51:48.000000000 +0200 -+++ netgen-6.2.2007-new/libsrc/core/table.hpp 2020-07-23 23:12:18.313198693 +0200 -@@ -101,8 +101,10 @@ public: +diff -rupN --no-dereference netgen-6.2.2008/libsrc/core/table.hpp netgen-6.2.2008-new/libsrc/core/table.hpp +--- netgen-6.2.2008/libsrc/core/table.hpp 2020-09-15 15:48:49.000000000 +0200 ++++ netgen-6.2.2008-new/libsrc/core/table.hpp 2020-09-17 22:44:48.999982581 +0200 +@@ -101,8 +101,10 @@ namespace ngcore { return TablePrefixSum32 (FlatArray (entrysize.Size(), (unsigned int*)(int*)(entrysize.Addr(0)))); } NETGEN_INLINE size_t * TablePrefixSum (FlatArray> entrysize) { return TablePrefixSum32 (FlatArray (entrysize.Size(), (unsigned int*)(std::atomic*)entrysize.Addr(0))); } @@ -27,4 +27,4 @@ diff -rupN --no-dereference netgen-6.2.2007/libsrc/core/table.hpp netgen-6.2.200 +#endif - /** + /** diff --git a/sources b/sources index 1c88983..f304a87 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (netgen-mesher-6.2.2007.tar.gz) = 4f6cf0628c6919e9ec828e9e63b5630b838eeb65491153ebfa86a639fe9775f6412ec74d2a42b7f2926eb13dee7b90cc9d110b1df531505f06c281abca9fc5c6 +SHA512 (netgen-mesher-6.2.2008.tar.gz) = 76c49bab2caff9058d482e5328e1f16fda6dc218ef5d4be628f92e35f2c79bdaaa1407e36bf6824dd3560e97c99a7f07967c460cd0ea49000fe3c40f539e3f55