[cig-commits] r5457 -
short/3D/lithomop/trunk/lithomop3d/liblithomop3d
willic3 at geodynamics.org
willic3 at geodynamics.org
Tue Dec 5 07:13:18 PST 2006
Author: willic3
Date: 2006-12-05 07:13:17 -0800 (Tue, 05 Dec 2006)
New Revision: 5457
Modified:
short/3D/lithomop/trunk/lithomop3d/liblithomop3d/formdf_ss.f
short/3D/lithomop/trunk/lithomop3d/liblithomop3d/get_initial_stress.f
short/3D/lithomop/trunk/lithomop3d/liblithomop3d/gload_drv.f
short/3D/lithomop/trunk/lithomop3d/liblithomop3d/matinit_drv.F
short/3D/lithomop/trunk/lithomop3d/liblithomop3d/sort_elements.f
short/3D/lithomop/trunk/lithomop3d/liblithomop3d/stress_drv.f
short/3D/lithomop/trunk/lithomop3d/liblithomop3d/stress_mat_drv.F
short/3D/lithomop/trunk/lithomop3d/liblithomop3d/update_state_drv.f
short/3D/lithomop/trunk/lithomop3d/liblithomop3d/write_connect.F
short/3D/lithomop/trunk/lithomop3d/liblithomop3d/write_props.F
short/3D/lithomop/trunk/lithomop3d/liblithomop3d/write_state_drv.F
short/3D/lithomop/trunk/lithomop3d/liblithomop3d/write_ucd_mesh.F
Log:
Added an extra field to ivfamily so we can output material ID rather
than material model, which is much more useful.
Modified: short/3D/lithomop/trunk/lithomop3d/liblithomop3d/formdf_ss.f
===================================================================
--- short/3D/lithomop/trunk/lithomop3d/liblithomop3d/formdf_ss.f 2006-12-05 15:12:56 UTC (rev 5456)
+++ short/3D/lithomop/trunk/lithomop3d/liblithomop3d/formdf_ss.f 2006-12-05 15:13:17 UTC (rev 5457)
@@ -58,7 +58,7 @@
integer neq,numnp,nvfamilies,numelv,nen,ngauss,nee,numrot,ierr
integer iddmat(nstr,nstr)
integer ien(nen,numelv),lm(ndof*nen,numelv),lmx(ndof*nen,numelv)
- integer ivfamily(5,nvfamilies),infmatmod(6,nmatmodmax)
+ integer ivfamily(6,nvfamilies),infmatmod(6,nmatmodmax)
character errstrng*(*)
double precision bintern(neq),x(nsd,numnp),d(ndof,numnp)
double precision deld(ndof,numnp),s(neemax*neemax)
Modified: short/3D/lithomop/trunk/lithomop3d/liblithomop3d/get_initial_stress.f
===================================================================
--- short/3D/lithomop/trunk/lithomop3d/liblithomop3d/get_initial_stress.f 2006-12-05 15:12:56 UTC (rev 5456)
+++ short/3D/lithomop/trunk/lithomop3d/liblithomop3d/get_initial_stress.f 2006-12-05 15:13:17 UTC (rev 5457)
@@ -47,7 +47,7 @@
c... subroutine arguments
c
integer nvfamilies,numelv,nstatesz,nstatesz0,nen,ngauss
- integer ivfamily(5,nvfamilies),infmatmod(6,nmatmodmax)
+ integer ivfamily(6,nvfamilies),infmatmod(6,nmatmodmax)
double precision state(nstatesz),state0(nstatesz0)
c
c... included dimension and type statements
Modified: short/3D/lithomop/trunk/lithomop3d/liblithomop3d/gload_drv.f
===================================================================
--- short/3D/lithomop/trunk/lithomop3d/liblithomop3d/gload_drv.f 2006-12-05 15:12:56 UTC (rev 5456)
+++ short/3D/lithomop/trunk/lithomop3d/liblithomop3d/gload_drv.f 2006-12-05 15:13:17 UTC (rev 5457)
@@ -56,7 +56,7 @@
integer ngravflag,neq,numnp,numslp,numfn,nvfamilies,numelv,npropsz
integer nen,ngauss,nee,nhist,lastep,numrot,ierr
integer ien(nen,numelv),lm(ndof*nen,numelv),lmx(ndof*nen,numelv)
- integer lmf(nen,numelv),ivfamily(5,nvfamilies)
+ integer lmf(nen,numelv),ivfamily(6,nvfamilies)
integer infmatmod(6,nmatmodmax)
character errstrng*(*)
double precision bgravity(ngravflag*neq),grav(ndof)
Modified: short/3D/lithomop/trunk/lithomop3d/liblithomop3d/matinit_drv.F
===================================================================
--- short/3D/lithomop/trunk/lithomop3d/liblithomop3d/matinit_drv.F 2006-12-05 15:12:56 UTC (rev 5456)
+++ short/3D/lithomop/trunk/lithomop3d/liblithomop3d/matinit_drv.F 2006-12-05 15:13:17 UTC (rev 5457)
@@ -74,7 +74,7 @@
integer iwink(2,nwink),iddmat(nstr,nstr),iwinkx(2,nwinkx)
integer ien(nen,numelv)
integer lm(ndof*nen,numelv),lmx(ndof*nen,numelv),lmf(nen,numelv)
- integer ivfamily(5,nvfamilies)
+ integer ivfamily(6,nvfamilies)
integer infmatmod(6,nmatmodmax)
character errstrng*(*)
double precision x(nsd,numnp),d(ndof,numnp)
Modified: short/3D/lithomop/trunk/lithomop3d/liblithomop3d/sort_elements.f
===================================================================
--- short/3D/lithomop/trunk/lithomop3d/liblithomop3d/sort_elements.f 2006-12-05 15:12:56 UTC (rev 5456)
+++ short/3D/lithomop/trunk/lithomop3d/liblithomop3d/sort_elements.f 2006-12-05 15:13:17 UTC (rev 5457)
@@ -83,7 +83,7 @@
c nstatesz: Size of state variable array.
c nstatesz0: Size of initial state variable array.
c npropsz: Size of material property array.
-c ivfamily(5,nvfamilies): Element family info array:
+c ivfamily(6,nvfamilies): Element family info array:
c 1: Number of elements in family.
c 2: Material model for family.
c 3: Pointer into state variable array for
@@ -92,6 +92,7 @@
c for the family.
c 5: Pointer into material property array for
c the family.
+c 6: Material ID for family.
c iens(nen,numelv): Sorted version of ien array. The ien array
c may be deleted after this routine has been
c called.
@@ -119,7 +120,7 @@
integer nen,ngauss,maxvfamilies,nvfamilies,nprestrflag,numelv
integer numnp,nstatesz,nstatesz0,npropsz,ierr
integer ien(nen,numelv),mat(numelv),infmatmod(6,nmatmodmax)
- integer ivflist(3,maxvfamilies),ivfamily(5,nvfamilies)
+ integer ivflist(3,maxvfamilies),ivfamily(6,nvfamilies)
integer iens(nen,numelv),ivftmp(nvfamilies),indxiel(numelv)
character errstrng*(*)
c
@@ -137,7 +138,7 @@
c
cdebug write(6,*) "Hello from read_connect_f!"
call ifill(iens,izero,nen*numelv)
- call ifill(ivfamily,izero,5*nvfamilies)
+ call ifill(ivfamily,izero,6*nvfamilies)
ifam=izero
nstatesz=izero
nstatesz0=izero
@@ -169,6 +170,7 @@
ivfamily(3,ifam)=nstatesz+ione
ivfamily(4,ifam)=nstatesz0+ione
ivfamily(5,ifam)=npropsz+ione
+ ivfamily(6,ifam)=ivflist(2,j)
nstatesz=nstatesz+nstate*ngauss*nelfamily
nstatesz0=nstatesz0+incstate0*nstate0*ngauss*nelfamily
npropsz=npropsz+nprop
Modified: short/3D/lithomop/trunk/lithomop3d/liblithomop3d/stress_drv.f
===================================================================
--- short/3D/lithomop/trunk/lithomop3d/liblithomop3d/stress_drv.f 2006-12-05 15:12:56 UTC (rev 5456)
+++ short/3D/lithomop/trunk/lithomop3d/liblithomop3d/stress_drv.f 2006-12-05 15:13:17 UTC (rev 5457)
@@ -61,7 +61,7 @@
integer npropsz,nen,ngauss,nee,nhist,lastep,numrot,ierr
integer iddmat(nstr,nstr)
integer ien(nen,numelv),lm(ndof*nen,numelv),lmx(ndof*nen,numelv)
- integer lmf(nen,numelv),ivfamily(5,nvfamilies)
+ integer lmf(nen,numelv),ivfamily(6,nvfamilies)
integer infmatmod(6,nmatmodmax)
character errstrng*(*)
double precision bintern(neq),x(nsd,numnp),d(ndof,numnp)
Modified: short/3D/lithomop/trunk/lithomop3d/liblithomop3d/stress_mat_drv.F
===================================================================
--- short/3D/lithomop/trunk/lithomop3d/liblithomop3d/stress_mat_drv.F 2006-12-05 15:12:56 UTC (rev 5456)
+++ short/3D/lithomop/trunk/lithomop3d/liblithomop3d/stress_mat_drv.F 2006-12-05 15:13:17 UTC (rev 5457)
@@ -75,7 +75,7 @@
integer iddmat(nstr,nstr)
integer iwink(2,nwink),iwinkx(2,nwinkx),ien(nen,numelv)
integer lm(ndof*nen,numelv),lmx(ndof*nen,numelv),lmf(nen,numelv)
- integer ivfamily(5,nvfamilies)
+ integer ivfamily(6,nvfamilies)
integer infmatmod(6,nmatmodmax)
character errstrng*(*)
double precision bintern(neq),x(nsd,numnp),d(ndof,numnp)
Modified: short/3D/lithomop/trunk/lithomop3d/liblithomop3d/update_state_drv.f
===================================================================
--- short/3D/lithomop/trunk/lithomop3d/liblithomop3d/update_state_drv.f 2006-12-05 15:12:56 UTC (rev 5456)
+++ short/3D/lithomop/trunk/lithomop3d/liblithomop3d/update_state_drv.f 2006-12-05 15:13:17 UTC (rev 5457)
@@ -48,7 +48,7 @@
c... subroutine arguments
c
integer nvfamilies,numelv,nstatesz,ngauss,ierr
- integer ivfamily(5,nvfamilies),infmatmod(6,nmatmodmax)
+ integer ivfamily(6,nvfamilies),infmatmod(6,nmatmodmax)
character errstrng*(*)
double precision state(nstatesz),dstate(nstatesz)
c
Modified: short/3D/lithomop/trunk/lithomop3d/liblithomop3d/write_connect.F
===================================================================
--- short/3D/lithomop/trunk/lithomop3d/liblithomop3d/write_connect.F 2006-12-05 15:12:56 UTC (rev 5456)
+++ short/3D/lithomop/trunk/lithomop3d/liblithomop3d/write_connect.F 2006-12-05 15:13:17 UTC (rev 5457)
@@ -51,7 +51,7 @@
c... subroutine arguments
c
integer nen,ngauss,numelv,ietypev,nvfamilies,kw,kp,idout,idsk,ierr
- integer iens(nen,numelv),ivfamily(5,nvfamilies),indxiel(numelv)
+ integer iens(nen,numelv),ivfamily(6,nvfamilies),indxiel(numelv)
character ofile*(*),pfile*(*),errstrng*(*)
c
c... local variables
@@ -65,7 +65,7 @@
c
c... local variables
c
- integer ielg,ifam,nelfamily,matmod,ielf,ielgprev,j,npage
+ integer ielg,ifam,nelfamily,matid,matmod,ielf,ielgprev,j,npage
cdebug integer idb,jdb
c
cdebug write(6,*) "Hello from write_connect_f!"
@@ -81,10 +81,12 @@
do ifam=1,nvfamilies
nelfamily=ivfamily(1,ifam)
matmod=ivfamily(2,ifam)
+ matid=ivfamily(6,ifam)
do ielf=1,nelfamily
ielg=ielg+ione
ielgprev=indxiel(ielg)
- write(kp,1000) ielg,ielgprev,matmod,(iens(j,ielg),j=1,nen)
+ write(kp,1000) ielg,ielgprev,matid,matmod,
+ & (iens(j,ielg),j=1,nen)
end do
end do
close(kp)
@@ -109,6 +111,7 @@
do ifam=1,nvfamilies
nelfamily=ivfamily(1,ifam)
matmod=ivfamily(2,ifam)
+ matid=ivfamily(6,ifam)
do ielf=1,nelfamily
ielg=ielg+ione
ielgprev=indxiel(ielg)
@@ -116,7 +119,7 @@
write(kw,2000)(head(j),j,j=1,nen)
write(kw,2500)
end if
- write(kw,3000) ielg,ielgprev,matmod,ietypev,ngauss,
+ write(kw,3000) ielg,ielgprev,matid,matmod,ietypev,ngauss,
& (iens(j,ielg),j=1,nen)
end do
end do
@@ -140,9 +143,10 @@
1000 format(30i7)
2000 format(1x,///,
x ' e l e m e n t d a t a ',//,5x,
- x ' element element material ',20(a4,i2,4x))
-2500 format(5x,' reordered initial model ',/)
-3000 format(6x,i7,25(5x,i7))
+ x ' element element material material ',
+ x 20(a4,i2,4x))
+2500 format(5x,' reordered initial id model ',/)
+3000 format(6x,i7,26(5x,i7))
4000 format(//)
c
end
Modified: short/3D/lithomop/trunk/lithomop3d/liblithomop3d/write_props.F
===================================================================
--- short/3D/lithomop/trunk/lithomop3d/liblithomop3d/write_props.F 2006-12-05 15:12:56 UTC (rev 5456)
+++ short/3D/lithomop/trunk/lithomop3d/liblithomop3d/write_props.F 2006-12-05 15:13:17 UTC (rev 5457)
@@ -43,7 +43,7 @@
c... subroutine arguments
c
integer nvfamilies,npropsz,idout,idsk,kw,kp,ierr
- integer ivfamily(5,nvfamilies),infmatmod(6,nmatmodmax)
+ integer ivfamily(6,nvfamilies),infmatmod(6,nmatmodmax)
double precision prop(npropsz),grav(ndof)
character ofile*(*),pfile*(*),errstrng*(*)
c
Modified: short/3D/lithomop/trunk/lithomop3d/liblithomop3d/write_state_drv.F
===================================================================
--- short/3D/lithomop/trunk/lithomop3d/liblithomop3d/write_state_drv.F 2006-12-05 15:12:56 UTC (rev 5456)
+++ short/3D/lithomop/trunk/lithomop3d/liblithomop3d/write_state_drv.F 2006-12-05 15:13:17 UTC (rev 5457)
@@ -54,7 +54,7 @@
c
integer nvfamilies,numelv,nstatesz,ngauss,nstep
integer idout,idsk,iucd,kw,kp,kucd,iprestress,ierr
- integer ivfamily(5,nvfamilies),infmatmod(6,nmatmodmax)
+ integer ivfamily(6,nvfamilies),infmatmod(6,nmatmodmax)
integer istatout(nstatesmax,3),nstatout(3)
double precision delt
double precision state(nstatesz),dstate(nstatesz)
Modified: short/3D/lithomop/trunk/lithomop3d/liblithomop3d/write_ucd_mesh.F
===================================================================
--- short/3D/lithomop/trunk/lithomop3d/liblithomop3d/write_ucd_mesh.F 2006-12-05 15:12:56 UTC (rev 5456)
+++ short/3D/lithomop/trunk/lithomop3d/liblithomop3d/write_ucd_mesh.F 2006-12-05 15:13:17 UTC (rev 5457)
@@ -54,7 +54,7 @@
c... subroutine arguments
c
integer numnp,numelv,nvfamilies,nen,ngauss,ietype,kucd,iucd
- integer ien(nen,numelv),ivfamily(5,nvfamilies)
+ integer ien(nen,numelv),ivfamily(6,nvfamilies)
integer istatout(nstatesmax,3),nstatout(3)
character ucdroot*(*)
double precision x(nsd,numnp),sh(nsd+1,nen,ngauss)
@@ -90,7 +90,7 @@
c
integer nnattr,neattr,nngattr,negattr,nmattr,nnlist,nglist,i,j
integer iprestress,nstep,iopt
- integer ielg,ifam,ielf,nelfamily,matmodel
+ integer ielg,ifam,ielf,nelfamily,matid
integer numelg,l,ngpts,indtype,ictype,igpt
integer ibyte,intlen,floatlen,istride
integer itmp(20)
@@ -157,13 +157,13 @@
ielg=izero
do ifam=1,nvfamilies
nelfamily=ivfamily(1,ifam)
- matmodel=ivfamily(2,ifam)
+ matid=ivfamily(6,ifam)
do ielf=1,nelfamily
ielg=ielg+1
do j=1,nen
itmp(j)=ien(j,ielg)
end do
- write(kucd,"(2i7,2x,a4,20i7)") ielg,matmodel,
+ write(kucd,"(2i7,2x,a4,20i7)") ielg,matid,
& eltype(indtype),(itmp(inducd(j,indtype)),j=1,nen)
end do
end do
@@ -210,10 +210,10 @@
ielg=izero
do ifam=1,nvfamilies
nelfamily=ivfamily(1,ifam)
- matmodel=ivfamily(2,ifam)
+ matid=ivfamily(6,ifam)
do ielf=1,nelfamily
ielg=ielg+1
- write(kucd,BINARY_POS=ibyte) ielg,matmodel,nen,ictype
+ write(kucd,BINARY_POS=ibyte) ielg,matid,nen,ictype
ibyte=ibyte+4*intlen
end do
end do
@@ -223,7 +223,7 @@
ielg=izero
do ifam=1,nvfamilies
nelfamily=ivfamily(1,ifam)
- matmodel=ivfamily(2,ifam)
+ matid=ivfamily(6,ifam)
do ielf=1,nelfamily
ielg=ielg+1
do j=1,nen
More information about the cig-commits
mailing list