Commit: 9cbe88808c7a029b1962f5fd813b901b5d03a48e
Author: Sebastián Barschkis
Date: Wed Sep 16 15:05:16 2015 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rB9cbe88808c7a029b1962f5fd813b901b5d03a48e
remove comments for cleaner console
===================================================================
M intern/smoke/intern/FLUID_3D.cpp
M intern/smoke/intern/MANTA.cpp
M intern/smoke/intern/scenarios/smoke.h
M source/blender/blenkernel/intern/smoke.c
===================================================================
diff --git a/intern/smoke/intern/FLUID_3D.cpp b/intern/smoke/intern/FLUID_3D.cpp
index 1def80e..48f7cf6 100644
--- a/intern/smoke/intern/FLUID_3D.cpp
+++ b/intern/smoke/intern/FLUID_3D.cpp
@@ -767,7 +767,6 @@ void FLUID_3D::step(float dt, float gravity[3])
std::string py_string_0 = string("sim_step_low(").append(frame_str);
std::string py_string_1 = py_string_0.append(")\0");
PyRun_SimpleString(py_string_1.c_str());
- cout<< "done"<<manta_sim_running<<endl;
PyGILState_Release(gilstate);
Manta_API::updatePointers(this);
diff --git a/intern/smoke/intern/MANTA.cpp b/intern/smoke/intern/MANTA.cpp
index b99e7fd..813c3b5 100644
--- a/intern/smoke/intern/MANTA.cpp
+++ b/intern/smoke/intern/MANTA.cpp
@@ -282,7 +282,7 @@ string Manta_API::gridNameFromType(const string &type)
void Manta_API::addGrid(void * data, string name, string type, int x, int y,
int z, bool is2D = false)
{
if (data == NULL || name == "" || gridNameFromType(type) == "") return;
- cout << "Adding Grid:" << name << endl;
+ //cout << "Adding Grid:" << name << endl;
std::ostringstream stringStream;
/* Temporary gridname */
@@ -421,12 +421,12 @@ std::string Manta_API::getRealValue( const std::string&
varName, SmokeModifierDa
ss << smd->domain->fluid->_xRes;
else if (varName == "RESY")
- if (is2D){ ss << smd->domain->fluid->_zRes;}
+ if (is2D) { ss << smd->domain->fluid->_zRes;}
else{ ss << smd->domain->fluid->_yRes;}
else if (varName == "RESZ")
if (is2D){ ss << 1;}
- else{ ss << smd->domain->fluid->_zRes;}
+ else { ss << smd->domain->fluid->_zRes;}
else if (varName == "SOLVER_DIM")
ss << smd->domain->manta_solver_res;
@@ -447,13 +447,13 @@ std::string Manta_API::getRealValue( const std::string&
varName, SmokeModifierDa
else{ ss << smd->domain->wt->getResBig()[1];}
else if (varName == "HRESZ")
if (is2D){ ss << 1;}
- else{ ss << smd->domain->wt->getResBig()[2];}
+ else { ss << smd->domain->wt->getResBig()[2];}
else if (varName == "TIMESTEP")
ss << smd->domain->time_scale * 0.1f;
else if (varName == "XL_TIMESTEP")
ss << smd->domain->time_scale * 0.1f;
else if (varName == "USE_WAVELETS")
- ss << (smd->domain->flags & MOD_SMOKE_HIGHRES)?"True":"False";
+ ss << (smd->domain->flags & MOD_SMOKE_HIGHRES) ? "True" :
"False";
else if (varName == "BUYO_X")
ss << 0.;
else if (varName == "BUYO_Y")
@@ -466,15 +466,13 @@ std::string Manta_API::getRealValue( const std::string&
varName, SmokeModifierDa
ss << (-smd->domain->beta);
else if (varName == "ADVECT_ORDER")
ss << 2;
- else if (varName == "MANTA_EXPORT_PATH"){
+ else if (varName == "MANTA_EXPORT_PATH") {
char parent_dir[1024];
BLI_split_dir_part(smd->domain->_manta_filepath, parent_dir,
sizeof(parent_dir));
ss << parent_dir;
- }
- else if (varName == "VORTICITY"){
- cout << "Vorticity :" << smd->domain->vorticity /
smd->domain->fluid->_constantScaling << endl;
+ } else if (varName == "VORTICITY"){
ss << smd->domain->vorticity /
smd->domain->fluid->_constantScaling;
- }else if (varName == "BOUNDCONDITIONS"){
+ } else if (varName == "BOUNDCONDITIONS"){
if(smd->domain->border_collisions == SM_BORDER_OPEN) ss <<
"xXyY";
else if (smd->domain->border_collisions == SM_BORDER_VERTICAL)
ss << "xXyY";
else if (smd->domain->border_collisions == SM_BORDER_CLOSED) ss
<< "xXyY";
@@ -514,7 +512,7 @@ std::string Manta_API::getRealValue( const std::string&
varName, SmokeModifierDa
else if (varName == "FLAME_SMOKE_COLOR_Z")
ss << smd->domain->fluid->_flame_smoke_color[2];
else
- cout<< "ERROR: Unknown option:"<< varName <<endl;
+ cout << "ERROR: Unknown option:" << varName <<endl;
return ss.str();
}
@@ -575,7 +573,7 @@ string Manta_API::getGridPointer(std::string gridName,
std::string solverName)
if ((gridName == "") && (solverName == "")){
return "";
}
- cout << "getting grid pointer " << gridName<< " , " << solverName
<<endl;
+ //cout << "getting grid pointer " << gridName<< " , " << solverName
<<endl;
PyGILState_STATE gilstate = PyGILState_Ensure();
PyObject *main = PyImport_AddModule("__main__");
if (main == NULL){cout << "null" << 1 << endl;return "";}
@@ -589,7 +587,7 @@ string Manta_API::getGridPointer(std::string gridName,
std::string solverName)
PyObject* encoded = PyUnicode_AsUTF8String(retured_value);
if (retured_value == NULL){cout << "null" << 15 << endl;return "";}
std::string res = strdup(PyBytes_AsString(encoded));
- cout << "Pointer on "<< gridName << " " << res << endl;
+ //cout << "Pointer on "<< gridName << " " << res << endl;
PyGILState_Release(gilstate);
return res;
}
@@ -626,9 +624,10 @@ void Manta_API::updatePointers(FLUID_3D *fluid)
//x + y * max_x + z * max_x*max_y
// int position_to_copy_from(0 + (fluid->xRes()/2) * fluid->xRes() +
(fluid->zRes()/2) * fluid->xRes()*fluid->yRes());
// float *whereToCopy = &fluid->_density[position_to_copy_from];
- cout << 'updating pointers'<<endl;
+ //cout << 'Updating pointers' << endl;
if (fluid->manta_resoution == 2)
{
+ //cout << '2D' << endl;
float* manta_fluid_density = (float*
)pointerFromString(getGridPointer("density", "s"));
int* manta_fluid_flags = (int*
)pointerFromString(getGridPointer("flags", "s"));
if (fluid->_density != NULL){
@@ -650,13 +649,13 @@ void Manta_API::updatePointers(FLUID_3D *fluid)
}
}
else {
- cout << '3D'<<endl;
+ //cout << '3D' << endl;
fluid->_density = (float*
)pointerFromString(getGridPointer("density", "s"));
fluid->_manta_flags = (int*
)pointerFromString(getGridPointer("flags", "s"));
}
fluid->_manta_inflow = (float*
)pointerFromString(getGridPointer("inflow_grid", "s"));
- if (fluid-> manta_resoution == 2){return;}
+ if (fluid-> manta_resoution == 2) {return;}
if (fluid->using_colors) {
fluid->_color_r = (float*
)pointerFromString(getGridPointer("color_r_low", "s"));
fluid->_color_g = (float*
)pointerFromString(getGridPointer("color_g_low", "s"));
@@ -675,7 +674,7 @@ void Manta_API::updatePointers(FLUID_3D *fluid)
void Manta_API::updateHighResPointers(WTURBULENCE *wt)
{
wt->_densityBig = (float*
)pointerFromString(getGridPointer("xl_density", "xl"));;
- if (wt->using_colors){
+ if (wt->using_colors) {
wt->_color_rBig = (float*
)pointerFromString(getGridPointer("color_r_high", "xl"));
wt->_color_gBig = (float*
)pointerFromString(getGridPointer("color_g_high", "xl"));
wt->_color_bBig = (float*
)pointerFromString(getGridPointer("color_b_high", "xl"));
diff --git a/intern/smoke/intern/scenarios/smoke.h
b/intern/smoke/intern/scenarios/smoke.h
index 2589841..89912c2 100644
--- a/intern/smoke/intern/scenarios/smoke.h
+++ b/intern/smoke/intern/scenarios/smoke.h
@@ -11,7 +11,7 @@ def transform_back(obj, gs):\n\
\n\
def load_once(grid, file, dict):\n\
if grid not in dict:\n\
- print('Loading file' + file + 'in grid')\n\
+ #print('Loading file' + file + 'in grid')\n\
grid.load(file)\n\
dict[grid] = 1\n\
\n\
@@ -86,7 +86,7 @@ if $USE_WAVELETS$ and $UPRES$ > 0:\n\
xl_wltnoise.timeAnim = 0.1 \n\
";
-const string smoke_init_colors_low = "print(\"Initializing colors\")\n\
+const string smoke_init_colors_low = "#print(\"Initializing colors\")\n\
color_r_low = s.create(RealGrid)\n\
color_g_low = s.create(RealGrid)\n\
color_b_low = s.create(RealGrid)\n\
@@ -106,7 +106,7 @@ del color_g_low \n\
del color_b_low \n\
manta_using_colors = False";
-const string smoke_init_colors_high = "print(\"Initializing colors
highres\")\n\
+const string smoke_init_colors_high = "#print(\"Initializing colors
highres\")\n\
color_r_high = xl.create(RealGrid)\n\
color_g_high = xl.create(RealGrid)\n\
color_b_high = xl.create(RealGrid)\n\
@@ -120,17 +120,17 @@ color_b_high.add(xl_density) \n\
color_b_high.multConst(manta_color_b) \n\
manta_using_colors = True\n";
-const string smoke_init_heat_low = "print(\"Initializing heat lowres\")\n\
+const string smoke_init_heat_low = "#print(\"Initializing heat lowres\")\n\
heat_low = s.create(RealGrid)\n\
manta_using_heat = True\n";
-const string smoke_init_fire_low = "print(\"Initializing fire lowres\")\n\
+const string smoke_init_fire_low = "#print(\"Initializing fire lowres\")\n\
flame_low = s.create(RealGrid)\n\
fuel_low = s.create(RealGrid)\n\
react_low = s.create(RealGrid)\n\
manta_using_fire = True\n";
-const string smoke_init_fire_high = "print(\"Initializing fire highres\")\n\
+const string smoke_init_fire_high = "#print(\"Initializing fire highres\")\n\
flame_high = xl.create(RealGrid)\n\
fuel_high = xl.create(RealGrid)\n\
react_high = xl.create(RealGrid)\n\
@@ -156,7 +156,7 @@
density.save(os.path.join('$MANTA_EXPORT_PATH$','density.uni'))\n\
flags.save(os.path.join('$MANTA_EXPORT_PATH$','flags.uni'))\n\
inflow_grid.save(os.path.join('$MANTA_EXPORT_PATH$','inflow.uni'))\n\
forces.save(os.path.join('$MANTA_EXPORT_PATH$','forces.uni'))\n\
-print('Grids exported')";
+#print('Grids exported')";
const string fire_process_burn_low = "\n\
processBurn(fuel=fuel_low, density=density, react=react_low, red=color_r_low,
green=color_g_low, blue=color_b_low, heat=heat_low, burningRate=burning_rate,
flameSmoke=flame_smoke, ignitionTemp=ignition_temp, maxTemp=max_temp, dt=dt,
flameSmokeColor=flame_smoke_color)";
@@ -192,7 +192,7 @@ const string smoke_step_low = "def sim_step_low(t,
standalone = False):\n\
density.add(inflow_grid)\n\
elif solver_dim == 2:\n\
density.add(inflow_grid)\n\
- print ('Simulating frame ' + str(t))\n\
+ #print ('Simulating frame ' + str(t))\n\
if not standalone and t == 1 and solver_dim == 2:\n\
density.add(inflow_grid)\n\
if manta_using_heat:\n\
@@ -202,31 +202,31 @@ const string smoke_step_low = "def sim_step_low(t,
standalone = False):\n\
gravity=vec3(0,0,-0.01 * $ALPHA$) if solver_dim==3 else vec3(0,-0.01*
$ALPHA$,0)\n\
addBuoyancy(density=density, vel=vel, gravity=gravity, flags=flags)\n\
if manta_using_colors:\n\
- print ('Advecting colors')\n\
+ #print ('Advecting colors')\n\
advectSemiLagrange(flags=flags, vel=vel, grid=color_r_low,
order=$ADVECT_ORDER$)\n\
advectSemiLagrange(flags=flags, vel=vel, grid=color_g_low,
order=$ADVECT_ORDER$)\n\
advectSemiLagrange(flags=flags, vel=vel, grid=c
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
