[Bf-blender-cvs] [80f4488] fluid-mantaflow: script cleanup (added some debug messages and remained phi grid)
Sebastián Barschkis
noreply at git.blender.org
Thu Jun 9 00:08:15 CEST 2016
Commit: 80f4488cf6322aba4bf96ade06c40393088c1afb
Author: Sebastián Barschkis
Date: Wed Jun 8 22:55:40 2016 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rB80f4488cf6322aba4bf96ade06c40393088c1afb
script cleanup (added some debug messages and remained phi grid)
===================================================================
M intern/mantaflow/intern/SMOKE.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/SMOKE.cpp b/intern/mantaflow/intern/SMOKE.cpp
index 62f17f6..d257fc8 100644
--- a/intern/mantaflow/intern/SMOKE.cpp
+++ b/intern/mantaflow/intern/SMOKE.cpp
@@ -693,7 +693,7 @@ void SMOKE::updatePointers(SmokeModifierData *smd)
// Liquid
if (mUsingLiquid) {
- mPhi = (float*) getGridPointer("phiTemp", "s");
+ mPhi = (float*) getGridPointer("phiInit", "s");
}
// Smoke
diff --git a/intern/mantaflow/intern/strings/liquid_script.h b/intern/mantaflow/intern/strings/liquid_script.h
index fc5a858..73cbdef 100644
--- a/intern/mantaflow/intern/strings/liquid_script.h
+++ b/intern/mantaflow/intern/strings/liquid_script.h
@@ -54,7 +54,7 @@ flags = s.create(FlagGrid)\n\
\n\
phiParts = s.create(LevelsetGrid)\n\
phi = s.create(LevelsetGrid)\n\
-phiTemp = s.create(LevelsetGrid)\n\
+phiInit = s.create(LevelsetGrid)\n\
pressure = s.create(RealGrid)\n\
\n\
vel = s.create(MACGrid)\n\
@@ -73,7 +73,7 @@ gpi = s.create(IntGrid)\n";
const std::string prep_domain = "\n\
flags.initDomain(boundaryWidth=0)\n\
phi.initFromFlags(flags)\n\
-phiTemp.initFromFlags(flags)\n";
+phiInit.initFromFlags(flags)\n";
//////////////////////////////////////////////////////////////////////
// ADAPTIVE STEP
@@ -87,14 +87,14 @@ def manta_step(start_frame):\n\
\n\
# Sample particles on first frame\n\
if (start_frame == 1):\n\
- phi.copyFrom(phiTemp)\n\
+ phi.copyFrom(phiInit)\n\
flags.updateFromLevelset(phi)\n\
sampleLevelsetWithParticles( phi=phi, flags=flags, parts=pp, discretization=2, randomness=0.01 )\n\
mapGridToPartsVec3(source=vel, parts=pp, target=pVel )\n\
phi.save('/Users/sbarschkis/Desktop/phi.uni')\n\
\n\
#for i in range(int(gs.z)):\n\
- #phiTemp.printGrid(zSlice=int(i))\n\
+ #phiInit.printGrid(zSlice=int(i))\n\
while s.frame == last_frame:\n\
global step\n\
step = step + 1\n\
@@ -184,7 +184,7 @@ mantaMsg('Deleting grids, mesh, particlesystem')\n\
if 'flags' in globals() : del flags\n\
if 'phiParts' in globals() : del phiParts\n\
if 'phi' in globals() : del phi\n\
-if 'phiTemp' in globals() : del phiTemp\n\
+if 'phiInit' in globals() : del phiInit\n\
if 'pressure' in globals() : del pressure\n\
if 'vel' in globals() : del vel\n\
if 'velOld' in globals() : del velOld\n\
diff --git a/intern/mantaflow/intern/strings/shared_script.h b/intern/mantaflow/intern/strings/shared_script.h
index c07d57d..288344a 100644
--- a/intern/mantaflow/intern/strings/shared_script.h
+++ b/intern/mantaflow/intern/strings/shared_script.h
@@ -35,6 +35,7 @@ import os, shutil, math, sys, gc\n";
const std::string solver_low = "\n\
# solver low params\n\
+mantaMsg('Solver low')\n\
dim = $SOLVER_DIM$\n\
res = $RES$\n\
gs = vec3($RESX$,$RESY$,$RESZ$)\n\
@@ -43,13 +44,15 @@ s = Solver(name='main', gridSize=gs, dim=dim)\n";
const std::string solver_high = "\n\
# solver high params\n\
+mantaMsg('Solver high')\n\
upres = $UPRES$\n\
xl_gs = vec3($HRESX$, $HRESY$, $HRESZ$)\n\
if dim == 2: xl_gs.z = 1\n\
-xl = Solver(name = 'larger', gridSize = xl_gs)\n";
+xl = Solver(name='larger', gridSize=xl_gs)\n";
const std::string adaptive_time_stepping_low = "\n\
# adaptive time stepping\n\
+mantaMsg('Adaptive time stepping low')\n\
dt_default = 0.1\n\
dt_factor = $DT_FACTOR$\n\
fps = $FPS$\n\
@@ -61,6 +64,7 @@ s.cfl = 4.0\n\
s.timestep = dt0\n";
const std::string adaptive_time_stepping_high = "\n\
+mantaMsg('Adaptive time stepping high')\n\
xl.frameLength = s.frameLength\n\
xl.timestepMin = s.timestepMin / 10\n\
xl.timestepMax = s.timestepMax\n\
diff --git a/intern/mantaflow/intern/strings/smoke_script.h b/intern/mantaflow/intern/strings/smoke_script.h
index f900c9c..f611c60 100644
--- a/intern/mantaflow/intern/strings/smoke_script.h
+++ b/intern/mantaflow/intern/strings/smoke_script.h
@@ -51,6 +51,7 @@ copyVec3ToReal(source=uv[1], targetX=texture_u2, targetY=texture_v2, targetZ=tex
//////////////////////////////////////////////////////////////////////
const std::string smoke_variables_low = "\n\
+mantaMsg('Smoke variables low')\n\
using_colors = $USING_COLORS$\n\
using_heat = $USING_HEAT$\n\
using_fire = $USING_FIRE$\n\
@@ -62,6 +63,7 @@ boundaryWidth = 1\n";
const std::string alloc_base_grids_low = "\n\
# prepare grids low\n\
+mantaMsg('Smoke alloc grids low')\n\
flags = s.create(FlagGrid)\n\
vel = s.create(MACGrid)\n\
x_vel = s.create(RealGrid)\n\
@@ -82,6 +84,7 @@ fuel_inflow = s.create(LevelsetGrid)\n";
const std::string prep_domain_low = "\n\
# prepare domain low\n\
+mantaMsg('Smoke domain low')\n\
flags.initDomain(boundaryWidth=boundaryWidth)\n\
flags.fillGrid()\n\
if doOpen:\n\
@@ -92,9 +95,11 @@ if doOpen:\n\
//////////////////////////////////////////////////////////////////////
const std::string smoke_variables_high = "\n\
-wltStrength = $WLT_STR$\n\
-octaves = 0\n\
-uvs = 2\n\
+mantaMsg('Smoke variables high')\n\
+wltStrength = $WLT_STR$\n\
+octaves = 0\n\
+uvs = 2\n\
+\n\
if upres == 1:\n\
octaves = int(math.log(upres+1)/ math.log(2.0) + 0.5)\n\
elif upres > 1:\n\
@@ -102,6 +107,7 @@ elif upres > 1:\n\
const std::string alloc_base_grids_high = "\n\
# prepare grids high\n\
+mantaMsg('Smoke alloc grids high')\n\
xl_flags = xl.create(FlagGrid)\n\
xl_vel = xl.create(MACGrid)\n\
xl_density = xl.create(RealGrid)\n\
@@ -116,6 +122,7 @@ texture_w2 = s.create(RealGrid)\n";
const std::string prep_domain_high = "\n\
# prepare domain high\n\
+mantaMsg('Smoke domain high')\n\
xl_flags.initDomain(boundaryWidth=boundaryWidth)\n\
xl_flags.fillGrid()\n\
if doOpen:\n\
@@ -123,6 +130,7 @@ if doOpen:\n\
const std::string wavelet_turbulence_noise = "\n\
# wavelet turbulence noise field\n\
+mantaMsg('Smoke wavelet noise')\n\
xl_wltnoise = NoiseField(parent=xl, loadFromFile=True)\n\
xl_wltnoise.posScale = vec3(int(1.0*gs.x)) / $NOISE_POSSCALE$\n\
xl_wltnoise.timeAnim = $NOISE_TIMEANIM$\n";
More information about the Bf-blender-cvs
mailing list