Changeset c4ebad

Timestamp:

Feb 1, 2010, 9:02:55 PM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

49faa8

Parents:

4737be

Message:

NanoCreator - length and radius parameters are now parsed as doubles and rounded to integers.

• This is necessary due to pgfplotstable writing out 7.89e2 instead of 789. The former is a double, the latter an integer value.

File:

• util/src/NanoCreator.c (modified) (4 diffs)

util/src/NanoCreator.c

@@ -849 +849 @@
 
   int numbersheet, biggestdiameter, sheetnr[NDIM], tmp, seed;
+  double dfactors[2];
   double x1,x2,x3, angle;
   char flag = 'n';
@@ -943 +944 @@
       x1 = fabs(gsl_vector_get(u,0));
       x2 = fabs(gsl_vector_get(u,1));
-      fprintf(stdout, "(c,d) = (%d,%d)\n",((int)(x1+x1/fabs(x1)*.5)), ((int)(x2+x2/fabs(x2)*.5)));
+      fprintf(stdout, "(c,d) = (%d,%d).\n",((int)(x1+x1/fabs(x1)*.5)), ((int)(x2+x2/fabs(x2)*.5)));
       j = GCD(((int)(x1+x1/fabs(x1)*.5)), ((int)(x2+x2/fabs(x2)*.5)));
-      fprintf(stdout, "GCD(%d,%d) = %i", ((int)(x1+x1/fabs(x1)*.5)), ((int)(x2+x2/fabs(x2)*.5)), j);
+      fprintf(stdout, "GCD(%d,%d) = %i.\n", ((int)(x1+x1/fabs(x1)*.5)), ((int)(x2+x2/fabs(x2)*.5)), j);
       for (i=0;i<2;i++)
         gsl_vector_set(u,i, gsl_vector_get(u,i)/(double)j);
@@ -953 +954 @@
         x[i] = gsl_vector_get(u,0) * Vector[axis[0]][i] + gsl_vector_get(u,1) * Vector[axis[1]][i];
       angle = Norm(x)/Norm(Tubevector[axis[1]]) ;//ScalarProduct(x,Tubevector[axis[1]])/Norm(Tubevector[axis[1]]);
-      fprintf(stdout, "angle is %lg\n", angle);
+      fprintf(stdout, "Angle is %lg.\n", angle);
       for (i=0;i<NDIM;i++) {
         Tubevector[axis[1]][i] = gsl_vector_get(u,0) * Vector[axis[0]][i] + gsl_vector_get(u,1) * Vector[axis[1]][i];
@@ -1009 +1010 @@
         );
       fprintf(stdout, "\nGive integer factors for length and radius of tube (multiple of %d suggested) : ", ggT);
-      fscanf(stdin, "%d %d", &factors[1], &factors[0]);
+      fscanf(stdin, "%lg %lg", &dfactors[1], &dfactors[0]);
+      for(i=0;i<2;i++)
+        factors[i] = (int)(dfactors[i]);
+      fprintf(stdout, "\nI got %d and %d.\n", factors[1], factors[0]);
       fprintf(stdout, "\nThe chiral angle then is %5.5f degrees with tube radius %5.5f A and length %5.5f A, i.e. torus radius of %5.5f A.\n",
         acos(Projection(Vector[axis[0]], Tubevector[axis[0]]))/M_PI*180.,