out of day already?!

build_linux64/default.inp

@@ -30,4 +30,8 @@ nthreads = 256
 isjulia = 0
 juliac = 0.0, 0.0, 0.0
 exponent = 8.0
+fractaliter = 64
+threshhold = 2.0
+freezethresh = 10.0
+
 

include/amscudafractallevelset/amscfls_functiondefs.cuh

@@ -5,10 +5,31 @@
 struct main_functionpars
 {
     public:
+    //if I need it to go faster, I should make a seperate cutdown version
     int fractaliter;
     float threshold;
     float freezethresh;
+    //these are included for flexibility and can be cut later
+    float exponent;
+    bool isjulia;
+    cuvec3f juliac;
 };
 #endif
 
+#ifdef AMSCLS_PPKFRACTAL
+struct main_functionpars
+{
+    public:
+    //if I need it to go faster, I should make a seperate cutdown version
+    int fractaliter;
+    float threshold;
+    float freezethresh;
+    //these are included for flexibility and can be cut later
+    float scale;
+    bool isjulia;
+    cuvec3f juliac;
+};
+
+#endif
+
 #endif

include/amscudafractallevelset/amscfls_parseinput.cuh

@@ -17,9 +17,15 @@ namespace fractallevelset
         int nblockdiv;
         int nthreads;
 
+        //function parameters
         bool isjulia;
         cuvec3f juliac;
         float exponent;
+        int fractaliter;
+        float threshold;
+        float freezethresh;
+
+        float scale;
 
         
 

include/amscudafractallevelset/amscudafractallevelset.cuh

@@ -39,7 +39,6 @@ class cuvec4f;
 // #endif
 
 #define AMSCLS_MANDELBROT
-//#define AMSCLS_JULIA
 //#define AMSCLS_PPKFRACTAL
 
 

src/amscudafractallevelset/amscufracls_parseinputfile.cu

@@ -170,10 +170,18 @@ namespace fractallevelset
         parsearch_int("Nz",&stringpars,&(pars->Nz));
         parsearch_int("nblockdiv",&stringpars,&(pars->nblockdiv));
         parsearch_int("nthreads",&stringpars,&(pars->nthreads));
-        parsearch_bool("juliac",&stringpars,&(pars->isjulia));
         parsearch_int("operatingmode",&stringpars,&(pars->operatingmode));
         parsearch_int("verbosity",&stringpars,&(pars->verbosity));
 
+        parsearch_bool("isjulia",&stringpars,&(pars->isjulia));
+        parsearch_cuvec3f("juliac",&stringpars,&(pars->juliac));
+        parsearch_float("exponent",&stringpars,&(pars->exponent));
+        parsearch_int("fractaliter",&stringpars,&(pars->fractaliter));
+        parsearch_float("threshold",&stringpars,&(pars->threshold));
+        parsearch_float("freezethresh",&stringpars,&(pars->freezethresh));
+        parsearch_float("scale",&stringpars,&(pars->scale));
+
+
 
         return ret;
     }
@@ -197,7 +205,8 @@ namespace fractallevelset
 
         if(argc<2)
         {
-            
+            printf("useage: (execname) [inputfile.inp] [optional outputfile.stl]\n");
+            return;
         }
         else
         {
@@ -205,6 +214,24 @@ namespace fractallevelset
             if(res<0) return;
         }
 
+        #ifdef AMSCLS_MANDELBROT
+            mfpars.isjulia = pars.isjulia;
+            mfpars.juliac = pars.juliac;
+            mfpars.exponent = pars.exponent;
+            mfpars.fractaliter = pars.fractaliter;
+            mfpars.threshold = pars.threshold;
+            mfpars.freezethresh = pars.freezethresh;
+        #endif
+
+        #ifdef AMSCLS_PPKFRACTAL
+            mfpars.isjulia = pars.isjulia;
+            mfpars.juliac = pars.juliac;
+            mfpars.fractaliter = pars.fractaliter;
+            mfpars.threshold = pars.threshold;
+            mfpars.freezethresh = pars.freezethresh;
+            mfpars.scale = pars.scale;
+        #endif
+
         //Fill operatingstructs
         mtpars.xyz_min = pars.xyz_min;
         mtpars.xyz_max = pars.xyz_max;