[cig-commits] r6298 - geodyn/3D/MAG/trunk/src

[wei at geodynamics.org]

Author: wei
Date: 2007-03-19 15:57:55 -0700 (Mon, 19 Mar 2007)
New Revision: 6298

Added:
   geodyn/3D/MAG/trunk/src/par.revRmv
Modified:
   geodyn/3D/MAG/trunk/src/cmbcoeff.f
   geodyn/3D/MAG/trunk/src/nl.f
   geodyn/3D/MAG/trunk/src/par.bnch0
   geodyn/3D/MAG/trunk/src/par.bnch1
   geodyn/3D/MAG/trunk/src/par.bnch1mv
   geodyn/3D/MAG/trunk/src/param.f
Log:
Change cc file to formatted output

Modified: geodyn/3D/MAG/trunk/src/cmbcoeff.f
===================================================================
--- geodyn/3D/MAG/trunk/src/cmbcoeff.f	2007-03-19 22:53:40 UTC (rev 6297)
+++ geodyn/3D/MAG/trunk/src/cmbcoeff.f	2007-03-19 22:57:55 UTC (rev 6298)
@@ -17,14 +17,18 @@
 c
 c  write header
 c
-      write(21) nlma,lmax,minc,r(1),r(kc),time/tscale
+      write(21,2100) nlma,lmax,minc,r(1),r(kc),time/tscale
+ 2100 format(/, 4x,"nlma=",i3,4x,"lmax=",i3,4x,"minc=",i3,4x,
+     $   "r(1)=",f7.4,4x,"r(kc)=",f7.4,4x,"time/tscale=",f9.6)
 c
 c  write data
 c
-      write(21) (b(lm,1),lm=1,nlma)
-      write(21) (w(lm,kc),lm=1,nlma)
-      write(21) (dw(lm,kc),lm=1,nlma)
-      write(21) (z(lm,kc),lm=1,nlma)
+      write(21,2101) (b(lm,1),lm=1,nlma)
+      write(21,2102) (w(lm,kc),lm=1,nlma)
+      write(21,2102) (dw(lm,kc),lm=1,nlma)
+      write(21,2102) (z(lm,kc),lm=1,nlma)
+ 2101 format(256(1X,f9.5))
+ 2102 format(256(1X,f9.3))
 c
       return
       end

Modified: geodyn/3D/MAG/trunk/src/nl.f
===================================================================
--- geodyn/3D/MAG/trunk/src/nl.f	2007-03-19 22:53:40 UTC (rev 6297)
+++ geodyn/3D/MAG/trunk/src/nl.f	2007-03-19 22:57:55 UTC (rev 6298)
@@ -150,7 +150,7 @@
       if(mod(imovopt,1000).ge.100)
      $ open(20,file=movmfile,status='new',form='formatted')
       if(imovopt.ge.1000)
-     $ open(21,file=ccfile,status='new',form='unformatted')
+     $ open(21,file=ccfile,status='new',form='formatted')
 c
 c  write header for movie file
 c

Modified: geodyn/3D/MAG/trunk/src/par.bnch0
===================================================================
--- geodyn/3D/MAG/trunk/src/par.bnch0	2007-03-19 22:53:40 UTC (rev 6297)
+++ geodyn/3D/MAG/trunk/src/par.bnch0	2007-03-19 22:57:55 UTC (rev 6298)
@@ -5,8 +5,8 @@
  treset=.true.,
  samp=0.1000,
  nstep=200,
- nprnt=04,
- nstor=02,
+ nprnt=08,
+ nstor=04,
  nplog=0,
  nlogstep=100,
  ngform=1,

Modified: geodyn/3D/MAG/trunk/src/par.bnch1
===================================================================
--- geodyn/3D/MAG/trunk/src/par.bnch1	2007-03-19 22:53:40 UTC (rev 6297)
+++ geodyn/3D/MAG/trunk/src/par.bnch1	2007-03-19 22:57:55 UTC (rev 6298)
@@ -1,10 +1,11 @@
  &contrl
- outfile="bench1",
+ outfile="bench1rrrr",
+ infile="d3.bench1rrr",
  runid="Ra=1.0E5 Ek=1E-3 Els=0 Pr=1 Pm=5 RR TT H=0",
- init=0404,
- treset=.true.,
+ init=0,
+ treset=.false.,
  samp=0.1000,
- nstep=200,
+ nstep=1000,
  nprnt=08,
  nstor=04,
  nplog=0,

Modified: geodyn/3D/MAG/trunk/src/par.bnch1mv
===================================================================
--- geodyn/3D/MAG/trunk/src/par.bnch1mv	2007-03-19 22:53:40 UTC (rev 6297)
+++ geodyn/3D/MAG/trunk/src/par.bnch1mv	2007-03-19 22:57:55 UTC (rev 6298)
@@ -30,7 +30,7 @@
  ktopv=2,
  kbotv=2,
  difamp=0,
- imovopt=111,
+ imovopt=1111,
  tmovstart=2.0,
  tmovstep=2.E-3,
  iframes=100,

Added: geodyn/3D/MAG/trunk/src/par.revRmv
===================================================================
--- geodyn/3D/MAG/trunk/src/par.revRmv	2007-03-19 22:53:40 UTC (rev 6297)
+++ geodyn/3D/MAG/trunk/src/par.revRmv	2007-03-19 22:57:55 UTC (rev 6298)
@@ -0,0 +1,40 @@
+ &contrl
+ outfile="revRmv",
+ infile="d5.rev",
+ runid="Ra=1.2E4 Ek=2.0E-2 Els=5 Pr=1 Pm=10 RR TT H=0 rstrt",
+ init=0,
+ treset=.false.,
+ samp=0.1000,
+ nstep=3000,
+ nprnt=8,
+ nstor=8,
+ nplog=0,
+ nlogstep=150,
+ ngform=1,
+ ngrad=01,
+ ngcolat=1,
+ nglon=1,
+ dtmax=1.5E-4,
+ courfac=5.0,
+ alffac=0.1,
+ radratio=0.35,
+ ra=1.2E4,
+ ek=2.0E-2,
+ pr=1.0,
+ prmag=10.0,
+ bpeak=-5.0,
+ ifbfrz=.false.,
+ imagcon=0,
+ ktops=1,
+ kbots=1,
+ epsc0=0.0,
+ ktopv=2,
+ kbotv=2,
+ difamp=0,
+ imovopt=1100,
+ tmovstart=22,
+ tmovstep=2.E-2,
+ iframes=400,
+ icour=4 /
+ &bounds /
+

Modified: geodyn/3D/MAG/trunk/src/param.f
===================================================================
--- geodyn/3D/MAG/trunk/src/param.f	2007-03-19 22:53:40 UTC (rev 6297)
+++ geodyn/3D/MAG/trunk/src/param.f	2007-03-19 22:57:55 UTC (rev 6298)
@@ -1 +1 @@
-link param32s1.f
\ No newline at end of file
+link param32s4.f
\ No newline at end of file