[Bf-blender-cvs] [065e1a1] soc-2014-fluid: debug output, smoke BC

Roman Pogribnyi noreply at git.blender.org
Wed Oct 15 19:53:43 CEST 2014


Commit: 065e1a196cb646d1c1a12fa099b5716296fd9ccf
Author: Roman Pogribnyi
Date:   Sat Oct 11 19:39:03 2014 +0200
Branches: soc-2014-fluid
https://developer.blender.org/rB065e1a196cb646d1c1a12fa099b5716296fd9ccf

debug output, smoke BC

===================================================================

M	intern/smoke/intern/scenarios/smoke.h
M	source/blender/blenkernel/intern/smoke.c

===================================================================

diff --git a/intern/smoke/intern/scenarios/smoke.h b/intern/smoke/intern/scenarios/smoke.h
index 5f87d0b..29e1991 100644
--- a/intern/smoke/intern/scenarios/smoke.h
+++ b/intern/smoke/intern/scenarios/smoke.h
@@ -94,7 +94,7 @@ const string smoke_step_low = "def sim_step(t):\n\
   setWallBcs(flags=flags, vel=vel)    \n\
   addBuoyancy(density=density, vel=vel, gravity=vec3($BUYO_X$,$BUYO_Y$,$BUYO_Z$), flags=flags)\n\
   \n\
-  solvePressure(flags=flags, vel=vel, pressure=pressure, useResNorm=True)\n\
+  solvePressure(flags=flags, vel=vel, pressure=pressure, useResNorm=True, openBound='xXyYzZ')\n\
   setWallBcs(flags=flags, vel=vel)\n\
   \n\
   density.writeGridToMemory(memLoc = \"$DENSITY_MEM$\",sizeAllowed = \"$DENSITY_SIZE$\") \n\
diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c
index 1c81aae..64513a4 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -1567,6 +1567,7 @@ static void sample_derivedmesh(
 
 static void emit_from_derivedmesh(Object *flow_ob, SmokeDomainSettings *sds, SmokeFlowSettings *sfs, EmissionMap *em, float dt)
 {
+	clock_t start = clock();
 	if (!sfs->dm) return;
 	{
 		DerivedMesh *dm;
@@ -1704,6 +1705,10 @@ static void emit_from_derivedmesh(Object *flow_ob, SmokeDomainSettings *sds, Smo
 
 		if (vert_vel) MEM_freeN(vert_vel);
 	}
+	clock_t end = clock();
+	float seconds = (float)(end - start) / CLOCKS_PER_SEC;
+	printf("TIME FOR RECONSTRUCTING SDF: %f \n", seconds);
+	int kkk = 9;
 }
 
 /**********************************************************




More information about the Bf-blender-cvs mailing list