[Bf-blender-cvs] [71979c248f] fluid-mantaflow: manta script cleanup

[Sebastián Barschkis]

Commit: 71979c248fa67e2619e93fff55b5ac4ce4990540
Author: Sebastián Barschkis
Date:   Tue Feb 21 01:04:23 2017 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rB71979c248fa67e2619e93fff55b5ac4ce4990540

manta script cleanup

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

M	intern/mantaflow/intern/strings/liquid_script.h
M	intern/mantaflow/intern/strings/smoke_script.h

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

diff --git a/intern/mantaflow/intern/strings/liquid_script.h b/intern/mantaflow/intern/strings/liquid_script.h
index 7c1d96e31e..1b3f46acfe 100644
--- a/intern/mantaflow/intern/strings/liquid_script.h
+++ b/intern/mantaflow/intern/strings/liquid_script.h
@@ -81,7 +81,7 @@ phiOut     = s.create(LevelsetGrid)\n\
 pressure   = s.create(RealGrid)\n\
 \n\
 phiObs     = s.create(LevelsetGrid)\n\
-phiObsIn = s.create(LevelsetGrid)\n\
+phiObsIn   = s.create(LevelsetGrid)\n\
 fractions  = s.create(MACGrid)\n\
 \n\
 vel        = s.create(MACGrid)\n\
diff --git a/intern/mantaflow/intern/strings/smoke_script.h b/intern/mantaflow/intern/strings/smoke_script.h
index ecce15156b..25d80e4183 100644
--- a/intern/mantaflow/intern/strings/smoke_script.h
+++ b/intern/mantaflow/intern/strings/smoke_script.h
@@ -103,7 +103,7 @@ pressure    = s.create(RealGrid)\n\
 phiObsIn    = s.create(LevelsetGrid)\n\
 phiOut      = s.create(LevelsetGrid)\n\
 fractions   = s.create(MACGrid) # dummy grid\n\
-forces      = s.create(MACGrid)\n\
+forces      = s.create(Vec3Grid)\n\
 x_force     = s.create(RealGrid)\n\
 y_force     = s.create(RealGrid)\n\
 z_force     = s.create(RealGrid)\n\
@@ -326,7 +326,6 @@ def step_low():\n\
     \n\
     mantaMsg('Adding forces')\n\
     addForceField(flags=flags, vel=vel, force=forces)\n\
-    addForceField(flags=flags, vel=vel, force=obvel)\n\
     \n\
     mantaMsg('Walls')\n\
     setWallBcs(flags=flags, vel=vel)\n\
@@ -429,6 +428,7 @@ def load_smoke_data_low(path):\n\
     phiObsIn.load(os.path.join(path, 'phiObsIn.uni'))\n\
     phiOut.load(os.path.join(path, 'phiOut.uni'))\n\
     fractions.load(os.path.join(path, 'fractions.uni'))\n\
+    numObs.load(os.path.join(path, 'numObs.uni'))\n\
     if using_colors:\n\
         color_r.load(os.path.join(path, 'color_r.uni'))\n\
         color_g.load(os.path.join(path, 'color_g.uni'))\n\
@@ -483,6 +483,7 @@ def save_smoke_data_low(path):\n\
     phiObsIn.save(os.path.join(path, 'phiObsIn.uni'))\n\
     phiOut.save(os.path.join(path, 'phiOut.uni'))\n\
     fractions.save(os.path.join(path, 'fractions.uni'))\n\
+    numObs.save(os.path.join(path, 'numObs.uni'))\n\
     if using_colors:\n\
         color_r.save(os.path.join(path, 'color_r.uni'))\n\
         color_g.save(os.path.join(path, 'color_g.uni'))\n\