makefile cleanup

Author: ktkonrad

c/makefile

@@ -15,6 +15,8 @@ perc: percolation_driver.o $(objects)
 	$(CC) -o perc percolation_driver.o $(objects) $(CFLAGS)
 
 vc: verg_and_count.o nodal_domain_driver_no_main.o ../vergini/verg_no_main.o $(objects) $(dependencies)
+	./update_no_main.sh
+	cd ../vergini; ./update_no_main.sh; cd ../c
 	$(CC) $(CFLAGS) -o vc verg_and_count.o nodal_domain_driver_no_main.o ../vergini/verg_no_main.o $(objects) $(VERG) $(MATHLIBS)
 
 nodal_domain_driver.o: nodal_domain_driver.c

c/nodal_domain_driver_no_main.c

@@ -19,7 +19,7 @@ Kyle Konrad
 
 // vergini code dependencies
 #include "../vergini/billiard.h"
-;
+extern int verb;
 
 // options specified by command line arguments
 int showTime = 0; // flag: print time it takes for countNodalDomains to run
@@ -29,6 +29,7 @@ int mode = -1; // 0 - generate random_percolation grid; 1 - read grid from sta_b
 int maskFlag = 0; // flag: use a mask file
 char *maskFile; // use mask from this file
 int oneFlag = 0; // flag: only count one eigenfunction
+int sizeFlag = 0; // flag: write domain sizes to file
 
 Billiard bil; // Billiard shape we are using - defined in vergini code
 double dx = -1; // grid spacing
@@ -42,11 +43,13 @@ int interp = 1; // boolean whether or not to interpolate
   print a usage statement
 */
 void usage() {
-  fprintf(stderr, "USAGE: count -f file [-m maskFile | {-l billiardType -d dx [-k k_0] -M besselOrder -u upsample}] [-t] [-o] [-1] [-n]\n");
+  fprintf(stderr, "USAGE: count -f file [-m maskFile | {-l billiardType -d dx [-k k_0] -M besselOrder -u upsample}] [-t] [-o] [-1] [-n] [-q] [-s]\n");
   fprintf(stderr, "-t: show timing info\n");
   fprintf(stderr, "-o: output grid to file\n");
   fprintf(stderr, "-1: only count first eigenfunction\n");
   fprintf(stderr, "-n: do not use interpolation\n");
+  fprintf(stderr, "-q: quiet\n");
+  fprintf(stderr, "-s: output nodal domain sizes to file\n");
 }
 
 /*
@@ -63,16 +66,14 @@ void count_processArgs(int argc, char **argv) {
     exit(CMD_LINE_ARG_ERR);
   }
 
-  while ((c = getopt(argc, argv, "f:m:l:d:k:M:u:to1n")) != -1) {
+  while ((c = getopt(argc, argv, "f:m:l:d:k:M:u:to1nqs")) != -1) {
     switch (c) {
     case 'f':
-      file = (char *)malloc(strlen(optarg)*sizeof(char));
-      strcpy(file, optarg);
+      SET(file, optarg);
       mode = 1;
       break;
     case 'm':
-      maskFile = (char *)malloc(strlen(optarg)*sizeof(char));
-      strcpy(maskFile, optarg);
+      SET(maskFile, optarg);
       maskFlag = 1;
       break;
     case 'l':
@@ -107,6 +108,12 @@ void count_processArgs(int argc, char **argv) {
     case 'n':
       interp = 0;
       break;
+    case 'q':
+      verb = 0;
+      break;
+    case 's':
+      sizeFlag = 1;
+      break;
     case '?':
       switch (optopt) {
       case 'f':
@@ -162,16 +169,21 @@ void count_processArgs(int argc, char **argv) {
 */
 int runTest(double **grid, char **mask, int ny, int nx, double k, double dx, int besselOrder, int upsample, interp_stats *stats) {
   char sizefilename[50];
-  sprintf(sizefilename, "sizes_%f_%f.dat", k, dx);
-  FILE *sizefile = fopen(sizefilename, "w");
+  FILE *sizefile = NULL;
+  if (sizeFlag) {
+    sprintf(sizefilename, "sizes_%f_%f.dat", k, dx);
+    sizefile = fopen(sizefilename, "w");
+  }
   int nd;
   if (interp) {
     nd = countNodalDomainsInterp(grid, mask, ny, nx, k, dx, besselOrder, upsample, stats, sizefile);
   }
   else {
     nd = countNodalDomainsNoInterp(grid, mask, ny, nx, sizefile);
   }
-  fclose(sizefile);
+  if (sizeFlag) {
+    fclose(sizefile);
+  }
   return nd;
 }
 
@@ -215,8 +227,7 @@ int count_main(int argc, char **argv) {
       free(maskFile);
     }
 
-    printf("%s\t%s\t%s\t%s\t%s\n", "k", "count", "small domains", "interp count", "boundary trouble count", "edge trouble count");
-    printf("%f\t%d\t%d\t%d\t%d\n", k_0, count, stats.small_domain_count, stats.interp_count, stats.boundary_trouble_count, stats.edge_trouble_count);
+    printf("%f,%f,%d,%d,%d,%d\n", k_0, dx, count, stats.small_domain_count, stats.interp_count, stats.boundary_trouble_count, stats.edge_trouble_count);
 
   }
 

c/percolation_driver.c

@@ -16,6 +16,9 @@ Kyle Konrad
 #include <string.h>
 #include <unistd.h> // for command line parsing with getopt
 
+// global verbosity variable
+int verb = 1;
+
 // options specified by command line arguments
 int showTime = 0; // flag: print time it takes for countNodalDomains to run
 int gridSize = -1; // size of grid in x and y dimensions

c/update_no_main.sh

@@ -6,4 +6,4 @@ sed -i -e 's/int main(/int count_main(/' nodal_domain_driver_no_main.c
 sed -i -e 's/processArgs/count_processArgs/' nodal_domain_driver_no_main.c
 sed -i -e '/void count_processArgs(/ a\
   optind = 0;' nodal_domain_driver_no_main.c
-sed -i -e 's/int verb//' nodal_domain_driver_no_main.c
+sed -i -e 's/int verb.*/extern int verb;/' nodal_domain_driver_no_main.c

vergini/update_no_main.sh

@@ -5,3 +5,4 @@ cp verg.cc verg_no_main.cc
 sed -i -e 's/int main(/int verg_main(/' verg_no_main.cc
 sed -i -e '/bas.set_type = NBASES;/ a\
   optind = 0;' verg_no_main.cc
+sed -i -e 's/int verb.*/extern int verb;/' verg_no_main.cc

vergini/verg_no_main.cc

@@ -30,7 +30,7 @@
    flags: 0x02 - generally more
           0x80 - cmd line parsing
 */ 
-int verb = 1;
+extern int verb;
 
 // tasks...
 #define NO_TASK -1