Merge branch 'morphLBM' of github.com:JamesEMcClure/LBPM-WIA into morphLBM

example/Workflow/HelperFunctions.R

@@ -17,7 +17,7 @@ ReadSubphase<-function(PATH){
 ReadTimelog<-function(PATH){
 	FILE=paste0(PATH,"/timelog.csv")
 	D<-read.csv(file=FILE,head=TRUE,sep=" ")
-	D$time<-seq(0,nrow(D))
+	D$time<-seq(1,nrow(D))
 	return(D)
 }
 

models/MRTModel.cpp

@@ -300,9 +300,9 @@ void ScaLBL_MRTModel::Run(){
 			As=sumReduce( Dm->Comm, As);
 			Hs=sumReduce( Dm->Comm, Hs);
 			Xs=sumReduce( Dm->Comm, Xs);
+			double h = Dm->voxel_length;
+			double absperm = h*h*mu*Mask->Porosity()*flow_rate / force_mag;
 			if (rank==0) {
-				double h = Dm->voxel_length;
-				double absperm = h*h*mu*Mask->Porosity()*flow_rate / force_mag;
 				printf("     %f\n",absperm);
 				FILE * log_file = fopen("Permeability.csv","a");
 				fprintf(log_file,"%i %.8g %.8g %.8g %.8g %.8g %.8g %.8g %.8g %.8g %.8g %.8g %.8g\n",timestep, Fx, Fy, Fz, mu, 

tests/lbpm_morph_pp.cpp

@@ -56,7 +56,6 @@ int main(int argc, char **argv)
 		auto domain_db = db->getDatabase( "Domain" );
 
 		// Read domain parameters
-		auto L = domain_db->getVector<double>( "L" );
 		auto size = domain_db->getVector<int>( "n" );
 		auto nproc = domain_db->getVector<int>( "nproc" );
 		auto ReadValues = domain_db->getVector<int>( "ReadValues" );

tests/lbpm_morphdrain_pp.cpp

@@ -56,7 +56,6 @@ int main(int argc, char **argv)
 		auto domain_db = db->getDatabase( "Domain" );
 
 		// Read domain parameters
-		auto L = domain_db->getVector<double>( "L" );
 		auto size = domain_db->getVector<int>( "n" );
 		auto nproc = domain_db->getVector<int>( "nproc" );
 		auto ReadValues = domain_db->getVector<int>( "ReadValues" );

tests/lbpm_morphopen_pp.cpp

@@ -56,7 +56,6 @@ int main(int argc, char **argv)
 		auto domain_db = db->getDatabase( "Domain" );
 
 		// Read domain parameters
-		auto L = domain_db->getVector<double>( "L" );
 		auto size = domain_db->getVector<int>( "n" );
 		auto nproc = domain_db->getVector<int>( "nproc" );
 		auto ReadValues = domain_db->getVector<int>( "ReadValues" );