54 lines
1.8 KiB
Diff
54 lines
1.8 KiB
Diff
|
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)
|