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

[willic3 at geodynamics.org]

Author: willic3
Date: 2007-04-22 20:02:56 -0700 (Sun, 22 Apr 2007)
New Revision: 6630

Modified:
   short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/libpylith3d.pxd
   short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/scan_tractions.f
Log:
Changed method for determining how many vertices per face for traction
BC.



Modified: short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/libpylith3d.pxd
===================================================================
--- short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/libpylith3d.pxd	2007-04-22 23:51:20 UTC (rev 6629)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/libpylith3d.pxd	2007-04-23 03:02:56 UTC (rev 6630)
@@ -709,6 +709,7 @@
     int *,
     int *,
     int *,
+    int *,
     char *,
     char *,
     int *,

Modified: short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/scan_tractions.f
===================================================================
--- short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/scan_tractions.f	2007-04-22 23:51:20 UTC (rev 6629)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/scan_tractions.f	2007-04-23 03:02:56 UTC (rev 6630)
@@ -28,7 +28,7 @@
 c~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 c
 c
-      subroutine scan_tractions(numtractions,nsnodesmax,kr,
+      subroutine scan_tractions(numtractions,nsnodesmax,kr,ietypev,
      & traction_units,tfile,ierr,errstrng)
 c
 c...  subroutine to perform an initial scan of the traction BC input
@@ -50,7 +50,7 @@
 c
 c...  subroutine arguments
 c
-      integer numtractions,nsnodesmax,kr,ierr
+      integer numtractions,nsnodesmax,kr,ietypev,ierr
       character traction_units*(*),tfile*(*),errstrng*(*)
 c
 c...  local constants
@@ -91,25 +91,18 @@
 c
       call pskip(kr)
 c
-c...  for now, determine number of vertices per face by evaluating read
-c     errors
+c...  for now, determine number of vertices per face by determining
+c     element type
 c
-      read(kr,*,end=10,err=31) (tractionverts(i),i=1,4),
-     & (tractionvals(i),i=1,ndof)
-      numverts=4
-      go to 33
- 31   continue
-        backspace(kr)
-        read(kr,*,end=10,err=32) (tractionverts(i),i=1,3),
-     &   (tractionvals(i),i=1,ndof)
+      if(ietypev.eq.1) then
+        numverts=4
+      else if(ietypev.eq.31) then
         numverts=3
-        go to 33
- 32   continue
-        ierr=106
+      else
+        ierr=121
         errstrng="scan_tractions"
         return
- 33   continue
-        backspace(kr)
+      end if
  40   continue
         read(kr,*,end=10,err=30) (tractionverts(i),i=1,numverts),
      &   (tractionvals(i),i=1,ndof)