[Bf-blender-cvs] [ec9c908] soc-2014-fluid: forces included in manta simulation on per-basis step

[Roman Pogribnyi]

Commit: ec9c908018fe90ddd3380c01a79e8b94368c070d
Author: Roman Pogribnyi
Date:   Fri Aug 8 00:14:35 2014 +0200
Branches: soc-2014-fluid
https://developer.blender.org/rBec9c908018fe90ddd3380c01a79e8b94368c070d

forces included in manta simulation on per-basis step

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

M	intern/smoke/intern/MANTA.cpp
M	source/blender/python/manta_pp/pwrapper/pymain.cpp

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

diff --git a/intern/smoke/intern/MANTA.cpp b/intern/smoke/intern/MANTA.cpp
index d2c789b..5a3ff9a 100644
--- a/intern/smoke/intern/MANTA.cpp
+++ b/intern/smoke/intern/MANTA.cpp
@@ -366,8 +366,7 @@ void generate_manta_sim_file(Scene *scene, SmokeModifierData *smd)
 	ss << "tempFlag  = s.create(FlagGrid)\n";
 	ss << "sdf_flow  = s.create(LevelsetGrid)\n";
 	ss << "forces = s.create(MACGrid)\n";
-//	ss << "forces.load('manta_forces.uni')\n";
-
+	
 //	ss << "field_source = s.create(Box, p0=vec3(0,0,0), p1=gs)\n";
 	ss << "source.meshSDF(source, sdf_flow, 1.1)\n";
 	ss << "source_shape = s.create(Cylinder, center=gs*vec3(0.5,0.1,0.5), radius=res*0.14, z=gs*vec3(0, 0.02, 0))\n";
@@ -388,6 +387,8 @@ void generate_manta_sim_file(Scene *scene, SmokeModifierData *smd)
 	//setting 20 sim frames for now
 //	ss << "for t in range(0,20): \n";		// << scene->r.sfra << ", " << scene->r.efra << "): \n";
 	ss << "def sim_step(t):\n";
+	ss << "  forces.load('manta_forces.uni')\n";
+	ss << "  addForceField(flags=flags, vel=vel,force=forces)\n";
 	
 	manta_advect_SemiLagr(ss, 1, "flags", "vel", "density", 2);
 	manta_advect_SemiLagr(ss, 1, "flags", "vel", "vel", 2);
diff --git a/source/blender/python/manta_pp/pwrapper/pymain.cpp b/source/blender/python/manta_pp/pwrapper/pymain.cpp
index a569322..1527cd0 100644
--- a/source/blender/python/manta_pp/pwrapper/pymain.cpp
+++ b/source/blender/python/manta_pp/pwrapper/pymain.cpp
@@ -81,8 +81,10 @@ void export_force_fields(int size_x, int size_y, int size_z, float *f_x, float*f
 			}
 		}
 	}
-	writeGridUni("s.uni", &force_fields);
-	writeGridTxt("s.txt", &force_fields);
+	writeGridUni("manta_forces.uni", &force_fields);
+	/*rename after export successful*/
+	
+//	writeGridTxt("s.txt", &force_fields);
 }
 		   
 void runMantaScript(vector<string>& args) {