DFH test working

example/Bubble/input.db

@@ -0,0 +1,38 @@
+Color {
+    tauA   = 1.0;  
+    tauB   = 1.0;  
+    rhoA   = 1.0;  
+    rhoB   = 1.0;  
+    alpha = 1e-2;
+    beta  = 0.95;
+    F = 0, 0, 0
+    Restart = false
+    pBC = 0
+    din = 1.0
+    dout = 1.0
+    timestepMax = 200
+    interval = 1000
+    tol = 1e-5;
+    das = 0.1
+    dbs = 0.9
+}
+
+Domain {
+    nproc = 1, 1, 1     // Number of processors (Npx,Npy,Npz)
+    n = 16, 16, 16      // Size of local domain (Nx,Ny,Nz)
+    n_spheres = 1       // Number of spheres
+    L = 1, 1, 1         // Length of domain (x,y,z)
+    BC = 0              // Boundary condition type
+}
+
+Analysis {
+    blobid_interval = 1000      // Frequency to perform blob identification
+    analysis_interval = 1000    // Frequency to perform analysis
+    restart_interval = 20000    // Frequency to write restart data
+    visualization_interval = 20000        // Frequency to write visualization data
+    restart_file = "Restart"    // Filename to use for restart file (will append rank)
+    N_threads    = 4            // Number of threads to use
+    load_balance = "independent" // Load balance method to use: "none", "default", "independent"
+}
+
+

tests/CMakeLists.txt

@@ -44,7 +44,7 @@ ADD_LBPM_TEST( TestMap )
 ADD_LBPM_TEST( TestMRT )
 ADD_LBPM_TEST( TestColorGrad )
 ADD_LBPM_TEST( TestColorGradDFH )
-ADD_LBPM_TEST( TestBubbleDFH ../example/Piston/input.db)
+ADD_LBPM_TEST( TestBubbleDFH ../example/Bubble/input.db)
 ADD_LBPM_TEST( TestColorMassBounceback )
 ADD_LBPM_TEST( TestPressVel  ../example/Piston/input.db)
 ADD_LBPM_TEST( TestPoiseuille ../example/Piston/input.db)

tests/TestBubbleDFH.cpp

@@ -95,7 +95,7 @@ int main(int argc, char **argv)
         double Fz = color_db->getVector<double>( "F" )[2];
         double alpha = color_db->getScalar<double>( "alpha" );
         double beta = color_db->getScalar<double>( "beta" );
-        bool Restart = color_db->getScalar<int>( "Restart" );
+        bool Restart = color_db->getScalar<bool>( "Restart" );
         double din = color_db->getScalar<double>( "din" );
         double dout = color_db->getScalar<double>( "dout" );;
         double inletA=1.f;

tests/TestColorGradDFH.cpp

@@ -34,13 +34,9 @@ int main(int argc, char **argv)
 	MPI_Comm comm = MPI_COMM_WORLD;
 	MPI_Comm_rank(comm,&rank);
 	MPI_Comm_size(comm,&nprocs);
-	int check;
+	int check=0;
 	{
 		// parallel domain size (# of sub-domains)
-		int nprocx,nprocy,nprocz;
-		int iproc,jproc,kproc;
-
-
 		if (rank == 0){
 			printf("********************************************************\n");
 			printf("Running Color Model: TestColorGradDFH	\n");
@@ -49,13 +45,11 @@ int main(int argc, char **argv)
 
 		// BGK Model parameters
 		string FILENAME;
-		unsigned int nBlocks, nthreads;
 		int timestepMax, interval;
 		double Fx,Fy,Fz,tol;
 		// Domain variables
 		double Lx,Ly,Lz;
 		int nspheres;
-		int Nx,Ny,Nz;
 		int i,j,k,n;
 		int dim = 3;
 		//if (rank == 0) printf("dim=%d\n",dim);