- add patch from Guido Dhondt to fix compiler warnings
- do not link against openblas since arpack is linked against reference blas and lapack OBS-URL: https://build.opensuse.org/package/show/science/ccx?expand=0&rev=3
This commit is contained in:
parent
c62bffb080
commit
a4f669479c
53
ccx-2.4-fix-compiler-warnings.patch
Normal file
53
ccx-2.4-fix-compiler-warnings.patch
Normal file
@ -0,0 +1,53 @@
|
|||||||
|
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)
|
11
ccx.changes
11
ccx.changes
@ -1,3 +1,14 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Jul 3 20:08:04 UTC 2012 - scorot@free.fr
|
||||||
|
|
||||||
|
- add patch from Guido Dhondt to fix compiler warnings
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Jun 7 20:27:07 UTC 2012 - scorot@free.fr
|
||||||
|
|
||||||
|
- do not link against openblas since arpack is linked against
|
||||||
|
reference blas and lapack
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sun May 6 20:53:51 UTC 2012 - scorot@free.fr
|
Sun May 6 20:53:51 UTC 2012 - scorot@free.fr
|
||||||
|
|
||||||
|
4
ccx.spec
4
ccx.spec
@ -32,6 +32,7 @@ Patch2: patch-ccx-beamread
|
|||||||
Patch3: patch-ccx-bufferoverrun
|
Patch3: patch-ccx-bufferoverrun
|
||||||
Patch4: patch-ccx-no-local
|
Patch4: patch-ccx-no-local
|
||||||
Patch5: patch-ccx-spooles-dynamic
|
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
|
||||||
@ -80,6 +81,7 @@ cd ${RPM_BUILD_DIR}/%{name}-%{version}
|
|||||||
%patch3 -p1
|
%patch3 -p1
|
||||||
%patch4 -p1
|
%patch4 -p1
|
||||||
%patch5 -p1
|
%patch5 -p1
|
||||||
|
%patch6 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
cd ${RPM_BUILD_DIR}/%{name}-%{version}
|
cd ${RPM_BUILD_DIR}/%{name}-%{version}
|
||||||
@ -97,7 +99,7 @@ cd ../doc
|
|||||||
ln -s %{_datadir}/texmf/fonts/enc/dvips/tex-gyre/q-texnansi.enc ./texnansi.enc
|
ln -s %{_datadir}/texmf/fonts/enc/dvips/tex-gyre/q-texnansi.enc ./texnansi.enc
|
||||||
make %{?_smp_mflags}
|
make %{?_smp_mflags}
|
||||||
|
|
||||||
# copy central descriptions to topmost folder, for %doc directive
|
# copy central descriptions to topmost folder, for %%doc directive
|
||||||
cd ${RPM_BUILD_DIR}/%{name}-%{version}
|
cd ${RPM_BUILD_DIR}/%{name}-%{version}
|
||||||
cp src/{BUGS,LOGBOOK,README.INSTALL,TODO} .
|
cp src/{BUGS,LOGBOOK,README.INSTALL,TODO} .
|
||||||
cp doc/*.pdf .
|
cp doc/*.pdf .
|
||||||
|
Loading…
Reference in New Issue
Block a user