Enable parallel computation

3 files changed, 8 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2005d8393bc6..a3025a67329b 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = calculix
 	pkgdesc = CalculiX: 3D finite element solver and post-processor (executables)
 	pkgver = 2.17
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.calculix.de/
 	arch = i686
 	arch = x86_64
@@ -27,7 +27,7 @@ pkgbase = calculix
 	sha256sums = ca708ad4aa729d9f84a9faba343c1bcc0b7cc84ed372616ebb55c8e6fa8f6e50
 	sha256sums = 798f94e536197bb10a74bae096f2a29a5111239020e7d10f93e1ad3d90c370cf
 	sha256sums = 01b32864714d7ed7c760567e3a04077f3e41fe171d1804b305c96c344b0e4d2e
-	sha256sums = a3c8c91c6ecd4b958ed366fb78cd6ebde077d238f7aaa2d0714fab31d6ff48c9
+	sha256sums = d6bbe96457d6a773958a9eb5a783ae630c8c2ea38ebaa0c6a799f3384e85d84f
 
 pkgname = calculix
 
diff --git a/PKGBUILD b/PKGBUILD
index d96ccc28994b..454948236682 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 
 pkgname=calculix
 pkgver=2.17
-pkgrel=1
+pkgrel=2
 pkgdesc="CalculiX: 3D finite element solver and post-processor (executables)"
 arch=('i686' 'x86_64')
 options=(!makeflags !buildflags)
@@ -29,7 +29,7 @@ source=("http://www.dhondt.de/ccx_${pkgver}.src.tar.bz2"
 sha256sums=('ca708ad4aa729d9f84a9faba343c1bcc0b7cc84ed372616ebb55c8e6fa8f6e50'
             '798f94e536197bb10a74bae096f2a29a5111239020e7d10f93e1ad3d90c370cf'
             '01b32864714d7ed7c760567e3a04077f3e41fe171d1804b305c96c344b0e4d2e'
-            'a3c8c91c6ecd4b958ed366fb78cd6ebde077d238f7aaa2d0714fab31d6ff48c9')
+            'd6bbe96457d6a773958a9eb5a783ae630c8c2ea38ebaa0c6a799f3384e85d84f')
 
 prepare()
 {
@@ -47,11 +47,11 @@ build()
     
     msg2 "Building solver..."
     cd "${srcdir}/CalculiX/ccx_${pkgver}/src"
-    make
+    make CFLAGS='-Wall -O2 -fopenmp -I /usr/include/spooles -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE -DNETWORKOUT -DUSE_MT=1' FFLAGS='-Wall -O2 -fallow-argument-mismatch' LIBS='-lpthread -lm -lc -lspooles -larpack -lblas -llapack'
     
     msg2 "Building gui..."
     cd "${srcdir}/CalculiX/cgx_${pkgver}/src"
-    make
+    make  CFLAGS='-O2 -Wall -Wno-narrowing -I./ -I/usr/include/libSNL -I../../glut-3.5/src' LFLAGS='-lGL -lGLU -lX11 -lXi -lXmu -lXext -lXt -lSM -lICE -lSNL -lm -lpthread -lrt'
 
     msg2 "Build complete"
 }
@@ -88,7 +88,8 @@ check()
     rm -f ${dat_file}
     rm -f ${frd_file}
 
-    ../src/ccx_${pkgver} ${test_name} &> ${log_file} ||\
+    # Testing on maximum 4 cores
+    OMP_NUM_THREADS=4 ../src/ccx_${pkgver} ${test_name} &> ${log_file} ||\
         warning "check $(pwd)/${log_file}"
 
     if [ ! -f ${dat_file} ]; then
diff --git a/calculix_2.17_archlinux.patch b/calculix_2.17_archlinux.patch
index 584ddb8982ea..e1632a3fc7dd 100755
--- a/calculix_2.17_archlinux.patch
+++ b/calculix_2.17_archlinux.patch
@@ -1,40 +1,6 @@
-diff -ur CalculiX_orig/ccx_2.17/src/Makefile CalculiX/ccx_2.17/src/Makefile
---- CalculiX_orig/ccx_2.17/src/Makefile
-+++ CalculiX/ccx_2.17/src/Makefile
-@@ -2,2 +2,2 @@ 
--CFLAGS = -Wall -O2 -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE -DNETWORKOUT
--FFLAGS = -Wall -O2
-+CFLAGS = -Wall -O2 -fopenmp -I /usr/include/spooles -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE -DNETWORKOUT
-+FFLAGS = -Wall -O2 -fallow-argument-mismatch
-@@ -21,6 +21,1 @@
--DIR=../../../SPOOLES.2.2
--
--LIBS = \
--       $(DIR)/spooles.a \
--	../../../ARPACK/libarpack_INTEL.a \
--       -lpthread -lm -lc
-+LIBS = -lpthread -lm -lc -lspooles -larpack -lblas -llapack
 diff -ur CalculiX_orig/cgx_2.17/src/Makefile CalculiX/cgx_2.16/src/Makefile
 --- CalculiX_orig/cgx_2.17/src/Makefile
 +++ CalculiX/cgx_2.17/src/Makefile
-@@ -1,14 +1,8 @@
- CFLAGS = -O2 -Wall -Wno-narrowing \
-   -I./ \
--  -I/usr/include \
--  -I/usr/include/GL \
--  -I../../libSNL/src \
--  -I../../glut-3.5/src \
--  -I/usr/X11/include 
-+  -I/usr/include/libSNL \
-+  -I../../glut-3.5/src
-
--LFLAGS = \
--  -L/usr/lib64 -lGL -lGLU \
--  -L/usr/X11R6/lib64 -lX11 -lXi -lXmu -lXext -lXt -lSM -lICE \
--  -lm -lpthread -lrt
-+LFLAGS = -lGL -lGLU -lX11 -lXi -lXmu -lXext -lXt -lSM -lICE -lSNL -lm -lpthread -lrt
-
-
 @@ -59,1 +53,1 @@
 - ../../libSNL/src/*.cpp
 +# ../../libSNL/src/*.cpp