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
This commit is contained in:
parent
a4f669479c
commit
6e5f3e2d46
@ -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)
|
|
13
ccx-2.5-abaqus-shell-heat-transfer-elements-read.patch
Normal file
13
ccx-2.5-abaqus-shell-heat-transfer-elements-read.patch
Normal file
@ -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
|
22
ccx-2.5-build.patch
Normal file
22
ccx-2.5-build.patch
Normal file
@ -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)
|
24
ccx-2.5-no-local-compare.patch
Normal file
24
ccx-2.5-no-local-compare.patch
Normal file
@ -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
|
@ -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
|
Tue Jul 3 20:08:04 UTC 2012 - scorot@free.fr
|
||||||
|
|
||||||
|
23
ccx.spec
23
ccx.spec
@ -17,7 +17,7 @@
|
|||||||
|
|
||||||
|
|
||||||
Name: ccx
|
Name: ccx
|
||||||
Version: 2.4
|
Version: 2.5
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: An open source finite element package
|
Summary: An open source finite element package
|
||||||
License: GPL-2.0 and BSD-3-Clause and SUSE-Public-Domain
|
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
|
Source0: http://www.dhondt.de/ccx_%{version}.src.tar.bz2
|
||||||
Source1: http://www.dhondt.de/ccx_%{version}.doc.tar.bz2
|
Source1: http://www.dhondt.de/ccx_%{version}.doc.tar.bz2
|
||||||
Source2: http://www.dhondt.de/ccx_%{version}.test.tar.bz2
|
Source2: http://www.dhondt.de/ccx_%{version}.test.tar.bz2
|
||||||
Patch0: patch-ccx-build
|
Patch0: ccx-2.5-build.patch
|
||||||
Patch1: patch-ccx-doc-Makefile
|
Patch1: ccx-1.2-doc-Makefile.patch
|
||||||
Patch2: patch-ccx-beamread
|
Patch2: ccx-2.5-no-local-compare.patch
|
||||||
Patch3: patch-ccx-bufferoverrun
|
Patch3: ccx-2.0-spooles-dynamic.patch
|
||||||
Patch4: patch-ccx-no-local
|
Patch4: ccx-2.5-abaqus-shell-heat-transfer-elements-read.patch
|
||||||
Patch5: patch-ccx-spooles-dynamic
|
|
||||||
Patch6: ccx-2.4-fix-compiler-warnings.patch
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
BuildRequires: arpack-ng-devel
|
BuildRequires: arpack-ng-devel
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
BuildRequires: gcc-fortran
|
BuildRequires: gcc-fortran
|
||||||
|
BuildRequires: lapack-devel
|
||||||
BuildRequires: latex2html
|
BuildRequires: latex2html
|
||||||
BuildRequires: openblas-devel
|
|
||||||
BuildRequires: sed
|
BuildRequires: sed
|
||||||
BuildRequires: spooles-devel
|
BuildRequires: spooles-devel
|
||||||
|
|
||||||
@ -80,8 +78,6 @@ cd ${RPM_BUILD_DIR}/%{name}-%{version}
|
|||||||
%patch2 -p1
|
%patch2 -p1
|
||||||
%patch3 -p1
|
%patch3 -p1
|
||||||
%patch4 -p1
|
%patch4 -p1
|
||||||
%patch5 -p1
|
|
||||||
%patch6 -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
cd ${RPM_BUILD_DIR}/%{name}-%{version}
|
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}/datcheck.pl
|
||||||
chmod 755 $RPM_BUILD_ROOT/%{_datadir}/%{name}-examples-%{version}/frdcheck.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}
|
%fdupes $RPM_BUILD_ROOT/%{_datadir}/%{name}-examples-%{version}
|
||||||
%endif
|
|
||||||
|
|
||||||
%clean
|
%clean
|
||||||
rm -Rf $RPM_BUILD_ROOT
|
rm -Rf $RPM_BUILD_ROOT
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:9f5c2fb6689c8d8e71a3a0c4776992da20803f5307085086337aa2b834ad598c
|
|
||||||
size 3282853
|
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:cadcd0d71bb54c6d61c83ce3aaa7a3fb8c8517d40db3909778797fd05e25e7a4
|
|
||||||
size 830747
|
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:5eca6a56cd2a9a500317fe45579e92d70222f68681dbb76a58eef5b58bd83c05
|
|
||||||
size 6589894
|
|
3
ccx_2.5.doc.tar.bz2
Normal file
3
ccx_2.5.doc.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:3118981763f7dd5f039df4666687eeb978e6ae9a0a4ce240aa769fdd06ac3a17
|
||||||
|
size 3638148
|
3
ccx_2.5.src.tar.bz2
Normal file
3
ccx_2.5.src.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:7b695c8dbcf3b7680dad31d2f5403c3115bc48d526815182245ba4d7986b24a5
|
||||||
|
size 923149
|
3
ccx_2.5.test.tar.bz2
Normal file
3
ccx_2.5.test.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:48e428a483e7d099bd19b5ebb2416c29437bad6e5f12dff5eeb4e0fb791756e7
|
||||||
|
size 7630079
|
@ -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
|
|
||||||
#
|
|
@ -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<argc;i++){
|
|
||||||
if(strcmp1(argv[i],"-o")==0) {
|
|
||||||
- strcpy(output,argv[i+1]);break;}
|
|
||||||
+ strncpy(output,argv[i+1],sizeof(output));
|
|
||||||
+ output[sizeof(output)-1] = '\0';
|
|
||||||
+ break;
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,25 +0,0 @@
|
|||||||
--- ccx-2.1/src/Makefile.orig 2010-02-21 15:46:55.000000000 +0100
|
|
||||||
+++ ccx-2.1/src/Makefile 2010-03-08 21:01:00.000000000 +0100
|
|
||||||
@@ -1,6 +1,6 @@
|
|
||||||
|
|
||||||
-CFLAGS = -Wall -O -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE
|
|
||||||
-FFLAGS = -Wall -O -fopenmp
|
|
||||||
+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
|
|
||||||
@@ -18,11 +18,9 @@
|
|
||||||
OCCXC = $(SCCXC:.c=.o)
|
|
||||||
OCCXMAIN = $(SCCXMAIN:.c=.o)
|
|
||||||
|
|
||||||
-DIR=../../../SPOOLES.2.2
|
|
||||||
-
|
|
||||||
LIBS = \
|
|
||||||
- $(DIR)/spooles.a \
|
|
||||||
- ../../../ARPACK/libarpack_INTEL.a \
|
|
||||||
+ -lspooles \
|
|
||||||
+ -larpack -lopenblas \
|
|
||||||
-lm -lc
|
|
||||||
|
|
||||||
ccx_2.4: $(OCCXMAIN) ccx_2.4.a $(LIBS)
|
|
@ -1,11 +0,0 @@
|
|||||||
--- ccx-1.8/test/compare.orig 2009-06-29 22:50:57.000000000 +0200
|
|
||||||
+++ ccx-1.8/test/compare 2009-06-29 22:51:06.000000000 +0200
|
|
||||||
@@ -30,7 +30,7 @@
|
|
||||||
# the .frd file
|
|
||||||
#
|
|
||||||
|
|
||||||
- /usr/local/bin/ccx_2.4 ${i%.inp} >> $tempfile 2>&1
|
|
||||||
+ /usr/bin/ccx_2.4 ${i%.inp} >> $tempfile 2>&1
|
|
||||||
|
|
||||||
#
|
|
||||||
# check whether the .dat and .dat.ref files exist
|
|
Loading…
Reference in New Issue
Block a user