Commits

Anonymous committed 12093a0

let fungus use the pickles from Textursynthesis.

Comments (0)

Files changed (1)

fungus_advection.py

 
         # and the simulated blobs along with additional synthesizers for new blobs
 	if options.coarse: num = 1
-	else: num = 50
+	else: num = 30
         self.blobs, self.synth, self.velocity_matrizes = setup(picklepath=None, #"datafile-tmp.pickle",
                                                                num=num, 
-                                                               synth_pickle="datafile_6000_synthesizers.pickle", vel_pickle="datafile_6000_velocity.pickle")#tracing_resultfile="../Textursynthese/tests/TraceResult_6000-2.dat", num=30)#picklepath="../Textursynthese/datafile.pickle")
+                                                               synth_pickle="../Textursynthese/datafile_6000_synthesizers.pickle", #"datafile_6000_synthesizers.pickle",
+							       vel_pickle="../Textursynthese/datafile_6000_velocity.pickle") # datafile_6000_velocity.pickle")#tracing_resultfile="../Textursynthese/tests/TraceResult_6000-2.dat", num=30)#picklepath="../Textursynthese/datafile.pickle")
 	
         self.step = 0
         self.t = time()
         # synchronize positions
         for i in range(len(self.blobs)):
             self.visible[i].x = self.blobs[i].x# + self.blobs[i].x*0.707
-            self.visible[i].y = self.blobs[i].y
+            self.visible[i].y = self.blobs[i].z
             #self.visible[i].scale = 100/self.blobs[i].x