[cig-commits] r6784 - geodyn/3D/MAG/trunk/src
wei at geodynamics.org
wei at geodynamics.org
Fri May 4 12:54:53 PDT 2007
Author: wei
Date: 2007-05-04 12:54:52 -0700 (Fri, 04 May 2007)
New Revision: 6784
Modified:
geodyn/3D/MAG/trunk/src/amhd.f
geodyn/3D/MAG/trunk/src/cmbcoeff.f
geodyn/3D/MAG/trunk/src/movaout.f
geodyn/3D/MAG/trunk/src/moveout.f
geodyn/3D/MAG/trunk/src/movmout.f
geodyn/3D/MAG/trunk/src/par.bnch1mv
geodyn/3D/MAG/trunk/src/prep.f
geodyn/3D/MAG/trunk/src/spectrum.f
Log:
change all format related to time/scale
Modified: geodyn/3D/MAG/trunk/src/amhd.f
===================================================================
--- geodyn/3D/MAG/trunk/src/amhd.f 2007-05-04 03:00:59 UTC (rev 6783)
+++ geodyn/3D/MAG/trunk/src/amhd.f 2007-05-04 19:54:52 UTC (rev 6784)
@@ -1051,13 +1051,13 @@
endif
c print to l-file
- if(mod(kstep,nlogstep).eq.0) write(15,'(f9.6,8f9.2,5f9.5,3f9.2)')
+ if(mod(kstep,nlogstep).eq.0) write(15,'(f10.6,8f9.2,5f9.5,3f9.2)')
$time/tscale,env/escale,envp/escale,enb/escale,enbp/escale,
$adrke/escale,amcke/escale,apome/escale,atome/escale,
$topnuss,botnuss,bmean,dipole,dipolax,
$tiltdipole*180./pi,phidipole*180./pi,vmean
if(nplog.gt.0) then
- if(mod(kstep,nplog).eq.0) write(17,'(f9.6,6(1x,f9.3))')
+ if(mod(kstep,nplog).eq.0) write(17,'(f10.6,6(1x,f9.3))')
$ time/tscale,
$ vrpoint(nn/2),vppoint(nn/2),
$ vrpoint(2*nn/3),vppoint(2*nn/3)
@@ -1084,7 +1084,7 @@
dth=sqrt(dth2)
write(6,900) kstep,time/tscale
900 format(/4x,"****",i6,1x,"steps",3x,
- $"time=",3x,f9.6," (visc.diff.time) ****")
+ $"time=",3x,f10.6," (visc.diff.time) ****")
write(6,901) dt/tscale,dtr/tscale,dth/tscale
901 format(/,2x,"dt =",f10.8,3x,"dtrmin =",f10.8,3x,
$"dthmin =",f10.8)
Modified: geodyn/3D/MAG/trunk/src/cmbcoeff.f
===================================================================
--- geodyn/3D/MAG/trunk/src/cmbcoeff.f 2007-05-04 03:00:59 UTC (rev 6783)
+++ geodyn/3D/MAG/trunk/src/cmbcoeff.f 2007-05-04 19:54:52 UTC (rev 6784)
@@ -48,7 +48,7 @@
c
write(21,2100) nlma,lmax,minc,r(1),r(kc),time/tscale
2100 format(/, 2x,"nlma=",i3,2x,"lmax=",i3,2x,"minc=",i3,2x,
- $ "r(1)=",f7.4,2x,"r(kc)=",f7.4,2x,"time/tscale=",f9.6)
+ $ "r(1)=",f7.4,2x,"r(kc)=",f7.4,2x,"time/tscale=",f10.6)
c
c write data to cc file
@@ -166,11 +166,11 @@
c return
c else ! form dimensionless fully normalized potential coeffs
-c aalm(l,m)=glm(l,m)/(anano*escale*fact2*conalm)
-c ablm(l,m)=hlm(l,m)/(anano*escale*fact2*conblm)
+ aalm(l,m)=glm(l,m)/(anano*escale*fact2*conalm)
+ ablm(l,m)=hlm(l,m)/(anano*escale*fact2*conblm)
-c write(21,2106) l,m,aalm(l,m),ablm(l,m),glm(l,m),hlm(l,m)
-c 2206 format(/,2x,2i3,2x,2(f15.5),2x,2(f15.5))
+ write(21,2106) l,m,aalm(l,m),ablm(l,m),glm(l,m),hlm(l,m)
+ 2206 format(/,2x,2i3,2x,2(f15.5),2x,2(f15.5))
c return
c endif
@@ -183,7 +183,7 @@
c wirte a header for cg. file
write(22,2200) nlma,lmax,minc,r(1),r(kc),time/tscale
2200 format(/, 2x,"nlma=",i3,2x,"lmax=",i3,2x,"minc=",i3,2x,
- $ "r(1)=",f7.4,2x,"r(kc)=",f7.4,2x,"time/tscale=",f9.6)
+ $ "r(1)=",f7.4,2x,"r(kc)=",f7.4,2x,"time/tscale=",f10.6)
do 43 i=1,lmax
do 41 j=0,i
Modified: geodyn/3D/MAG/trunk/src/movaout.f
===================================================================
--- geodyn/3D/MAG/trunk/src/movaout.f 2007-05-04 03:00:59 UTC (rev 6783)
+++ geodyn/3D/MAG/trunk/src/movaout.f 2007-05-04 19:54:52 UTC (rev 6784)
@@ -100,7 +100,7 @@
& (r(kc)*(qi(ni,5)-qi(ni-1,5)))
c
if(kc.eq.1) then
- write(19,'(I5,1x,f8.5)') imovct,time/tscale
+ write(19,'(I5,1x,f10.6)') imovct,time/tscale
else
c
c write j_phi for level kc-1
Modified: geodyn/3D/MAG/trunk/src/moveout.f
===================================================================
--- geodyn/3D/MAG/trunk/src/moveout.f 2007-05-04 03:00:59 UTC (rev 6783)
+++ geodyn/3D/MAG/trunk/src/moveout.f 2007-05-04 19:54:52 UTC (rev 6784)
@@ -89,7 +89,7 @@
enddo
c
if(kc.eq.1) then
- write(18,'(I5,1x,f8.5)') imovct,time/tscale
+ write(18,'(I5,1x,f10.6)') imovct,time/tscale
else
c
c write vorticity for level kc-1
Modified: geodyn/3D/MAG/trunk/src/movmout.f
===================================================================
--- geodyn/3D/MAG/trunk/src/movmout.f 2007-05-04 03:00:59 UTC (rev 6783)
+++ geodyn/3D/MAG/trunk/src/movmout.f 2007-05-04 19:54:52 UTC (rev 6784)
@@ -50,7 +50,7 @@
c output of B_r at outer surface
c
else if (kc.eq.1) then
- write(20,'(I5,1x,f9.6)') imovct,time/tscale
+ write(20,'(I5,1x,f10.6)') imovct,time/tscale
if(nfilt.le.0) then
do ic=1,ni,ngcolat
write(20,901) (br(jc,ic)*qk(1,1),jc=1,nja,nglon)
Modified: geodyn/3D/MAG/trunk/src/par.bnch1mv
===================================================================
--- geodyn/3D/MAG/trunk/src/par.bnch1mv 2007-05-04 03:00:59 UTC (rev 6783)
+++ geodyn/3D/MAG/trunk/src/par.bnch1mv 2007-05-04 19:54:52 UTC (rev 6784)
@@ -31,7 +31,7 @@
kbotv=2,
difamp=0,
imovopt=1101,
- tmovstart=0.02,
+ tmovstart=1,
tmovstep=2.E-3,
iframes=100,
icour=4 /
Modified: geodyn/3D/MAG/trunk/src/prep.f
===================================================================
--- geodyn/3D/MAG/trunk/src/prep.f 2007-05-04 03:00:59 UTC (rev 6783)
+++ geodyn/3D/MAG/trunk/src/prep.f 2007-05-04 19:54:52 UTC (rev 6784)
@@ -965,7 +965,7 @@
$ write(6,'(3x,'' energy multiplied by '',f8.4)') enscale
write(6,6) dt/tscale,kstep,time/tscale
6 format(3x,"dt =",f10.8,3x,"kstep =",i7,3x,
- $"time =",f8.6/)
+ $"time =",f10.6/)
c
c *** construct lu decomposed matrices for w, z, s, b, aj, and p equations
c
Modified: geodyn/3D/MAG/trunk/src/spectrum.f
===================================================================
--- geodyn/3D/MAG/trunk/src/spectrum.f 2007-05-04 03:00:59 UTC (rev 6783)
+++ geodyn/3D/MAG/trunk/src/spectrum.f 2007-05-04 19:54:52 UTC (rev 6784)
@@ -214,14 +214,14 @@
c output on logs-file
c
if(imode.lt.1) then
- write(16,'(f9.6,1x,65f10.4)') time/tscale,(ekin(l)/escale,
+ write(16,'(f10.6,1x,65f10.4)') time/tscale,(ekin(l)/escale,
& l=1,nlaf)
- write(16,'(f9.6,1x,65f10.4)') time/tscale,(emag(l)/escale,
+ write(16,'(f10.6,1x,65f10.4)') time/tscale,(emag(l)/escale,
& l=1,nlaf,lstep)
else
- write(16,'(f9.6,1x,65f10.4)') time/tscale,(ekin(l)/escale,
+ write(16,'(f10.6,1x,65f10.4)') time/tscale,(ekin(l)/escale,
& l=1,nlaf,lstep)
- write(16,'(f9.6,1x,65f10.4)') time/tscale,(emag(l)/escale,
+ write(16,'(f10.6,1x,65f10.4)') time/tscale,(emag(l)/escale,
& l=1,nlaf,lstep)
endif
c
More information about the cig-commits
mailing list