[cig-commits] r5781 -
short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d
willic3 at geodynamics.org
willic3 at geodynamics.org
Fri Jan 12 13:23:53 PST 2007
Author: willic3
Date: 2007-01-12 13:23:53 -0800 (Fri, 12 Jan 2007)
New Revision: 5781
Modified:
short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/elas_strs_cmp_ss.f
short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/elas_strs_mat_cmp_ss.F
short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/iterate.F
short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/makefile.test
short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_1.f
short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_10.f
short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_11.f
short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_12.f
short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_13.f
short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_14.f
short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_15.f
short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_16.f
short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_17.f
short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_18.f
short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_19.f
short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_2.f
short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_20.f
short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_3.f
short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_4.f
short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_5.f
short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_7.f
short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_8.f
short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/stress_drv.f
short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/stress_mat_drv.F
short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/td_strs_cmp_ss.f
short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/td_strs_mat_cmp_ss.F
Log:
Update all material model routines and associated drivers to make use
of iteration counter, which is useful for some material models.
Added option to tangent computation routines to let them know whether
tangent is being computed using current stresses or stresses from
previous time step.
Fixed test makefile to add top-level PETSc directory to include path.
Modified: short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/elas_strs_cmp_ss.f
===================================================================
--- short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/elas_strs_cmp_ss.f 2007-01-12 21:20:20 UTC (rev 5780)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/elas_strs_cmp_ss.f 2007-01-12 21:23:53 UTC (rev 5781)
@@ -38,7 +38,7 @@
& ielg, ! elemnt
& prop,nprop,elas_strs,td_strs,matchg,tminmax, ! materl
& gauss,sh,shj,nen,ngauss,nee, ! eltype
- & rtimdat,ntimdat,rgiter, ! timdat
+ & rtimdat,ntimdat,rgiter,iter, ! timdat
& skew,numrot, ! skew
& getshape,bmatrix, ! bbar
& ierr,errstrng) ! errcode
@@ -64,7 +64,8 @@
c family.
c
integer ielg
- integer nprestrflag,ipstrs,ipauto,nprop,nen,ngauss,nee,numrot,ierr
+ integer nprestrflag,ipstrs,ipauto,nprop,nen,ngauss,nee,iter
+ integer numrot,ierr
integer iddmat(nstr,nstr)
integer ien(nen,nelfamily),lm(ndof*nen,nelfamily)
integer lmx(ndof*nen,nelfamily),lmf(nen,nelfamily)
Modified: short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/elas_strs_mat_cmp_ss.F
===================================================================
--- short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/elas_strs_mat_cmp_ss.F 2007-01-12 21:20:20 UTC (rev 5780)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/elas_strs_mat_cmp_ss.F 2007-01-12 21:23:53 UTC (rev 5781)
@@ -40,7 +40,7 @@
& ielg,numelv,ielindx, ! elemnt,orig element num
& prop,nprop,elas_strs_mat,td_strs_mat,matchg,tminmax, ! materl
& gauss,sh,shj,nen,ngauss,nee, ! eltype
- & rtimdat,ntimdat,rgiter, ! timdat
+ & rtimdat,ntimdat,rgiter,iter, ! timdat
& skew,numrot, ! skew
& getshape,bmatrix, ! bbar
& ierr,errstrng) ! errcode
@@ -76,7 +76,7 @@
c
integer ielg,numelv,ielindx(numelv)
integer nprestrflag,ipstrs,ipauto,n0states,nprop,nen,ngauss,nee
- integer numrot,ierr
+ integer iter,numrot,ierr
integer iddmat(nstr,nstr)
integer ien(nen,nelfamily),lm(ndof*nen,nelfamily)
integer lmx(ndof*nen,nelfamily),lmf(nen,nelfamily)
Modified: short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/iterate.F
===================================================================
--- short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/iterate.F 2007-01-12 21:20:20 UTC (rev 5780)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/iterate.F 2007-01-12 21:23:53 UTC (rev 5781)
@@ -326,6 +326,7 @@
& prop,infmatmod,npropsz,tminmax, ! materl
& gauss,sh,shj,nen,ngauss,nee, ! eltype
& histry,rtimdat,rgiter,ntimdat,nhist,lastep,stress_mat_cmp, ! timdat
+ & iter, ! timdat
& skew,numrot, ! skew
& getshape,bmatrix, ! bbar
& ierr,errstrng) ! errcode
@@ -340,7 +341,7 @@
& numelv,nstatesz,nstatesz0,nprestrflag,ipstrs,ipauto, ! elemnt
& prop,infmatmod,npropsz,tminmax, ! materl
& gauss,sh,shj,nen,ngauss,nee, ! eltype
- & histry,rtimdat,rgiter,ntimdat,nhist,lastep,stress_cmp, ! timdat
+ & histry,rtimdat,rgiter,ntimdat,nhist,lastep,stress_cmp,iter, ! timdat
& skew,numrot, ! skew
& getshape,bmatrix, ! bbar
& ierr,errstrng) ! errcode
Modified: short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/makefile.test
===================================================================
--- short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/makefile.test 2007-01-12 21:20:20 UTC (rev 5780)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/makefile.test 2007-01-12 21:23:53 UTC (rev 5781)
@@ -6,7 +6,7 @@
#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
PROJ_F77_INCLUDES= -I./includes
-PROJ_CPP_INCLUDES= -I$(PETSC_DIR)/include -I$(PETSC_DIR)/bmake/$(PETSC_ARCH) -I$(MPI_INCDIR)
+PROJ_CPP_INCLUDES= -I$(PETSC_DIR)/include -I$(PETSC_DIR)/bmake/$(PETSC_ARCH) -I$(MPI_INCDIR) -I$(PETSC_DIR)
#FFLAGC= -fno-silent -fno-ugly -fno-f77 -ff90 -fpedantic -Wall -fbackslash -Wsurprising -W $(PROJ_F77_INCLUDES) $(PROJ_CPP_INCLUDES)
Modified: short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_1.f
===================================================================
--- short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_1.f 2007-01-12 21:20:20 UTC (rev 5780)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_1.f 2007-01-12 21:23:53 UTC (rev 5781)
@@ -195,7 +195,7 @@
c
c
subroutine td_matinit_1(state,dstate,state0,dmat,prop,rtimdat,
- & rgiter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,matchg,ierr,
+ & rgiter,iopt,ntimdat,iddmat,tmax,nstate,nstate0,nprop,matchg,ierr,
& errstrng)
c
c... subroutine to form the material matrix for an integration point
@@ -219,7 +219,7 @@
c
c... subroutine arguments
c
- integer nstate,nstate0,nprop,ierr
+ integer iopt,nstate,nstate0,nprop,ierr
integer iddmat(nstr,nstr)
character errstrng*(*)
double precision state(nstate),dstate(nstate)
@@ -250,8 +250,8 @@
c
c
subroutine td_strs_1(state,dstate,state0,ee,scur,dmat,prop,
- & rtimdat,rgiter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,matchg,
- & ierr,errstrng)
+ & rtimdat,rgiter,iter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,
+ & matchg,ierr,errstrng)
c
c... subroutine to compute the current stress for the time-dependent
c solution.
@@ -268,7 +268,7 @@
c
c... subroutine arguments
c
- integer nstate,nstate0,nprop,ierr
+ integer iter,nstate,nstate0,nprop,ierr
integer iddmat(nstr,nstr)
character errstrng*(*)
logical matchg
@@ -298,8 +298,8 @@
c
c
subroutine td_strs_mat_1(state,dstate,state0,ee,scur,dmat,prop,
- & rtimdat,rgiter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,matchg,
- & ierr,errstrng)
+ & rtimdat,rgiter,iter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,
+ & matchg,ierr,errstrng)
c
c... subroutine to compute the current stress and updated material
c matrix for the time-dependent solution. Since this is a purely
@@ -318,7 +318,7 @@
c
c... subroutine arguments
c
- integer nstate,nstate0,nprop,ierr
+ integer iter,nstate,nstate0,nprop,ierr
integer iddmat(nstr,nstr)
character errstrng*(*)
logical matchg
Modified: short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_10.f
===================================================================
--- short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_10.f 2007-01-12 21:20:20 UTC (rev 5780)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_10.f 2007-01-12 21:23:53 UTC (rev 5781)
@@ -140,7 +140,7 @@
c
c
subroutine td_matinit_10(state,dstate,state0,dmat,prop,rtimdat,
- & rgiter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,matchg,ierr,
+ & rgiter,iopt,ntimdat,iddmat,tmax,nstate,nstate0,nprop,matchg,ierr,
& errstrng)
c
c... subroutine to form the material matrix for an integration point
@@ -161,7 +161,7 @@
c
c... subroutine arguments
c
- integer nstate,nstate0,nprop,ierr
+ integer iopt,nstate,nstate0,nprop,ierr
integer iddmat(nstr,nstr)
character errstrng*(*)
double precision state(nstate),dstate(nstate)
@@ -189,8 +189,8 @@
c
c
subroutine td_strs_10(state,dstate,state0,ee,scur,dmat,prop,
- & rtimdat,rgiter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,matchg,
- & ierr,errstrng)
+ & rtimdat,rgiter,iter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,
+ & matchg,ierr,errstrng)
c
c... subroutine to compute the current stress for the time-dependent
c solution.
@@ -207,7 +207,7 @@
c
c... subroutine arguments
c
- integer nstate,nstate0,nprop,ierr
+ integer iter,nstate,nstate0,nprop,ierr
integer iddmat(nstr,nstr)
character errstrng*(*)
logical matchg
@@ -236,8 +236,8 @@
c
c
subroutine td_strs_mat_10(state,dstate,state0,ee,scur,dmat,prop,
- & rtimdat,rgiter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,matchg,
- & ierr,errstrng)
+ & rtimdat,rgiter,iter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,
+ & matchg,ierr,errstrng)
c
c... subroutine to compute the current stress and updated material
c matrix for the time-dependent solution. Since this is a purely
@@ -256,7 +256,7 @@
c
c... subroutine arguments
c
- integer nstate,nstate0,nprop,ierr
+ integer iter,nstate,nstate0,nprop,ierr
integer iddmat(nstr,nstr)
character errstrng*(*)
logical matchg
Modified: short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_11.f
===================================================================
--- short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_11.f 2007-01-12 21:20:20 UTC (rev 5780)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_11.f 2007-01-12 21:23:53 UTC (rev 5781)
@@ -140,7 +140,7 @@
c
c
subroutine td_matinit_11(state,dstate,state0,dmat,prop,rtimdat,
- & rgiter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,matchg,ierr,
+ & rgiter,iopt,ntimdat,iddmat,tmax,nstate,nstate0,nprop,matchg,ierr,
& errstrng)
c
c... subroutine to form the material matrix for an integration point
@@ -161,7 +161,7 @@
c
c... subroutine arguments
c
- integer nstate,nstate0,nprop,ierr
+ integer iopt,nstate,nstate0,nprop,ierr
integer iddmat(nstr,nstr)
character errstrng*(*)
double precision state(nstate),dstate(nstate)
@@ -189,8 +189,8 @@
c
c
subroutine td_strs_11(state,dstate,state0,ee,scur,dmat,prop,
- & rtimdat,rgiter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,matchg,
- & ierr,errstrng)
+ & rtimdat,rgiter,iter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,
+ & matchg,ierr,errstrng)
c
c... subroutine to compute the current stress for the time-dependent
c solution.
@@ -207,7 +207,7 @@
c
c... subroutine arguments
c
- integer nstate,nstate0,nprop,ierr
+ integer iter,nstate,nstate0,nprop,ierr
integer iddmat(nstr,nstr)
character errstrng*(*)
logical matchg
@@ -236,8 +236,8 @@
c
c
subroutine td_strs_mat_11(state,dstate,state0,ee,scur,dmat,prop,
- & rtimdat,rgiter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,matchg,
- & ierr,errstrng)
+ & rtimdat,rgiter,iter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,
+ & matchg,ierr,errstrng)
c
c... subroutine to compute the current stress and updated material
c matrix for the time-dependent solution. Since this is a purely
@@ -256,7 +256,7 @@
c
c... subroutine arguments
c
- integer nstate,nstate0,nprop,ierr
+ integer iter,nstate,nstate0,nprop,ierr
integer iddmat(nstr,nstr)
character errstrng*(*)
logical matchg
Modified: short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_12.f
===================================================================
--- short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_12.f 2007-01-12 21:20:20 UTC (rev 5780)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_12.f 2007-01-12 21:23:53 UTC (rev 5781)
@@ -140,7 +140,7 @@
c
c
subroutine td_matinit_12(state,dstate,state0,dmat,prop,rtimdat,
- & rgiter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,matchg,ierr,
+ & rgiter,iopt,ntimdat,iddmat,tmax,nstate,nstate0,nprop,matchg,ierr,
& errstrng)
c
c... subroutine to form the material matrix for an integration point
@@ -161,7 +161,7 @@
c
c... subroutine arguments
c
- integer nstate,nstate0,nprop,ierr
+ integer iopt,nstate,nstate0,nprop,ierr
integer iddmat(nstr,nstr)
character errstrng*(*)
double precision state(nstate),dstate(nstate)
@@ -189,8 +189,8 @@
c
c
subroutine td_strs_12(state,dstate,state0,ee,scur,dmat,prop,
- & rtimdat,rgiter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,matchg,
- & ierr,errstrng)
+ & rtimdat,rgiter,iter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,
+ & matchg,ierr,errstrng)
c
c... subroutine to compute the current stress for the time-dependent
c solution.
@@ -207,7 +207,7 @@
c
c... subroutine arguments
c
- integer nstate,nstate0,nprop,ierr
+ integer iter,nstate,nstate0,nprop,ierr
integer iddmat(nstr,nstr)
character errstrng*(*)
logical matchg
@@ -236,8 +236,8 @@
c
c
subroutine td_strs_mat_12(state,dstate,state0,ee,scur,dmat,prop,
- & rtimdat,rgiter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,matchg,
- & ierr,errstrng)
+ & rtimdat,rgiter,iter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,
+ & matchg,ierr,errstrng)
c
c... subroutine to compute the current stress and updated material
c matrix for the time-dependent solution. Since this is a purely
@@ -256,7 +256,7 @@
c
c... subroutine arguments
c
- integer nstate,nstate0,nprop,ierr
+ integer iter,nstate,nstate0,nprop,ierr
integer iddmat(nstr,nstr)
character errstrng*(*)
logical matchg
Modified: short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_13.f
===================================================================
--- short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_13.f 2007-01-12 21:20:20 UTC (rev 5780)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_13.f 2007-01-12 21:23:53 UTC (rev 5781)
@@ -140,7 +140,7 @@
c
c
subroutine td_matinit_13(state,dstate,state0,dmat,prop,rtimdat,
- & rgiter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,matchg,ierr,
+ & rgiter,iopt,ntimdat,iddmat,tmax,nstate,nstate0,nprop,matchg,ierr,
& errstrng)
c
c... subroutine to form the material matrix for an integration point
@@ -161,7 +161,7 @@
c
c... subroutine arguments
c
- integer nstate,nstate0,nprop,ierr
+ integer iopt,nstate,nstate0,nprop,ierr
integer iddmat(nstr,nstr)
character errstrng*(*)
double precision state(nstate),dstate(nstate)
@@ -189,8 +189,8 @@
c
c
subroutine td_strs_13(state,dstate,state0,ee,scur,dmat,prop,
- & rtimdat,rgiter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,matchg,
- & ierr,errstrng)
+ & rtimdat,rgiter,iter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,
+ & matchg,ierr,errstrng)
c
c... subroutine to compute the current stress for the time-dependent
c solution.
@@ -207,7 +207,7 @@
c
c... subroutine arguments
c
- integer nstate,nstate0,nprop,ierr
+ integer iter,nstate,nstate0,nprop,ierr
integer iddmat(nstr,nstr)
character errstrng*(*)
logical matchg
@@ -236,8 +236,8 @@
c
c
subroutine td_strs_mat_13(state,dstate,state0,ee,scur,dmat,prop,
- & rtimdat,rgiter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,matchg,
- & ierr,errstrng)
+ & rtimdat,rgiter,iter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,
+ & matchg,ierr,errstrng)
c
c... subroutine to compute the current stress and updated material
c matrix for the time-dependent solution. Since this is a purely
@@ -256,7 +256,7 @@
c
c... subroutine arguments
c
- integer nstate,nstate0,nprop,ierr
+ integer iter,nstate,nstate0,nprop,ierr
integer iddmat(nstr,nstr)
character errstrng*(*)
logical matchg
Modified: short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_14.f
===================================================================
--- short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_14.f 2007-01-12 21:20:20 UTC (rev 5780)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_14.f 2007-01-12 21:23:53 UTC (rev 5781)
@@ -140,7 +140,7 @@
c
c
subroutine td_matinit_14(state,dstate,state0,dmat,prop,rtimdat,
- & rgiter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,matchg,ierr,
+ & rgiter,iopt,ntimdat,iddmat,tmax,nstate,nstate0,nprop,matchg,ierr,
& errstrng)
c
c... subroutine to form the material matrix for an integration point
@@ -161,7 +161,7 @@
c
c... subroutine arguments
c
- integer nstate,nstate0,nprop,ierr
+ integer iopt,nstate,nstate0,nprop,ierr
integer iddmat(nstr,nstr)
character errstrng*(*)
double precision state(nstate),dstate(nstate)
@@ -189,8 +189,8 @@
c
c
subroutine td_strs_14(state,dstate,state0,ee,scur,dmat,prop,
- & rtimdat,rgiter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,matchg,
- & ierr,errstrng)
+ & rtimdat,rgiter,iter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,
+ & matchg,ierr,errstrng)
c
c... subroutine to compute the current stress for the time-dependent
c solution.
@@ -207,7 +207,7 @@
c
c... subroutine arguments
c
- integer nstate,nstate0,nprop,ierr
+ integer iter,nstate,nstate0,nprop,ierr
integer iddmat(nstr,nstr)
character errstrng*(*)
logical matchg
@@ -236,8 +236,8 @@
c
c
subroutine td_strs_mat_14(state,dstate,state0,ee,scur,dmat,prop,
- & rtimdat,rgiter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,matchg,
- & ierr,errstrng)
+ & rtimdat,rgiter,iter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,
+ & matchg,ierr,errstrng)
c
c... subroutine to compute the current stress and updated material
c matrix for the time-dependent solution. Since this is a purely
@@ -256,7 +256,7 @@
c
c... subroutine arguments
c
- integer nstate,nstate0,nprop,ierr
+ integer iter,nstate,nstate0,nprop,ierr
integer iddmat(nstr,nstr)
character errstrng*(*)
logical matchg
Modified: short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_15.f
===================================================================
--- short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_15.f 2007-01-12 21:20:20 UTC (rev 5780)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_15.f 2007-01-12 21:23:53 UTC (rev 5781)
@@ -140,7 +140,7 @@
c
c
subroutine td_matinit_15(state,dstate,state0,dmat,prop,rtimdat,
- & rgiter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,matchg,ierr,
+ & rgiter,iopt,ntimdat,iddmat,tmax,nstate,nstate0,nprop,matchg,ierr,
& errstrng)
c
c... subroutine to form the material matrix for an integration point
@@ -161,7 +161,7 @@
c
c... subroutine arguments
c
- integer nstate,nstate0,nprop,ierr
+ integer iopt,nstate,nstate0,nprop,ierr
integer iddmat(nstr,nstr)
character errstrng*(*)
double precision state(nstate),dstate(nstate)
@@ -189,8 +189,8 @@
c
c
subroutine td_strs_15(state,dstate,state0,ee,scur,dmat,prop,
- & rtimdat,rgiter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,matchg,
- & ierr,errstrng)
+ & rtimdat,rgiter,iter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,
+ & matchg,ierr,errstrng)
c
c... subroutine to compute the current stress for the time-dependent
c solution.
@@ -207,7 +207,7 @@
c
c... subroutine arguments
c
- integer nstate,nstate0,nprop,ierr
+ integer iter,nstate,nstate0,nprop,ierr
integer iddmat(nstr,nstr)
character errstrng*(*)
logical matchg
@@ -236,8 +236,8 @@
c
c
subroutine td_strs_mat_15(state,dstate,state0,ee,scur,dmat,prop,
- & rtimdat,rgiter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,matchg,
- & ierr,errstrng)
+ & rtimdat,rgiter,iter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,
+ & matchg,ierr,errstrng)
c
c... subroutine to compute the current stress and updated material
c matrix for the time-dependent solution. Since this is a purely
@@ -256,7 +256,7 @@
c
c... subroutine arguments
c
- integer nstate,nstate0,nprop,ierr
+ integer iter,nstate,nstate0,nprop,ierr
integer iddmat(nstr,nstr)
character errstrng*(*)
logical matchg
Modified: short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_16.f
===================================================================
--- short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_16.f 2007-01-12 21:20:20 UTC (rev 5780)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_16.f 2007-01-12 21:23:53 UTC (rev 5781)
@@ -140,7 +140,7 @@
c
c
subroutine td_matinit_16(state,dstate,state0,dmat,prop,rtimdat,
- & rgiter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,matchg,ierr,
+ & rgiter,iopt,ntimdat,iddmat,tmax,nstate,nstate0,nprop,matchg,ierr,
& errstrng)
c
c... subroutine to form the material matrix for an integration point
@@ -161,7 +161,7 @@
c
c... subroutine arguments
c
- integer nstate,nstate0,nprop,ierr
+ integer iopt,nstate,nstate0,nprop,ierr
integer iddmat(nstr,nstr)
character errstrng*(*)
double precision state(nstate),dstate(nstate)
@@ -189,8 +189,8 @@
c
c
subroutine td_strs_16(state,dstate,state0,ee,scur,dmat,prop,
- & rtimdat,rgiter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,matchg,
- & ierr,errstrng)
+ & rtimdat,rgiter,iter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,
+ & matchg,ierr,errstrng)
c
c... subroutine to compute the current stress for the time-dependent
c solution.
@@ -207,7 +207,7 @@
c
c... subroutine arguments
c
- integer nstate,nstate0,nprop,ierr
+ integer iter,nstate,nstate0,nprop,ierr
integer iddmat(nstr,nstr)
character errstrng*(*)
logical matchg
@@ -236,8 +236,8 @@
c
c
subroutine td_strs_mat_16(state,dstate,state0,ee,scur,dmat,prop,
- & rtimdat,rgiter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,matchg,
- & ierr,errstrng)
+ & rtimdat,rgiter,iter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,
+ & matchg,ierr,errstrng)
c
c... subroutine to compute the current stress and updated material
c matrix for the time-dependent solution. Since this is a purely
@@ -256,7 +256,7 @@
c
c... subroutine arguments
c
- integer nstate,nstate0,nprop,ierr
+ integer iter,nstate,nstate0,nprop,ierr
integer iddmat(nstr,nstr)
character errstrng*(*)
logical matchg
Modified: short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_17.f
===================================================================
--- short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_17.f 2007-01-12 21:20:20 UTC (rev 5780)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_17.f 2007-01-12 21:23:53 UTC (rev 5781)
@@ -140,7 +140,7 @@
c
c
subroutine td_matinit_17(state,dstate,state0,dmat,prop,rtimdat,
- & rgiter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,matchg,ierr,
+ & rgiter,iopt,ntimdat,iddmat,tmax,nstate,nstate0,nprop,matchg,ierr,
& errstrng)
c
c... subroutine to form the material matrix for an integration point
@@ -161,7 +161,7 @@
c
c... subroutine arguments
c
- integer nstate,nstate0,nprop,ierr
+ integer iopt,nstate,nstate0,nprop,ierr
integer iddmat(nstr,nstr)
character errstrng*(*)
double precision state(nstate),dstate(nstate)
@@ -189,8 +189,8 @@
c
c
subroutine td_strs_17(state,dstate,state0,ee,scur,dmat,prop,
- & rtimdat,rgiter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,matchg,
- & ierr,errstrng)
+ & rtimdat,rgiter,iter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,
+ & matchg,ierr,errstrng)
c
c... subroutine to compute the current stress for the time-dependent
c solution.
@@ -207,7 +207,7 @@
c
c... subroutine arguments
c
- integer nstate,nstate0,nprop,ierr
+ integer iter,nstate,nstate0,nprop,ierr
integer iddmat(nstr,nstr)
character errstrng*(*)
logical matchg
@@ -236,8 +236,8 @@
c
c
subroutine td_strs_mat_17(state,dstate,state0,ee,scur,dmat,prop,
- & rtimdat,rgiter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,matchg,
- & ierr,errstrng)
+ & rtimdat,rgiter,iter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,
+ & matchg,ierr,errstrng)
c
c... subroutine to compute the current stress and updated material
c matrix for the time-dependent solution. Since this is a purely
@@ -256,7 +256,7 @@
c
c... subroutine arguments
c
- integer nstate,nstate0,nprop,ierr
+ integer iter,nstate,nstate0,nprop,ierr
integer iddmat(nstr,nstr)
character errstrng*(*)
logical matchg
Modified: short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_18.f
===================================================================
--- short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_18.f 2007-01-12 21:20:20 UTC (rev 5780)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_18.f 2007-01-12 21:23:53 UTC (rev 5781)
@@ -140,7 +140,7 @@
c
c
subroutine td_matinit_18(state,dstate,state0,dmat,prop,rtimdat,
- & rgiter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,matchg,ierr,
+ & rgiter,iopt,ntimdat,iddmat,tmax,nstate,nstate0,nprop,matchg,ierr,
& errstrng)
c
c... subroutine to form the material matrix for an integration point
@@ -161,7 +161,7 @@
c
c... subroutine arguments
c
- integer nstate,nstate0,nprop,ierr
+ integer iopt,nstate,nstate0,nprop,ierr
integer iddmat(nstr,nstr)
character errstrng*(*)
double precision state(nstate),dstate(nstate)
@@ -189,8 +189,8 @@
c
c
subroutine td_strs_18(state,dstate,state0,ee,scur,dmat,prop,
- & rtimdat,rgiter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,matchg,
- & ierr,errstrng)
+ & rtimdat,rgiter,iter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,
+ & matchg,ierr,errstrng)
c
c... subroutine to compute the current stress for the time-dependent
c solution.
@@ -207,7 +207,7 @@
c
c... subroutine arguments
c
- integer nstate,nstate0,nprop,ierr
+ integer iter,nstate,nstate0,nprop,ierr
integer iddmat(nstr,nstr)
character errstrng*(*)
logical matchg
@@ -236,8 +236,8 @@
c
c
subroutine td_strs_mat_18(state,dstate,state0,ee,scur,dmat,prop,
- & rtimdat,rgiter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,matchg,
- & ierr,errstrng)
+ & rtimdat,rgiter,iter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,
+ & matchg,ierr,errstrng)
c
c... subroutine to compute the current stress and updated material
c matrix for the time-dependent solution. Since this is a purely
@@ -256,7 +256,7 @@
c
c... subroutine arguments
c
- integer nstate,nstate0,nprop,ierr
+ integer iter,nstate,nstate0,nprop,ierr
integer iddmat(nstr,nstr)
character errstrng*(*)
logical matchg
Modified: short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_19.f
===================================================================
--- short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_19.f 2007-01-12 21:20:20 UTC (rev 5780)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_19.f 2007-01-12 21:23:53 UTC (rev 5781)
@@ -140,7 +140,7 @@
c
c
subroutine td_matinit_19(state,dstate,state0,dmat,prop,rtimdat,
- & rgiter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,matchg,ierr,
+ & rgiter,iopt,ntimdat,iddmat,tmax,nstate,nstate0,nprop,matchg,ierr,
& errstrng)
c
c... subroutine to form the material matrix for an integration point
@@ -161,7 +161,7 @@
c
c... subroutine arguments
c
- integer nstate,nstate0,nprop,ierr
+ integer iopt,nstate,nstate0,nprop,ierr
integer iddmat(nstr,nstr)
character errstrng*(*)
double precision state(nstate),dstate(nstate)
@@ -189,8 +189,8 @@
c
c
subroutine td_strs_19(state,dstate,state0,ee,scur,dmat,prop,
- & rtimdat,rgiter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,matchg,
- & ierr,errstrng)
+ & rtimdat,rgiter,iter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,
+ & matchg,ierr,errstrng)
c
c... subroutine to compute the current stress for the time-dependent
c solution.
@@ -207,7 +207,7 @@
c
c... subroutine arguments
c
- integer nstate,nstate0,nprop,ierr
+ integer iter,nstate,nstate0,nprop,ierr
integer iddmat(nstr,nstr)
character errstrng*(*)
logical matchg
@@ -236,8 +236,8 @@
c
c
subroutine td_strs_mat_19(state,dstate,state0,ee,scur,dmat,prop,
- & rtimdat,rgiter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,matchg,
- & ierr,errstrng)
+ & rtimdat,rgiter,iter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,
+ & matchg,ierr,errstrng)
c
c... subroutine to compute the current stress and updated material
c matrix for the time-dependent solution. Since this is a purely
@@ -256,7 +256,7 @@
c
c... subroutine arguments
c
- integer nstate,nstate0,nprop,ierr
+ integer iter,nstate,nstate0,nprop,ierr
integer iddmat(nstr,nstr)
character errstrng*(*)
logical matchg
Modified: short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_2.f
===================================================================
--- short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_2.f 2007-01-12 21:20:20 UTC (rev 5780)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_2.f 2007-01-12 21:23:53 UTC (rev 5781)
@@ -140,7 +140,7 @@
c
c
subroutine td_matinit_2(state,dstate,state0,dmat,prop,rtimdat,
- & rgiter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,matchg,ierr,
+ & rgiter,iopt,ntimdat,iddmat,tmax,nstate,nstate0,nprop,matchg,ierr,
& errstrng)
c
c... subroutine to form the material matrix for an integration point
@@ -161,7 +161,7 @@
c
c... subroutine arguments
c
- integer nstate,nstate0,nprop,ierr
+ integer iopt,nstate,nstate0,nprop,ierr
integer iddmat(nstr,nstr)
character errstrng*(*)
double precision state(nstate),dstate(nstate)
@@ -189,8 +189,8 @@
c
c
subroutine td_strs_2(state,dstate,state0,ee,scur,dmat,prop,
- & rtimdat,rgiter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,matchg,
- & ierr,errstrng)
+ & rtimdat,rgiter,iter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,
+ & matchg,ierr,errstrng)
c
c... subroutine to compute the current stress for the time-dependent
c solution.
@@ -207,7 +207,7 @@
c
c... subroutine arguments
c
- integer nstate,nstate0,nprop,ierr
+ integer iter,nstate,nstate0,nprop,ierr
integer iddmat(nstr,nstr)
character errstrng*(*)
logical matchg
@@ -236,8 +236,8 @@
c
c
subroutine td_strs_mat_2(state,dstate,state0,ee,scur,dmat,prop,
- & rtimdat,rgiter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,matchg,
- & ierr,errstrng)
+ & rtimdat,rgiter,iter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,
+ & matchg,ierr,errstrng)
c
c... subroutine to compute the current stress and updated material
c matrix for the time-dependent solution. Since this is a purely
@@ -256,7 +256,7 @@
c
c... subroutine arguments
c
- integer nstate,nstate0,nprop,ierr
+ integer iter,nstate,nstate0,nprop,ierr
integer iddmat(nstr,nstr)
character errstrng*(*)
logical matchg
Modified: short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_20.f
===================================================================
--- short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_20.f 2007-01-12 21:20:20 UTC (rev 5780)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_20.f 2007-01-12 21:23:53 UTC (rev 5781)
@@ -140,7 +140,7 @@
c
c
subroutine td_matinit_20(state,dstate,state0,dmat,prop,rtimdat,
- & rgiter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,matchg,ierr,
+ & rgiter,iopt,ntimdat,iddmat,tmax,nstate,nstate0,nprop,matchg,ierr,
& errstrng)
c
c... subroutine to form the material matrix for an integration point
@@ -161,7 +161,7 @@
c
c... subroutine arguments
c
- integer nstate,nstate0,nprop,ierr
+ integer iopt,nstate,nstate0,nprop,ierr
integer iddmat(nstr,nstr)
character errstrng*(*)
double precision state(nstate),dstate(nstate)
@@ -189,8 +189,8 @@
c
c
subroutine td_strs_20(state,dstate,state0,ee,scur,dmat,prop,
- & rtimdat,rgiter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,matchg,
- & ierr,errstrng)
+ & rtimdat,rgiter,iter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,
+ & matchg,ierr,errstrng)
c
c... subroutine to compute the current stress for the time-dependent
c solution.
@@ -207,7 +207,7 @@
c
c... subroutine arguments
c
- integer nstate,nstate0,nprop,ierr
+ integer iter,nstate,nstate0,nprop,ierr
integer iddmat(nstr,nstr)
character errstrng*(*)
logical matchg
@@ -236,8 +236,8 @@
c
c
subroutine td_strs_mat_20(state,dstate,state0,ee,scur,dmat,prop,
- & rtimdat,rgiter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,matchg,
- & ierr,errstrng)
+ & rtimdat,rgiter,iter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,
+ & matchg,ierr,errstrng)
c
c... subroutine to compute the current stress and updated material
c matrix for the time-dependent solution. Since this is a purely
@@ -256,7 +256,7 @@
c
c... subroutine arguments
c
- integer nstate,nstate0,nprop,ierr
+ integer iter,nstate,nstate0,nprop,ierr
integer iddmat(nstr,nstr)
character errstrng*(*)
logical matchg
Modified: short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_3.f
===================================================================
--- short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_3.f 2007-01-12 21:20:20 UTC (rev 5780)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_3.f 2007-01-12 21:23:53 UTC (rev 5781)
@@ -140,7 +140,7 @@
c
c
subroutine td_matinit_3(state,dstate,state0,dmat,prop,rtimdat,
- & rgiter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,matchg,ierr,
+ & rgiter,iopt,ntimdat,iddmat,tmax,nstate,nstate0,nprop,matchg,ierr,
& errstrng)
c
c... subroutine to form the material matrix for an integration point
@@ -161,7 +161,7 @@
c
c... subroutine arguments
c
- integer nstate,nstate0,nprop,ierr
+ integer iopt,nstate,nstate0,nprop,ierr
integer iddmat(nstr,nstr)
character errstrng*(*)
double precision state(nstate),dstate(nstate)
@@ -189,8 +189,8 @@
c
c
subroutine td_strs_3(state,dstate,state0,ee,scur,dmat,prop,
- & rtimdat,rgiter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,matchg,
- & ierr,errstrng)
+ & rtimdat,rgiter,iter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,
+ & matchg,ierr,errstrng)
c
c... subroutine to compute the current stress for the time-dependent
c solution.
@@ -207,7 +207,7 @@
c
c... subroutine arguments
c
- integer nstate,nstate0,nprop,ierr
+ integer iter,nstate,nstate0,nprop,ierr
integer iddmat(nstr,nstr)
character errstrng*(*)
logical matchg
@@ -236,8 +236,8 @@
c
c
subroutine td_strs_mat_3(state,dstate,state0,ee,scur,dmat,prop,
- & rtimdat,rgiter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,matchg,
- & ierr,errstrng)
+ & rtimdat,rgiter,iter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,
+ & matchg,ierr,errstrng)
c
c... subroutine to compute the current stress and updated material
c matrix for the time-dependent solution. Since this is a purely
@@ -256,7 +256,7 @@
c
c... subroutine arguments
c
- integer nstate,nstate0,nprop,ierr
+ integer iter,nstate,nstate0,nprop,ierr
integer iddmat(nstr,nstr)
character errstrng*(*)
logical matchg
Modified: short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_4.f
===================================================================
--- short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_4.f 2007-01-12 21:20:20 UTC (rev 5780)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_4.f 2007-01-12 21:23:53 UTC (rev 5781)
@@ -140,7 +140,7 @@
c
c
subroutine td_matinit_4(state,dstate,state0,dmat,prop,rtimdat,
- & rgiter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,matchg,ierr,
+ & rgiter,iopt,ntimdat,iddmat,tmax,nstate,nstate0,nprop,matchg,ierr,
& errstrng)
c
c... subroutine to form the material matrix for an integration point
@@ -161,7 +161,7 @@
c
c... subroutine arguments
c
- integer nstate,nstate0,nprop,ierr
+ integer iopt,nstate,nstate0,nprop,ierr
integer iddmat(nstr,nstr)
character errstrng*(*)
double precision state(nstate),dstate(nstate)
@@ -189,8 +189,8 @@
c
c
subroutine td_strs_4(state,dstate,state0,ee,scur,dmat,prop,
- & rtimdat,rgiter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,matchg,
- & ierr,errstrng)
+ & rtimdat,rgiter,iter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,
+ & matchg,ierr,errstrng)
c
c... subroutine to compute the current stress for the time-dependent
c solution.
@@ -207,7 +207,7 @@
c
c... subroutine arguments
c
- integer nstate,nstate0,nprop,ierr
+ integer iter,nstate,nstate0,nprop,ierr
integer iddmat(nstr,nstr)
character errstrng*(*)
logical matchg
@@ -236,8 +236,8 @@
c
c
subroutine td_strs_mat_4(state,dstate,state0,ee,scur,dmat,prop,
- & rtimdat,rgiter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,matchg,
- & ierr,errstrng)
+ & rtimdat,rgiter,iter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,
+ & matchg,ierr,errstrng)
c
c... subroutine to compute the current stress and updated material
c matrix for the time-dependent solution. Since this is a purely
@@ -256,7 +256,7 @@
c
c... subroutine arguments
c
- integer nstate,nstate0,nprop,ierr
+ integer iter,nstate,nstate0,nprop,ierr
integer iddmat(nstr,nstr)
character errstrng*(*)
logical matchg
Modified: short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_5.f
===================================================================
--- short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_5.f 2007-01-12 21:20:20 UTC (rev 5780)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_5.f 2007-01-12 21:23:53 UTC (rev 5781)
@@ -296,7 +296,7 @@
c
c
subroutine td_matinit_5(state,dstate,state0,dmat,prop,rtimdat,
- & rgiter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,matchg,ierr,
+ & rgiter,iopt,ntimdat,iddmat,tmax,nstate,nstate0,nprop,matchg,ierr,
& errstrng)
c
c... subroutine to form the material matrix for an integration point
@@ -317,7 +317,7 @@
c
c... subroutine arguments
c
- integer nstate,nstate0,nprop,ierr
+ integer iopt,nstate,nstate0,nprop,ierr
integer iddmat(nstr,nstr)
character errstrng*(*)
double precision state(nstate),dstate(nstate)
@@ -388,8 +388,8 @@
c
c
subroutine td_strs_5(state,dstate,state0,ee,scur,dmat,prop,
- & rtimdat,rgiter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,matchg,
- & ierr,errstrng)
+ & rtimdat,rgiter,iter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,
+ & matchg,ierr,errstrng)
c
c... subroutine to compute the current stress for the time-dependent
c solution.
@@ -406,7 +406,7 @@
c
c... subroutine arguments
c
- integer nstate,nstate0,nprop,ierr
+ integer iter,nstate,nstate0,nprop,ierr
integer iddmat(nstr,nstr)
character errstrng*(*)
logical matchg
@@ -488,8 +488,8 @@
c
c
subroutine td_strs_mat_5(state,dstate,state0,ee,scur,dmat,prop,
- & rtimdat,rgiter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,matchg,
- & ierr,errstrng)
+ & rtimdat,rgiter,iter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,
+ & matchg,ierr,errstrng)
c
c... subroutine to compute the current stress and updated material
c matrix for the time-dependent solution.
@@ -506,7 +506,7 @@
c
c... subroutine arguments
c
- integer nstate,nstate0,nprop,ierr
+ integer iter,nstate,nstate0,nprop,ierr
integer iddmat(nstr,nstr)
character errstrng*(*)
logical matchg
Modified: short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_7.f
===================================================================
--- short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_7.f 2007-01-12 21:20:20 UTC (rev 5780)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_7.f 2007-01-12 21:23:53 UTC (rev 5781)
@@ -330,7 +330,7 @@
c
c
subroutine td_matinit_7(state,dstate,state0,dmat,prop,rtimdat,
- & rgiter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,matchg,ierr,
+ & rgiter,iopt,ntimdat,iddmat,tmax,nstate,nstate0,nprop,matchg,ierr,
& errstrng)
c
c... subroutine to form the material matrix for an integration point
@@ -351,7 +351,7 @@
c
c... subroutine arguments
c
- integer nstate,nstate0,nprop,ierr
+ integer iopt,nstate,nstate0,nprop,ierr
integer iddmat(nstr,nstr)
character errstrng*(*)
double precision state(nstate),dstate(nstate)
@@ -433,8 +433,8 @@
c
c
subroutine td_strs_7(state,dstate,state0,ee,scur,dmat,prop,
- & rtimdat,rgiter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,matchg,
- & ierr,errstrng)
+ & rtimdat,rgiter,iter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,
+ & matchg,ierr,errstrng)
c
c... subroutine to compute the current stress for the time-dependent
c solution.
@@ -451,7 +451,7 @@
c
c... subroutine arguments
c
- integer nstate,nstate0,nprop,ierr
+ integer iter,nstate,nstate0,nprop,ierr
integer iddmat(nstr,nstr)
character errstrng*(*)
logical matchg
@@ -551,8 +551,8 @@
c
c
subroutine td_strs_mat_7(state,dstate,state0,ee,scur,dmat,prop,
- & rtimdat,rgiter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,matchg,
- & ierr,errstrng)
+ & rtimdat,rgiter,iter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,
+ & matchg,ierr,errstrng)
c
c... subroutine to compute the current stress and updated material
c matrix for the time-dependent solution.
@@ -569,7 +569,7 @@
c
c... subroutine arguments
c
- integer nstate,nstate0,nprop,ierr
+ integer iter,nstate,nstate0,nprop,ierr
integer iddmat(nstr,nstr)
character errstrng*(*)
logical matchg
Modified: short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_8.f
===================================================================
--- short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_8.f 2007-01-12 21:20:20 UTC (rev 5780)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_8.f 2007-01-12 21:23:53 UTC (rev 5781)
@@ -218,7 +218,7 @@
c
c
subroutine td_matinit_8(state,dstate,state0,dmat,prop,rtimdat,
- & rgiter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,matchg,ierr,
+ & rgiter,iopt,ntimdat,iddmat,tmax,nstate,nstate0,nprop,matchg,ierr,
& errstrng)
c
c... subroutine to form the material matrix for an integration point
@@ -242,7 +242,7 @@
c
c... subroutine arguments
c
- integer nstate,nstate0,nprop,ierr
+ integer iopt,nstate,nstate0,nprop,ierr
integer iddmat(nstr,nstr)
character errstrng*(*)
double precision state(nstate),dstate(nstate)
@@ -289,8 +289,8 @@
c
c
subroutine td_strs_8(state,dstate,state0,ee,scur,dmat,prop,
- & rtimdat,rgiter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,matchg,
- & ierr,errstrng)
+ & rtimdat,rgiter,iter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,
+ & matchg,ierr,errstrng)
c
c... subroutine to compute the current values for stress, total strain,
c and viscous strain increment.
@@ -305,7 +305,7 @@
c
c... subroutine arguments
c
- integer nstate,nstate0,nprop,ierr
+ integer iter,nstate,nstate0,nprop,ierr
integer iddmat(nstr,nstr)
character errstrng*(*)
logical matchg
@@ -385,8 +385,8 @@
c
c
subroutine td_strs_mat_8(state,dstate,state0,ee,scur,dmat,prop,
- & rtimdat,rgiter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,matchg,
- & ierr,errstrng)
+ & rtimdat,rgiter,iter,ntimdat,iddmat,tmax,nstate,nstate0,nprop,
+ & matchg,ierr,errstrng)
c
c... subroutine to compute the current stress and updated material
c matrix for the time-dependent solution.
@@ -403,7 +403,7 @@
c
c... subroutine arguments
c
- integer nstate,nstate0,nprop,ierr
+ integer iter,nstate,nstate0,nprop,ierr
integer iddmat(nstr,nstr)
character errstrng*(*)
logical matchg
Modified: short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/stress_drv.f
===================================================================
--- short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/stress_drv.f 2007-01-12 21:20:20 UTC (rev 5780)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/stress_drv.f 2007-01-12 21:23:53 UTC (rev 5781)
@@ -37,7 +37,7 @@
& numelv,nstatesz,nstatesz0,nprestrflag,ipstrs,ipauto, ! elemnt
& prop,infmatmod,npropsz,tminmax, ! materl
& gauss,sh,shj,nen,ngauss,nee, ! eltype
- & histry,rtimdat,rgiter,ntimdat,nhist,lastep,stress_cmp, ! timdat
+ & histry,rtimdat,rgiter,ntimdat,nhist,lastep,stress_cmp,iter, ! timdat
& skew,numrot, ! skew
& getshape,bmatrix, ! bbar
& ierr,errstrng) ! errcode
@@ -59,7 +59,7 @@
c
integer neq,numnp,numslp,numfn,nvfamilies,numelv,nstatesz
integer nstatesz0,nprestrflag,ipstrs,ipauto
- integer npropsz,nen,ngauss,nee,nhist,lastep,numrot,ierr
+ integer npropsz,nen,ngauss,nee,nhist,lastep,iter,numrot,ierr
integer iddmat(nstr,nstr)
integer ien(nen,numelv),lm(ndof*nen,numelv),lmx(ndof*nen,numelv)
integer lmf(nen,numelv),ivfamily(6,nvfamilies)
@@ -145,7 +145,7 @@
& ipauto,n0states,ielg, ! elemfamily
& ptmp,nprop,elas_strs_1,td_strs_1,matchg,tminmax, ! materl
& gauss,sh,shj,nen,ngauss,nee, ! eltype
- & rtimdat,ntimdat,rgiter, ! timdat
+ & rtimdat,ntimdat,rgiter,iter, ! timdat
& skew,numrot, ! skew
& getshape,bmatrix, ! bbar
& ierr,errstrng) ! errcode
@@ -161,7 +161,7 @@
& ipauto,n0states,ielg, ! elemfamily
& ptmp,nprop,elas_strs_2,td_strs_2,matchg,tminmax, ! materl
& gauss,sh,shj,nen,ngauss,nee, ! eltype
- & rtimdat,ntimdat,rgiter, ! timdat
+ & rtimdat,ntimdat,rgiter,iter, ! timdat
& skew,numrot, ! skew
& getshape,bmatrix, ! bbar
& ierr,errstrng) ! errcode
@@ -177,7 +177,7 @@
& ipauto,n0states,ielg, ! elemfamily
& ptmp,nprop,elas_strs_3,td_strs_3,matchg,tminmax, ! materl
& gauss,sh,shj,nen,ngauss,nee, ! eltype
- & rtimdat,ntimdat,rgiter, ! timdat
+ & rtimdat,ntimdat,rgiter,iter, ! timdat
& skew,numrot, ! skew
& getshape,bmatrix, ! bbar
& ierr,errstrng) ! errcode
@@ -193,7 +193,7 @@
& ipauto,n0states,ielg, ! elemfamily
& ptmp,nprop,elas_strs_4,td_strs_4,matchg,tminmax, ! materl
& gauss,sh,shj,nen,ngauss,nee, ! eltype
- & rtimdat,ntimdat,rgiter, ! timdat
+ & rtimdat,ntimdat,rgiter,iter, ! timdat
& skew,numrot, ! skew
& getshape,bmatrix, ! bbar
& ierr,errstrng) ! errcode
@@ -209,7 +209,7 @@
& ipauto,n0states,ielg, ! elemfamily
& ptmp,nprop,elas_strs_5,td_strs_5,matchg,tminmax, ! materl
& gauss,sh,shj,nen,ngauss,nee, ! eltype
- & rtimdat,ntimdat,rgiter, ! timdat
+ & rtimdat,ntimdat,rgiter,iter, ! timdat
& skew,numrot, ! skew
& getshape,bmatrix, ! bbar
& ierr,errstrng) ! errcode
@@ -225,7 +225,7 @@
& ipauto,n0states,ielg, ! elemfamily
& ptmp,nprop,elas_strs_6,td_strs_6,matchg,tminmax, ! materl
& gauss,sh,shj,nen,ngauss,nee, ! eltype
- & rtimdat,ntimdat,rgiter, ! timdat
+ & rtimdat,ntimdat,rgiter,iter, ! timdat
& skew,numrot, ! skew
& getshape,bmatrix, ! bbar
& ierr,errstrng) ! errcode
@@ -241,7 +241,7 @@
& ipauto,n0states,ielg, ! elemfamily
& ptmp,nprop,elas_strs_7,td_strs_7,matchg,tminmax, ! materl
& gauss,sh,shj,nen,ngauss,nee, ! eltype
- & rtimdat,ntimdat,rgiter, ! timdat
+ & rtimdat,ntimdat,rgiter,iter, ! timdat
& skew,numrot, ! skew
& getshape,bmatrix, ! bbar
& ierr,errstrng) ! errcode
@@ -257,7 +257,7 @@
& ipauto,n0states,ielg, ! elemfamily
& ptmp,nprop,elas_strs_8,td_strs_8,matchg,tminmax, ! materl
& gauss,sh,shj,nen,ngauss,nee, ! eltype
- & rtimdat,ntimdat,rgiter, ! timdat
+ & rtimdat,ntimdat,rgiter,iter, ! timdat
& skew,numrot, ! skew
& getshape,bmatrix, ! bbar
& ierr,errstrng) ! errcode
@@ -273,7 +273,7 @@
& ipauto,n0states,ielg, ! elemfamily
& ptmp,nprop,elas_strs_9,td_strs_9,matchg,tminmax, ! materl
& gauss,sh,shj,nen,ngauss,nee, ! eltype
- & rtimdat,ntimdat,rgiter, ! timdat
+ & rtimdat,ntimdat,rgiter,iter, ! timdat
& skew,numrot, ! skew
& getshape,bmatrix, ! bbar
& ierr,errstrng) ! errcode
@@ -289,7 +289,7 @@
& ipauto,n0states,ielg, ! elemfamily
& ptmp,nprop,elas_strs_10,td_strs_10,matchg,tminmax, ! materl
& gauss,sh,shj,nen,ngauss,nee, ! eltype
- & rtimdat,ntimdat,rgiter, ! timdat
+ & rtimdat,ntimdat,rgiter,iter, ! timdat
& skew,numrot, ! skew
& getshape,bmatrix, ! bbar
& ierr,errstrng) ! errcode
@@ -305,7 +305,7 @@
& ipauto,n0states,ielg, ! elemfamily
& ptmp,nprop,elas_strs_11,td_strs_11,matchg,tminmax, ! materl
& gauss,sh,shj,nen,ngauss,nee, ! eltype
- & rtimdat,ntimdat,rgiter, ! timdat
+ & rtimdat,ntimdat,rgiter,iter, ! timdat
& skew,numrot, ! skew
& getshape,bmatrix, ! bbar
& ierr,errstrng) ! errcode
@@ -321,7 +321,7 @@
& ipauto,n0states,ielg, ! elemfamily
& ptmp,nprop,elas_strs_12,td_strs_12,matchg,tminmax, ! materl
& gauss,sh,shj,nen,ngauss,nee, ! eltype
- & rtimdat,ntimdat,rgiter, ! timdat
+ & rtimdat,ntimdat,rgiter,iter, ! timdat
& skew,numrot, ! skew
& getshape,bmatrix, ! bbar
& ierr,errstrng) ! errcode
@@ -337,7 +337,7 @@
& ipauto,n0states,ielg, ! elemfamily
& ptmp,nprop,elas_strs_13,td_strs_13,matchg,tminmax, ! materl
& gauss,sh,shj,nen,ngauss,nee, ! eltype
- & rtimdat,ntimdat,rgiter, ! timdat
+ & rtimdat,ntimdat,rgiter,iter, ! timdat
& skew,numrot, ! skew
& getshape,bmatrix, ! bbar
& ierr,errstrng) ! errcode
@@ -353,7 +353,7 @@
& ipauto,n0states,ielg, ! elemfamily
& ptmp,nprop,elas_strs_14,td_strs_14,matchg,tminmax, ! materl
& gauss,sh,shj,nen,ngauss,nee, ! eltype
- & rtimdat,ntimdat,rgiter, ! timdat
+ & rtimdat,ntimdat,rgiter,iter, ! timdat
& skew,numrot, ! skew
& getshape,bmatrix, ! bbar
& ierr,errstrng) ! errcode
@@ -369,7 +369,7 @@
& ipauto,n0states,ielg, ! elemfamily
& ptmp,nprop,elas_strs_15,td_strs_15,matchg,tminmax, ! materl
& gauss,sh,shj,nen,ngauss,nee, ! eltype
- & rtimdat,ntimdat,rgiter, ! timdat
+ & rtimdat,ntimdat,rgiter,iter, ! timdat
& skew,numrot, ! skew
& getshape,bmatrix, ! bbar
& ierr,errstrng) ! errcode
@@ -385,7 +385,7 @@
& ipauto,n0states,ielg, ! elemfamily
& ptmp,nprop,elas_strs_16,td_strs_16,matchg,tminmax, ! materl
& gauss,sh,shj,nen,ngauss,nee, ! eltype
- & rtimdat,ntimdat,rgiter, ! timdat
+ & rtimdat,ntimdat,rgiter,iter, ! timdat
& skew,numrot, ! skew
& getshape,bmatrix, ! bbar
& ierr,errstrng) ! errcode
@@ -401,7 +401,7 @@
& ipauto,n0states,ielg, ! elemfamily
& ptmp,nprop,elas_strs_17,td_strs_17,matchg,tminmax, ! materl
& gauss,sh,shj,nen,ngauss,nee, ! eltype
- & rtimdat,ntimdat,rgiter, ! timdat
+ & rtimdat,ntimdat,rgiter,iter, ! timdat
& skew,numrot, ! skew
& getshape,bmatrix, ! bbar
& ierr,errstrng) ! errcode
@@ -417,7 +417,7 @@
& ipauto,n0states,ielg, ! elemfamily
& ptmp,nprop,elas_strs_18,td_strs_18,matchg,tminmax, ! materl
& gauss,sh,shj,nen,ngauss,nee, ! eltype
- & rtimdat,ntimdat,rgiter, ! timdat
+ & rtimdat,ntimdat,rgiter,iter, ! timdat
& skew,numrot, ! skew
& getshape,bmatrix, ! bbar
& ierr,errstrng) ! errcode
@@ -433,7 +433,7 @@
& ipauto,n0states,ielg, ! elemfamily
& ptmp,nprop,elas_strs_19,td_strs_19,matchg,tminmax, ! materl
& gauss,sh,shj,nen,ngauss,nee, ! eltype
- & rtimdat,ntimdat,rgiter, ! timdat
+ & rtimdat,ntimdat,rgiter,iter, ! timdat
& skew,numrot, ! skew
& getshape,bmatrix, ! bbar
& ierr,errstrng) ! errcode
@@ -449,7 +449,7 @@
& ipauto,n0states,ielg, ! elemfamily
& ptmp,nprop,elas_strs_20,td_strs_20,matchg,tminmax, ! materl
& gauss,sh,shj,nen,ngauss,nee, ! eltype
- & rtimdat,ntimdat,rgiter, ! timdat
+ & rtimdat,ntimdat,rgiter,iter, ! timdat
& skew,numrot, ! skew
& getshape,bmatrix, ! bbar
& ierr,errstrng) ! errcode
Modified: short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/stress_mat_drv.F
===================================================================
--- short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/stress_mat_drv.F 2007-01-12 21:20:20 UTC (rev 5780)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/stress_mat_drv.F 2007-01-12 21:23:53 UTC (rev 5781)
@@ -39,7 +39,7 @@
& numelv,nstatesz,nstatesz0,nprestrflag,ipstrs,ipauto,ielindx, ! elemnt
& prop,infmatmod,npropsz,tminmax, ! materl
& gauss,sh,shj,nen,ngauss,nee, ! eltype
- & histry,rtimdat,rgiter,ntimdat,nhist,lastep,stress_mat_cmp, ! timdat
+ & histry,rtimdat,rgiter,ntimdat,nhist,lastep,stress_mat_cmp,iter, ! timdat
& skew,numrot, ! skew
& getshape,bmatrix, ! bbar
& ierr,errstrng) ! errcode
@@ -72,7 +72,7 @@
c
integer nnz,neq,numnp,nwink,numslp,numsn,nwinkx,numfn,nvfamilies
integer numelv,nstatesz,nstatesz0,nprestrflag,ipstrs,ipauto
- integer npropsz,nen,ngauss,nee,nhist,lastep,numrot,ierr
+ integer npropsz,nen,ngauss,nee,nhist,lastep,iter,numrot,ierr
integer iddmat(nstr,nstr)
integer iwink(2,nwink),iwinkx(2,nwinkx),ien(nen,numelv)
integer ielindx(numelv)
@@ -164,7 +164,7 @@
& ielg,numelv,ielindx, ! elemnt,orig element num
& ptmp,nprop,elas_strs_1,td_strs_mat_1,matchg,tminmax, ! materl
& gauss,sh,shj,nen,ngauss,nee, ! eltype
- & rtimdat,ntimdat,rgiter, ! timdat
+ & rtimdat,ntimdat,rgiter,iter, ! timdat
& skew,numrot, ! skew
& getshape,bmatrix, ! bbar
& ierr,errstrng) ! errcode
@@ -182,7 +182,7 @@
& ielg,numelv,ielindx, ! elemnt,orig element num
& ptmp,nprop,elas_strs_2,td_strs_mat_2,matchg,tminmax, ! materl
& gauss,sh,shj,nen,ngauss,nee, ! eltype
- & rtimdat,ntimdat,rgiter, ! timdat
+ & rtimdat,ntimdat,rgiter,iter, ! timdat
& skew,numrot, ! skew
& getshape,bmatrix, ! bbar
& ierr,errstrng) ! errcode
@@ -200,7 +200,7 @@
& ielg,numelv,ielindx, ! elemnt,orig element num
& ptmp,nprop,elas_strs_3,td_strs_mat_3,matchg,tminmax, ! materl
& gauss,sh,shj,nen,ngauss,nee, ! eltype
- & rtimdat,ntimdat,rgiter, ! timdat
+ & rtimdat,ntimdat,rgiter,iter, ! timdat
& skew,numrot, ! skew
& getshape,bmatrix, ! bbar
& ierr,errstrng) ! errcode
@@ -218,7 +218,7 @@
& ielg,numelv,ielindx, ! elemnt,orig element num
& ptmp,nprop,elas_strs_4,td_strs_mat_4,matchg,tminmax, ! materl
& gauss,sh,shj,nen,ngauss,nee, ! eltype
- & rtimdat,ntimdat,rgiter, ! timdat
+ & rtimdat,ntimdat,rgiter,iter, ! timdat
& skew,numrot, ! skew
& getshape,bmatrix, ! bbar
& ierr,errstrng) ! errcode
@@ -236,7 +236,7 @@
& ielg,numelv,ielindx, ! elemnt,orig element num
& ptmp,nprop,elas_strs_5,td_strs_mat_5,matchg,tminmax, ! materl
& gauss,sh,shj,nen,ngauss,nee, ! eltype
- & rtimdat,ntimdat,rgiter, ! timdat
+ & rtimdat,ntimdat,rgiter,iter, ! timdat
& skew,numrot, ! skew
& getshape,bmatrix, ! bbar
& ierr,errstrng) ! errcode
@@ -254,7 +254,7 @@
& ielg,numelv,ielindx, ! elemnt,orig element num
& ptmp,nprop,elas_strs_6,td_strs_mat_6,matchg,tminmax, ! materl
& gauss,sh,shj,nen,ngauss,nee, ! eltype
- & rtimdat,ntimdat,rgiter, ! timdat
+ & rtimdat,ntimdat,rgiter,iter, ! timdat
& skew,numrot, ! skew
& getshape,bmatrix, ! bbar
& ierr,errstrng) ! errcode
@@ -272,7 +272,7 @@
& ielg,numelv,ielindx, ! elemnt,orig element num
& ptmp,nprop,elas_strs_7,td_strs_mat_7,matchg,tminmax, ! materl
& gauss,sh,shj,nen,ngauss,nee, ! eltype
- & rtimdat,ntimdat,rgiter, ! timdat
+ & rtimdat,ntimdat,rgiter,iter, ! timdat
& skew,numrot, ! skew
& getshape,bmatrix, ! bbar
& ierr,errstrng) ! errcode
@@ -290,7 +290,7 @@
& ielg,numelv,ielindx, ! elemnt,orig element num
& ptmp,nprop,elas_strs_8,td_strs_mat_8,matchg,tminmax, ! materl
& gauss,sh,shj,nen,ngauss,nee, ! eltype
- & rtimdat,ntimdat,rgiter, ! timdat
+ & rtimdat,ntimdat,rgiter,iter, ! timdat
& skew,numrot, ! skew
& getshape,bmatrix, ! bbar
& ierr,errstrng) ! errcode
@@ -308,7 +308,7 @@
& ielg,numelv,ielindx, ! elemnt,orig element num
& ptmp,nprop,elas_strs_9,td_strs_mat_9,matchg,tminmax, ! materl
& gauss,sh,shj,nen,ngauss,nee, ! eltype
- & rtimdat,ntimdat,rgiter, ! timdat
+ & rtimdat,ntimdat,rgiter,iter, ! timdat
& skew,numrot, ! skew
& getshape,bmatrix, ! bbar
& ierr,errstrng) ! errcode
@@ -326,7 +326,7 @@
& ielg,numelv,ielindx, ! elemnt,orig element num
& ptmp,nprop,elas_strs_10,td_strs_mat_10,matchg,tminmax, ! materl
& gauss,sh,shj,nen,ngauss,nee, ! eltype
- & rtimdat,ntimdat,rgiter, ! timdat
+ & rtimdat,ntimdat,rgiter,iter, ! timdat
& skew,numrot, ! skew
& getshape,bmatrix, ! bbar
& ierr,errstrng) ! errcode
@@ -344,7 +344,7 @@
& ielg,numelv,ielindx, ! elemnt,orig element num
& ptmp,nprop,elas_strs_11,td_strs_mat_11,matchg,tminmax, ! materl
& gauss,sh,shj,nen,ngauss,nee, ! eltype
- & rtimdat,ntimdat,rgiter, ! timdat
+ & rtimdat,ntimdat,rgiter,iter, ! timdat
& skew,numrot, ! skew
& getshape,bmatrix, ! bbar
& ierr,errstrng) ! errcode
@@ -362,7 +362,7 @@
& ielg,numelv,ielindx, ! elemnt,orig element num
& ptmp,nprop,elas_strs_12,td_strs_mat_12,matchg,tminmax, ! materl
& gauss,sh,shj,nen,ngauss,nee, ! eltype
- & rtimdat,ntimdat,rgiter, ! timdat
+ & rtimdat,ntimdat,rgiter,iter, ! timdat
& skew,numrot, ! skew
& getshape,bmatrix, ! bbar
& ierr,errstrng) ! errcode
@@ -380,7 +380,7 @@
& ielg,numelv,ielindx, ! elemnt,orig element num
& ptmp,nprop,elas_strs_13,td_strs_mat_13,matchg,tminmax, ! materl
& gauss,sh,shj,nen,ngauss,nee, ! eltype
- & rtimdat,ntimdat,rgiter, ! timdat
+ & rtimdat,ntimdat,rgiter,iter, ! timdat
& skew,numrot, ! skew
& getshape,bmatrix, ! bbar
& ierr,errstrng) ! errcode
@@ -398,7 +398,7 @@
& ielg,numelv,ielindx, ! elemnt,orig element num
& ptmp,nprop,elas_strs_14,td_strs_mat_14,matchg,tminmax, ! materl
& gauss,sh,shj,nen,ngauss,nee, ! eltype
- & rtimdat,ntimdat,rgiter, ! timdat
+ & rtimdat,ntimdat,rgiter,iter, ! timdat
& skew,numrot, ! skew
& getshape,bmatrix, ! bbar
& ierr,errstrng) ! errcode
@@ -416,7 +416,7 @@
& ielg,numelv,ielindx, ! elemnt,orig element num
& ptmp,nprop,elas_strs_15,td_strs_mat_15,matchg,tminmax, ! materl
& gauss,sh,shj,nen,ngauss,nee, ! eltype
- & rtimdat,ntimdat,rgiter, ! timdat
+ & rtimdat,ntimdat,rgiter,iter, ! timdat
& skew,numrot, ! skew
& getshape,bmatrix, ! bbar
& ierr,errstrng) ! errcode
@@ -434,7 +434,7 @@
& ielg,numelv,ielindx, ! elemnt,orig element num
& ptmp,nprop,elas_strs_16,td_strs_mat_16,matchg,tminmax, ! materl
& gauss,sh,shj,nen,ngauss,nee, ! eltype
- & rtimdat,ntimdat,rgiter, ! timdat
+ & rtimdat,ntimdat,rgiter,iter, ! timdat
& skew,numrot, ! skew
& getshape,bmatrix, ! bbar
& ierr,errstrng) ! errcode
@@ -452,7 +452,7 @@
& ielg,numelv,ielindx, ! elemnt,orig element num
& ptmp,nprop,elas_strs_17,td_strs_mat_17,matchg,tminmax, ! materl
& gauss,sh,shj,nen,ngauss,nee, ! eltype
- & rtimdat,ntimdat,rgiter, ! timdat
+ & rtimdat,ntimdat,rgiter,iter, ! timdat
& skew,numrot, ! skew
& getshape,bmatrix, ! bbar
& ierr,errstrng) ! errcode
@@ -470,7 +470,7 @@
& ielg,numelv,ielindx, ! elemnt,orig element num
& ptmp,nprop,elas_strs_18,td_strs_mat_18,matchg,tminmax, ! materl
& gauss,sh,shj,nen,ngauss,nee, ! eltype
- & rtimdat,ntimdat,rgiter, ! timdat
+ & rtimdat,ntimdat,rgiter,iter, ! timdat
& skew,numrot, ! skew
& getshape,bmatrix, ! bbar
& ierr,errstrng) ! errcode
@@ -488,7 +488,7 @@
& ielg,numelv,ielindx, ! elemnt,orig element num
& ptmp,nprop,elas_strs_19,td_strs_mat_19,matchg,tminmax, ! materl
& gauss,sh,shj,nen,ngauss,nee, ! eltype
- & rtimdat,ntimdat,rgiter, ! timdat
+ & rtimdat,ntimdat,rgiter,iter, ! timdat
& skew,numrot, ! skew
& getshape,bmatrix, ! bbar
& ierr,errstrng) ! errcode
@@ -506,7 +506,7 @@
& ielg,numelv,ielindx, ! elemnt,orig element num
& ptmp,nprop,elas_strs_20,td_strs_mat_20,matchg,tminmax, ! materl
& gauss,sh,shj,nen,ngauss,nee, ! eltype
- & rtimdat,ntimdat,rgiter, ! timdat
+ & rtimdat,ntimdat,rgiter,iter, ! timdat
& skew,numrot, ! skew
& getshape,bmatrix, ! bbar
& ierr,errstrng) ! errcode
Modified: short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/td_strs_cmp_ss.f
===================================================================
--- short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/td_strs_cmp_ss.f 2007-01-12 21:20:20 UTC (rev 5780)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/td_strs_cmp_ss.f 2007-01-12 21:23:53 UTC (rev 5781)
@@ -38,7 +38,7 @@
& ielg, ! elemnt
& prop,nprop,elas_strs,td_strs,matchg,tminmax, ! materl
& gauss,sh,shj,nen,ngauss,nee, ! eltype
- & rtimdat,ntimdat,rgiter, ! timdat
+ & rtimdat,ntimdat,rgiter,iter, ! timdat
& skew,numrot, ! skew
& getshape,bmatrix, ! bbar
& ierr,errstrng) ! errcode
@@ -64,7 +64,8 @@
c family.
c
integer ielg
- integer nprestrflag,ipstrs,ipauto,nprop,nen,ngauss,nee,numrot,ierr
+ integer nprestrflag,ipstrs,ipauto,nprop,nen,ngauss,nee,iter
+ integer numrot,ierr
integer iddmat(nstr,nstr)
integer ien(nen,nelfamily),lm(ndof*nen,nelfamily)
integer lmx(ndof*nen,nelfamily),lmf(nen,nelfamily)
@@ -142,7 +143,7 @@
do l=1,ngauss
call td_strs(state(1,l,ielf),dstate(1,l,ielf),
& state0(1,l,indstate0),ee(nstr*(l-1)+1),scur(nstr*(l-1)+1),
- & dmat(1,l,ielf),prop,rtimdat,rgiter,ntimdat,iddmat,tmax,
+ & dmat(1,l,ielf),prop,rtimdat,rgiter,iter,ntimdat,iddmat,tmax,
& nstate,nstate0,nprop,matchg,ierr,errstrng)
if(ierr.ne.izero) return
tminmax=min(tmax,tminmax)
Modified: short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/td_strs_mat_cmp_ss.F
===================================================================
--- short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/td_strs_mat_cmp_ss.F 2007-01-12 21:20:20 UTC (rev 5780)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/td_strs_mat_cmp_ss.F 2007-01-12 21:23:53 UTC (rev 5781)
@@ -40,7 +40,7 @@
& ielg,numelv,ielindx, ! elordering
& prop,nprop,elas_strs_mat,td_strs_mat,matchg,tminmax, ! materl
& gauss,sh,shj,nen,ngauss,nee, ! eltype
- & rtimdat,ntimdat,rgiter, ! timdat
+ & rtimdat,ntimdat,rgiter,iter, ! timdat
& skew,numrot, ! skew
& getshape,bmatrix, ! bbar
& ierr,errstrng) ! errcode
@@ -72,7 +72,7 @@
integer ielg,numelv,ielindx(numelv)
integer nnz,neq,numnp,numslp,numsn,numfn,nelfamily,nstate,nstate0
integer nprestrflag,ipstrs,ipauto,n0states,nprop
- integer nen,ngauss,nee,numrot,ierr
+ integer nen,ngauss,nee,iter,numrot,ierr
integer iddmat(nstr,nstr)
integer ien(nen,nelfamily),lm(nee,nelfamily),lmx(nee,nelfamily)
integer lmf(nen,nelfamily)
@@ -149,7 +149,7 @@
do l=1,ngauss
call td_strs_mat(state(1,l,ielf),dstate(1,l,ielf),
& state0(1,l,indstate0),ee(nstr*(l-1)+1),scur(nstr*(l-1)+1),
- & dmat(1,l,ielf),prop,rtimdat,rgiter,ntimdat,iddmat,tmax,
+ & dmat(1,l,ielf),prop,rtimdat,rgiter,iter,ntimdat,iddmat,tmax,
& nstate,nstate0,nprop,matchg,ierr,errstrng)
if(ierr.ne.izero) return
tminmax=min(tmax,tminmax)
More information about the cig-commits
mailing list