[asl] 99/177: Adding iterations parameter

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch master
in repository asl.

commit 76cb0a6de2d7ea1083b7c4df96f91f411d4b2649
Author: Avtech Scientific <AvtechScientific at users.noreply.github.com>
Date:   Wed Jul 15 15:03:51 2015 +0300

    Adding iterations parameter
---
 examples/flow/locomotive_in_tunnel.cc  |  8 +++-----
 examples/flow/locomotive_laminar.cc    | 32 ++++++++++++++------------------
 src/utilities/aslParametersManager.cxx |  2 +-
 3 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/examples/flow/locomotive_in_tunnel.cc b/examples/flow/locomotive_in_tunnel.cc
index 24c776e..35e4bc5 100644
--- a/examples/flow/locomotive_in_tunnel.cc
+++ b/examples/flow/locomotive_in_tunnel.cc
@@ -100,6 +100,7 @@ int main(int argc, char* argv[])
 	asl::Parameter<FlT> dx(0.08, "dx", "space step", "m");
 	asl::Parameter<FlT> dt(1., "dt", "time step", "s");
 	asl::Parameter<FlT> nu(.001, "nu", "kinematic viscosity", "m^2 s^-1");
+	asl::Parameter<unsigned int> iterations(20001, "iterations number", "");
 
 	/* Load previously declared Parameters from command line and/or
 	parameters file. Use default values if neither is provided. */
@@ -144,11 +145,10 @@ int main(int argc, char* argv[])
 	asl::SPLBGK lbgk(new asl::LBGKTurbulence(block, 
 	                                         acl::generateVEConstant(FlT(nu.v())),  
 	                                         &asl::d3q15()));
-	
 	lbgk->init();
 	// Generate an instance for LBGK data initialization
 	asl::SPLBGKUtilities lbgkUtil(new asl::LBGKUtilities(lbgk));
-	// Initialize the LBGK internal data with the flow velocity of (0.1, 0, 0) [in lattice units]
+	// Initialize the LBGK internal data with the flow velocity of (0.1, 0, 0) in [lattice units]
 	lbgkUtil->initF(acl::generateVEConstant(.1, .0, .0));
 
 	auto vfTunnel(asl::generatePFConstant(makeAVec(0.1, 0., 0.)));
@@ -156,7 +156,6 @@ int main(int argc, char* argv[])
 	std::vector<asl::SPNumMethod> bc;
 	std::vector<asl::SPNumMethod> bcV;
 
-
 	// Generate boundary conditions for the tunnel geometry. Constant velocity BC
 	bc.push_back(generateBCVelocity(lbgk, vfTunnel, tunnelMap));
 	// Generate boundary conditions for the tunnel geometry. Constant velocity BC
@@ -182,7 +181,6 @@ int main(int argc, char* argv[])
 	auto computeForce(generateComputeSurfaceForce(lbgk, forceField, locomotive));
 	computeForce->init();
 	
-
 	cout << "Finished" << endl;
 	cout << "Computing..." << endl;
 	asl::Timer timer;
@@ -206,7 +204,7 @@ int main(int argc, char* argv[])
 
 	timer.start();
 	// Iteration loop 
-	for (unsigned int i(1); i < 20001; ++i)
+	for (unsigned int i(1); i < iterations.v(); ++i)
 	{
 		// One iteration (timestep) of bulk numerical procedure
 		lbgk->execute();
diff --git a/examples/flow/locomotive_laminar.cc b/examples/flow/locomotive_laminar.cc
index 17350f9..fa9778f 100644
--- a/examples/flow/locomotive_laminar.cc
+++ b/examples/flow/locomotive_laminar.cc
@@ -86,7 +86,7 @@ int main(int argc, char* argv[])
 	
 	Param nuNum(nu.v()*dt.v()/dx.v()/dx.v());
 	
-	std::cout<<"Flow: Data initialization...";
+	std::cout << "Data initialization..." << endl;
 
 
 	auto object(asl::readSurface("locomotive.stl", bl));
@@ -99,9 +99,9 @@ int main(int argc, char* argv[])
 	auto forceField(asl::generateDataContainerACL_SP<FlT>(block, 3, 1u));
 	asl::initData(forceField, makeAVec(0.,0.,0.));
 	
-	std::cout<<"Finished"<<endl;
+	std::cout << "Finished"<<endl;
 	
-	std::cout<<"Flow: Numerics initialization...";
+	std::cout << "Numerics initialization..." << endl;
 
 	asl::SPLBGK lbgk(new asl::LBGK(block,
 	                               acl::generateVEConstant(FlT(nuNum.v())),
@@ -111,13 +111,13 @@ int main(int argc, char* argv[])
 	asl::SPLBGKUtilities lbgkUtil(new asl::LBGKUtilities(lbgk));
 	lbgkUtil->initF(acl::generateVEConstant(.1,.0,.0));
 
-	auto vfTunel(asl::generatePFConstant(makeAVec(0.1,0.,0.)));
+	auto vfTunnel(asl::generatePFConstant(makeAVec(0.1,0.,0.)));
 
 	std::vector<asl::SPNumMethod> bc;
 	std::vector<asl::SPNumMethod> bcV;
 
-	bc.push_back(generateBCVelocity(lbgk, vfTunel, tunelMap));
-	bcV.push_back(generateBCVelocityVel(lbgk, vfTunel, tunelMap));
+	bc.push_back(generateBCVelocity(lbgk, vfTunnel, tunelMap));
+	bcV.push_back(generateBCVelocityVel(lbgk, vfTunnel, tunelMap));
 //	bcV.push_back(generateBCNoSlipRho(lbgk, tunelMap));
 	bc.push_back(generateBCNoSlip(lbgk,  object));
 	bcV.push_back(generateBCNoSlipVel(lbgk, object));
@@ -130,12 +130,11 @@ int main(int argc, char* argv[])
 	auto computeForce(generateComputeSurfaceForce(lbgk, forceField, object));
 	computeForce->init();
 	
-
-	std::cout<<"Finished"<<endl;
-	std::cout<<"Computing...";
+	cout << "Finished" << endl;
+	cout << "Computing..." << endl;
 	asl::Timer timer;
 
-	asl::WriterVTKXML writer("flowAroundObjRes");
+	asl::WriterVTKXML writer(appParamsManager.getDir() + "locomotive_laminar");
 	writer.addScalars("map", *object);
 	writer.addScalars("tunel", *tunelMap);
 	writer.addScalars("rho", *lbgk->getRho());
@@ -163,15 +162,12 @@ int main(int argc, char* argv[])
 	}
 	timer.stop();
 	
-	std::cout<<"Finished"<<endl;	
-
-	cout << "time=" << timer.getTime() << "; clockTime="
-		<< timer.getClockTime()	<< "; load=" 
-		<< timer.getProcessorLoad() * 100 << "%" << endl;
+	cout << "Finished" << endl;	
 
-	std::cout<<"Output...";
-	std::cout<<"Finished"<<endl;	
-	std::cout<<"Ok"<<endl;
+	cout << "Computation statistic:" << endl;
+	cout << "time = " << timer.getTime() << "; clockTime = "
+		 << timer.getClockTime() << "; load = "
+		 << timer.getProcessorLoad() * 100 << "%" << endl;
 
 	return 0;
 }
diff --git a/src/utilities/aslParametersManager.cxx b/src/utilities/aslParametersManager.cxx
index b25658c..f3c41c5 100644
--- a/src/utilities/aslParametersManager.cxx
+++ b/src/utilities/aslParametersManager.cxx
@@ -514,4 +514,4 @@ namespace asl
 		}
 	}
 		 
-} //namespace asl
+} //namespace asl
\ No newline at end of file

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/asl.git