[Bf-blender-cvs] [05664b2] fluid-mantaflow: clean up and maintenance in script files

Sebastián Barschkis noreply at git.blender.org
Mon Oct 3 19:47:44 CEST 2016


Commit: 05664b2b4c4c4b5f6d84811050c18218cbb6ba76
Author: Sebastián Barschkis
Date:   Mon Sep 12 20:11:45 2016 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rB05664b2b4c4c4b5f6d84811050c18218cbb6ba76

clean up and maintenance in script files

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

M	intern/mantaflow/intern/FLUID.cpp
M	intern/mantaflow/intern/strings/liquid_script.h
M	intern/mantaflow/intern/strings/shared_script.h
M	intern/mantaflow/intern/strings/smoke_script.h

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

diff --git a/intern/mantaflow/intern/FLUID.cpp b/intern/mantaflow/intern/FLUID.cpp
index 4738999..acec131 100644
--- a/intern/mantaflow/intern/FLUID.cpp
+++ b/intern/mantaflow/intern/FLUID.cpp
@@ -500,7 +500,7 @@ std::string FLUID::getRealValue(const std::string& varName,  SmokeModifierData *
 		ss << (smd->domain->active_fields & SM_ACTIVE_HEAT ? "True" : "False");
 	else if (varName == "USING_FIRE")
 		ss << (smd->domain->active_fields & SM_ACTIVE_FIRE ? "True" : "False");
-	else if (varName == "USE_WAVELETS")
+	else if (varName == "USING_HIGHRES")
 		ss << (smd->domain->flags & MOD_SMOKE_HIGHRES ? "True" : "False");
 	else if (varName == "SOLVER_DIM")
 		ss << smd->domain->manta_solver_res;
diff --git a/intern/mantaflow/intern/strings/liquid_script.h b/intern/mantaflow/intern/strings/liquid_script.h
index a54e0c1..e4f5b54 100644
--- a/intern/mantaflow/intern/strings/liquid_script.h
+++ b/intern/mantaflow/intern/strings/liquid_script.h
@@ -65,7 +65,7 @@ randomness     = $PARTICLE_RANDOMNESS$\n\
 step    = -1\n\
 maxVel  = 0\n\
 \n\
-using_highres = $USE_WAVELETS$\n";
+using_highres = $USING_HIGHRES$\n";
 
 const std::string liquid_variables_high = "\n\
 mantaMsg('Liquid variables high')\n";
@@ -169,7 +169,7 @@ def liquid_step():\n\
     if narrowBand:\n\
         advectSemiLagrange(flags=flags, vel=vel, grid=vel, order=2, openBounds=doOpen, boundaryWidth=boundaryWidth)\n\
     \n\
-	# Keep an original copy of interpolated phi grid for later use in (optional) high-res step\n\
+    # Keep an original copy of interpolated phi grid for later use in (optional) high-res step\n\
     if using_highres:\n\
         interpolateGrid(target=xl_phi, source=phi)\n\
     \n\
diff --git a/intern/mantaflow/intern/strings/shared_script.h b/intern/mantaflow/intern/strings/shared_script.h
index 9f9ba95..e9240ba 100644
--- a/intern/mantaflow/intern/strings/shared_script.h
+++ b/intern/mantaflow/intern/strings/shared_script.h
@@ -134,7 +134,7 @@ if (GUI):\n\
     gui.pause()\n\
 \n\
 start_frame = $CURRENT_FRAME$\n\
-end_frame = 100\n\
+end_frame = 1000\n\
 \n\
 # All low and high res steps\n\
 while start_frame <= end_frame:\n\
diff --git a/intern/mantaflow/intern/strings/smoke_script.h b/intern/mantaflow/intern/strings/smoke_script.h
index 5f1caa5..d653a0a 100644
--- a/intern/mantaflow/intern/strings/smoke_script.h
+++ b/intern/mantaflow/intern/strings/smoke_script.h
@@ -58,7 +58,7 @@ mantaMsg('Smoke variables low')\n\
 using_colors    = $USING_COLORS$\n\
 using_heat      = $USING_HEAT$\n\
 using_fire      = $USING_FIRE$\n\
-using_wavelets  = $USE_WAVELETS$\n\
+using_highres   = $USING_HIGHRES$\n\
 vorticity       = $VORTICITY$\n";
 
 const std::string smoke_variables_high = "\n\
@@ -251,6 +251,7 @@ def step_low():\n\
         mantaMsg('Adding buoyancy')\n\
         addBuoyancy(density=density, vel=vel, gravity=gravity, flags=flags)\n\
     \n\
+    #addObjectVelocity(flags, vel, obvel)\n\
     copyRealToVec3(sourceX=x_force, sourceY=y_force, sourceZ=z_force, target=forces)\n\
     mantaMsg('Adding forces')\n\
     addForceField(flags=flags, vel=vel, force=forces)\n\
@@ -346,32 +347,32 @@ def load_smoke_data_low(path):\n\
     density.load(path + str('density.uni'))\n\
     flags.load(path + str('flags.uni'))\n\
     vel.load(path + str('vel.uni'))\n\
-    forces.load(path + str('forces.uni')\n\
-    inflow_grid.load(path + str('inflow_low.uni')\n\
-    fuel_inflow.load(path + str('fuel_inflow.uni')\n\
+    forces.load(path + str('forces.uni'))\n\
+    inflow_grid.load(path + str('inflow_low.uni'))\n\
+    fuel_inflow.load(path + str('fuel_inflow.uni'))\n\
     if using_colors:\n\
-        color_r.load(path + str('color_r.uni')\n\
-        color_g.load(path + str('color_g.uni')\n\
-        color_b.load(path + str('color_b.uni')\n\
+        color_r.load(path + str('color_r.uni'))\n\
+        color_g.load(path + str('color_g.uni'))\n\
+        color_b.load(path + str('color_b.uni'))\n\
     if using_heat:\n\
-        heat.load(path + str('heat.uni')\n\
+        heat.load(path + str('heat.uni'))\n\
     if using_fire:\n\
-        flame.load(path + str('flame.uni')\n\
-        fuel.load(path + str('fuel.uni')\n\
-        react.load(path + str('react.uni')\n";
+        flame.load(path + str('flame.uni'))\n\
+        fuel.load(path + str('fuel.uni'))\n\
+        react.load(path + str('react.uni'))\n";
 
 const std::string smoke_import_high = "\n\
 def load_smoke_data_high(path):\n\
     xl_density.load(path + str('xl_density.uni'))\n\
-    xl_flags.load(path + str('xl_flags.uni')\n\
+    xl_flags.load(path + str('xl_flags.uni'))\n\
     if using_colors:\n\
-        xl_color_r.load(path + str('xl_color_r.uni')\n\
-        xl_color_g.load(path + str('xl_color_g.uni')\n\
-        xl_color_b.load(path + str('xl_color_b.uni')\n\
+        xl_color_r.load(path + str('xl_color_r.uni'))\n\
+        xl_color_g.load(path + str('xl_color_g.uni'))\n\
+        xl_color_b.load(path + str('xl_color_b.uni'))\n\
     if using_fire:\n\
-        xl_flame.load(path + str('xl_flame.uni')\n\
-        xl_fuel.load(path + str('xl_fuel.uni')\n\
-        xl_react.load(path + str('xl_react.uni')\n";
+        xl_flame.load(path + str('xl_flame.uni'))\n\
+        xl_fuel.load(path + str('xl_fuel.uni'))\n\
+        xl_react.load(path + str('xl_react.uni'))\n";
 
 const std::string smoke_export_low = "\n\
 def save_smoke_data_low(path):\n\




More information about the Bf-blender-cvs mailing list