- fixed MSVC problem in fluidsim.c
authorNils Thuerey <nils@thuerey.de>
Thu, 11 May 2006 13:19:41 +0000 (13:19 +0000)
committerNils Thuerey <nils@thuerey.de>
Thu, 11 May 2006 13:19:41 +0000 (13:19 +0000)
- removed some more debug output in the solver

intern/elbeem/intern/ntl_geometrymodel.cpp
intern/elbeem/intern/solver_main.cpp
source/blender/src/fluidsim.c

index 598abbddfacdda5d517f0f51f3e36499121ad6ca..16d18c4b238bc85d56ad748b710fce686f16d3c5 100644 (file)
@@ -234,8 +234,8 @@ int ntlGeometryObjModel::loadBobjModel(string filename)
        vector<ntlSetVec3f> aninorms;
        vector<double> anitimes;
 
-       const bool debugPrint=true;
-       const bool debugPrintFull=true;
+       const bool debugPrint=false;
+       const bool debugPrintFull=false;
        gzFile gzf;
        gzf = gzopen(filename.c_str(), "rb");
        if (!gzf) {
index 70ff31066455d9a7b2745f633ee8d3cb734b1355..2888c7e172ea3f7b2a825a6183dfbde8b1ed1594 100644 (file)
@@ -900,8 +900,8 @@ LbmFsgrSolver::mainLoop(int lev)
                                        ((rl>RWVEL_WINDTHRESH) && (lcsmqo<P_LCSMQO)) )// normal checks
                                        ||(k>this->mSizez-SLOWDOWNREGION)   ) {
                                LbmFloat nuz = uz;
-                               LbmFloat jdf; // = 0.05 * (rand()/(RAND_MAX+1.0));
-                               if(rl>RWVEL_WINDTHRESH) jdf *= (rl-RWVEL_WINDTHRESH);
+                               //? LbmFloat jdf; // = 0.05 * (rand()/(RAND_MAX+1.0));
+                               //? if(rl>RWVEL_WINDTHRESH) jdf *= (rl-RWVEL_WINDTHRESH);
                                if(k>this->mSizez-SLOWDOWNREGION) {
                                        // special case
                                        LbmFloat zfac = (LbmFloat)( k-(this->mSizez-SLOWDOWNREGION) );
@@ -910,11 +910,11 @@ LbmFsgrSolver::mainLoop(int lev)
                                        //errMsg("TOPT"," at "<<PRINT_IJK<<" zfac"<<zfac);
                                } else {
                                        // normal probability
-                                       LbmFloat fac = P_LCSMQO-lcsmqo;
-                                       jdf *= fac;
+                                       //? LbmFloat fac = P_LCSMQO-lcsmqo;
+                                       //? jdf *= fac;
                                }
                                FORDF1 {
-                                       jdf = 0.05 * (rand()/(RAND_MAX+1.0));
+                                       const LbmFloat jdf = 0.05 * (rand()/(RAND_MAX+1.0));
                                        // TODO  use wind velocity?
                                        if(jdf>0.025) {
                                        const LbmFloat add =  this->dfLength[l]*(-ux*this->dfDvecX[l]-uy*this->dfDvecY[l]-nuz*this->dfDvecZ[l])*jdf;
index a712f96e66ee9a88aff1d99d9460a46e38388955..8d5e6e7ff6be3e656055195bb525037212c3643e 100644 (file)
@@ -71,8 +71,7 @@
 #include "BKE_DerivedMesh.h"
 #include "BKE_ipo.h"
 #include "LBM_fluidsim.h"
-// FIXME move?
-// TODO FIXME DOUBLE elbeem.h! in intern/extern...
+// TODO FIXME double elbeem.h in intern/extern...
 #include "elbeem.h"
 
 #include "BLI_editVert.h"
@@ -925,9 +924,7 @@ void fluidsimBake(struct Object *ob)
                                int *tris=NULL;
                                int numVerts=0, numTris=0;
                                int o = channelObjCount;
-                               //Key *shapekey= ob_get_key(obit);
-                               int     deform; // = (shapekey && BLI_countlist(&shapekey->block) >0)||(obit->parent && obit->partype==PARSKEL);
-                               deform = (obit->fluidsimSettings->domainNovecgen);
+                               int     deform = (obit->fluidsimSettings->domainNovecgen);
                                elbeemMesh fsmesh;
                                elbeemResetMesh( &fsmesh );
                                fsmesh.type = obit->fluidsimSettings->type;;
@@ -1250,10 +1247,7 @@ void fluidsimBake(struct Object *ob)
                                                (obit->fluidsimSettings->type != OB_FLUIDSIM_DOMAIN) &&
                                                (obit->fluidsimSettings->type != OB_FLUIDSIM_PARTICLE)
                                        ) {
-                                       //Key *shapekey= ob_get_key(obit); 
-                                       // armature check from effect.c
-                                       int deform; //= (shapekey && BLI_countlist(&shapekey->block) >0)||(obit->parent && obit->partype==PARSKEL);
-                                       deform = (obit->fluidsimSettings->domainNovecgen);
+                                       int deform = (obit->fluidsimSettings->domainNovecgen);
 
                                        fluidsimGetGeometryObjFilename(obit, fnameObjdat);
                                        strcpy(targetFile, targetDir);