openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File fastcap.patch of Package fastcap (Revision 25c4fd0428bf01078c75af2268cec850)

Currently displaying revision 25c4fd0428bf01078c75af2268cec850 , Show latest

Files fastcap2Orig/doc/FastCapsuppl.pdf and fastcap2/doc/FastCapsuppl.pdf differ
diff -uNr fastcap2Orig/examples/connector2.sh fastcap2/examples/connector2.sh
--- fastcap2Orig/examples/connector2.sh	1992-09-18 22:05:44.000000000 -0500
+++ fastcap2/examples/connector2.sh	2009-08-05 15:38:23.000000000 -0500
@@ -6,7 +6,7 @@
 #  use passed directly arg as "-d" to turn off all discretization (for plots)
 #
 #echo "THIS SCRIPT SHOULD BE CHECKED OVER"
-set cubegen = "../bin/cubegen -e0"
+set cubegen = "cubegen -e0"
 set ex = $1$2
 set offset = "0.0 0.0 0.0"
 set op = $2
diff -uNr fastcap2Orig/examples/connector3.sh fastcap2/examples/connector3.sh
--- fastcap2Orig/examples/connector3.sh	1992-09-18 22:05:44.000000000 -0500
+++ fastcap2/examples/connector3.sh	2009-08-05 15:38:42.000000000 -0500
@@ -5,7 +5,7 @@
 #  all args must be given always (interface does no error checking)
 #  use passed directly arg as "-d" to turn off all discretization (for plots)
 #
-set cubegen = "../bin/cubegen -e0"
+set cubegen = "cubegen -e0"
 set ex = $1$2
 set offset = "0.0 0.0 0.0"
 set op = $2
diff -uNr fastcap2Orig/examples/connector3.sh~ fastcap2/examples/connector3.sh~
--- fastcap2Orig/examples/connector3.sh~	1969-12-31 18:00:00.000000000 -0600
+++ fastcap2/examples/connector3.sh~	2009-08-05 15:38:42.000000000 -0500
@@ -0,0 +1,37 @@
+#!/bin/csh -f
+#
+# shell script for generating a connector problem
+# usage: connector3.sh <plastic_permittivity> <passed_directly>
+#  all args must be given always (interface does no error checking)
+#  use passed directly arg as "-d" to turn off all discretization (for plots)
+#
+set cubegen = "../bin/cubegen -e0"
+set ex = $1$2
+set offset = "0.0 0.0 0.0"
+set op = $2
+#### build the pins 
+echo "* 9 pin connector, plastic permittivity = $1, options: ${op}" >connector3${ex}.lst
+pin 13.0 13.0 0.0 $1 3 $2
+pin 0.0 13.0 0.0 $1 3 $2
+pin 6.5 13.0 0.0 $1 3 $2
+pin 0.0 6.5 0.0 $1 3 $2
+pin 6.5 6.5 0.0 $1 3 $2
+pin 13.0 6.5 0.0 $1 3 $2
+pin 0.0 0.0 0.0 $1 3 $2
+pin 6.5 0.0 0.0 $1 3 $2
+pin 13.0 0.0 0.0 $1 3 $2
+#### build the sides
+${cubegen} $3 -xo-7.8 -yo-2.6 -zo5.2 -xh5.2 -yh19.5 -zh18.8 -b ${op} -n4 > side_l3${ex}.qui
+${cubegen} $3 -xo16.9 -yo-2.6 -zo5.2 -xh5.2 -yh19.5 -zh18.8 -b ${op} -n4 > side_r3${ex}.qui
+${cubegen} $3 -xo-7.8 -yo-2.6 -xh5.2 -yh19.5 -zh5.2 -t -pfl ${op} -n4 > corner_l3${ex}.qui
+${cubegen} $3 -xo16.9 -yo-2.6 -xh5.2 -yh19.5 -zh5.2 -t -pbr ${op} -n4 > corner_r3${ex}.qui
+${cubegen} $3 -xo-2.6 -yo-2.6 -xh19.5 -yh19.5 -zh5.2 -t -b -pfl -pbr ${op} -n4 > back3${ex}.qui
+#### add sides, side caps and back caps to .lst file
+echo "* body3${ex}.lst" > body3${ex}.lst
+echo "D side_l3${ex}.qui 1.0 $1 ${offset} -3.5 0.0 7.0 -" >> body3${ex}.lst
+echo "D side_r3${ex}.qui 1.0 $1 ${offset} 17.5 0.0 7.0 -" >> body3${ex}.lst
+echo "D corner_l3${ex}.qui 1.0 $1 ${offset} -3.5 0.0 2.5 -" >> body3${ex}.lst
+echo "D corner_r3${ex}.qui 1.0 $1 ${offset} 17.5 0.0 2.5 -" >> body3${ex}.lst
+echo "D back3${ex}.qui 1.0 $1 ${offset} 0.0 0.0 2.5 -" >> body3${ex}.lst
+cat body3${ex}.lst >> connector3${ex}.lst
+
diff -uNr fastcap2Orig/examples/connector4.sh fastcap2/examples/connector4.sh
--- fastcap2Orig/examples/connector4.sh	1992-09-18 22:05:44.000000000 -0500
+++ fastcap2/examples/connector4.sh	2009-08-05 15:38:55.000000000 -0500
@@ -5,7 +5,7 @@
 #  all args must be given always (interface does no error checking)
 #  use passed directly arg as "-d" to turn off all discretization (for plots)
 #
-set cubegen = "../bin/cubegen -e0"
+set cubegen = "cubegen -e0"
 set ex = $1$2
 set offset = "0.0 0.0 0.0"
 set op = $2
diff -uNr fastcap2Orig/examples/pin fastcap2/examples/pin
--- fastcap2Orig/examples/pin	1992-09-18 22:05:44.000000000 -0500
+++ fastcap2/examples/pin	2009-08-05 15:39:19.000000000 -0500
@@ -7,9 +7,9 @@
 #  called by script `connector4' 
 #  requires input file generators `pyragen' and `cubegen'
 #
-set bindir = "../bin/"
-set pyragen = "${bindir}pyragen"
-set cubegen = "${bindir}cubegen"
+#set bindir = "../bin/"
+set pyragen = "pyragen"
+set cubegen = "cubegen"
 set xh = 1.3
 set yh = 1.3
 set xyh = "-xh${xh} -yh${yh}"
diff -uNr fastcap2Orig/examples/ramgen.sh fastcap2/examples/ramgen.sh
--- fastcap2Orig/examples/ramgen.sh	1992-09-18 22:05:44.000000000 -0500
+++ fastcap2/examples/ramgen.sh	2009-08-05 15:38:02.000000000 -0500
@@ -6,10 +6,10 @@
 #  -d (no discretization)
 #  -nX (set number of panels per edge to at least X (default = 3))
 #
-set exe = ../bin
+#set exe = ../bin
 set dest = .
-set cgen = ${exe}/cubegen
-set pgen = ${exe}/pipedgen
+set cgen = cubegen
+set pgen = pipedgen
 set px = ${dest}/ramcell
 set tox = 0.01
 set sio2 = 3.9
diff -uNr fastcap2Orig/examples/testgen.sh fastcap2/examples/testgen.sh
--- fastcap2Orig/examples/testgen.sh	1992-09-18 22:05:44.000000000 -0500
+++ fastcap2/examples/testgen.sh	2009-08-05 15:39:52.000000000 -0500
@@ -5,11 +5,11 @@
 #
 #   set up parameters
 set exam = .
-set exe = ../bin
+#set exe = ../bin
 set dest = .
-set cubegen = ${exe}/cubegen
-set pyragen = ${exe}/pyragen
-set busgen = ${exe}/busgen
+set cubegen = cubegen
+set pyragen = pyragen
+set busgen = busgen
 set top_perm = 3
 set bot_perm = 1
 #
diff -uNr fastcap2Orig/examples/test.lst fastcap2/examples/test.lst
--- fastcap2Orig/examples/test.lst	1969-12-31 18:00:00.000000000 -0600
+++ fastcap2/examples/test.lst	2009-08-05 15:30:43.000000000 -0500
@@ -0,0 +1,20 @@
+*
+* test geometry to show how interface works
+* - a pyramid, an L-shape and a 1x1 bus xing btwn gnd planes
+* - two dielectric slabs between ground planes
+*
+**   pyramid (single conductor in its own file)
+C ./pyramid.qui 1  0 3 0
+**   1x1 bus crossing (single file with multiple conductors)
+G BUS
+C ./bus.qui 1  0 0 0
+**   L-shaped conductor (single object built from 3 separate files)
+C ./lcntr.qui 1  0 0 0 +
+C ./lleft.qui 1  1 0 0 +
+C ./lright.qui 1  0 1 0
+**   ground planes (use of same file repeatedly)
+C ./plane.qui 1  -1 -1 -1 +
+C ./plane.qui 3  -1 -1 5
+**   dielectric interface (same file as ground planes)
+D ./plane.qui 3 1  -1 -1 4  0 0 5
+D ./skirt.qui 1 3  -1 -1 4  0 0 4.5 -
diff -uNr fastcap2Orig/examples/testrun.sh fastcap2/examples/testrun.sh
--- fastcap2Orig/examples/testrun.sh	1992-09-18 22:05:44.000000000 -0500
+++ fastcap2/examples/testrun.sh	2009-08-05 15:40:13.000000000 -0500
@@ -4,10 +4,10 @@
 # - problems are meant to exercise interface, not engine
 #
 set exam = .
-set exe = ../bin
+#set exe = ../bin
 set dest = .
-set fastcap = ${exe}/fastcap
-set cubegen = ${exe}/cubegen
+set fastcap = fastcap
+set cubegen = cubegen
 #
 #   run the full test problem
 echo "Running full test problem"
diff -uNr fastcap2Orig/src/mulSetup.c fastcap2/src/mulSetup.c
--- fastcap2Orig/src/mulSetup.c	2004-08-11 12:44:56.000000000 -0500
+++ fastcap2/src/mulSetup.c	2009-08-05 12:16:24.000000000 -0500
@@ -38,51 +38,6 @@
 cube *cstack[1024];		/* Stack used in several routines. */
 
 /*
-  sets up the partitioning of space and room for charges and expansions
-*/
-ssystem *mulInit(autom, depth, order, charges)
-int autom;			/* ON => choose depth automatically */
-int depth, order;
-charge *charges;
-{
-  ssystem *sys;
-  int qindex=1, cindex=1;
-
-  CALLOC(sys, 1, ssystem, ON, AMSC);
-  sys->depth = depth;		/* overwritten below if autom = ON */
-  sys->order = order;
-  
-  sys->depth = placeq(autom, sys, charges); /* create cubes, put in charges */
-
-  getrelations(sys);		/* Get all the prnts and kids for each cube. */
-
-  setPosition(sys);		/* Figures out position of cube center. */
-  indexkid(sys, sys->cubes[0][0][0][0], &qindex, &cindex); 
-				/* Index chgs and cubes. */
-
-#if ADAPT == ON
-  setExact(sys, multerms(sys->order)); /* Note cubes to be done exactly and
-					   determine the number of nonempty
-					   kids for each cube. */
-#else
-  setExact(sys, 0);		/* Note cubes to be done exactly and
-					   determine the number of nonempty
-					   kids for each cube. */
-#endif
-
-  getnbrs(sys);			/* Get all the nearest neighbors. At bot level
-				   add as nearest nbrs cubes in exact block. */
-  linkcubes(sys);		/* Make linked-lists of direct, multis, and
-				   locals to do at each level. */
-  set_vector_masks(sys);	/* set up sys->is_dummy and sys->is_dielec */
-  setMaxq(sys);                 /* Calculates the max # chgs in cubes treated
-				   exactly, and over lowest level cubes. */
-  getAllInter(sys);		/* Get the interaction lists at all levels. */
-
-  return(sys);
-}
-
-/*
   places the charges using best number of levels for adaptive algorithm
   - returns number of levels used
   - can be called with flag == OFF to set depth = sys->depth
@@ -1069,6 +1024,51 @@
 }
 
 
+/*
+  sets up the partitioning of space and room for charges and expansions
+*/
+ssystem *mulInit(autom, depth, order, charges)
+int autom;			/* ON => choose depth automatically */
+int depth, order;
+charge *charges;
+{
+  ssystem *sys;
+  int qindex=1, cindex=1;
+
+  CALLOC(sys, 1, ssystem, ON, AMSC);
+  sys->depth = depth;		/* overwritten below if autom = ON */
+  sys->order = order;
+  
+  sys->depth = placeq(autom, sys, charges); /* create cubes, put in charges */
+
+  getrelations(sys);		/* Get all the prnts and kids for each cube. */
+
+  setPosition(sys);		/* Figures out position of cube center. */
+  indexkid(sys, sys->cubes[0][0][0][0], &qindex, &cindex); 
+				/* Index chgs and cubes. */
+
+#if ADAPT == ON
+  setExact(sys, multerms(sys->order)); /* Note cubes to be done exactly and
+					   determine the number of nonempty
+					   kids for each cube. */
+#else
+  setExact(sys, 0);		/* Note cubes to be done exactly and
+					   determine the number of nonempty
+					   kids for each cube. */
+#endif
+
+  getnbrs(sys);			/* Get all the nearest neighbors. At bot level
+				   add as nearest nbrs cubes in exact block. */
+  linkcubes(sys);		/* Make linked-lists of direct, multis, and
+				   locals to do at each level. */
+  set_vector_masks(sys);	/* set up sys->is_dummy and sys->is_dielec */
+  setMaxq(sys);                 /* Calculates the max # chgs in cubes treated
+				   exactly, and over lowest level cubes. */
+  getAllInter(sys);		/* Get the interaction lists at all levels. */
+
+  return(sys);
+}
+
 
 
 
diff -uNr fastcap2Orig/src/resusage.h fastcap2/src/resusage.h
--- fastcap2Orig/src/resusage.h	2004-08-11 12:45:48.000000000 -0500
+++ fastcap2/src/resusage.h	2009-08-05 12:14:24.000000000 -0500
@@ -53,25 +53,25 @@
 /* define macros for time and resident memory usage checks */
 
 static double dtime = 0.0;
-static long stime, utime;
+static long stimeL, utimeL;
 
 #ifdef NOTOTHER
 
 #ifdef FOUR			/* 4.2,3BSD (tested: Sun4, IBM6000, DEC5000) */
 #define starttimer getrusage(RUSAGE_SELF, &timestuff); \
-stime = timestuff.ru_utime.tv_sec; \
-utime = timestuff.ru_utime.tv_usec
+stimeL = timestuff.ru_utimeL.tv_sec; \
+utimeL = timestuff.ru_utimeL.tv_usec
 #define stoptimer getrusage(RUSAGE_SELF, &timestuff); \
-dtime = (double)(timestuff.ru_utime.tv_sec - stime) \
-        + 1.0e-6*(double)(timestuff.ru_utime.tv_usec - utime)
+dtime = (double)(timestuff.ru_utimeL.tv_sec - stimeL) \
+        + 1.0e-6*(double)(timestuff.ru_utimeL.tv_usec - utimeL)
 #define DUMPRSS			/*  */
 #endif /* FOUR */
 
 #ifdef FIVE			/* for System V (tested: HP300) */
 #define starttimer times(&timestuff); \
-utime = timestuff.tms_utime
+utimeL = timestuff.tms_utimeL
 #define stoptimer times(&timestuff); \
-dtime = (timestuff.tms_utime)-utime; \
+dtime = (timestuff.tms_utimeL)-utimeL; \
 dtime /= HZ
 #define DUMPRSS			/*  */
 #endif /* FIVE */

Places

File fastcap.patch of Package fastcap (Revision 25c4fd0428bf01078c75af2268cec850)

Places