[thread display] [new arrival display] [word search] [past log] [管理用]
| Subject | ： src/trade.f r1.19 - r1.20の変更内容 |
| Date | ： 2012/11/27(Tue) 19:23:56 |
| Contributor | ： Akio Morita |
cvs log src/trade.f 抜粋
----------------------------
revision 1.20
date: 2010/01/18 13:08:29; author: oide; state: Exp; lines: +5 -4
V1.0.10.4a06
----------------------------
cvs diff -r1.19 -r1.20 src/trade.f
Index: src/trade.f
===================================================================
RCS file: /SAD/cvsroot/oldsad/src/trade.f,v
retrieving revision 1.19
retrieving revision 1.20
diff -d -u -r1.19 -r1.20
--- src/trade.f 17 Jan 2010 07:19:11 -0000 1.19
+++ src/trade.f 18 Jan 2010 13:08:29 -0000 1.20
@@ -1,4 +1,4 @@
-c$Header: /SAD/cvsroot/oldsad/src/trade.f,v 1.19 2010/01/17 07:19:11 oide Exp $
+c$Header: /SAD/cvsroot/oldsad/src/trade.f,v 1.20 2010/01/18 13:08:29 oide Exp $
subroutine trade(trans,beam,cod,bx,by,bz,br,
$ bxx,bxy,byy,dldx,
$ f1,s,ala,al)
@@ -43,7 +43,7 @@
call tclr(radi,36)
radi(6,1)=-h1sq*tlc*2.d0*
$ (pzi*(-vx*bxy+vy*bxx)+vz*(pxi*bxy-pyi*bxx))
- 1 -h1sq*brad*dtdsc*al*dldx
+ 1 -h1sq*brad*dtdsc*dldx
radi(6,2)=(dp*dtds**2*pxi-h1sq*tlc*2.d0*
$ ((vx*by-vy*bx)*pxi/pzi-vy*bz+vz*by))/pr
radi(6,3)=-h1sq*tlc*2.d0*
@@ -54,6 +54,7 @@
radi(6,6)=-2.d0*p1*p0*tlc*brad
1 -dp*dtds**2*sq/pr
1 +2.d0*h1sq*(qx*vx+qy*vy+vz**2)/pr*tlc
+c write(*,'(1p6g15.7)')(radi(6,i),i=1,6)
call tradp(radi,pxi,pyi,dp,pr,ar)
call tmuld(trans,radi)
do i=1,6
@@ -142,8 +143,8 @@
subroutine tradp(trans,pxi,pyi,dp,pr,ar)
implicit none
real*8 trans(6,6),pxi,pyi,dp,pr,ar
- trans(6,1)=trans(6,1)-ar*trans(6,4)/pr
- trans(6,3)=trans(6,3)+ar*trans(6,2)/pr
+ trans(6,1)=trans(6,1)-ar*trans(6,4)
+ trans(6,3)=trans(6,3)+ar*trans(6,2)
trans(2,1)=pxi*trans(6,1)
trans(2,2)=pxi*trans(6,2)
trans(2,3)=pxi*trans(6,3)