[cig-commits] r5371 - short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d

[willic3 at geodynamics.org]

Author: willic3
Date: 2006-11-28 19:33:58 -0800 (Tue, 28 Nov 2006)
New Revision: 5371

Modified:
   short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_7.f
Log:
Changed name of compdq function to avoid conflicts with other material
models that might use the same (or similar) function.



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-11-29 03:32:05 UTC (rev 5370)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/mat_7.f	2006-11-29 03:33:58 UTC (rev 5371)
@@ -282,7 +282,7 @@
       end
 c
 c
-      function compdq(deltp,tau)
+      function compdq_7(deltp,tau)
 c
 c...  function to compute the viscous state variable increment delta-q.
 c
@@ -298,7 +298,7 @@
 c
 c...  subroutine arguments
 c
-      double precision compdq,deltp,tau
+      double precision compdq_7,deltp,tau
 c
 c...  intrinsic functions
 c
@@ -309,21 +309,21 @@
       integer i
       double precision fsign,fac,frac
 c
-      compdq=zero
+      compdq_7=zero
       if(tau.eq.zero) return
       if(tau.lt.tfrac*deltp) then
         fsign=one
         fac=one
         frac=one
-        compdq=one
+        compdq_7=one
         do i=2,nterms
           fac=fac*dble(i)
           fsign=-one*fsign
           frac=frac*(deltp/tau)
-          compdq=compdq+fsign*frac/fac
+          compdq_7=compdq_7+fsign*frac/fac
         end do
       else
-        compdq=tau*(one-exp(-deltp/tau))/deltp
+        compdq_7=tau*(one-exp(-deltp/tau))/deltp
       end if
       return
       end
@@ -366,8 +366,8 @@
 c
 c...  external functions
 c
-      double precision compdq
-      external compdq
+      double precision compdq_7
+      external compdq_7
 c
 c...  local variables
 c
@@ -412,7 +412,7 @@
         if(rmue.ne.zero) then
           tau=vise/rmut
           tmax=min(tmax,tau)
-          shfac=shfac+rmue*compdq(deltp,tau)
+          shfac=shfac+rmue*compdq_7(deltp,tau)
         end if
       end do
 c
@@ -466,8 +466,8 @@
 c
 c...  external functions
 c
-      double precision compdq
-      external compdq
+      double precision compdq_7
+      external compdq_7
 c
 c...  local constants
 c
@@ -521,7 +521,7 @@
         if(rmue.ne.zero) then
           rtime(i)=vise/rmut
           tmax=min(tmax,rtime(i))
-          dq(i)=compdq(deltp,rtime(i))
+          dq(i)=compdq_7(deltp,rtime(i))
         end if
       end do
 c