[Bf-blender-cvs] [0e17344] soc-2014-fluid: manta running speed increased. Buoyancy factor added

[Roman Pogribnyi]

Commit: 0e173445c7324cd0594f7172b64cfd3cf6237815
Author: Roman Pogribnyi
Date:   Fri Aug 8 17:55:14 2014 +0200
Branches: soc-2014-fluid
https://developer.blender.org/rB0e173445c7324cd0594f7172b64cfd3cf6237815

manta running speed increased. Buoyancy factor added

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

M       intern/smoke/intern/MANTA.cpp

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

diff --git a/intern/smoke/intern/MANTA.cpp b/intern/smoke/intern/MANTA.cpp
index 621da15..7280272 100644
--- a/intern/smoke/intern/MANTA.cpp
+++ b/intern/smoke/intern/MANTA.cpp
@@ -390,6 +390,7 @@ void generate_manta_sim_file(Scene *scene, 
SmokeModifierData *smd)
        ss << "def sim_step(t):\n";
        ss << "  forces.load('manta_forces.uni')\n";
        ss << "  addForceField(flags=flags, vel=vel,force=forces)\n";
+       ss << "  addBuoyancy(density=density, vel=vel, gravity=vec3(0,0,-" 
<<smd->domain->beta << "), flags=flags) \n";
        
        manta_advect_SemiLagr(ss, 1, "flags", "vel", "density", 2);
        manta_advect_SemiLagr(ss, 1, "flags", "vel", "vel", 2);
@@ -405,11 +406,12 @@ void generate_manta_sim_file(Scene *scene, 
SmokeModifierData *smd)
        
        ss << "    densityInflowMesh( flags=flags, density=density, 
noise=noise, mesh=source, scale=1, sigma=0.5 )\n";
        //ss << "    sourceVel.applyToGrid( grid=vel , value=velInflow )\n";
-       ss << "    sourceVel.applyToGrid(grid=vel , value=velInflow,cutoff = 
3)\n";
+       //ss << "    sourceVel.applyToGrid(grid=vel , value=velInflow,cutoff = 
3)\n";
+//     ss << "    source.applyToGrid(grid=vel , value=velInflow,cutoff = 3)\n";
        ss << "    applyInflow=True\n";
        
        ss << "  setWallBcs(flags=flags, vel=vel) \n";
-       ss << "  addBuoyancy(density=density, vel=vel, gravity=vec3(0,-6e-4,0), 
flags=flags) \n";
+//     ss << "  addBuoyancy(density=density, vel=vel, gravity=vec3(0,-6e-4,0), 
flags=flags) \n";
        ss << "  vorticityConfinement( vel=vel, flags=flags, strength=" << 
smd->domain->vorticity / 10. << " ) \n";
        
        manta_solve_pressure(ss,"flags", "vel", 
"pressure",true,smd->domain->border_collisions, 
smd->domain->manta_solver_res,1.0,0.01);

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs