[asl] 11/27: Adding default parameters
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Sat Nov 26 16:35:43 UTC 2016
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 f0b9fa1cee450dcf3bdea336aa41a97c16662876
Author: Avtech Scientific <AvtechScientific at users.noreply.github.com>
Date: Tue Nov 8 21:55:00 2016 +0200
Adding default parameters
---
examples/elastic/cubePoroelasticGravity.cc | 22 +++++++++++-----------
examples/elastic/poroelastic.cc | 20 ++++++++++----------
examples/levelSet/levelSetBasic.cc | 14 +++++++-------
examples/levelSet/levelSetFacetedGrowth.cc | 20 ++++++++++----------
examples/levelSet/levelSetNormalGrowth.cc | 14 +++++++-------
.../levelSet/parameters_levelSetFacetedGrowth.ini | 14 +++++++-------
6 files changed, 52 insertions(+), 52 deletions(-)
diff --git a/examples/elastic/cubePoroelasticGravity.cc b/examples/elastic/cubePoroelasticGravity.cc
index 90b9a12..9949199 100644
--- a/examples/elastic/cubePoroelasticGravity.cc
+++ b/examples/elastic/cubePoroelasticGravity.cc
@@ -48,17 +48,17 @@ int main(int argc, char* argv[])
{
asl::ApplicationParametersManager appParamsManager("cubePoroelasticGravity",
"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> hydraulicConductivity("hydraulic_conductivity", "hydraulic conductivity");
- 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(4e-3, "dx", "dx");
+ asl::Parameter<cl_float> dt(0.0001, "dt", "dt");
+ asl::Parameter<cl_float> bulkModulus(1000.0, "bulk_modulus", "bulk modulus");
+ asl::Parameter<cl_float> shearModulus(30.0, "shear_modulus", "shear modulus");
+ asl::Parameter<cl_float> hydraulicConductivity(1e-10, "hydraulic_conductivity", "hydraulic conductivity");
+ asl::Parameter<cl_float> rho(1e3, "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(20000, "num_iterations", "number of iterations");
+ asl::Parameter<unsigned int> tout(500, "num_it_out", "number of iterations between outputs");
appParamsManager.load(argc, argv);
diff --git a/examples/elastic/poroelastic.cc b/examples/elastic/poroelastic.cc
index 3322254..74adba0 100644
--- a/examples/elastic/poroelastic.cc
+++ b/examples/elastic/poroelastic.cc
@@ -51,17 +51,17 @@ typedef asl::UValue<FlT> Param;
int main(int argc, char* argv[])
{
asl::ApplicationParametersManager appParamsManager("poroelastic", "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> hydraulicConductivity("hydraulic_conductivity", "hydraulic conductivity");
- asl::Parameter<cl_float> rho("rho", "density");
- asl::Parameter<asl::AVec<FlT> > g("g", "gravity vector");
+ asl::Parameter<asl::AVec<int> > size(asl::makeAVec<int>(50, 50, 50), "size", "3D size");
+ asl::Parameter<cl_float> dx(4e-3, "dx", "dx");
+ asl::Parameter<cl_float> dt(0.0001, "dt", "dt");
+ asl::Parameter<cl_float> bulkModulus(1000.0, "bulk_modulus", "bulk modulus");
+ asl::Parameter<cl_float> shearModulus(30.0, "shear_modulus", "shear modulus");
+ asl::Parameter<cl_float> hydraulicConductivity(1e-10, "hydraulic_conductivity", "hydraulic conductivity");
+ asl::Parameter<cl_float> rho(1e3, "rho", "density");
+ asl::Parameter<asl::AVec<FlT> > g(asl::makeAVec<FlT>(-9.8, 0.0, 0.0), "g", "gravity vector");
asl::Parameter<string> input("input", "path to the brain geometry input file");
- 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<unsigned int> tsim(20000, "num_iterations", "number of iterations");
+ asl::Parameter<unsigned int> tout(500, "num_it_out", "number of iterations between outputs");
appParamsManager.load(argc, argv);
diff --git a/examples/levelSet/levelSetBasic.cc b/examples/levelSet/levelSetBasic.cc
index 681fa83..f50ef98 100644
--- a/examples/levelSet/levelSetBasic.cc
+++ b/examples/levelSet/levelSetBasic.cc
@@ -45,15 +45,15 @@ int main(int argc, char* argv[])
{
asl::ApplicationParametersManager appParamsManager("levelSetBasic", "1.0");
- asl::Parameter<asl::AVec<int>> size("size", "size");
- asl::Parameter<FlT> dx("dx", "dx");
- asl::Parameter<FlT> dt("dt", "dt");
- asl::Parameter<asl::AVec<FlT>> v("v", "v");
- asl::Parameter<FlT> radius("radius", "initial radius");
+ asl::Parameter<asl::AVec<int>> size(asl::makeAVec<int>(100, 100, 100), "size", "size");
+ asl::Parameter<FlT> dx(1.0, "dx", "dx");
+ asl::Parameter<FlT> dt(1.0, "dt", "dt");
+ asl::Parameter<asl::AVec<FlT>> v(asl::makeAVec<FlT>(0.0, 0.0, 0.0), "v", "v");
+ asl::Parameter<FlT> radius(10.5, "radius", "initial radius");
- asl::Parameter<cl_uint> nIterations("nIterations", "Number of iterations");
- asl::Parameter<cl_uint> nItOut("nItOut", "Number of iterations for output");
+ asl::Parameter<cl_uint> nIterations(100, "nIterations", "Number of iterations");
+ asl::Parameter<cl_uint> nItOut(10, "nItOut", "Number of iterations for output");
appParamsManager.load(argc, argv);
diff --git a/examples/levelSet/levelSetFacetedGrowth.cc b/examples/levelSet/levelSetFacetedGrowth.cc
index 4c7def0..594a5e3 100644
--- a/examples/levelSet/levelSetFacetedGrowth.cc
+++ b/examples/levelSet/levelSetFacetedGrowth.cc
@@ -47,20 +47,20 @@ int main(int argc, char* argv[])
asl::ApplicationParametersManager appParamsManager("levelSetFacetedGrowth",
"1.0");
- asl::Parameter<asl::AVec<int>> size("size", "size");
- asl::Parameter<FlT> dx("dx", "dx");
- asl::Parameter<FlT> dt("dt", "dt");
- asl::Parameter<FlT> superS("superS", "Super saturation");
- asl::Parameter<FlT> radius("radius", "Initial radius");
- asl::Parameter<FlT> betaSt("beta_step", "Kinetic coefficient for step");
- asl::Parameter<FlT> betaDisl("beta_dislocation", "Kinetic coefficient for dislocation");
- asl::Parameter<FlT> betaRough("beta_rough", "Kinetic coefficient for rough region");
+ asl::Parameter<asl::AVec<int>> size(asl::makeAVec<int>(100, 100, 100), "size", "size");
+ asl::Parameter<FlT> dx(1.0, "dx", "dx");
+ asl::Parameter<FlT> dt(1.0, "dt", "dt");
+ asl::Parameter<FlT> superS(0.2, "superS", "Super saturation");
+ asl::Parameter<FlT> radius(10.5, "radius", "Initial radius");
+ asl::Parameter<FlT> betaSt(0.5, "beta_step", "Kinetic coefficient for step");
+ asl::Parameter<FlT> betaDisl(0.0, "beta_dislocation", "Kinetic coefficient for dislocation");
+ asl::Parameter<FlT> betaRough(0.1, "beta_rough", "Kinetic coefficient for rough region");
asl::Parameter<map<string, asl::AVec<FlT>>> cr_directions_p("cr_direction_*",
"Crystallographic directions");
- asl::Parameter<cl_uint> nIterations("nIterations", "Number of iterations");
- asl::Parameter<cl_uint> nItOut("nItOut", "Number of iterations for output");
+ asl::Parameter<cl_uint> nIterations(100, "nIterations", "Number of iterations");
+ asl::Parameter<cl_uint> nItOut(10, "nItOut", "Number of iterations for output");
appParamsManager.load(argc, argv);
diff --git a/examples/levelSet/levelSetNormalGrowth.cc b/examples/levelSet/levelSetNormalGrowth.cc
index 1341b38..47efff6 100644
--- a/examples/levelSet/levelSetNormalGrowth.cc
+++ b/examples/levelSet/levelSetNormalGrowth.cc
@@ -47,15 +47,15 @@ int main(int argc, char* argv[])
asl::ApplicationParametersManager appParamsManager("levelSetNormalGrowth",
"1.0");
- asl::Parameter<asl::AVec<int>> size("size", "size");
- asl::Parameter<FlT> dx("dx", "dx");
- asl::Parameter<FlT> dt("dt", "dt");
- asl::Parameter<FlT> superS("superS", "super satuation");
- asl::Parameter<FlT> radius("radius", "initial radius");
+ asl::Parameter<asl::AVec<int>> size(asl::makeAVec<int>(100, 100, 100), "size", "size");
+ asl::Parameter<FlT> dx(1.0, "dx", "dx");
+ asl::Parameter<FlT> dt(1.0, "dt", "dt");
+ asl::Parameter<FlT> superS(0.2, "superS", "super saturation");
+ asl::Parameter<FlT> radius(10.5, "radius", "initial radius");
- asl::Parameter<cl_uint> nIterations("nIterations", "Number of iterations");
- asl::Parameter<cl_uint> nItOut("nItOut", "Number of iterations for output");
+ asl::Parameter<cl_uint> nIterations(100, "nIterations", "Number of iterations");
+ asl::Parameter<cl_uint> nItOut(10, "nItOut", "Number of iterations for output");
appParamsManager.load(argc, argv);
diff --git a/examples/levelSet/parameters_levelSetFacetedGrowth.ini b/examples/levelSet/parameters_levelSetFacetedGrowth.ini
index fcf4ebf..cc2e46b 100644
--- a/examples/levelSet/parameters_levelSetFacetedGrowth.ini
+++ b/examples/levelSet/parameters_levelSetFacetedGrowth.ini
@@ -4,16 +4,16 @@
size = 100 100 100
-dx = 1
-dt = 1
-v = 0.0 0. 0.
+dx = 1.0
+dt = 1.0
+v = 0.0 0.0 0.0
radius = 10.5
-superS = .2
+superS = 0.2
-beta_step = .5
-beta_dislocation = .0
-beta_rough = .1
+beta_step = 0.5
+beta_dislocation = 0.0
+beta_rough = 0.1
cr_direction_100 = 1 0 0
cr_direction_010 = 0 1 0
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/asl.git
More information about the debian-science-commits
mailing list