[cig-commits] r4644 - in
short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d: . includes
willic3 at geodynamics.org
willic3 at geodynamics.org
Thu Sep 28 09:01:15 PDT 2006
Author: willic3
Date: 2006-09-28 09:01:15 -0700 (Thu, 28 Sep 2006)
New Revision: 4644
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/npar_def.inc
short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/includes/npar_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_step.F
Log:
Updated all routines for traction BC.
Modified: short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/autoprestr.F
===================================================================
--- short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/autoprestr.F 2006-09-28 14:56:04 UTC (rev 4643)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/autoprestr.F 2006-09-28 16:01:15 UTC (rev 4644)
@@ -38,7 +38,7 @@
& fault,nfault,dfault,tfault, ! fault
& s,stemp, ! stiff
& state,dstate,state0,dmat,ien,lm,lmx,lmf,ivfamily,npar,ielindx, ! elemnt
- & ielno,iside,ihistry,pres,pdir, ! tractn
+ & tractionverts,tractionvals,gauss2d,sh2d,infetype2d, ! tractn
& prop,infmatmod, ! materl
& gauss,sh,shj,infetype, ! eltype
& histry,rtimdat,ntimdat,nvisdat,maxstp,delt,alfa,maxit,ntdinit, ! timdat
@@ -85,7 +85,7 @@
integer idx(*),iwinkx(*),idslp(*),ipslp(*),idhist(*)
integer nfault(*)
integer ien(*),lm(*),lmx(*),lmf(*),ivfamily(*),ielindx(*)
- integer ielno(*),iside(*),ihistry(*)
+ integer tractionverts(*),infetype2d(*)
integer infmatmod(*)
integer infetype(4)
integer maxstp(*),maxit(*),ntdinit(*),lgdef(*),itmax(*)
@@ -99,7 +99,7 @@
double precision fault(*),dfault(*),tfault(*)
double precision s(*),stemp(*)
double precision state(*),dstate(*),state0(*),dmat(*)
- double precision pres(*),pdir(*)
+ double precision tractionvals(*),gauss2d(*),sh2d(*)
double precision prop(*)
double precision gauss(*),sh(*),shj(*)
double precision histry(*),delt(*),alfa(*),utol(*),ftol(*),etol(*)
@@ -123,8 +123,8 @@
c... external routines
c
external bmatrixn,bmatrixb,getshapn,getshapb
- external prestr_matinit_cmp_ss,gload_cmp_ss,elas_strs_cmp_ss
- external elas_strs_mat_cmp_ss
+ external prestr_matinit_cmp_ss,gload_cmp_ss,traction_cmp_ss
+ external elas_strs_cmp_ss,elas_strs_mat_cmp_ss
c
c... local variables
c
@@ -305,15 +305,15 @@
& s,stemp, ! stiff
& state,dstate,state0,dmat,ien,lm,lmx,lmf,ivfamily,npar, ! elemnt
& ielindx, ! elemnt
- & ielno,iside,ihistry,pres,pdir, ! tractn
+ & tractionverts,tractionvals,gauss2d,sh2d,infetype2d, ! tractn
& prop,infmatmod,tminmax, ! materl
& gauss,sh,shj,nen,ngauss,nee,nec, ! eltype
& histry,rtimdat,ntimdat,nvisdat,iprestress, ! timdat
& rgiter,gtol, ! iterate
& skew, ! skew
& ncodat,nunits,nprint, ! ioinfo
- & getshapn,bmatrixn,gload_cmp_ss,elas_strs_cmp_ss, ! external
- & elas_strs_mat_cmp_ss, ! external
+ & getshapn,bmatrixn,gload_cmp_ss,traction_cmp_ss, ! external
+ & elas_strs_cmp_ss,elas_strs_mat_cmp_ss, ! external
& iterateEvent, ! PETSc logging
& ierr,errstrng) ! errcode
cdebug write(6,*) "After iterate (1):"
@@ -380,15 +380,15 @@
& s,stemp, ! stiff
& state,dstate,state0,dmat,ien,lm,lmx,lmf,ivfamily,npar, ! elemnt
& ielindx, ! elemnt
- & ielno,iside,ihistry,pres,pdir, ! tractn
+ & tractionverts,tractionvals,gauss2d,sh2d,infetype2d, ! tractn
& prop,infmatmod,tminmax, ! materl
& gauss,sh,shj,nen,ngauss,nee,nec, ! eltype
& histry,rtimdat,ntimdat,nvisdat,iprestress, ! timdat
& rgiter,gtol, ! iterate
& skew, ! skew
& ncodat,nunits,nprint, ! ioinfo
- & getshapb,bmatrixb,gload_cmp_ss,elas_strs_cmp_ss, ! external
- & elas_strs_mat_cmp_ss, ! external
+ & getshapb,bmatrixb,gload_cmp_ss,traction_cmp_ss, ! external
+ & elas_strs_cmp_ss,elas_strs_mat_cmp_ss, ! external
& iterateEvent, ! PETSc logging
& ierr,errstrng) ! errcode
cdebug write(6,*) "After iterate (2):"
@@ -451,15 +451,15 @@
clater & nfault,dfault,tfault, ! fault
clater & s,stemp, ! stiff
clater & state,dstate,state0,dmat,ien,lm,lmx,lmf,infiel,iddmat,npar, ! elemnt
-clater & ielno,iside,ihistry,pres,pdir, ! tractn
+clater & tractionverts,tractionvals,gauss2d,sh2d,infetype2d, ! tractn
clater & prop,infmat,infmatmod,tminmax, ! materl
clater & gauss,sh,shj,infetype, ! eltype
clater & histry,rtimdat,ntimdat,nvisdat,iprestress, ! timdat
clater & rgiter,gtol, ! iterate
clater & skew, ! skew
clater & ncodat,nunits,nprint, ! ioinfo
-clater & getshapn,bmatrixn,gload_cmp_ld,elas_strs_cmp_ld, ! external
-clater & elas_strs_mat_cmp_ld, ! external
+clater & getshapn,bmatrixn,gload_cmp_ld,traction_cmp_ld, ! external
+clater & elas_strs_cmp_ld,elas_strs_mat_cmp_ld, ! external
clater & ierr,errstrng) ! errcode
c
clater if(ierr.ne.izero) return
@@ -520,15 +520,15 @@
clater & nfault,dfault,tfault, ! fault
clater & s,stemp, ! stiff
clater & state,dstate,state0,dmat,ien,lm,lmx,lmf,infiel,iddmat,npar, ! elemnt
-clater & ielno,iside,ihistry,pres,pdir, ! tractn
+clater & tractionverts,tractionvals,gauss2d,sh2d,infetype2d, ! tractn
clater & prop,infmat,infmatmod,tminmax, ! materl
clater & gauss,sh,shj,infetype, ! eltype
clater & histry,rtimdat,ntimdat,nvisdat,iprestress, ! timdat
clater & rgiter,gtol, ! iterate
clater & skew, ! skew
clater & ncodat,nunits,nprint, ! ioinfo
-clater & getshapb,bmatrixb,gload_cmp_ld,elas_strs_cmp_ld, ! external
-clater & elas_strs_mat_cmp_ld, ! external
+clater & getshapb,bmatrixb,gload_cmp_ld,traction_cmp_ld, ! external
+clater & elas_strs_cmp_ld,elas_strs_mat_cmp_ld, ! external
clater & ierr,errstrng) ! errcode
c
clater if(ierr.ne.izero) return
Modified: short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/elastc.F
===================================================================
--- short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/elastc.F 2006-09-28 14:56:04 UTC (rev 4643)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/elastc.F 2006-09-28 16:01:15 UTC (rev 4644)
@@ -38,7 +38,7 @@
& fault,nfault,dfault,tfault, ! fault
& s,stemp, ! stiff
& state,dstate,state0,dmat,ien,lm,lmx,lmf,ivfamily,npar,ielindx, ! elemnt
- & ielno,iside,ihistry,pres,pdir, ! tractn
+ & tractionverts,tractionvals,gauss2d,sh2d,infetype2d, ! tractn
& prop,infmatmod, ! materl
& gauss,sh,shj,infetype, ! eltype
& histry,rtimdat,ntimdat,nvisdat,maxstp,delt,alfa,maxit,ntdinit, ! timdat
@@ -84,7 +84,7 @@
integer idx(*),iwinkx(*),idslp(*),ipslp(*),idhist(*)
integer nfault(*)
integer ien(*),lm(*),lmx(*),lmf(*),ivfamily(*),ielindx(*)
- integer ielno(*),iside(*),ihistry(*)
+ integer tractionverts(*),infetype2d(*)
integer infmatmod(*)
integer infetype(4)
integer maxstp(*),maxit(*),ntdinit(*),lgdef(*),itmax(*)
@@ -98,7 +98,7 @@
double precision fault(*),dfault(*),tfault(*)
double precision s(*),stemp(*)
double precision state(*),dstate(*),state0(*),dmat(*)
- double precision pres(*),pdir(*)
+ double precision tractionvals(*),gauss2d(*),sh2d(*)
double precision prop(*)
double precision gauss(*),sh(*),shj(*)
double precision histry(*),delt(*),alfa(*),utol(*),ftol(*),etol(*)
@@ -122,8 +122,8 @@
c... external routines
c
external bmatrixn,bmatrixb,getshapn,getshapb
- external elas_matinit_cmp_ss,gload_cmp_ss,elas_strs_cmp_ss
- external elas_strs_mat_cmp_ss
+ external elas_matinit_cmp_ss,gload_cmp_ss,traction_cmp_ss
+ external elas_strs_cmp_ss,elas_strs_mat_cmp_ss
c
c... local variables
c
@@ -314,15 +314,15 @@
& nfault,dfault,tfault, ! fault
& s,stemp, ! stiff
& state,dstate,state0,dmat,ien,lm,lmx,lmf,ivfamily,npar,ielindx, ! elemnt
- & ielno,iside,ihistry,pres,pdir, ! tractn
+ & tractionverts,tractionvals,gauss2d,sh2d,infetype2d, ! tractn
& prop,infmatmod,tminmax, ! materl
& gauss,sh,shj,nen,ngauss,nee,nec, ! eltype
& histry,rtimdat,ntimdat,nvisdat,iprestress, ! timdat
& rgiter,gtol, ! iterate
& skew, ! skew
& ncodat,nunits,nprint, ! ioinfo
- & getshapn,bmatrixn,gload_cmp_ss,elas_strs_cmp_ss, ! external
- & elas_strs_mat_cmp_ss, ! external
+ & getshapn,bmatrixn,gload_cmp_ss,traction_cmp_ss, ! external
+ & elas_strs_cmp_ss,elas_strs_mat_cmp_ss, ! external
& iterateEvent, ! PETSc logging
& ierr,errstrng) ! errcode
cdebug write(6,*) "After iterate (1):"
@@ -388,15 +388,15 @@
& nfault,dfault,tfault, ! fault
& s,stemp, ! stiff
& state,dstate,state0,dmat,ien,lm,lmx,lmf,ivfamily,npar,ielindx, ! elemnt
- & ielno,iside,ihistry,pres,pdir, ! tractn
+ & tractionverts,tractionvals,gauss2d,sh2d,infetype2d, ! tractn
& prop,infmatmod,tminmax, ! materl
& gauss,sh,shj,nen,ngauss,nee,nec, ! eltype
& histry,rtimdat,ntimdat,nvisdat,iprestress, ! timdat
& rgiter,gtol, ! iterate
& skew, ! skew
& ncodat,nunits,nprint, ! ioinfo
- & getshapb,bmatrixb,gload_cmp_ss,elas_strs_cmp_ss, ! external
- & elas_strs_mat_cmp_ss, ! external
+ & getshapb,bmatrixb,gload_cmp_ss,traction_cmp_ss, ! external
+ & elas_strs_cmp_ss,elas_strs_mat_cmp_ss, ! external
& iterateEvent, ! PETSc logging
& ierr,errstrng) ! errcode
cdebug write(6,*) "After iterate (2):"
@@ -459,15 +459,15 @@
clater & nfault,dfault,tfault, ! fault
clater & s,stemp, ! stiff
clater & state,dstate,state0,dmat,ien,lm,lmx,lmf,infiel,iddmat,npar, ! elemnt
-clater & ielno,iside,ihistry,pres,pdir, ! tractn
+clater & tractionverts,tractionvals,gauss2d,sh2d,infetype2d, ! tractn
clater & prop,infmat,infmatmod,tminmax, ! materl
clater & gauss,sh,shj,infetype, ! eltype
clater & histry,rtimdat,ntimdat,nvisdat,iprestress, ! timdat
clater & rgiter,gtol, ! iterate
clater & skew, ! skew
clater & ncodat,nunits,nprint, ! ioinfo
-clater & getshapn,bmatrixn,gload_cmp_ld,elas_strs_cmp_ld, ! external
-clater & elas_strs_mat_cmp_ld, ! external
+clater & getshapn,bmatrixn,gload_cmp_ld,traction_cmp_ld, ! external
+clater & elas_strs_cmp_ld,elas_strs_mat_cmp_ld, ! external
clater & iterateEvent, ! PETSc logging
clater & ierr,errstrng) ! errcode
c
@@ -529,15 +529,15 @@
clater & nfault,dfault,tfault, ! fault
clater & s,stemp, ! stiff
clater & state,dstate,state0,dmat,ien,lm,lmx,lmf,infiel,iddmat,npar, ! elemnt
-clater & ielno,iside,ihistry,pres,pdir, ! tractn
+clater & tractionverts,tractionvals,gauss2d,sh2d,infetype2d, ! tractn
clater & prop,infmat,infmatmod,tminmax, ! materl
clater & gauss,sh,shj,infetype, ! eltype
clater & histry,rtimdat,ntimdat,nvisdat,iprestress, ! timdat
clater & rgiter,gtol, ! iterate
clater & skew, ! skew
clater & ncodat,nunits,nprint, ! ioinfo
-clater & getshapb,bmatrixb,gload_cmp_ld,elas_strs_cmp_ld, ! external
-clater & elas_strs_mat_cmp_ld, ! external
+clater & getshapb,bmatrixb,gload_cmp_ld,traction_cmp_ld, ! external
+clater & elas_strs_cmp_ld,elas_strs_mat_cmp_ld, ! external
clater & iterateEvent, ! PETSc logging
clater & ierr,errstrng) ! errcode
c
Modified: short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/includes/npar_def.inc
===================================================================
--- short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/includes/npar_def.inc 2006-09-28 14:56:04 UTC (rev 4643)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/includes/npar_def.inc 2006-09-28 16:01:15 UTC (rev 4644)
@@ -37,7 +37,7 @@
c
numelv=npar(1)
numat=npar(2)
- numpr=npar(3)
+ numtractions=npar(3)
numslp=npar(4)
numfn=npar(5)
ipstrs=npar(6)
Modified: short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/includes/npar_dim.inc
===================================================================
--- short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/includes/npar_dim.inc 2006-09-28 14:56:04 UTC (rev 4643)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/includes/npar_dim.inc 2006-09-28 16:01:15 UTC (rev 4644)
@@ -39,8 +39,8 @@
c
c... scalar parameters associated with arrays
c
- integer numelv,numat,numpr,numslp,numfn,ipstrs,ipauto,nstatesz,
- & nstatesz0,nvfamilies,numdif,intord
+ integer numelv,numat,numtractions,numslp,numfn,ipstrs,ipauto,
+ & nstatesz,nstatesz0,nvfamilies,numdif,intord
c
c version
c $Id: npar_dim.inc,v 1.5 2005/03/25 01:36:54 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 2006-09-28 14:56:04 UTC (rev 4643)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/iterate.F 2006-09-28 16:01:15 UTC (rev 4644)
@@ -37,14 +37,15 @@
& nfault,dfault,tfault, ! fault
& s,stemp, ! stiff
& state,dstate,state0,dmat,ien,lm,lmx,lmf,ivfamily,npar,ielindx, ! elemnt
- & ielno,iside,ihistry,pres,pdir, ! tractn
+ & tractionverts,tractionvals,gauss2d,sh2d,infetype2d, ! tractn
& prop,infmatmod,tminmax, ! materl
& gauss,sh,shj,nen,ngauss,nee,nec, ! eltype
& histry,rtimdat,ntimdat,nvisdat,iprestress, ! timdat
& rgiter,gtol, ! iterate
& skew, ! skew
& ncodat,nunits,nprint, ! ioinfo
- & getshape,bmatrix,gload_cmp,stress_cmp,stress_mat_cmp, ! external
+ & getshape,bmatrix,gload_cmp,traction_cmp, ! external
+ & stress_cmp,stress_mat_cmp, ! external
& iterateEvent, ! PETSc logging
& ierr,errstrng) ! errcode
c
@@ -100,7 +101,8 @@
integer idx(*),iwinkx(*),idslp(*),ipslp(*)
integer nfault(*)
integer ien(*),lm(*),lmx(*),lmf(*),ivfamily(*)
- integer ielno(*),iside(*),ihistry(*),ielindx(*)
+ integer tractionverts(*),infetype2d(*)
+ integer ielindx(*)
integer infmatmod(*)
character errstrng*(*)
double precision bextern(*),btraction(*),bgravity(*),bconcforce(*)
@@ -111,7 +113,7 @@
double precision dfault(*),tfault(*)
double precision s(*),stemp(*)
double precision state(*),dstate(*),state0(*),dmat(*)
- double precision pres(*),pdir(*)
+ double precision tractionvals(*),gauss2d(*),sh2d(*)
double precision prop(*),tminmax
double precision gauss(*),sh(*),shj(*)
double precision histry(*)
@@ -133,7 +135,8 @@
c
c... external functions
c
- external getshape,bmatrix,gload_cmp,stress_cmp,stress_mat_cmp
+ external getshape,bmatrix,gload_cmp,traction_cmp
+ external stress_cmp,stress_mat_cmp
c
c... intrinsic functions
c
@@ -141,7 +144,7 @@
c
c... local variables
c
- integer i,iter
+ integer i,iter,nsnodes,nsgauss
double precision gi(3),gprev(3),gcurr(3)
logical fulout,converge,updats,skc,used,reform
c
@@ -163,6 +166,8 @@
cdebug write(6,*) "Hello from iterate_f!"
c
call PetscLogEventBegin(iterateEvent, ierr)
+ nsnodes=infetype2d(1)
+ nsgauss=infetype2d(2)
fulout=.true.
converge=.false.
reform=.false.
@@ -189,15 +194,19 @@
used=nstep.gt.0.and.nprevdflag.eq.1.and.iter.eq.1
if(iter.gt.1) fulout=.false.
c
-c...add pressure forces,if present, to global load vector
+c...add traction forces,if present, to global load vector
c
-clater if(numpr.ne.0.and.updats.and.iprestress.eq.0) call addpr(
-clater & btot,bres,x,d,dx,tfault,histry,skew,
-clater & ien,infin,lm,lmx,lmf,
-clater & ielno,iside,ihistry,pres,pdir,pvec,gvec2,fulout,
-clater & nsd,ndof,nen,nskdim,npdir,numnp,neq,nee,numrot,lastep,nhist,
-clater & nstep,lgdefp,numel,numpr,numfn,numslp,ipstrs,idout,idebug,kto,
-clater & kw)
+ if(numtractions.ne.0.and.updats.and.iprestress.eq.0) then
+ call traction_drv(
+ & btraction,ntractflag,neq, ! force
+ & x,d,id,numnp, ! global
+ & dx,numslp, ! slip
+ & tfault,numfn, ! split
+ & gauss2d,sh2d,nsnodes,nsgauss,traction_cmp, ! eltype
+ & tractionverts,tractionvals,numtractions, ! traction
+ & skew,numrot, ! skew
+ & ierr,errstrng) ! errcode
+ end if
c
c...add gravity body forces to global load vector
c
Modified: short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/viscos.F
===================================================================
--- short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/viscos.F 2006-09-28 14:56:04 UTC (rev 4643)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/viscos.F 2006-09-28 16:01:15 UTC (rev 4644)
@@ -38,7 +38,7 @@
& fault,nfault,dfault,tfault, ! split
& s,stemp, ! stiff
& state,dstate,state0,dmat,ien,lm,lmx,lmf,ivfamily,npar,ielindx, ! elemnt
- & ielno,iside,ihistry,pres,pdir, ! tractn
+ & tractionverts,tractionvals,gauss2d,sh2d,infetype2d, ! tractn
& prop,infmatmod, ! materl
& gauss,sh,shj,infetype, ! eltype
& histry,rtimdat,ntimdat,nvisdat,maxstp,delt,alfa,maxit,ntdinit, ! timdat
@@ -85,7 +85,7 @@
integer idx(*),iwinkx(*),idslp(*),ipslp(*),idhist(*)
integer nfault(*)
integer ien(*),lm(*),lmx(*),lmf(*),ivfamily(*),ielindx(*)
- integer ielno(*),iside(*),ihistry(*)
+ integer tractionverts(*),infetype2d(*)
integer infmatmod(*)
integer infetype(4)
integer maxstp(*),maxit(*),ntdinit(*),lgdef(*),itmax(*)
@@ -100,7 +100,7 @@
double precision fault(*),dfault(*),tfault(*)
double precision s(*),stemp(*)
double precision state(*),dstate(*),state0(*),dmat(*)
- double precision pres(*),pdir(*)
+ double precision tractionvals(*),gauss2d(*),sh2d(*)
double precision prop(*)
double precision gauss(*),sh(*),shj(*)
double precision histry(*),delt(*),alfa(*),utol(*),ftol(*),etol(*)
@@ -128,8 +128,8 @@
c... external routines
c
external bmatrixn,bmatrixb,getshapn,getshapb
- external td_matinit_cmp_ss,gload_cmp_ss,td_strs_cmp_ss
- external td_strs_mat_cmp_ss
+ external td_matinit_cmp_ss,gload_cmp_ss,traction_cmp_ss
+ external td_strs_cmp_ss,td_strs_mat_cmp_ss
c
c... local variables
c
@@ -376,15 +376,15 @@
& s,stemp, ! stiff
& state,dstate,state0,dmat,ien,lm,lmx,lmf,ivfamily,npar, ! elemnt
& ielindx, ! elemnt
- & ielno,iside,ihistry,pres,pdir, ! tractn
+ & tractionverts,tractionvals,gauss2d,sh2d,infetype2d, ! tractn
& prop,infmatmod,tminmax, ! materl
& gauss,sh,shj,nen,ngauss,nee,nec, ! eltype
& histry,rtimdat,ntimdat,nvisdat,iprestress, ! timdat
& rgiter,gtol, ! iterate
& skew, ! skew
& ncodat,nunits,nprint, ! ioinfo
- & getshapn,bmatrixn,gload_cmp_ss,td_strs_cmp_ss, ! external
- & td_strs_mat_cmp_ss, ! external
+ & getshapn,bmatrixn,gload_cmp_ss,traction_cmp_ss, ! external
+ & td_strs_cmp_ss,td_strs_mat_cmp_ss, ! external
& iterateEvent, ! PETSc logging
& ierr,errstrng) ! errcode
cdebug write(6,*) "After iterate (1):"
@@ -456,15 +456,15 @@
& s,stemp, ! stiff
& state,dstate,state0,dmat,ien,lm,lmx,lmf,ivfamily,npar, ! elemnt
& ielindx, ! elemnt
- & ielno,iside,ihistry,pres,pdir, ! tractn
+ & tractionverts,tractionvals,gauss2d,sh2d,infetype2d, ! tractn
& prop,infmatmod,tminmax, ! materl
& gauss,sh,shj,nen,ngauss,nee,nec, ! eltype
& histry,rtimdat,ntimdat,nvisdat,iprestress, ! timdat
& rgiter,gtol, ! iterate
& skew, ! skew
& ncodat,nunits,nprint, ! ioinfo
- & getshapb,bmatrixb,gload_cmp_ss,td_strs_cmp_ss, ! external
- & td_strs_mat_cmp_ss, ! external
+ & getshapb,bmatrixb,gload_cmp_ss,traction_cmp_ss, ! external
+ & td_strs_cmp_ss,td_strs_mat_cmp_ss, ! external
& iterateEvent, ! PETSc logging
& ierr,errstrng) ! errcode
cdebug write(6,*) "After iterate (2):"
@@ -530,15 +530,15 @@
clater & s,stemp, ! stiff
clater & state,dstate,state0,dmat,ien,lm,lmx,lmf,infiel,iddmat, ! elemnt
clater & npar, ! elemnt
-clater & ielno,iside,ihistry,pres,pdir, ! tractn
+clater & tractionverts,tractionvals,gauss2d,sh2d,infetype2d, ! tractn
clater & prop,infmat,infmatmod,tminmax, ! materl
clater & gauss,sh,shj,infetype, ! eltype
clater & histry,rtimdat,ntimdat,nvisdat,iprestress, ! timdat
clater & rgiter,gtol, ! iterate
clater & skew, ! skew
clater & ncodat,nunits,nprint, ! ioinfo
-clater & getshapn,bmatrixn,gload_cmp_ld,td_strs_cmp_ld, ! external
-clater & td_strs_mat_cmp_ld, ! external
+clater & getshapn,bmatrixn,gload_cmp_ld,traction_cmp_ld, ! external
+clater & td_strs_cmp_ld,td_strs_mat_cmp_ld, ! external
clater & ierr,errstrng) ! errcode
c
clater if(ierr.ne.izero) return
@@ -599,15 +599,15 @@
clater & s,stemp, ! stiff
clater & state,dstate,state0,dmat,ien,lm,lmx,lmf,infiel,iddmat, ! elemnt
clater & npar, ! elemnt
-clater & ielno,iside,ihistry,pres,pdir, ! tractn
+clater & tractionverts,tractionvals,gauss2d,sh2d,infetype2d, ! tractn
clater & prop,infmat,infmatmod,tminmax, ! materl
clater & gauss,sh,shj,infetype, ! eltype
clater & histry,rtimdat,ntimdat,nvisdat,iprestress, ! timdat
clater & rgiter,gtol, ! iterate
clater & skew, ! skew
clater & ncodat,nunits,nprint, ! ioinfo
-clater & getshapb,bmatrixb,gload_cmp_ld,td_strs_cmp_ld, ! external
-clater & td_strs_mat_cmp_ld, ! external
+clater & getshapb,bmatrixb,gload_cmp_ld,traction_cmp_ld, ! external
+clater & td_strs_cmp_ld,td_strs_mat_cmp_ld, ! external
clater & iterateEvent, ! PETSc logging
clater & ierr,errstrng) ! errcode
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 2006-09-28 14:56:04 UTC (rev 4643)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/viscos_step.F 2006-09-28 16:01:15 UTC (rev 4644)
@@ -38,7 +38,7 @@
& fault,nfault,dfault,tfault, ! split
& s,stemp, ! stiff
& state,dstate,state0,dmat,ien,lm,lmx,lmf,ivfamily,npar,ielindx, ! elemnt
- & ielno,iside,ihistry,pres,pdir, ! tractn
+ & tractionverts,tractionvals,gauss2d,sh2d,infetype2d, ! tractn
& prop,infmatmod, ! materl
& gauss,sh,shj,infetype, ! eltype
& histry,rtimdat,ntimdat,nvisdat,maxstp,delt,alfa,maxit,ntdinit, ! timdat
@@ -87,7 +87,7 @@
integer idx(*),iwinkx(*),idslp(*),ipslp(*),idhist(*)
integer nfault(*)
integer ien(*),lm(*),lmx(*),lmf(*),ivfamily(*),ielindx(*)
- integer ielno(*),iside(*),ihistry(*)
+ integer tractionverts(*),infetype2d(*)
integer infmatmod(*)
integer infetype(4)
integer maxstp(*),maxit(*),ntdinit(*),lgdef(*),itmax(*)
@@ -103,7 +103,7 @@
double precision fault(*),dfault(*),tfault(*)
double precision s(*),stemp(*)
double precision state(*),dstate(*),state0(*),dmat(*)
- double precision pres(*),pdir(*)
+ double precision tractionvals(*),gauss2d(*),sh2d(*)
double precision prop(*)
double precision gauss(*),sh(*),shj(*)
double precision histry(*),delt(*),alfa(*),utol(*),ftol(*),etol(*)
@@ -132,8 +132,8 @@
c... external routines
c
external bmatrixn,bmatrixb,getshapn,getshapb
- external td_matinit_cmp_ss,gload_cmp_ss,td_strs_cmp_ss
- external td_strs_mat_cmp_ss
+ external td_matinit_cmp_ss,gload_cmp_ss,traction_cmp_ss
+ external td_strs_cmp_ss,td_strs_mat_cmp_ss
c
c... local variables
c
@@ -272,76 +272,76 @@
if(reform) then
write(kto,650)
call matinit_drv(
- & A,nnz,neq, ! sparse
- & x,d,iwink,wink,numnp,nwink,iddmat, ! global
- & dx,iwinkx,winkx,numslp,numsn,nwinkx, ! slip
- & tfault,numfn, ! fault
- & s,stemp, ! stiff
- & state,dstate,state0,dmat,ien,lm,lmx,lmf,ivfamily, ! elemnt
- & nvfamilies,numelv,nstatesz,nstatesz0,nprestrflag, ! elemnt
- & ipstrs,ipauto,ielindx, ! elemnt
- & prop,infmatmod,npropsz,tminmax, ! materl
- & gauss,sh,shj,nen,ngauss,nee, ! eltype
- & histry,rtimdat,ntimdat,rgiter,nhist,lastep, ! timdat
- & td_matinit_cmp_ss, ! timdat
- & skew,numrot, ! skew
- & getshapn,bmatrixn, ! bbar
- & ierr,errstrng) ! errcode
+ & A,nnz,neq, ! sparse
+ & x,d,iwink,wink,numnp,nwink,iddmat, ! global
+ & dx,iwinkx,winkx,numslp,numsn,nwinkx, ! slip
+ & tfault,numfn, ! fault
+ & s,stemp, ! stiff
+ & state,dstate,state0,dmat,ien,lm,lmx,lmf,ivfamily, ! elemnt
+ & nvfamilies,numelv,nstatesz,nstatesz0,nprestrflag, ! elemnt
+ & ipstrs,ipauto,ielindx, ! elemnt
+ & prop,infmatmod,npropsz,tminmax, ! materl
+ & gauss,sh,shj,nen,ngauss,nee, ! eltype
+ & histry,rtimdat,ntimdat,rgiter,nhist,lastep, ! timdat
+ & td_matinit_cmp_ss, ! timdat
+ & skew,numrot, ! skew
+ & getshapn,bmatrixn, ! bbar
+ & ierr,errstrng) ! errcode
end if
cdebug write(6,*) "After matinit_drv (1):"
c
if(ierr.ne.izero) return
c
call formdf_ss(
- & bintern,neq, ! force
- & x,d,deld,numnp,iddmat, ! global
- & s,stemp, ! stiff
- & dmat,ien,lm,lmx,ivfamily,nvfamilies,numelv, ! elemnt
- & infmatmod, ! materl
- & gauss,sh,shj,nen,ngauss,nee, ! eltype
- & skew,numrot, ! skew
- & getshapn,bmatrixn, ! bbar
- & ierr,errstrng) ! errcode
+ & bintern,neq, ! force
+ & x,d,deld,numnp,iddmat, ! global
+ & s,stemp, ! stiff
+ & dmat,ien,lm,lmx,ivfamily,nvfamilies,numelv, ! elemnt
+ & infmatmod, ! materl
+ & gauss,sh,shj,nen,ngauss,nee, ! eltype
+ & skew,numrot, ! skew
+ & getshapn,bmatrixn, ! bbar
+ & ierr,errstrng) ! errcode
c debug write(6,*) "After formdf_ss (1):"
c
if(ierr.ne.izero) return
c
if(numfn.ne.izero) call formf_ss(
- & bintern,neq, ! force
- & x,numnp,iddmat, ! global
- & s,stemp, ! stiff
- & dmat,ien,lm,lmx,ivfamily,nvfamilies,numelv, ! elemnt
- & infmatmod, ! materl
- & gauss,sh,shj,nen,ngauss,nee, ! eltype
- & skew,numrot, ! skew
- & nfault,dfault,tfault,numfn, ! split
- & getshapn,bmatrixn, ! bbar
- & ierr,errstrng) ! errcode
+ & bintern,neq, ! force
+ & x,numnp,iddmat, ! global
+ & s,stemp, ! stiff
+ & dmat,ien,lm,lmx,ivfamily,nvfamilies,numelv, ! elemnt
+ & infmatmod, ! materl
+ & gauss,sh,shj,nen,ngauss,nee, ! eltype
+ & skew,numrot, ! skew
+ & nfault,dfault,tfault,numfn, ! split
+ & getshapn,bmatrixn, ! bbar
+ & ierr,errstrng) ! errcode
c debug write(6,*) "After formf_ss (1):"
c
if(ierr.ne.izero) return
c
call iterate(
- & A,rhs,sol, ! sparse
- & bextern,btraction,bgravity,bconcforce,bintern,bresid, ! force
- & bwink,bwinkx,dispvec,dprev,nforce,grav, ! force
- & x,d,deld,dcur,id,iwink,wink,nsysdat,iddmat, ! global
- & dx,deldx,dxcur,idx,iwinkx,winkx,idslp,ipslp, ! slip
- & nfault,dfault,tfault, ! fault
- & s,stemp, ! stiff
- & state,dstate,state0,dmat,ien,lm,lmx,lmf,ivfamily,npar, ! elemnt
- & ielindx, ! elemnt
- & ielno,iside,ihistry,pres,pdir, ! tractn
- & prop,infmatmod,tminmax, ! materl
- & gauss,sh,shj,nen,ngauss,nee,nec, ! eltype
- & histry,rtimdat,ntimdat,nvisdat,iprestress, ! timdat
- & rgiter,gtol, ! iterate
- & skew, ! skew
- & ncodat,nunits,nprint, ! ioinfo
- & getshapn,bmatrixn,gload_cmp_ss,td_strs_cmp_ss, ! external
- & td_strs_mat_cmp_ss, ! external
- & iterateEvent, ! PETSc logging
- & ierr,errstrng) ! errcode
+ & A,rhs,sol, ! sparse
+ & bextern,btraction,bgravity,bconcforce,bintern,bresid, ! force
+ & bwink,bwinkx,dispvec,dprev,nforce,grav, ! force
+ & x,d,deld,dcur,id,iwink,wink,nsysdat,iddmat, ! global
+ & dx,deldx,dxcur,idx,iwinkx,winkx,idslp,ipslp, ! slip
+ & nfault,dfault,tfault, ! fault
+ & s,stemp, ! stiff
+ & state,dstate,state0,dmat,ien,lm,lmx,lmf,ivfamily,npar, ! elemnt
+ & ielindx, ! elemnt
+ & tractionverts,tractionvals,gauss2d,sh2d,infetype2d, ! tractn
+ & prop,infmatmod,tminmax, ! materl
+ & gauss,sh,shj,nen,ngauss,nee,nec, ! eltype
+ & histry,rtimdat,ntimdat,nvisdat,iprestress, ! timdat
+ & rgiter,gtol, ! iterate
+ & skew, ! skew
+ & ncodat,nunits,nprint, ! ioinfo
+ & getshapn,bmatrixn,gload_cmp_ss,traction_cmp_ss, ! external
+ & td_strs_cmp_ss,td_strs_mat_cmp_ss, ! external
+ & iterateEvent, ! PETSc logging
+ & ierr,errstrng) ! errcode
c debug write(6,*) "After iterate (1):"
c
if(ierr.ne.izero) return
@@ -352,76 +352,76 @@
if(reform) then
write(kto,650)
call matinit_drv(
- & A,nnz,neq, ! sparse
- & x,d,iwink,wink,numnp,nwink,iddmat, ! global
- & dx,iwinkx,winkx,numslp,numsn,nwinkx, ! slip
- & tfault,numfn, ! fault
- & s,stemp, ! stiff
- & state,dstate,state0,dmat,ien,lm,lmx,lmf,ivfamily, ! elemnt
- & nvfamilies,numelv,nstatesz,nstatesz0,nprestrflag, ! elemnt
- & ipstrs,ipauto,ielindx, ! elemnt
- & prop,infmatmod,npropsz,tminmax, ! materl
- & gauss,sh,shj,nen,ngauss,nee, ! eltype
- & histry,rtimdat,ntimdat,rgiter,nhist,lastep, ! timdat
- & td_matinit_cmp_ss, ! timdat
- & skew,numrot, ! skew
- & getshapb,bmatrixb, ! bbar
- & ierr,errstrng) ! errcode
+ & A,nnz,neq, ! sparse
+ & x,d,iwink,wink,numnp,nwink,iddmat, ! global
+ & dx,iwinkx,winkx,numslp,numsn,nwinkx, ! slip
+ & tfault,numfn, ! fault
+ & s,stemp, ! stiff
+ & state,dstate,state0,dmat,ien,lm,lmx,lmf,ivfamily, ! elemnt
+ & nvfamilies,numelv,nstatesz,nstatesz0,nprestrflag, ! elemnt
+ & ipstrs,ipauto,ielindx, ! elemnt
+ & prop,infmatmod,npropsz,tminmax, ! materl
+ & gauss,sh,shj,nen,ngauss,nee, ! eltype
+ & histry,rtimdat,ntimdat,rgiter,nhist,lastep, ! timdat
+ & td_matinit_cmp_ss, ! timdat
+ & skew,numrot, ! skew
+ & getshapb,bmatrixb, ! bbar
+ & ierr,errstrng) ! errcode
end if
c debug write(6,*) "After matinit_drv (2):"
c
if(ierr.ne.izero) return
c
call formdf_ss(
- & bintern,neq, ! force
- & x,d,deld,numnp,iddmat, ! global
- & s,stemp, ! stiff
- & dmat,ien,lm,lmx,ivfamily,nvfamilies,numelv, ! elemnt
- & infmatmod, ! materl
- & gauss,sh,shj,nen,ngauss,nee, ! eltype
- & skew,numrot, ! skew
- & getshapb,bmatrixb, ! bbar
- & ierr,errstrng) ! errcode
+ & bintern,neq, ! force
+ & x,d,deld,numnp,iddmat, ! global
+ & s,stemp, ! stiff
+ & dmat,ien,lm,lmx,ivfamily,nvfamilies,numelv, ! elemnt
+ & infmatmod, ! materl
+ & gauss,sh,shj,nen,ngauss,nee, ! eltype
+ & skew,numrot, ! skew
+ & getshapb,bmatrixb, ! bbar
+ & ierr,errstrng) ! errcode
c debug write(6,*) "After formdf_ss (2):"
c
if(ierr.ne.izero) return
c
if(numfn.ne.izero) call formf_ss(
- & bintern,neq, ! force
- & x,numnp,iddmat, ! global
- & s,stemp, ! stiff
- & dmat,ien,lm,lmx,ivfamily,nvfamilies,numelv, ! elemnt
- & infmatmod, ! materl
- & gauss,sh,shj,nen,ngauss,nee, ! eltype
- & skew,numrot, ! skew
- & nfault,dfault,tfault,numfn, ! split
- & getshapb,bmatrixb, ! bbar
- & ierr,errstrng) ! errcode
+ & bintern,neq, ! force
+ & x,numnp,iddmat, ! global
+ & s,stemp, ! stiff
+ & dmat,ien,lm,lmx,ivfamily,nvfamilies,numelv, ! elemnt
+ & infmatmod, ! materl
+ & gauss,sh,shj,nen,ngauss,nee, ! eltype
+ & skew,numrot, ! skew
+ & nfault,dfault,tfault,numfn, ! split
+ & getshapb,bmatrixb, ! bbar
+ & ierr,errstrng) ! errcode
c debug write(6,*) "After formf_ss (2):"
c
if(ierr.ne.izero) return
c
call iterate(
- & A,rhs,sol, ! sparse
- & bextern,btraction,bgravity,bconcforce,bintern,bresid, ! force
- & bwink,bwinkx,dispvec,dprev,nforce,grav, ! force
- & x,d,deld,dcur,id,iwink,wink,nsysdat,iddmat, ! global
- & dx,deldx,dxcur,idx,iwinkx,winkx,idslp,ipslp, ! slip
- & nfault,dfault,tfault, ! fault
- & s,stemp, ! stiff
- & state,dstate,state0,dmat,ien,lm,lmx,lmf,ivfamily,npar, ! elemnt
- & ielindx, ! elemnt
- & ielno,iside,ihistry,pres,pdir, ! tractn
- & prop,infmatmod,tminmax, ! materl
- & gauss,sh,shj,nen,ngauss,nee,nec, ! eltype
- & histry,rtimdat,ntimdat,nvisdat,iprestress, ! timdat
- & rgiter,gtol, ! iterate
- & skew, ! skew
- & ncodat,nunits,nprint, ! ioinfo
- & getshapb,bmatrixb,gload_cmp_ss,td_strs_cmp_ss, ! external
- & td_strs_mat_cmp_ss, ! external
- & iterateEvent, ! PETSc logging
- & ierr,errstrng) ! errcode
+ & A,rhs,sol, ! sparse
+ & bextern,btraction,bgravity,bconcforce,bintern,bresid, ! force
+ & bwink,bwinkx,dispvec,dprev,nforce,grav, ! force
+ & x,d,deld,dcur,id,iwink,wink,nsysdat,iddmat, ! global
+ & dx,deldx,dxcur,idx,iwinkx,winkx,idslp,ipslp, ! slip
+ & nfault,dfault,tfault, ! fault
+ & s,stemp, ! stiff
+ & state,dstate,state0,dmat,ien,lm,lmx,lmf,ivfamily,npar, ! elemnt
+ & ielindx, ! elemnt
+ & tractionverts,tractionvals,gauss2d,sh2d,infetype2d, ! tractn
+ & prop,infmatmod,tminmax, ! materl
+ & gauss,sh,shj,nen,ngauss,nee,nec, ! eltype
+ & histry,rtimdat,ntimdat,nvisdat,iprestress, ! timdat
+ & rgiter,gtol, ! iterate
+ & skew, ! skew
+ & ncodat,nunits,nprint, ! ioinfo
+ & getshapb,bmatrixb,gload_cmp_ss,traction_cmp_ss, ! external
+ & td_strs_cmp_ss,td_strs_mat_cmp_ss, ! external
+ & iterateEvent, ! PETSc logging
+ & ierr,errstrng) ! errcode
c debug write(6,*) "After iterate (2):"
c
if(ierr.ne.izero) return
@@ -485,15 +485,15 @@
c later & s,stemp, ! stiff
c later & state,dstate,state0,dmat,ien,lm,lmx,lmf,infiel,iddmat, ! elemnt
c later & npar, ! elemnt
-c later & ielno,iside,ihistry,pres,pdir, ! tractn
+c later & tractionverts,tractionvals,gauss2d,sh2d,infetype2d, ! tractn
c later & prop,infmat,infmatmod,tminmax, ! materl
c later & gauss,sh,shj,infetype, ! eltype
c later & histry,rtimdat,ntimdat,nvisdat,iprestress, ! timdat
c later & rgiter,gtol, ! iterate
c later & skew, ! skew
c later & ncodat,nunits,nprint, ! ioinfo
-c later & getshapn,bmatrixn,gload_cmp_ld,td_strs_cmp_ld, ! external
-c later & td_strs_mat_cmp_ld, ! external
+c later & getshapn,bmatrixn,gload_cmp_ld,traction_cmp_ld, ! external
+c later & td_strs_cmp_ld,td_strs_mat_cmp_ld, ! external
c later & ierr,errstrng) ! errcode
c
c later if(ierr.ne.izero) return
@@ -554,15 +554,15 @@
c later & s,stemp, ! stiff
c later & state,dstate,state0,dmat,ien,lm,lmx,lmf,infiel,iddmat, ! elemnt
c later & npar, ! elemnt
-c later & ielno,iside,ihistry,pres,pdir, ! tractn
+c later & tractionverts,tractionvals,gauss2d,sh2d,infetype2d, ! tractn
c later & prop,infmat,infmatmod,tminmax, ! materl
c later & gauss,sh,shj,infetype, ! eltype
c later & histry,rtimdat,ntimdat,nvisdat,iprestress, ! timdat
c later & rgiter,gtol, ! iterate
c later & skew, ! skew
c later & ncodat,nunits,nprint, ! ioinfo
-c later & getshapb,bmatrixb,gload_cmp_ld,td_strs_cmp_ld, ! external
-c later & td_strs_mat_cmp_ld, ! external
+c later & getshapb,bmatrixb,gload_cmp_ld,traction_cmp_ld, ! external
+c later & td_strs_cmp_ld,td_strs_mat_cmp_ld, ! external
c later & iterateEvent, ! PETSc logging
c later & ierr,errstrng) ! errcode
c
More information about the cig-commits
mailing list