[Bf-blender-cvs] [3d397d2] soc-2014-fluid: Smoke: UI controls for manta buoyancy used

Roman Pogribnyi noreply at git.blender.org
Sun May 17 21:23:53 CEST 2015


Commit: 3d397d22d75e06a6dbe456fab499dbf7c0866923
Author: Roman Pogribnyi
Date:   Sun May 17 21:22:08 2015 +0200
Branches: soc-2014-fluid
https://developer.blender.org/rB3d397d22d75e06a6dbe456fab499dbf7c0866923

Smoke: UI controls for manta buoyancy used

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

M	intern/smoke/intern/scenarios/smoke.h

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

diff --git a/intern/smoke/intern/scenarios/smoke.h b/intern/smoke/intern/scenarios/smoke.h
index 91eb27a..7678c7e 100644
--- a/intern/smoke/intern/scenarios/smoke.h
+++ b/intern/smoke/intern/scenarios/smoke.h
@@ -21,7 +21,7 @@ boundConditions = '$BOUNDCONDITIONS$'\n\
 if solver_dim == 2:\n\
   gs.z = 1\n\
 s = FluidSolver(name='main', gridSize = gs, dim = $SOLVER_DIM$)\n\
-s.timestep = 0.1\n\
+s.timestep = $TIMESTEP$\n\
 timings = Timings()\n\
 \n\
 # prepare grids\n\
@@ -160,9 +160,9 @@ const string smoke_step_low = "def sim_step_low(t, standalone = False):\n\
     density.add(inflow_grid)\n\
   if manta_using_heat:\n\
     gravity=vec3(0,0,-0.0981) if solver_dim==3 else vec3(0,-0.0981,0)\n\
-    addHeatBuoyancy(density=density, densCoeff = 0.001, vel=vel, gravity=gravity, flags=flags, heat = heat_low, heatCoeff = -0.1*10)\n\
+    addHeatBuoyancy(density=density, densCoeff = $ALPHA$, vel=vel, gravity=gravity, flags=flags, heat = heat_low, heatCoeff = $BETA$*10)\n\
   else:\n\
-    gravity=vec3(0,0,-0.01) if solver_dim==3 else vec3(0,-0.01,0)\n\
+    gravity=vec3(0,0,-0.01 * $ALPHA$) if solver_dim==3 else vec3(0,-0.01* $ALPHA$,0)\n\
     addBuoyancy(density=density, vel=vel, gravity=gravity, flags=flags)\n\
   if manta_using_colors:\n\
     advectSemiLagrange(flags=flags, vel=vel, grid=color_r_low, order=$ADVECT_ORDER$)\n\




More information about the Bf-blender-cvs mailing list