cleaned output. merged correction from trunk rev 52 (spline coefficients dimensions)

This commit is contained in:
Lorenzo Figini 2013-10-11 15:10:56 +00:00
parent 81dc2d0a3c
commit 85b13a4b8d

View File

@ -376,7 +376,7 @@ c
common/parwv/ak0,akinv,fhz common/parwv/ak0,akinv,fhz
common/dxgyg/derxg,deryg common/dxgyg/derxg,deryg
common/toxmxx/toxxmx,xgmax,ygxmx,anplxmx,anprxmx,thkbxmx,ixmx common/toxmxx/toxxmx,xgmax,ygxmx,anplxmx,anprxmx,thkbxmx,ixmx
common/toxmxt/toxmax,xgtmx,ygtmx,anpltmx,anprtmx,thkbtmx,itmx ! common/toxmxt/toxmax,xgtmx,ygtmx,anpltmx,anprtmx,thkbtmx,itmx
anplopt=sqrt(yg/(yg+1.0d0)) anplopt=sqrt(yg/(yg+1.0d0))
thkb=1.8d2/pi*acos(anpl/sqrt(an2)) thkb=1.8d2/pi*acos(anpl/sqrt(an2))
@ -398,16 +398,16 @@ c
anprxmx=anpr anprxmx=anpr
thkbxmx=thkb thkbxmx=thkb
end if end if
if (tox.gt.toxmax) then ! if (tox.gt.toxmax) then
itmx=i ! itmx=i
toxmax=tox ! toxmax=tox
xgtmx=xg ! xgtmx=xg
ygtmx=yg ! ygtmx=yg
anpltmx=anpl ! anpltmx=anpl
anprtmx=anpr ! anprtmx=anpr
thkbtmx=thkb ! thkbtmx=thkb
end if ! end if
write(46,98) i,tox,xg,yg,anpl,anpr,thkb,xv/1.d2,anv,derxg,deryg ! write(46,98) i,tox,xg,yg,anpl,anpr,thkb,xv/1.d2,anv,derxg,deryg
end if end if
c c
return return
@ -419,9 +419,9 @@ c
subroutine print_tox subroutine print_tox
implicit real*8 (a-h,o-z) implicit real*8 (a-h,o-z)
common/toxmxx/toxxmx,xgmax,ygxmx,anplxmx,anprxmx,thkbxmx,ixmx common/toxmxx/toxxmx,xgmax,ygxmx,anplxmx,anprxmx,thkbxmx,ixmx
common/toxmxt/toxmax,xgtmx,ygtmx,anpltmx,anprtmx,thkbtmx,itmx ! common/toxmxt/toxmax,xgtmx,ygtmx,anpltmx,anprtmx,thkbtmx,itmx
write(44,98) ixmx,toxxmx,xgmax,ygxmx,anplxmx,anprxmx,thkbxmx write(44,98) ixmx,toxxmx,xgmax,ygxmx,anplxmx,anprxmx,thkbxmx
write(45,98) itmx,toxmax,xgtmx,ygtmx,anpltmx,anprtmx,thkbtmx ! write(45,98) itmx,toxmax,xgtmx,ygtmx,anpltmx,anprtmx,thkbtmx
c c
return return
98 format(1x,i8,30(1x,e16.8e3)) 98 format(1x,i8,30(1x,e16.8e3))
@ -586,6 +586,7 @@ c
write(7,*)'#Icd Pa Jphimx dPdVmx '// write(7,*)'#Icd Pa Jphimx dPdVmx '//
.'rhotj rhotjava rhotp rhotpav '// .'rhotj rhotjava rhotp rhotpav '//
.'drhotjava drhotpav ratjbmx stmx psipol chipol index_rt' .'drhotjava drhotpav ratjbmx stmx psipol chipol index_rt'
write(44,*) '#i Tox X Y Npl Nperp thetakB'
write(48,*) '#psi rhot Jphi Jcdb dPdV Icdins Pins P% index_rt' write(48,*) '#psi rhot Jphi Jcdb dPdV Icdins Pins P% index_rt'
else else
@ -2698,7 +2699,7 @@ c
common/ipol/ipolc common/ipol/ipolc
c used only for computation of O-X transmission function c used only for computation of O-X transmission function
common/toxmxx/toxxmx,xgmax,ygxmx,anplxmx,anprxmx,thkbxmx,ixmx common/toxmxx/toxxmx,xgmax,ygxmx,anplxmx,anprxmx,thkbxmx,ixmx
common/toxmxt/toxmax,xgtmx,ygtmx,anpltmx,anprtmx,thkbtmx,itmx ! common/toxmxt/toxmax,xgtmx,ygtmx,anpltmx,anprtmx,thkbtmx,itmx
c c
istpr=0 istpr=0
istpl=1 istpl=1
@ -2708,9 +2709,9 @@ c
ipolc=0 ipolc=0
c c
ixmx=0 ixmx=0
itmx=0 ! itmx=0
xgmax=0.0d0 xgmax=0.0d0
toxmax=0.0d0 ! toxmax=0.0d0
c c
return return
end end
@ -3555,7 +3556,7 @@ c
parameter(lw20=nnw*2+nnh*4+nnw*nnh,lw02=nnw*4+nnh*2+nnw*nnh) parameter(lw20=nnw*2+nnh*4+nnw*nnh,lw02=nnw*4+nnh*2+nnw*nnh)
parameter(lw11=nnw*3+nnh*3+nnw*nnh) parameter(lw11=nnw*3+nnh*3+nnw*nnh)
parameter(nrs=1,nzs=1) parameter(nrs=1,nzs=1)
dimension cc01(lw10),cc10(lw01),cc02(lw02),cc20(lw20),cc11(lw11) dimension cc01(lw01),cc10(lw10),cc02(lw02),cc20(lw20),cc11(lw11)
dimension tfp(nrest),cfp(nrest),wrkfd(nrest) dimension tfp(nrest),cfp(nrest),wrkfd(nrest)
c c
common/eqnn/nr,nz,npp,nintp common/eqnn/nr,nz,npp,nintp