[cig-commits] r4985 -
short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d
willic3 at geodynamics.org
willic3 at geodynamics.org
Fri Oct 13 09:43:55 PDT 2006
Author: willic3
Date: 2006-10-13 09:43:54 -0700 (Fri, 13 Oct 2006)
New Revision: 4985
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/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_6.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/mat_9.f
Log:
Updated all routine for computation of Maxwell time.
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 2006-10-13 11:35:01 UTC (rev 4984)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/elas_strs_cmp_ss.f 2006-10-13 16:43:54 UTC (rev 4985)
@@ -99,6 +99,7 @@
c... local variables
c
integer ielf,incstate0,indstate0,l
+ double precision tmax
double precision dl(60),xl(60),scur(162),ee(162),p(60),det(27)
cdebug integer idb,jdb
c
@@ -140,10 +141,11 @@
c scur
c
do l=1,ngauss
- call elas_strs(dstate(1,l,ielf),state0(1,l,indstate0),
- & ee(nstr*(l-1)+1),scur(nstr*(l-1)+1),dmat(1,l,ielf),
- & nstate,nstate0,ierr,errstrng)
+ call elas_strs(prop,nprop,dstate(1,l,ielf),
+ & state0(1,l,indstate0),ee(nstr*(l-1)+1),scur(nstr*(l-1)+1),
+ & dmat(1,l,ielf),tmax,nstate,nstate0,ierr,errstrng)
if(ierr.ne.izero) return
+ tminmax=min(tmax,tminmax)
end do
c
c... compute equivalent nodal loads
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 2006-10-13 11:35:01 UTC (rev 4984)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/elas_strs_mat_cmp_ss.F 2006-10-13 16:43:54 UTC (rev 4985)
@@ -110,6 +110,7 @@
c... local variables
c
integer ielf,incstate0,indstate0,l
+ double precision tmax
double precision dl(60),xl(60),scur(162),ee(162),p(60),det(27)
c
cdebug integer idb,jdb
@@ -152,10 +153,11 @@
c scur
c
do l=1,ngauss
- call elas_strs_mat(dstate(1,l,ielf),state0(1,l,indstate0),
- & ee(nstr*(l-1)+1),scur(nstr*(l-1)+1),dmat(1,l,ielf),
- & nstate,nstate0,ierr,errstrng)
+ call elas_strs_mat(prop,nprop,dstate(1,l,ielf),
+ & state0(1,l,indstate0),ee(nstr*(l-1)+1),scur(nstr*(l-1)+1),
+ & dmat(1,l,ielf),tmax,nstate,nstate0,ierr,errstrng)
if(ierr.ne.izero) return
+ tminmax=min(tmax,tminmax)
end do
c
c... compute equivalent nodal loads and add them to global load
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 2006-10-13 11:35:01 UTC (rev 4984)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_1.f 2006-10-13 16:43:54 UTC (rev 4985)
@@ -156,8 +156,8 @@
end
c
c
- subroutine elas_strs_1(state,state0,ee,scur,dmat,nstate,nstate0,
- & ierr,errstrng)
+ subroutine elas_strs_1(prop,nprop,state,state0,ee,scur,dmat,tmax,
+ & nstate,nstate0,ierr,errstrng)
c
c... subroutine to compute stresses for the elastic solution. For this
c material, there are just 2 sets of state variables: total stress
@@ -179,11 +179,13 @@
c
c... subroutine arguments
c
- integer nstate,nstate0,ierr
- double precision state(nstate),state0(nstate0),ee(nstr),scur(nstr)
- double precision dmat(nddmat)
+ integer nprop,nstate,nstate0,ierr
+ double precision prop(nprop),state(nstate),state0(nstate0)
+ double precision ee(nstr),scur(nstr)
+ double precision dmat(nddmat),tmax
character errstrng*(*)
c
+ tmax=big
call dcopy(nstr,ee,ione,state(7),ione)
call dcopy(nstr,state0,ione,state,ione)
call dspmv("u",nstr,one,dmat,state(7),ione,one,state,ione)
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 2006-10-13 11:35:01 UTC (rev 4984)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_10.f 2006-10-13 16:43:54 UTC (rev 4985)
@@ -108,8 +108,8 @@
end
c
c
- subroutine elas_strs_10(state,state0,ee,scur,dmat,nstate,nstate0,
- & ierr,errstrng)
+ subroutine elas_strs_10(prop,nprop,state,state0,ee,scur,dmat,tmax,
+ & nstate,nstate0,ierr,errstrng)
c
c... subroutine to compute stresses for the elastic solution.
c The current total strain is contained in ee and the computed
@@ -125,9 +125,10 @@
c
c... subroutine arguments
c
- integer nstate,nstate0,ierr
- double precision state(nstate),state0(nstate0),ee(nstr),scur(nstr)
- double precision dmat(nddmat)
+ integer nprop,nstate,nstate0,ierr
+ double precision prop(nprop),state(nstate),state0(nstate0)
+ double precision ee(nstr),scur(nstr)
+ double precision dmat(nddmat),tmax
character errstrng*(*)
c
c... return error code, as this material is not yet defined
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 2006-10-13 11:35:01 UTC (rev 4984)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_11.f 2006-10-13 16:43:54 UTC (rev 4985)
@@ -108,8 +108,8 @@
end
c
c
- subroutine elas_strs_11(state,state0,ee,scur,dmat,nstate,nstate0,
- & ierr,errstrng)
+ subroutine elas_strs_11(prop,nprop,state,state0,ee,scur,dmat,tmax,
+ & nstate,nstate0,ierr,errstrng)
c
c... subroutine to compute stresses for the elastic solution.
c The current total strain is contained in ee and the computed
@@ -125,9 +125,10 @@
c
c... subroutine arguments
c
- integer nstate,nstate0,ierr
- double precision state(nstate),state0(nstate0),ee(nstr),scur(nstr)
- double precision dmat(nddmat)
+ integer nprop,nstate,nstate0,ierr
+ double precision prop(nprop),state(nstate),state0(nstate0)
+ double precision ee(nstr),scur(nstr)
+ double precision dmat(nddmat),tmax
character errstrng*(*)
c
c... return error code, as this material is not yet defined
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 2006-10-13 11:35:01 UTC (rev 4984)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_12.f 2006-10-13 16:43:54 UTC (rev 4985)
@@ -108,8 +108,8 @@
end
c
c
- subroutine elas_strs_12(state,state0,ee,scur,dmat,nstate,nstate0,
- & ierr,errstrng)
+ subroutine elas_strs_12(prop,nprop,state,state0,ee,scur,dmat,tmax,
+ & nstate,nstate0,ierr,errstrng)
c
c... subroutine to compute stresses for the elastic solution.
c The current total strain is contained in ee and the computed
@@ -125,9 +125,10 @@
c
c... subroutine arguments
c
- integer nstate,nstate0,ierr
- double precision state(nstate),state0(nstate0),ee(nstr),scur(nstr)
- double precision dmat(nddmat)
+ integer nprop,nstate,nstate0,ierr
+ double precision prop(nprop),state(nstate),state0(nstate0)
+ double precision ee(nstr),scur(nstr)
+ double precision dmat(nddmat),tmax
character errstrng*(*)
c
c... return error code, as this material is not yet defined
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 2006-10-13 11:35:01 UTC (rev 4984)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_13.f 2006-10-13 16:43:54 UTC (rev 4985)
@@ -108,8 +108,8 @@
end
c
c
- subroutine elas_strs_13(state,state0,ee,scur,dmat,nstate,nstate0,
- & ierr,errstrng)
+ subroutine elas_strs_13(prop,nprop,state,state0,ee,scur,dmat,tmax,
+ & nstate,nstate0,ierr,errstrng)
c
c... subroutine to compute stresses for the elastic solution.
c The current total strain is contained in ee and the computed
@@ -125,9 +125,10 @@
c
c... subroutine arguments
c
- integer nstate,nstate0,ierr
- double precision state(nstate),state0(nstate0),ee(nstr),scur(nstr)
- double precision dmat(nddmat)
+ integer nprop,nstate,nstate0,ierr
+ double precision prop(nprop),state(nstate),state0(nstate0)
+ double precision ee(nstr),scur(nstr)
+ double precision dmat(nddmat),tmax
character errstrng*(*)
c
c... return error code, as this material is not yet defined
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 2006-10-13 11:35:01 UTC (rev 4984)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_14.f 2006-10-13 16:43:54 UTC (rev 4985)
@@ -108,8 +108,8 @@
end
c
c
- subroutine elas_strs_14(state,state0,ee,scur,dmat,nstate,nstate0,
- & ierr,errstrng)
+ subroutine elas_strs_14(prop,nprop,state,state0,ee,scur,dmat,tmax,
+ & nstate,nstate0,ierr,errstrng)
c
c... subroutine to compute stresses for the elastic solution.
c The current total strain is contained in ee and the computed
@@ -125,9 +125,10 @@
c
c... subroutine arguments
c
- integer nstate,nstate0,ierr
- double precision state(nstate),state0(nstate0),ee(nstr),scur(nstr)
- double precision dmat(nddmat)
+ integer nprop,nstate,nstate0,ierr
+ double precision prop(nprop),state(nstate),state0(nstate0)
+ double precision ee(nstr),scur(nstr)
+ double precision dmat(nddmat),tmax
character errstrng*(*)
c
c... return error code, as this material is not yet defined
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 2006-10-13 11:35:01 UTC (rev 4984)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_15.f 2006-10-13 16:43:54 UTC (rev 4985)
@@ -108,8 +108,8 @@
end
c
c
- subroutine elas_strs_15(state,state0,ee,scur,dmat,nstate,nstate0,
- & ierr,errstrng)
+ subroutine elas_strs_15(prop,nprop,state,state0,ee,scur,dmat,tmax,
+ & nstate,nstate0,ierr,errstrng)
c
c... subroutine to compute stresses for the elastic solution.
c The current total strain is contained in ee and the computed
@@ -125,9 +125,10 @@
c
c... subroutine arguments
c
- integer nstate,nstate0,ierr
- double precision state(nstate),state0(nstate0),ee(nstr),scur(nstr)
- double precision dmat(nddmat)
+ integer nprop,nstate,nstate0,ierr
+ double precision prop(nprop),state(nstate),state0(nstate0)
+ double precision ee(nstr),scur(nstr)
+ double precision dmat(nddmat),tmax
character errstrng*(*)
c
c... return error code, as this material is not yet defined
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 2006-10-13 11:35:01 UTC (rev 4984)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_16.f 2006-10-13 16:43:54 UTC (rev 4985)
@@ -108,8 +108,8 @@
end
c
c
- subroutine elas_strs_16(state,state0,ee,scur,dmat,nstate,nstate0,
- & ierr,errstrng)
+ subroutine elas_strs_16(prop,nprop,state,state0,ee,scur,dmat,tmax,
+ & nstate,nstate0,ierr,errstrng)
c
c... subroutine to compute stresses for the elastic solution.
c The current total strain is contained in ee and the computed
@@ -125,9 +125,10 @@
c
c... subroutine arguments
c
- integer nstate,nstate0,ierr
- double precision state(nstate),state0(nstate0),ee(nstr),scur(nstr)
- double precision dmat(nddmat)
+ integer nprop,nstate,nstate0,ierr
+ double precision prop(nprop),state(nstate),state0(nstate0)
+ double precision ee(nstr),scur(nstr)
+ double precision dmat(nddmat),tmax
character errstrng*(*)
c
c... return error code, as this material is not yet defined
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 2006-10-13 11:35:01 UTC (rev 4984)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_17.f 2006-10-13 16:43:54 UTC (rev 4985)
@@ -108,8 +108,8 @@
end
c
c
- subroutine elas_strs_17(state,state0,ee,scur,dmat,nstate,nstate0,
- & ierr,errstrng)
+ subroutine elas_strs_17(prop,nprop,state,state0,ee,scur,dmat,tmax,
+ & nstate,nstate0,ierr,errstrng)
c
c... subroutine to compute stresses for the elastic solution.
c The current total strain is contained in ee and the computed
@@ -125,9 +125,10 @@
c
c... subroutine arguments
c
- integer nstate,nstate0,ierr
- double precision state(nstate),state0(nstate0),ee(nstr),scur(nstr)
- double precision dmat(nddmat)
+ integer nprop,nstate,nstate0,ierr
+ double precision prop(nprop),state(nstate),state0(nstate0)
+ double precision ee(nstr),scur(nstr)
+ double precision dmat(nddmat),tmax
character errstrng*(*)
c
c... return error code, as this material is not yet defined
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 2006-10-13 11:35:01 UTC (rev 4984)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_18.f 2006-10-13 16:43:54 UTC (rev 4985)
@@ -108,8 +108,8 @@
end
c
c
- subroutine elas_strs_18(state,state0,ee,scur,dmat,nstate,nstate0,
- & ierr,errstrng)
+ subroutine elas_strs_18(prop,nprop,state,state0,ee,scur,dmat,tmax,
+ & nstate,nstate0,ierr,errstrng)
c
c... subroutine to compute stresses for the elastic solution.
c The current total strain is contained in ee and the computed
@@ -125,9 +125,10 @@
c
c... subroutine arguments
c
- integer nstate,nstate0,ierr
- double precision state(nstate),state0(nstate0),ee(nstr),scur(nstr)
- double precision dmat(nddmat)
+ integer nprop,nstate,nstate0,ierr
+ double precision prop(nprop),state(nstate),state0(nstate0)
+ double precision ee(nstr),scur(nstr)
+ double precision dmat(nddmat),tmax
character errstrng*(*)
c
c... return error code, as this material is not yet defined
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 2006-10-13 11:35:01 UTC (rev 4984)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_19.f 2006-10-13 16:43:54 UTC (rev 4985)
@@ -108,8 +108,8 @@
end
c
c
- subroutine elas_strs_19(state,state0,ee,scur,dmat,nstate,nstate0,
- & ierr,errstrng)
+ subroutine elas_strs_19(prop,nprop,state,state0,ee,scur,dmat,tmax,
+ & nstate,nstate0,ierr,errstrng)
c
c... subroutine to compute stresses for the elastic solution.
c The current total strain is contained in ee and the computed
@@ -125,9 +125,10 @@
c
c... subroutine arguments
c
- integer nstate,nstate0,ierr
- double precision state(nstate),state0(nstate0),ee(nstr),scur(nstr)
- double precision dmat(nddmat)
+ integer nprop,nstate,nstate0,ierr
+ double precision prop(nprop),state(nstate),state0(nstate0)
+ double precision ee(nstr),scur(nstr)
+ double precision dmat(nddmat),tmax
character errstrng*(*)
c
c... return error code, as this material is not yet defined
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 2006-10-13 11:35:01 UTC (rev 4984)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_2.f 2006-10-13 16:43:54 UTC (rev 4985)
@@ -108,8 +108,8 @@
end
c
c
- subroutine elas_strs_2(state,state0,ee,scur,dmat,nstate,nstate0,
- & ierr,errstrng)
+ subroutine elas_strs_2(prop,nprop,state,state0,ee,scur,dmat,tmax,
+ & nstate,nstate0,ierr,errstrng)
c
c... subroutine to compute stresses for the elastic solution.
c The current total strain is contained in ee and the computed
@@ -125,9 +125,10 @@
c
c... subroutine arguments
c
- integer nstate,nstate0,ierr
- double precision state(nstate),state0(nstate0),ee(nstr),scur(nstr)
- double precision dmat(nddmat)
+ integer nprop,nstate,nstate0,ierr
+ double precision prop(nprop),state(nstate),state0(nstate0)
+ double precision ee(nstr),scur(nstr)
+ double precision dmat(nddmat),tmax
character errstrng*(*)
c
c... return error code, as this material is not yet defined
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 2006-10-13 11:35:01 UTC (rev 4984)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_20.f 2006-10-13 16:43:54 UTC (rev 4985)
@@ -108,8 +108,8 @@
end
c
c
- subroutine elas_strs_20(state,state0,ee,scur,dmat,nstate,nstate0,
- & ierr,errstrng)
+ subroutine elas_strs_20(prop,nprop,state,state0,ee,scur,dmat,tmax,
+ & nstate,nstate0,ierr,errstrng)
c
c... subroutine to compute stresses for the elastic solution.
c The current total strain is contained in ee and the computed
@@ -125,9 +125,10 @@
c
c... subroutine arguments
c
- integer nstate,nstate0,ierr
- double precision state(nstate),state0(nstate0),ee(nstr),scur(nstr)
- double precision dmat(nddmat)
+ integer nprop,nstate,nstate0,ierr
+ double precision prop(nprop),state(nstate),state0(nstate0)
+ double precision ee(nstr),scur(nstr)
+ double precision dmat(nddmat),tmax
character errstrng*(*)
c
c... return error code, as this material is not yet defined
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 2006-10-13 11:35:01 UTC (rev 4984)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_3.f 2006-10-13 16:43:54 UTC (rev 4985)
@@ -108,8 +108,8 @@
end
c
c
- subroutine elas_strs_3(state,state0,ee,scur,dmat,nstate,nstate0,
- & ierr,errstrng)
+ subroutine elas_strs_3(prop,nprop,state,state0,ee,scur,dmat,tmax,
+ & nstate,nstate0,ierr,errstrng)
c
c... subroutine to compute stresses for the elastic solution.
c The current total strain is contained in ee and the computed
@@ -125,9 +125,10 @@
c
c... subroutine arguments
c
- integer nstate,nstate0,ierr
- double precision state(nstate),state0(nstate0),ee(nstr),scur(nstr)
- double precision dmat(nddmat)
+ integer nprop,nstate,nstate0,ierr
+ double precision prop(nprop),state(nstate),state0(nstate0)
+ double precision ee(nstr),scur(nstr)
+ double precision dmat(nddmat),tmax
character errstrng*(*)
c
c... return error code, as this material is not yet defined
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 2006-10-13 11:35:01 UTC (rev 4984)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_4.f 2006-10-13 16:43:54 UTC (rev 4985)
@@ -108,8 +108,8 @@
end
c
c
- subroutine elas_strs_4(state,state0,ee,scur,dmat,nstate,nstate0,
- & ierr,errstrng)
+ subroutine elas_strs_4(prop,nprop,state,state0,ee,scur,dmat,tmax,
+ & nstate,nstate0,ierr,errstrng)
c
c... subroutine to compute stresses for the elastic solution.
c The current total strain is contained in ee and the computed
@@ -125,9 +125,10 @@
c
c... subroutine arguments
c
- integer nstate,nstate0,ierr
- double precision state(nstate),state0(nstate0),ee(nstr),scur(nstr)
- double precision dmat(nddmat)
+ integer nprop,nstate,nstate0,ierr
+ double precision prop(nprop),state(nstate),state0(nstate0)
+ double precision ee(nstr),scur(nstr)
+ double precision dmat(nddmat),tmax
character errstrng*(*)
c
c... return error code, as this material is not yet defined
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 2006-10-13 11:35:01 UTC (rev 4984)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_5.f 2006-10-13 16:43:54 UTC (rev 4985)
@@ -192,7 +192,7 @@
integer nprop,nstate,nstate0,ierr
double precision prop(nprop),state(nstate),state0(nstate0)
double precision ee(nstr),scur(nstr)
- double precision dmat(nddmat)
+ double precision dmat(nddmat),tmax
character errstrng*(*)
c
c... local variables
@@ -212,7 +212,7 @@
pr=prop(3)
vis=prop(4)
rmu=half*e/(one+pr)
- tmax=emhu/rmu
+ tmax=vis/rmu
return
end
c
@@ -257,7 +257,7 @@
c
c... local variables
c
- double precision e,pr,vis,f1,f2
+ double precision e,pr,vis,f1,f2,rmu
c
c... included variable definitions
c
@@ -268,10 +268,11 @@
cdebug write(6,*) "Hello from td_matinit_5_f!"
c
call fill(dmat,zero,nddmat)
- tmax=big
e=prop(2)
pr=prop(3)
vis=prop(4)
+ rmu=half*e/(one+pr)
+ tmax=vis/rmu
f1=third*e/(one-two*pr)
f2=third/((one+pr)/e+half*alfap*deltp/vis)
dmat(iddmat(1,1))=f1+two*f2
@@ -348,7 +349,7 @@
vis=prop(4)
rmu=half*e/(one+pr)
rvis=one/vis
- tmax=two*vis/rmu
+ tmax=vis/rmu
fac1=half*deltp*rvis
fac2=(one+pr)/e
f1=fac1*(one-alfap)
Modified: short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_6.f
===================================================================
--- short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_6.f 2006-10-13 11:35:01 UTC (rev 4984)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_6.f 2006-10-13 16:43:54 UTC (rev 4985)
@@ -260,7 +260,7 @@
c
c... local variables
c
- double precision e,pr,anpwr,emhu,f1,f2,gam,ae
+ double precision e,pr,anpwr,emhu,f1,f2,gam,ae,rmu
double precision sdev(nstr),sinv1,steff
c
c... included variable definitions
@@ -272,15 +272,17 @@
cdebug write(6,*) "Hello from td_matinit_6_f!"
c
call fill(dmat,zero,nddmat)
- tmax=big
e=prop(2)
pr=prop(3)
anpwr=prop(4)
emhu=prop(5)
ae=(one+pr)/e
+ rmu=half*e/(one+pr)
f1=third*e/(one-two*pr)
call invar(sdev,sinv1,steff,state)
gam=half*(steff/emhu)**(anpwr-one)/emhu
+ tmax=big
+ if(steff.ne.zero) tmax=(emhu/steff)**(anpwr-one)*emhu/rmu
f2=third/(ae+deltp*gam)
dmat(iddmat(1,1))=f1+two*f2
dmat(iddmat(2,2))=dmat(iddmat(1,1))
@@ -407,6 +409,8 @@
gamtau=half*(sefftau/emhu)**(anpwr-one)/emhu
f1=one/(ae+alfap*deltp*gamtau)
f2=tf*gamtau
+ tmax=big
+ if(sefftdt.ne.zero) tmax=(emhu/sefftdt)**(anpwr-one)*emhu/rmu
c
c... compute new stresses and store stress and strain values in dstate
c
@@ -687,6 +691,8 @@
dstate(i+6)=ee(i)
dstate(i+12)=deltp*gamtau*sdevtau
end do
+ tmax=big
+ if(sefftdt.ne.zero) tmax=(emhu/sefftdt)**(anpwr-one)*emhu/rmu
c
c... define some constants for tangent computation
c
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 2006-10-13 11:35:01 UTC (rev 4984)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_7.f 2006-10-13 16:43:54 UTC (rev 4985)
@@ -108,8 +108,8 @@
end
c
c
- subroutine elas_strs_7(state,state0,ee,scur,dmat,nstate,nstate0,
- & ierr,errstrng)
+ subroutine elas_strs_7(prop,nprop,state,state0,ee,scur,dmat,tmax,
+ & nstate,nstate0,ierr,errstrng)
c
c... subroutine to compute stresses for the elastic solution.
c The current total strain is contained in ee and the computed
@@ -125,9 +125,10 @@
c
c... subroutine arguments
c
- integer nstate,nstate0,ierr
- double precision state(nstate),state0(nstate0),ee(nstr),scur(nstr)
- double precision dmat(nddmat)
+ integer nprop,nstate,nstate0,ierr
+ double precision prop(nprop),state(nstate),state0(nstate0)
+ double precision ee(nstr),scur(nstr)
+ double precision dmat(nddmat),tmax
character errstrng*(*)
c
c... return error code, as this material is not yet defined
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 2006-10-13 11:35:01 UTC (rev 4984)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_8.f 2006-10-13 16:43:54 UTC (rev 4985)
@@ -108,8 +108,8 @@
end
c
c
- subroutine elas_strs_8(state,state0,ee,scur,dmat,nstate,nstate0,
- & ierr,errstrng)
+ subroutine elas_strs_8(prop,nprop,state,state0,ee,scur,dmat,tmax,
+ & nstate,nstate0,ierr,errstrng)
c
c... subroutine to compute stresses for the elastic solution.
c The current total strain is contained in ee and the computed
@@ -125,9 +125,10 @@
c
c... subroutine arguments
c
- integer nstate,nstate0,ierr
- double precision state(nstate),state0(nstate0),ee(nstr),scur(nstr)
- double precision dmat(nddmat)
+ integer nprop,nstate,nstate0,ierr
+ double precision prop(nprop),state(nstate),state0(nstate0)
+ double precision ee(nstr),scur(nstr)
+ double precision dmat(nddmat),tmax
character errstrng*(*)
c
c... return error code, as this material is not yet defined
Modified: short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_9.f
===================================================================
--- short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_9.f 2006-10-13 11:35:01 UTC (rev 4984)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_9.f 2006-10-13 16:43:54 UTC (rev 4985)
@@ -108,8 +108,8 @@
end
c
c
- subroutine elas_strs_9(state,state0,ee,scur,dmat,nstate,nstate0,
- & ierr,errstrng)
+ subroutine elas_strs_9(prop,nprop,state,state0,ee,scur,dmat,tmax,
+ & nstate,nstate0,ierr,errstrng)
c
c... subroutine to compute stresses for the elastic solution.
c The current total strain is contained in ee and the computed
@@ -125,9 +125,10 @@
c
c... subroutine arguments
c
- integer nstate,nstate0,ierr
- double precision state(nstate),state0(nstate0),ee(nstr),scur(nstr)
- double precision dmat(nddmat)
+ integer nprop,nstate,nstate0,ierr
+ double precision prop(nprop),state(nstate),state0(nstate0)
+ double precision ee(nstr),scur(nstr)
+ double precision dmat(nddmat),tmax
character errstrng*(*)
c
c... return error code, as this material is not yet defined
More information about the cig-commits
mailing list