diff options
| author | Roman Pogribnyi <pogribnyi@gmail.com> | 2015-05-17 22:22:08 +0300 |
|---|---|---|
| committer | Roman Pogribnyi <pogribnyi@gmail.com> | 2015-05-17 22:22:08 +0300 |
| commit | 3d397d22d75e06a6dbe456fab499dbf7c0866923 (patch) | |
| tree | 4fd227c1b10f03e9b70f694483a39090b9c78205 | |
| parent | 16ace5e6f77137ad446b6952cdc4d385c1857a11 (diff) | |
Smoke: UI controls for manta buoyancy usedsoc-2014-fluid
| -rw-r--r-- | intern/smoke/intern/scenarios/smoke.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/intern/smoke/intern/scenarios/smoke.h b/intern/smoke/intern/scenarios/smoke.h index 91eb27a13ba..7678c7e724f 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\ |