Commit 34a1b77e authored by Sebastian Eibl's avatar Sebastian Eibl

added initial refinement to benchmarks

parent 4356a9b9
......@@ -4,6 +4,7 @@ GranularGas
simulationDomain < 6, 6, 6 >;
blocks < 2,2,2 >;
isPeriodic < 1, 1, 1 >;
initialRefinementLevel 0;
radius 0.6;
spacing 1.0;
......@@ -13,9 +14,5 @@ GranularGas
simulationSteps 500;
visSpacing 100;
HCSITSmaxIterations 10;
HCSITSRelaxationParameter 0.7;
HCSITSErrorReductionParameter 0.8;
HCSITSRelaxationModelStr ApproximateInelasticCoulombContactByDecoupling;
globalLinearAcceleration < 0, 0, 0 >;
numOuterIterations 1;
}
......@@ -146,6 +146,9 @@ int main( int argc, char ** argv )
int64_t numOuterIterations = mainConf.getParameter<int64_t>("numOuterIterations", 10 );
WALBERLA_LOG_INFO_ON_ROOT("numOuterIterations: " << numOuterIterations);
int64_t initialRefinementLevel = mainConf.getParameter<int64_t>("initialRefinementLevel", 0 );
WALBERLA_LOG_INFO_ON_ROOT("initialRefinementLevel: " << initialRefinementLevel);
int64_t simulationSteps = mainConf.getParameter<int64_t>("simulationSteps", 10 );
WALBERLA_LOG_INFO_ON_ROOT("simulationSteps: " << simulationSteps);
......@@ -437,6 +440,7 @@ int main( int argc, char ** argv )
integerProperties["blocks_x"] = int64_c(forest->getXSize());
integerProperties["blocks_y"] = int64_c(forest->getYSize());
integerProperties["blocks_z"] = int64_c(forest->getZSize());
integerProperties["initialRefinementLevel"] = int64_c(initialRefinementLevel);
realProperties["domain_x"] = double_c(forest->getDomain().xSize());
realProperties["domain_y"] = double_c(forest->getDomain().ySize());
realProperties["domain_z"] = double_c(forest->getDomain().zSize());
......
......@@ -222,6 +222,9 @@ int main( int argc, char ** argv )
int64_t numOuterIterations = mainConf.getParameter<int64_t>("numOuterIterations", 10 );
WALBERLA_LOG_INFO_ON_ROOT("numOuterIterations: " << numOuterIterations);
int64_t initialRefinementLevel = mainConf.getParameter<int64_t>("initialRefinementLevel", 0 );
WALBERLA_LOG_INFO_ON_ROOT("initialRefinementLevel: " << initialRefinementLevel);
int64_t simulationSteps = mainConf.getParameter<int64_t>("simulationSteps", 10 );
WALBERLA_LOG_INFO_ON_ROOT("simulationSteps: " << simulationSteps);
......@@ -515,6 +518,7 @@ int main( int argc, char ** argv )
integerProperties["blocks_x"] = int64_c(forest->getXSize());
integerProperties["blocks_y"] = int64_c(forest->getXSize());
integerProperties["blocks_z"] = int64_c(forest->getXSize());
integerProperties["initialRefinementLevel"] = int64_c(initialRefinementLevel);
realProperties["domain_x"] = double_c(forest->getDomain().xSize());
realProperties["domain_y"] = double_c(forest->getDomain().ySize());
realProperties["domain_z"] = double_c(forest->getDomain().zSize());
......
......@@ -110,6 +110,9 @@ int main( int argc, char ** argv )
int64_t numOuterIterations = mainConf.getParameter<int64_t>("numOuterIterations", 10 );
WALBERLA_LOG_INFO_ON_ROOT("numOuterIterations: " << numOuterIterations);
int64_t initialRefinementLevel = mainConf.getParameter<int64_t>("initialRefinementLevel", 0 );
WALBERLA_LOG_INFO_ON_ROOT("initialRefinementLevel: " << initialRefinementLevel);
int64_t simulationSteps = mainConf.getParameter<int64_t>("simulationSteps", 10 );
WALBERLA_LOG_INFO_ON_ROOT("simulationSteps: " << simulationSteps);
......@@ -351,6 +354,7 @@ int main( int argc, char ** argv )
integerProperties["blocks_x"] = int64_c(forest->getXSize());
integerProperties["blocks_y"] = int64_c(forest->getYSize());
integerProperties["blocks_z"] = int64_c(forest->getZSize());
integerProperties["initialRefinementLevel"] = int64_c(initialRefinementLevel);
realProperties["domain_x"] = double_c(forest->getDomain().xSize());
realProperties["domain_y"] = double_c(forest->getDomain().ySize());
realProperties["domain_z"] = double_c(forest->getDomain().zSize());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment