[Bf-blender-cvs] [2b9c2bc] soc-2014-fluid: debug messages added

[Roman Pogribnyi]

Commit: 2b9c2bc1d4075e11f4eb4ecc7cd9c6e3aa9b316d
Author: Roman Pogribnyi
Date:   Mon Aug 18 11:52:26 2014 +0200
Branches: soc-2014-fluid
https://developer.blender.org/rB2b9c2bc1d4075e11f4eb4ecc7cd9c6e3aa9b316d

debug messages added

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

M	intern/smoke/intern/MANTA.cpp
M	source/blender/blenkernel/intern/smoke.c
M	source/blender/python/manta_pp/pwrapper/pymain.cpp

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

diff --git a/intern/smoke/intern/MANTA.cpp b/intern/smoke/intern/MANTA.cpp
index fd5fef0..b950531 100644
--- a/intern/smoke/intern/MANTA.cpp
+++ b/intern/smoke/intern/MANTA.cpp
@@ -11,8 +11,10 @@ extern "C" bool manta_check_grid_size(struct FLUID_3D *fluid, int dimX, int dimY
 	if (!(dimX == fluid->xRes() && dimY == fluid->yRes() && dimZ == fluid->zRes())) {
 		for (int cnt(0); cnt < fluid->_totalCells; cnt++)
 			fluid->_density[cnt] = 0.0f;
+		cout<<"lowresgrid res not ok"<<endl;
 		return false;
 	}
+	cout<<"lowresgrid res ok"<<endl;
 	return true;
 }
 
@@ -22,8 +24,10 @@ extern "C" bool manta_check_wavelets_size(struct WTURBULENCE *wt, int dimX, int
 	if (!(dimX == wt->_xResBig && dimY == wt->_yResBig && dimZ == wt->_zResBig)) {
 		for (int cnt(0); cnt < wt->_totalCellsBig; cnt++)
 			wt->_densityBig[cnt] = 0.0f;
+		cout<<"highresgrid res not ok"<<endl;
 		return false;
 	}
+	cout<<"highresgrid res ok"<<endl;
 	return true;
 }
 
@@ -43,11 +47,13 @@ void read_rotated_grid(gzFile gzf, float *data, int size_x, int size_y, int size
 			}			
 		}
 	}
+	cout<<"rotated grid read"<<endl;
 }
 
 void wavelets_add_lowres_density(SmokeDomainSettings *sds)
 {
 	assert(sds != NULL);
+	cout<<"adding lowres density to wavelets"<<endl;
 	for (int cnt_x(0); cnt_x < sds->wt->_xResBig; ++cnt_x)
 	{
 		for (int cnt_y(0); cnt_y < sds->wt->_yResBig; ++cnt_y)
@@ -84,11 +90,13 @@ void wavelets_add_lowres_density(SmokeDomainSettings *sds)
 			}
 		}
 	}
+	cout<<"done"<<endl;
 }
 
 //PR need SMD data here for wavelets 
 extern "C" int read_mantaflow_sim(struct SmokeDomainSettings *sds, char *name, bool reading_wavelets)
 {
+	cout<<"reading mantaflow sim from file:"<<name<<endl;
     /*! legacy headers for reading old files */
 	typedef struct {
 		int dimX, dimY, dimZ;
@@ -160,16 +168,21 @@ extern "C" int read_mantaflow_sim(struct SmokeDomainSettings *sds, char *name, b
         gzread(gzf, &head, sizeof(UniHeader));
 		/* actual grid read */
         if ( ! reading_wavelets){
+			cout<<"lowres"<<endl;
 			if (!manta_check_grid_size(sds->fluid, head.dimX, head.dimY, head.dimZ))	return 0;
 			/*Y and Z axes are swapped in manta and blender*/
 //			read_rotated_grid(gzf,sds->fluid->_density,head.dimX,head.dimY,head.dimZ);
+			cout<<"lowres2"<<endl;
 			gzread(gzf,sds->fluid->_density, sizeof(float)*head.dimX*head.dimY*head.dimZ);
-    	}
+    		
+		}
 		else{
 			if (!manta_check_wavelets_size(sds->wt, head.dimX, head.dimY, head.dimZ))	return 0;
 			/*Y and Z axes are swapped in manta and blender*/
+			cout<<"highres"<<endl;
 			gzread(gzf,sds->wt->_densityBig, sizeof(float)*head.dimX*head.dimY*head.dimZ);
 			gzread(gzf,sds->wt->_densityBigOld, sizeof(float)*head.dimX*head.dimY*head.dimZ);
+			cout<<"highres2"<<endl;
 //			read_rotated_grid(gzf,sds->wt->_densityBig,head.dimX,head.dimY,head.dimZ);
 //			wavelets_add_lowres_density(sds);
 //			read_rotated_grid(gzf,sds->wt->_densityBigOld,head.dimX,head.dimY,head.dimZ);
diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c
index 85300e8..67f3023 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -2766,9 +2766,11 @@ static void smokeModifier_process(SmokeModifierData *smd, Scene *scene, Object *
 			printf("bad smokeModifier_init\n");
 			return;
 		}
-		if (framenr == startframe && smd->domain->flags & MOD_SMOKE_USE_MANTA && smd->domain->fluid)
+		if (framenr == startframe && smd->domain->flags & MOD_SMOKE_USE_MANTA && smd->domain->fluid){
+			printf("smoke.c writing scene\n");			
 			smoke_mantaflow_write_scene_file(scene, smd);
-		
+			printf("smoke.c writing scene done\n");			
+		}
 		/* try to read from cache */
 		if (BKE_ptcache_read(&pid, (float)framenr) == PTCACHE_READ_EXACT) {
 			BKE_ptcache_validate(cache, framenr);
@@ -2800,7 +2802,9 @@ static void smokeModifier_process(SmokeModifierData *smd, Scene *scene, Object *
 		// DG: interesting commenting this line + deactivating loading of noise files
 		if(framenr != startframe && smd->domain->flags & MOD_SMOKE_USE_MANTA)	/*load manta sim data into fluid object*/
 		{
+			printf("smoke.c smoke step\n");			
 			smoke_mantaflow_sim_step(scene,smd);
+			printf("smoke.c smoke step done\n");			
 			const char *density_name_format = "./den%04d.uni";
 			const char *wavelets_name_format = "./densityXL_%04d.uni";
 			char buff[100];
@@ -2815,6 +2819,7 @@ static void smokeModifier_process(SmokeModifierData *smd, Scene *scene, Object *
 				sprintf(buff, wavelets_name_format, scene->r.cfra);
 				read_wavelets = smoke_mantaflow_read(smd->domain, buff, 1);	
 			}
+			printf("smoke.c smoke read done\n");			
 		}else{
 			if (framenr != startframe)
 			{
diff --git a/source/blender/python/manta_pp/pwrapper/pymain.cpp b/source/blender/python/manta_pp/pwrapper/pymain.cpp
index c324703..ab015fd 100644
--- a/source/blender/python/manta_pp/pwrapper/pymain.cpp
+++ b/source/blender/python/manta_pp/pwrapper/pymain.cpp
@@ -100,11 +100,10 @@ void runMantaScript(const string& ss,vector<string>& args) {
 	PyGILState_STATE gilstate = PyGILState_Ensure();
 	/*cleaning possible previous setups*/
 	PyRun_SimpleString(clean_code2.c_str());
-	debMsg("running manta init?", 0);
 	
 	if (! manta_initialized)
 	{	
-		debMsg("yes", 0);
+		debMsg("running manta init?", 0);
 		Pb::setup(filename, args);
 		manta_initialized = true;
 	}