[asl] 09/27: Add default parameters

[Ghislain Vaillant]

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

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

commit 199d98aac46d5c707751c53b3b4adc285c121550
Author: Avtech Scientific <AvtechScientific at users.noreply.github.com>
Date:   Tue Nov 8 19:52:03 2016 +0200

    Add default parameters
---
 examples/jumpingObjects/jumpingBox.cc              | 22 ++++++-------
 examples/levelSet/levelSetFacetedGrowth.cc         |  1 +
 .../levelSet/parameters_levelSetFacetedGrowth.ini  | 37 ++++++++++++++++++++++
 3 files changed, 49 insertions(+), 11 deletions(-)

diff --git a/examples/jumpingObjects/jumpingBox.cc b/examples/jumpingObjects/jumpingBox.cc
index 1246568..d0a7ac7 100644
--- a/examples/jumpingObjects/jumpingBox.cc
+++ b/examples/jumpingObjects/jumpingBox.cc
@@ -44,16 +44,16 @@ typedef asl::UValue<FlT> Param;
 int main(int argc, char* argv[])
 {
 	asl::ApplicationParametersManager appParamsManager("jumpingBox", "1.0");
-	asl::Parameter<asl::AVec<int> > size("size", "size 3D");
-	asl::Parameter<cl_float> dx("dx", "dx");
-	asl::Parameter<cl_float> dt("dt", "dt");
-	asl::Parameter<cl_float> bulkModulus("bulk_modulus", "bulk modulus");
-	asl::Parameter<cl_float> shearModulus("shear_modulus", "shear modulus");
-	asl::Parameter<cl_float> rho("rho", "density");
-	asl::Parameter<asl::AVec<FlT> > g("g", "gravity vector");
-
-	asl::Parameter<unsigned int> tsim("num_iterations", "number of iterations");
-	asl::Parameter<unsigned int> tout("num_it_out", "number of iterations between outputs");
+	asl::Parameter<asl::AVec<int> > size(asl::makeAVec<int>(50, 50, 50), "size", "3D size");
+	asl::Parameter<cl_float> dx(1e-3, "dx", "dx");
+	asl::Parameter<cl_float> dt(1e-5, "dt", "dt");
+	asl::Parameter<cl_float> bulkModulus(2.5e6, "bulk_modulus", "bulk modulus");
+	asl::Parameter<cl_float> shearModulus(1e6, "shear_modulus", "shear modulus");
+	asl::Parameter<cl_float> rho(900, "rho", "density");
+	asl::Parameter<asl::AVec<FlT> > g(asl::makeAVec<FlT>(-9.8, 0.0, 0.0), "g", "gravity vector");
+
+	asl::Parameter<unsigned int> tsim(2000, "num_iterations", "number of iterations");
+	asl::Parameter<unsigned int> tout(100, "num_it_out", "number of iterations between outputs");
 	
 	appParamsManager.load(argc, argv);
 
@@ -61,7 +61,7 @@ int main(int argc, char* argv[])
 	Param shearModulusNum(shearModulus.v()/rho.v()/dx.v()/dx.v());
 
 	asl::AVec<FlT> gNum(g.v()/dx.v());
-		
+
 	std::cout << "Data initialization... ";
 
 	asl::Block block(size.v(), dx.v());
diff --git a/examples/levelSet/levelSetFacetedGrowth.cc b/examples/levelSet/levelSetFacetedGrowth.cc
index 2507b50..4c7def0 100644
--- a/examples/levelSet/levelSetFacetedGrowth.cc
+++ b/examples/levelSet/levelSetFacetedGrowth.cc
@@ -23,6 +23,7 @@
 
 /**
 	\example levelSetFacetedGrowth.cc
+	Required input file: default parameters - parameters_levelSetFacetedGrowth.ini
 */
 
 #include <aslDataInc.h>
diff --git a/examples/levelSet/parameters_levelSetFacetedGrowth.ini b/examples/levelSet/parameters_levelSetFacetedGrowth.ini
new file mode 100644
index 0000000..fcf4ebf
--- /dev/null
+++ b/examples/levelSet/parameters_levelSetFacetedGrowth.ini
@@ -0,0 +1,37 @@
+#
+# Default parameters for the levelSetFacetedGrowth example
+#
+
+
+size = 100 100 100 
+dx = 1
+dt = 1
+v = 0.0 0. 0.
+radius = 10.5
+
+superS = .2
+
+beta_step = .5
+beta_dislocation = .0
+beta_rough = .1
+
+cr_direction_100 =  1  0  0
+cr_direction_010 =  0  1  0
+cr_direction_001 =  0  0  1
+
+cr_direction_I00 = -1  0  0
+cr_direction_0I0 =  0 -1  0
+cr_direction_00I =  0  0  -1
+
+#cr_direction_I01 = -1  0  1
+#cr_direction_0I1 =  0 -1  1
+#cr_direction_I0I = -1  0 -1
+#cr_direction_0II =  0 -1 -1
+#cr_direction_101 =  1  0  1
+#cr_direction_011 =  0  1  1
+#cr_direction_10I =  1  0 -1
+#cr_direction_01I =  0  1 -1
+
+
+nIterations = 100
+nItOut = 10

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