[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46326] branches/smoke2/intern/smoke/ intern/source/main.cpp: Fix another compile error caused by an accidental leftover file ( scons only)
Daniel Genrich
daniel.genrich at gmx.net
Sat May 5 21:36:02 CEST 2012
Revision: 46326
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46326
Author: genscher
Date: 2012-05-05 19:36:00 +0000 (Sat, 05 May 2012)
Log Message:
-----------
Fix another compile error caused by an accidental leftover file (scons only)
Removed Paths:
-------------
branches/smoke2/intern/smoke/intern/source/main.cpp
Deleted: branches/smoke2/intern/smoke/intern/source/main.cpp
===================================================================
--- branches/smoke2/intern/smoke/intern/source/main.cpp 2012-05-05 19:26:53 UTC (rev 46325)
+++ branches/smoke2/intern/smoke/intern/source/main.cpp 2012-05-05 19:36:00 UTC (rev 46326)
@@ -1,348 +0,0 @@
-/******************************************************************************
- * DDF Fluid solver with Turbulence extensions
- *
- * copyright 2009 Nils Thuerey, Tobias Pfaff
- *
- * DDF is free software, distributed under the GNU General Public License (GPL v2).
- * See the file COPYING for more information.
- *
- * Main function, solver description
- *
- *****************************************************************************/
-
-#include "globals.h"
-#include "fluidsolver.h"
-
-#include "solverparams.h"
-#include "paramset.h"
-#include "solverplugin.h"
-#include "solverinit.h"
-using namespace std;
-
-namespace DDF
-{
- extern void closeDatabaseWriter();
- extern std::vector<Vec3> initDatabaseWriter(const string&, int, int);
-
- extern int showGlutGui(const char* text); // from glutgui.cpp
- SolverObject *solver;
- vector<SolverObject*> solvers;
-
- // functions taken over from standard main
- bool advanceAllSolvers()
- {
- for (unsigned i=0;i<solvers.size();i++) {
- if (solvers[i]->performStep()) return true;
- }
- return false;
- }
-
- void finalizeAllSolvers()
- {
- for (unsigned i=0;i<solvers.size();i++)
- solvers[i]->finalize();
- }
-
- void run(bool allowGui=true)
- {
- solver = solvers[0];
- // run solver
- for (unsigned i=0;i<solvers.size();i++)
- solvers[i]->forceInit();
-
- if ( DDF_GLUTGUI==1 && allowGui )
- showGlutGui("DDF noparser");
- else
- while ( !advanceAllSolvers() ) {};
-
- finalizeAllSolvers();
- for (unsigned i=0;i<solvers.size();i++)
- delete solvers[i];
-
- solvers.clear();
- }
-
-};
-using namespace DDF;
-
-void makeScenes()
-{
- { // static scene
- SolverObject* solver = new SolverObject( "makescene", nVec3i ( 200,80,150 ) );
- solver->createVec3Grid ( "normal" );
- solver->createRealGrid ( "dist" );
- solver->addInitPlugin ( "init-box-domain", IntArg ( "flag-inside",FFLUID ) + IntArg ( "flag-border",FINFLOW ) + IntArg("flag-floor", FOBSTACLE) );
- // obstacles
- solver->addInitPlugin ( "init-sphere", VecArg("center",Vec3(0.25,0.6,0.35)) + RealArg("radius",0.1) + StringArg("norm","normal")+StringArg("dist","dist"));
- solver->addInitPlugin ( "init-box", VecArg("pos1",Vec3(0.2,0.0,0.3)) + VecArg("pos2",Vec3(0.3,0.6,0.4)) + StringArg("norm","normal")+StringArg("dist","dist"));
- solver->addInitPlugin ( "init-box", VecArg("pos1",Vec3(0.3,0.0,0.65)) + VecArg("pos2",Vec3(0.5,0.3,0.9)) + StringArg("norm","normal")+StringArg("dist","dist"));
- solver->addInitPlugin ( "init-box", VecArg("pos1",Vec3(0.6,0.0,0.3)) + VecArg("pos2",Vec3(0.65,0.4,0.5)) + StringArg("norm","normal")+StringArg("dist","dist"));
- // smoke seed
- solver->addInitPlugin ( "init-sphere", VecArg("center",Vec3(0.3,0.65,0.35)) + RealArg("radius",0.1) + IntArg("type", FDENSITYSOURCE));
- solver->addInitPlugin ( "init-box", VecArg("pos1",Vec3(0.25,0.0,0.3)) + VecArg("pos2",Vec3(0.35,0.65,0.4)) + IntArg("type", FDENSITYSOURCE));
- solver->addInitPlugin ( "init-box", VecArg("pos1",Vec3(0.35,0.0,0.65)) + VecArg("pos2",Vec3(0.55,0.35,0.9)) + IntArg("type", FDENSITYSOURCE));
- solver->addInitPlugin ( "init-box", VecArg("pos1",Vec3(0.65,0.0,0.3)) + VecArg("pos2",Vec3(0.7,0.45,0.5)) + IntArg("type", FDENSITYSOURCE));
-
- solver->addInitPlugin ( "dump-universal", StringArg ( "grid", "flags" ) + StringArg ( "override-name","scene/static-flags" ) + IntArg ( "single-dump", 1 ) );
- solver->addInitPlugin ( "dump-universal", StringArg ( "grid", "dist" ) + StringArg ( "override-name","scene/static-dist" ) + IntArg ( "single-dump", 1 ) );
- solver->addInitPlugin ( "dump-universal", StringArg ( "grid", "normal" ) + StringArg ( "override-name","scene/static-normal" ) + IntArg ( "single-dump", 1 ) );
- solvers.push_back(solver);
- run(false);
- }
- { // moving objects
- SolverObject* solver = new SolverObject( "makescene", nVec3i ( 80,80,80 ) );
- solver->createVec3Grid ( "normal" );
- solver->createRealGrid ( "dist" );
- solver->addInitPlugin ( "init-box-domain", IntArg ( "flag-inside",FFLUID ) + IntArg ( "flag-border",FINFLOW ) );
- solver->addInitPlugin ( "init-box", VecArg("pos1",Vec3(0.2,0.4,0.4)) + VecArg("pos2",Vec3(0.8,0.5,0.6)) + StringArg("norm","normal")+StringArg("dist","dist"));
- solver->addInitPlugin ( "init-box", VecArg("pos1",Vec3(0.4,0.5,0.4)) + VecArg("pos2",Vec3(0.6,0.6,0.6)) + StringArg("norm","normal")+StringArg("dist","dist"));
- solver->addInitPlugin ( "init-sphere", VecArg("center",Vec3(0.4,0.5,0.5)) + RealArg("radius",0.1) + StringArg ( "norm","normal" ) + StringArg ( "dist","dist" ));
- solver->addInitPlugin ( "dump-universal", StringArg ( "grid", "flags" ) + StringArg ( "override-name","scene/dyn-flags" ) + IntArg ( "single-dump", 1 ) );
- solver->addInitPlugin ( "dump-universal", StringArg ( "grid", "dist" ) + StringArg ( "override-name","scene/dyn-dist" ) + IntArg ( "single-dump", 1 ) );
- solver->addInitPlugin ( "dump-universal", StringArg ( "grid", "normal" ) + StringArg ( "override-name","scene/dyn-normal" ) + IntArg ( "single-dump", 1 ) );
- solvers.push_back(solver);
- run(false);
- }
-}
-
-void doPrecompute(const std::string& name, const Vec3& inflow, int frames, bool dynamic, const Vec3& rotAxis = Vec3(0.), Real rotSpeed = 0.)
-{
- bool rotate = (rotSpeed != 0.);
- SolverObject* solver = new SolverObject( "precompute", "scene/" + name + "-flags.gz" );
-
- // create grids
- solver->createVec3Grid ( "normal" );
- solver->createRealGrid ( "dist" );
- solver->createVec3Grid ( "mean-vel" );
- solver->createVec3Grid ( "abl" );
- solver->addStandardSolverGrids();
-
- // additional grids for rot. precomputation
- if (rotate) {
- solver->createIntGrid ("obstacle-flags");
- solver->createIntGrid ("empty-flags");
- solver->addInitPlugin ( "load-universal", StringArg("grid","obstacle-flags") + StringArg("file","scene/" + name + "-flags.gz"));
- solver->addInitPlugin ( "init-box-domain", StringArg("gridname","empty-flags") + IntArg ( "flag-inside",FFLUID ) + IntArg ( "flag-border",FINFLOW ) );
- }
-
- // load grids, initialize fluid velocities
- solver->addInitPlugin ( "load-universal", StringArg("grid","dist") + StringArg("file","scene/" + name + "-dist.gz"));
- solver->addInitPlugin ( "load-universal", StringArg("grid","normal") + StringArg("file","scene/" + name + "-normal.gz"));
- solver->addInitPlugin ( "set-conditional", StringArg ( "gridname","vel-curr" ) + VecArg ( "target-vec",inflow ) + IntArg ( "flag", FFLUID ) );
-
- // program solver main loop
- solver->addPlugin ( "set-conditional", StringArg ( "gridname","vel-curr" ) + VecArg ( "target-vec",inflow ) + IntArg ( "flag", FINFLOW ) );
- solver->addPlugin ( "maccormack-advect-vec3", StringArg ( "vel-src", "vel-curr" ) );
- solver->addPlugin ( "set-noslip-bcs", StringArg ( "grid","vel-curr" ) );
- solver->addPlugin ( "diffuse-grid", StringArg ( "src-vec3", "vel-curr" ) + RealArg ( "diff", 0.3 ) );
- if (rotate)
- solver->addPlugin ("set-moving-obs-bcs", StringArg("obstacle","obstacle-flags") + StringArg("flags-src","empty-flags") +
- VecArg("obs-rot-axis", rotAxis) + RealArg("obs-rot-vel", rotSpeed) + VecArg("obs-center", Vec3(0.5,0.5,0.5)));
- solver->addPlugin ( "solve-pressure", IntArg ( "openbound",0 ) );
- if (rotate)
- solver->addPlugin ( "average", StringArg ( "gridname","vel-curr" ) + StringArg ( "sumgrid","mean-vel" ) + IntArg ( "from", frames ) + IntArg ( "frames", 3 ) + IntArg ( "post-quit",1 ) + IntArg("stride", frames) );
- else
- solver->addPlugin ( "average", StringArg ( "gridname","vel-curr" ) + StringArg ( "sumgrid","mean-vel" ) + IntArg ( "from", frames ) + IntArg ( "frames", frames ) + IntArg ( "post-quit",1 ) );
-
- // program final steps
- solver->addEndPlugin ( "calc-abl", StringArg ("mean-vel","mean-vel") + StringArg ("dist","dist") + StringArg("normal","normal") + StringArg("abl","abl") + RealArg("d", 1.7));
-
- if (dynamic)
- solver->addEndPlugin ( "add-database", StringArg("grid","abl") + StringArg("normal","normal") + VecArg("u0",rotate ? (rotSpeed*rotAxis):inflow));
- else {
- solver->addEndPlugin ( "dump-universal", StringArg ( "grid","abl" ) + StringArg ( "override-name","scene/" + name + "-abl" ) + IntArg ( "single-dump", 1 ) );
- solver->addEndPlugin ( "dump-universal", StringArg ( "grid","mean-vel" ) + StringArg ( "override-name","scene/" + name + "-mean" ) + IntArg ( "single-dump", 1 ) );
- }
-
- solvers.push_back(solver);
- run();
-}
-
-void runStatic(const Vec3& inflow)
-{
- SolverObject* solver = new SolverObject( "run_static", "scene/static-flags.gz" );
- solver->getParams().mU0 = inflow;
- solver->getParams().mTimestepAnim = 0.005;
-
- // create grids
- solver->createVec3Grid ( "mean-flow" );
- solver->createRealGrid ( "dist" );
- solver->createVec3Grid ( "vorticity" );
- solver->createVec3Grid ( "ABL" );
- solver->createVec3Grid ( "pre-ABL" );
- solver->createVec3Grid ( "vort" );
- solver->createRealGrid ( "pdf" );
- solver->createRealGrid ( "density" );
- solver->addStandardSolverGrids();
- solver->createNoiseField("noise", Vec3(0.), Vec3(50,50,50), -0.4, 2.0, 0.002);
-
- // program solver initialization process
- solver->addInitPlugin ( "load-universal", StringArg("grid","dist") + StringArg("file","scene/static-dist.gz"));
- solver->addInitPlugin ( "load-universal", StringArg("grid","mean-flow") + StringArg("file","scene/static-mean.gz"));
- solver->addInitPlugin ( "load-universal", StringArg("grid","pre-ABL") + StringArg("file","scene/static-abl.gz"));
-
- // program solver main loop
- solver->addPlugin ( "copy-grid", StringArg ( "src","mean-flow" ) + StringArg ( "dest","vel-curr") );
- solver->addPlugin ("init-density-inflow", StringArg("density","density") + RealArg("target-value",0.7) + IntArg("flag", FDENSITYSOURCE) + StringArg("noise","noise"));
- solver->addPlugin ( "gen-vpart", StringArg ("source","pre-ABL") + StringArg ("flow","ABL") + StringArg("dist","dist") + StringArg("pdf","pdf") +
- RealArg("thres-vort", 2e-2) + RealArg("thres-pdf",5e-5) + RealArg("mult-pdf",1) + RealArg("scale-flow",0.94) + RealArg("max-bl",0.15) +
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list