[cig-commits] r6604 - in
short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d: . includes
willic3 at geodynamics.org
willic3 at geodynamics.org
Wed Apr 18 19:33:37 PDT 2007
Author: willic3
Date: 2007-04-18 19:33:36 -0700 (Wed, 18 Apr 2007)
New Revision: 6604
Modified:
short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/autoprestr.F
short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/elastc.F
short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/includes/ntimdat_def.inc
short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/includes/ntimdat_dim.inc
short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/iterate.F
short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/viscos.F
short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/viscos_cleanup.F
short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/viscos_step.F
Log:
Removed ndtot, which was no longer being used, along with corresponding
entry in the ntimdat array.
Modified: short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/autoprestr.F
===================================================================
--- short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/autoprestr.F 2007-04-19 01:01:52 UTC (rev 6603)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/autoprestr.F 2007-04-19 02:33:36 UTC (rev 6604)
@@ -184,9 +184,7 @@
ntimdat(6)=nittot
nrftot=izero
ntimdat(7)=nrftot
- ndtot=izero
- ntimdat(8)=ndtot
- ntimdat(9)=ireform
+ ntimdat(8)=ireform
iprestress=ione
cdebug write(6,*) "Before const:"
call const(maxstp,delt,alfa,maxit,ntdinit,lgdef,utol,ftol,
@@ -562,8 +560,8 @@
cdebug write(6,*) "After write_state:"
c
if(nintg.eq.1) then
- write(kto,800) ntimdat(6),ntimdat(7),ntimdat(8)
- if(idout.gt.0) write(kw,800) ntimdat(6),ntimdat(7),ntimdat(8)
+ write(kto,800) ntimdat(6),ntimdat(7)
+ if(idout.gt.0) write(kw,800) ntimdat(6),ntimdat(7)
end if
c
c... copy stresses into initial stress array
@@ -578,8 +576,7 @@
650 format(//,"Reforming the stiffness matrix:",/)
700 format('STEP ',i5)
800 format(/," Total number of equilibrium iterations = ",i7,/,
- & " Total number of stiffness matrix reformations = ",i7,/,
- & " Total number of displacement subiterations = ",i7)
+ & " Total number of stiffness matrix reformations = ",i7)
return
end
c
Modified: short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/elastc.F
===================================================================
--- short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/elastc.F 2007-04-19 01:01:52 UTC (rev 6603)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/elastc.F 2007-04-19 02:33:36 UTC (rev 6604)
@@ -187,16 +187,14 @@
ntimdat(6)=nittot
nrftot=izero
ntimdat(7)=nrftot
- ndtot=izero
- ntimdat(8)=ndtot
- ntimdat(9)=ireform
+ ntimdat(8)=ireform
iprestress=izero
cdebug write(6,*) "Before const:"
call const(maxstp,delt,alfa,maxit,ntdinit,lgdef,utol,ftol,
& etol,itmax,nintg,igroup,naxstp,nfirst,rtimdat,deltp,alfap,
& ntimdat,nstep,maxitp,ntdinitp,lgdefp,itmaxp,gtol)
cdebug write(6,*) "After const:"
-cdebug write(6,*) "ireform,ntimdat(9):",ireform,ntimdat(9)
+cdebug write(6,*) "ireform,ntimdat(8):",ireform,ntimdat(8)
if(skc) then
call skclear(idslp,skew,numsn,numnp)
call skcomp(x,d,skew,idslp,ipslp,ipstrs,numsn,numnp,nstep,
@@ -583,16 +581,15 @@
cdebug write(6,*) "After write_state:"
c
if(nintg.eq.1) then
- write(kto,800) ntimdat(6),ntimdat(7),ntimdat(8)
- if(idout.gt.0) write(kw,800) ntimdat(6),ntimdat(7),ntimdat(8)
+ write(kto,800) ntimdat(6),ntimdat(7)
+ if(idout.gt.0) write(kw,800) ntimdat(6),ntimdat(7)
end if
c
600 format(//,'Beginning elastic solution:',/)
650 format(//,"Reforming the stiffness matrix:",/)
700 format('STEP ',i5)
800 format(/," Total number of equilibrium iterations = ",i7,/,
- & " Total number of stiffness matrix reformations = ",i7,/,
- & " Total number of displacement subiterations = ",i7)
+ & " Total number of stiffness matrix reformations = ",i7)
call PetscLogStagePop(ierr)
return
end
Modified: short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/includes/ntimdat_def.inc
===================================================================
--- short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/includes/ntimdat_def.inc 2007-04-19 01:01:52 UTC (rev 6603)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/includes/ntimdat_def.inc 2007-04-19 02:33:36 UTC (rev 6604)
@@ -42,8 +42,7 @@
itmaxp=ntimdat(5)
nittot=ntimdat(6)
nrftot=ntimdat(7)
- ndtot=ntimdat(8)
- ireform=ntimdat(9)
+ ireform=ntimdat(8)
c
c version
c $Id: ntimdat_def.inc,v 1.4 2004/07/21 15:24:20 willic3 Exp $
Modified: short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/includes/ntimdat_dim.inc
===================================================================
--- short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/includes/ntimdat_dim.inc 2007-04-19 01:01:52 UTC (rev 6603)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/includes/ntimdat_dim.inc 2007-04-19 02:33:36 UTC (rev 6604)
@@ -35,12 +35,12 @@
c
c... arrays containing parameters
c
- integer ntimdat(9)
+ integer ntimdat(8)
c
c... scalar parameters associated with arrays
c
integer nstep,maxitp,ntdinitp,lgdefp,itmaxp,nittot,nrftot,
- & ndtot,ireform
+ & ireform
c
c version
c $Id: ntimdat_dim.inc,v 1.4 2004/07/21 15:25:26 willic3 Exp $
Modified: short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/iterate.F
===================================================================
--- short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/iterate.F 2007-04-19 01:01:52 UTC (rev 6603)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/iterate.F 2007-04-19 02:33:36 UTC (rev 6604)
@@ -190,7 +190,7 @@
reform=reform.or.(mod(iter,maxitp).eq.0)
ireform=0
if(reform) ireform=1
- ntimdat(9)=ireform
+ ntimdat(8)=ireform
used=nstep.gt.0.and.nprevdflag.eq.1.and.iter.eq.1
if(iter.gt.1) fulout=.false.
c
Modified: short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/viscos.F
===================================================================
--- short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/viscos.F 2007-04-19 01:01:52 UTC (rev 6603)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/viscos.F 2007-04-19 02:33:36 UTC (rev 6604)
@@ -240,7 +240,7 @@
end if
reform=reform.or.ltim
if(reform) ireform=ione
- ntimdat(9)=ireform
+ ntimdat(8)=ireform
cdebug write(6,*) "ntdinitp,reform,ireform,ltim:",
cdebug & ntdinitp,reform,ireform,ltim
fulout=.false.
@@ -638,14 +638,13 @@
end do
end do
end do
- write(kto,800) ntimdat(6),ntimdat(7),ntimdat(8)
- if(idout.gt.ione) write(kw,800) ntimdat(6),ntimdat(7),ntimdat(8)
+ write(kto,800) ntimdat(6),ntimdat(7)
+ if(idout.gt.ione) write(kw,800) ntimdat(6),ntimdat(7)
c
650 format(//,"Reforming the stiffness matrix:",/)
700 format('STEP ',i7)
800 format(/," Total number of equilibrium iterations = ",i7,/,
- & " Total number of stiffness matrix reformations = ",i7,/,
- & " Total number of displacement subiterations = ",i7)
+ & " Total number of stiffness matrix reformations = ",i7)
1000 format(////' output which follows is at time= ',1pe15.8/
& ' step # ',i7,' in cycle # ',i7//)
2000 format(/'Time-dependent solution is begun:'/)
Modified: short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/viscos_cleanup.F
===================================================================
--- short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/viscos_cleanup.F 2007-04-19 01:01:52 UTC (rev 6603)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/viscos_cleanup.F 2007-04-19 02:33:36 UTC (rev 6604)
@@ -55,11 +55,10 @@
c
c... write output, if requested
c
- if(idout.gt.ione) write(kw,800) ntimdat(6),ntimdat(7),ntimdat(8)
+ if(idout.gt.ione) write(kw,800) ntimdat(6),ntimdat(7)
c
800 format(/," Total number of equilibrium iterations = ",i7,/,
- & " Total number of stiffness matrix reformations = ",i7,/,
- & " Total number of displacement subiterations = ",i7)
+ & " Total number of stiffness matrix reformations = ",i7)
return
end
c
Modified: short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/viscos_step.F
===================================================================
--- short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/viscos_step.F 2007-04-19 01:01:52 UTC (rev 6603)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/viscos_step.F 2007-04-19 02:33:36 UTC (rev 6604)
@@ -213,7 +213,7 @@
end if
reform=reform.or.ltim
if(reform) ireform=ione
- ntimdat(9)=ireform
+ ntimdat(8)=ireform
cdebug write(6,*) "ntdinitp,reform,ireform,ltim:",
cdebug & ntdinitp,reform,ireform,ltim
fulout=izero
More information about the cig-commits
mailing list