From dd21ef582a538b28aa560794770ae0d075c56c0fca7b2bfb643176fe049c42a8 Mon Sep 17 00:00:00 2001 From: Corot Sebastien Date: Wed, 10 Oct 2012 17:16:28 +0000 Subject: [PATCH] Accepting request 137767 from home:scorot:branches:science - version 2.5 * See http://www.dhondt.de/new_calc.htm for details - spec file cleanup and reformating - update patches OBS-URL: https://build.opensuse.org/request/show/137767 OBS-URL: https://build.opensuse.org/package/show/science/ccx?expand=0&rev=4 --- ...doc-Makefile => ccx-1.2-doc-Makefile.patch | 0 ...s-dynamic => ccx-2.0-spooles-dynamic.patch | 0 ccx-2.4-fix-compiler-warnings.patch | 53 ------------------- ...us-shell-heat-transfer-elements-read.patch | 13 +++++ ccx-2.5-build.patch | 22 ++++++++ ccx-2.5-no-local-compare.patch | 24 +++++++++ ccx.changes | 8 +++ ccx.spec | 23 +++----- ccx_2.4.doc.tar.bz2 | 3 -- ccx_2.4.src.tar.bz2 | 3 -- ccx_2.4.test.tar.bz2 | 3 -- ccx_2.5.doc.tar.bz2 | 3 ++ ccx_2.5.src.tar.bz2 | 3 ++ ccx_2.5.test.tar.bz2 | 3 ++ patch-ccx-beamread | 18 ------- patch-ccx-bufferoverrun | 14 ----- patch-ccx-build | 25 --------- patch-ccx-no-local | 11 ---- 18 files changed, 83 insertions(+), 146 deletions(-) rename patch-ccx-doc-Makefile => ccx-1.2-doc-Makefile.patch (100%) rename patch-ccx-spooles-dynamic => ccx-2.0-spooles-dynamic.patch (100%) delete mode 100644 ccx-2.4-fix-compiler-warnings.patch create mode 100644 ccx-2.5-abaqus-shell-heat-transfer-elements-read.patch create mode 100644 ccx-2.5-build.patch create mode 100644 ccx-2.5-no-local-compare.patch delete mode 100644 ccx_2.4.doc.tar.bz2 delete mode 100644 ccx_2.4.src.tar.bz2 delete mode 100644 ccx_2.4.test.tar.bz2 create mode 100644 ccx_2.5.doc.tar.bz2 create mode 100644 ccx_2.5.src.tar.bz2 create mode 100644 ccx_2.5.test.tar.bz2 delete mode 100644 patch-ccx-beamread delete mode 100644 patch-ccx-bufferoverrun delete mode 100644 patch-ccx-build delete mode 100644 patch-ccx-no-local diff --git a/patch-ccx-doc-Makefile b/ccx-1.2-doc-Makefile.patch similarity index 100% rename from patch-ccx-doc-Makefile rename to ccx-1.2-doc-Makefile.patch diff --git a/patch-ccx-spooles-dynamic b/ccx-2.0-spooles-dynamic.patch similarity index 100% rename from patch-ccx-spooles-dynamic rename to ccx-2.0-spooles-dynamic.patch diff --git a/ccx-2.4-fix-compiler-warnings.patch b/ccx-2.4-fix-compiler-warnings.patch deleted file mode 100644 index 372bb77..0000000 --- a/ccx-2.4-fix-compiler-warnings.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff -urN ccx_2.4-orig/src/angsum.f ccx_2.4/src/angsum.f ---- ccx_2.4-orig/src/angsum.f 2011-12-05 19:23:40.000000000 +0100 -+++ ccx_2.4/src/angsum.f 2012-07-02 18:48:56.000000000 +0200 -@@ -118,7 +118,7 @@ - ! - if((dabs(sa).lt.1.d-8).or.(dabs(sb).lt.1.d-8).or. - & (dabs(sc).lt.1.d-8)) then -- angle=0.d0 -+ spaceangle=0.d0 - return - endif - ! -diff -urN ccx_2.4-orig/src/calceigenvalues.f ccx_2.4/src/calceigenvalues.f ---- ccx_2.4-orig/src/calceigenvalues.f 2011-12-05 19:23:40.000000000 +0100 -+++ ccx_2.4/src/calceigenvalues.f 2012-07-02 18:41:54.000000000 +0200 -@@ -21,9 +21,11 @@ - ! calculates the eigenvalues al of the symmetric 3x3 matrix c - ! the eigenvalues are sorted in increasing order - ! -- integer idummy(3),three,kflag -+ implicit none - ! -- real*8 c(3,3),al(3),v1,v2,bb,cc,cm,cn,tt,pi -+ integer idummy(3),three,kflag,i -+! -+ real*8 c(3,3),al(3),v1,v2,v3,bb,cc,cm,cn,tt,pi - ! - data kflag /1/ - data three /3/ -@@ -36,6 +38,9 @@ - v1=c(1,1)+c(2,2)+c(3,3) - v2=c(2,2)*c(3,3)+c(1,1)*c(3,3)+c(1,1)*c(2,2)- - & (c(2,3)*c(2,3)+c(1,3)*c(1,3)+c(1,2)*c(1,2)) -+ v3=c(1,1)*(c(2,2)*c(3,3)-c(2,3)*c(2,3)) -+ & -c(1,2)*(c(1,2)*c(3,3)-c(1,3)*c(2,3)) -+ & +c(1,3)*(c(1,2)*c(2,3)-c(1,3)*c(2,2)) - ! - bb=v2-v1*v1/3.d0 - cc=-2.d0*v1**3/27.d0+v1*v2/3.d0-v3 -diff -urN ccx_2.4-orig/src/e_c3d_krhs.f ccx_2.4/src/e_c3d_krhs.f ---- ccx_2.4-orig/src/e_c3d_krhs.f 2011-12-05 19:23:40.000000000 +0100 -+++ ccx_2.4/src/e_c3d_krhs.f 2012-07-02 18:44:17.000000000 +0200 -@@ -100,8 +100,8 @@ - gamm1=beta1/betas-stuf1*xkappa*xkappa/dsqrt(betas) - gamm2=beta2/betas-stuf2*xkappa*xkappa/dsqrt(betas) - ! -- tvar(1)=time -- tvar(2)=ttime+dtime -+c tvar(1)=time -+c tvar(2)=ttime+dtime - ! - imat=ielmat(1,nelem) - amat=matname(imat) diff --git a/ccx-2.5-abaqus-shell-heat-transfer-elements-read.patch b/ccx-2.5-abaqus-shell-heat-transfer-elements-read.patch new file mode 100644 index 0000000..57ced5a --- /dev/null +++ b/ccx-2.5-abaqus-shell-heat-transfer-elements-read.patch @@ -0,0 +1,13 @@ +diff -aruN ccx_2.5.orig/src/elements.f ccx_2.5/src/elements.f +--- ccx_2.5.orig/src/elements.f 2012-10-06 15:13:06.000000000 +0200 ++++ ccx_2.5/src/elements.f 2012-10-09 21:07:13.733108555 +0200 +@@ -120,7 +120,8 @@ + ! + ! removing the ABAQUS label for heat transfer elements + ! +- if((label(1:2).eq.'DC').and.(label(1:7).ne.'DCOUP3D')) then ++ if((label(1:2).eq.'DC').or.(label(1:2).eq.'DS').and. ++ & (label(1:7).ne.'DCOUP3D')) then + label(1:7)=label(2:8) + label(8:8)=' ' + endif diff --git a/ccx-2.5-build.patch b/ccx-2.5-build.patch new file mode 100644 index 0000000..20f998f --- /dev/null +++ b/ccx-2.5-build.patch @@ -0,0 +1,22 @@ +--- ccx_2.5/src/Makefile.orig 2012-10-06 15:13:07.000000000 +0200 ++++ ccx_2.5/src/Makefile 2012-10-09 20:30:24.049056123 +0200 +@@ -1,6 +1,6 @@ + +-CFLAGS = -Wall -O3 -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE +-FFLAGS = -Wall -O3 ++CFLAGS = -Wall $(GLOBAL_OFLAGS) -g -DARCH="Linux" -DUSE_MT -DSPOOLES -DARPACK -DMATRIXSTORAGE -Wno-unused ++FFLAGS = -Wall $(GLOBAL_OFLAGS) -g -Wno-unused -fopenmp + + CC=cc + FC=gfortran +@@ -21,8 +21,8 @@ + DIR=../../../SPOOLES.2.2 + + LIBS = \ +- $(DIR)/spooles.a \ +- ../../../ARPACK/libarpack_INTEL.a \ ++ -lspooles \ ++ -larpack -llapack -lblas \ + -lpthread -lm -lc + + ccx_2.5: $(OCCXMAIN) ccx_2.5.a $(LIBS) diff --git a/ccx-2.5-no-local-compare.patch b/ccx-2.5-no-local-compare.patch new file mode 100644 index 0000000..92e8a06 --- /dev/null +++ b/ccx-2.5-no-local-compare.patch @@ -0,0 +1,24 @@ +--- ccx_2.5/test/compare.orig 2012-10-09 20:34:02.173061299 +0200 ++++ ccx_2.5/test/compare 2012-10-09 20:38:46.445068043 +0200 +@@ -18,12 +18,20 @@ + rm -f ${i%.inp}.dat + rm -f ${i%.inp}.frd + ++# beamread test? This one is special ++# ++ if [ "$i" == "beamread.inp" ]; then ++ rm -f beamread.rin ++ rm -f beamwrite.rout ++ /usr/bin/ccx_2.5 -i beamwrite ++ mv beamwrite.rout beamread.rin ++ fi + # + # executing CalculiX and generating the .dat and + # the .frd file + # + +- /usr/local/bin/ccx_2.5 ${i%.inp} >> $tempfile 2>&1 ++ /usr/bin/ccx_2.5 ${i%.inp} >> $tempfile 2>&1 + + # + # check whether the .dat and .dat.ref files exist diff --git a/ccx.changes b/ccx.changes index d419990..ad144a9 100644 --- a/ccx.changes +++ b/ccx.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Oct 9 18:58:37 UTC 2012 - scorot@free.fr + +- version 2.5 + * See http://www.dhondt.de/new_calc.htm for details +- spec file cleanup and reformating +- update patches + ------------------------------------------------------------------- Tue Jul 3 20:08:04 UTC 2012 - scorot@free.fr diff --git a/ccx.spec b/ccx.spec index ff05d8c..26e9dda 100644 --- a/ccx.spec +++ b/ccx.spec @@ -17,7 +17,7 @@ Name: ccx -Version: 2.4 +Version: 2.5 Release: 0 Summary: An open source finite element package License: GPL-2.0 and BSD-3-Clause and SUSE-Public-Domain @@ -26,19 +26,17 @@ Url: http://www.calculix.de/ Source0: http://www.dhondt.de/ccx_%{version}.src.tar.bz2 Source1: http://www.dhondt.de/ccx_%{version}.doc.tar.bz2 Source2: http://www.dhondt.de/ccx_%{version}.test.tar.bz2 -Patch0: patch-ccx-build -Patch1: patch-ccx-doc-Makefile -Patch2: patch-ccx-beamread -Patch3: patch-ccx-bufferoverrun -Patch4: patch-ccx-no-local -Patch5: patch-ccx-spooles-dynamic -Patch6: ccx-2.4-fix-compiler-warnings.patch +Patch0: ccx-2.5-build.patch +Patch1: ccx-1.2-doc-Makefile.patch +Patch2: ccx-2.5-no-local-compare.patch +Patch3: ccx-2.0-spooles-dynamic.patch +Patch4: ccx-2.5-abaqus-shell-heat-transfer-elements-read.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: arpack-ng-devel BuildRequires: fdupes BuildRequires: gcc-fortran +BuildRequires: lapack-devel BuildRequires: latex2html -BuildRequires: openblas-devel BuildRequires: sed BuildRequires: spooles-devel @@ -80,8 +78,6 @@ cd ${RPM_BUILD_DIR}/%{name}-%{version} %patch2 -p1 %patch3 -p1 %patch4 -p1 -%patch5 -p1 -%patch6 -p1 %build cd ${RPM_BUILD_DIR}/%{name}-%{version} @@ -119,12 +115,7 @@ chmod 755 $RPM_BUILD_ROOT/%{_datadir}/%{name}-examples-%{version}/compare chmod 755 $RPM_BUILD_ROOT/%{_datadir}/%{name}-examples-%{version}/datcheck.pl chmod 755 $RPM_BUILD_ROOT/%{_datadir}/%{name}-examples-%{version}/frdcheck.pl -# Pass rpm filelist check -rm $RPM_BUILD_ROOT/%{_datadir}/%{name}-examples-%{version}/compare.orig - -%if %suse_version >= 1030 %fdupes $RPM_BUILD_ROOT/%{_datadir}/%{name}-examples-%{version} -%endif %clean rm -Rf $RPM_BUILD_ROOT diff --git a/ccx_2.4.doc.tar.bz2 b/ccx_2.4.doc.tar.bz2 deleted file mode 100644 index 4360901..0000000 --- a/ccx_2.4.doc.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9f5c2fb6689c8d8e71a3a0c4776992da20803f5307085086337aa2b834ad598c -size 3282853 diff --git a/ccx_2.4.src.tar.bz2 b/ccx_2.4.src.tar.bz2 deleted file mode 100644 index 1e3a67f..0000000 --- a/ccx_2.4.src.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cadcd0d71bb54c6d61c83ce3aaa7a3fb8c8517d40db3909778797fd05e25e7a4 -size 830747 diff --git a/ccx_2.4.test.tar.bz2 b/ccx_2.4.test.tar.bz2 deleted file mode 100644 index cc9e291..0000000 --- a/ccx_2.4.test.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5eca6a56cd2a9a500317fe45579e92d70222f68681dbb76a58eef5b58bd83c05 -size 6589894 diff --git a/ccx_2.5.doc.tar.bz2 b/ccx_2.5.doc.tar.bz2 new file mode 100644 index 0000000..c7770bb --- /dev/null +++ b/ccx_2.5.doc.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3118981763f7dd5f039df4666687eeb978e6ae9a0a4ce240aa769fdd06ac3a17 +size 3638148 diff --git a/ccx_2.5.src.tar.bz2 b/ccx_2.5.src.tar.bz2 new file mode 100644 index 0000000..ff09471 --- /dev/null +++ b/ccx_2.5.src.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7b695c8dbcf3b7680dad31d2f5403c3115bc48d526815182245ba4d7986b24a5 +size 923149 diff --git a/ccx_2.5.test.tar.bz2 b/ccx_2.5.test.tar.bz2 new file mode 100644 index 0000000..3262db7 --- /dev/null +++ b/ccx_2.5.test.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:48e428a483e7d099bd19b5ebb2416c29437bad6e5f12dff5eeb4e0fb791756e7 +size 7630079 diff --git a/patch-ccx-beamread b/patch-ccx-beamread deleted file mode 100644 index 8b13a81..0000000 --- a/patch-ccx-beamread +++ /dev/null @@ -1,18 +0,0 @@ ---- ccx-2.2/test/compare.orig 2010-08-01 18:27:39.000000000 +0200 -+++ ccx-2.2/test/compare 2010-11-07 11:46:41.000000000 +0100 -@@ -19,6 +19,15 @@ - rm -f ${i%.inp}.frd - - # -+# beamread test? This one is special -+# -+ if [ "$i" == "beamread.inp" ]; then -+ rm -f beamread.rin -+ rm -f beamwrite.rout -+ /usr/bin/ccx_2.4 -i beamwrite -+ mv beamwrite.rout beamread.rin -+ fi -+# - # executing CalculiX and generating the .dat and - # the .frd file - # diff --git a/patch-ccx-bufferoverrun b/patch-ccx-bufferoverrun deleted file mode 100644 index 31fe689..0000000 --- a/patch-ccx-bufferoverrun +++ /dev/null @@ -1,14 +0,0 @@ ---- ccx-orig/src/ccx_2.4.c 2005-08-12 22:39:08.000000000 +0200 -+++ ccx-1.4/src/ccx_2.4.c 2005-09-04 08:26:27.000000000 +0200 -@@ -103,7 +103,10 @@ else{ - - for(i=1;i> $tempfile 2>&1 -+ /usr/bin/ccx_2.4 ${i%.inp} >> $tempfile 2>&1 - - # - # check whether the .dat and .dat.ref files exist