From 34a1b77e443c5b17df653352d72327fca4702365 Mon Sep 17 00:00:00 2001
From: Sebastian Eibl <sebastian.eibl@fau.de>
Date: Mon, 17 Jun 2019 16:32:50 +0200
Subject: [PATCH] added initial refinement to benchmarks
---
apps/benchmarks/GranularGas/GranularGas.cfg | 7 ++-----
apps/benchmarks/GranularGas/MESA_PD_GranularGas.cpp | 4 ++++
apps/benchmarks/GranularGas/MESA_PD_KernelBenchmark.cpp | 4 ++++
apps/benchmarks/GranularGas/PE_GranularGas.cpp | 4 ++++
4 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/apps/benchmarks/GranularGas/GranularGas.cfg b/apps/benchmarks/GranularGas/GranularGas.cfg
index 71f9c2cc2..a70c6572c 100644
--- a/apps/benchmarks/GranularGas/GranularGas.cfg
+++ b/apps/benchmarks/GranularGas/GranularGas.cfg
@@ -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;
}
diff --git a/apps/benchmarks/GranularGas/MESA_PD_GranularGas.cpp b/apps/benchmarks/GranularGas/MESA_PD_GranularGas.cpp
index 3ccff9ff4..51e8a620e 100644
--- a/apps/benchmarks/GranularGas/MESA_PD_GranularGas.cpp
+++ b/apps/benchmarks/GranularGas/MESA_PD_GranularGas.cpp
@@ -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());
diff --git a/apps/benchmarks/GranularGas/MESA_PD_KernelBenchmark.cpp b/apps/benchmarks/GranularGas/MESA_PD_KernelBenchmark.cpp
index 47d20d42a..bf2b95065 100644
--- a/apps/benchmarks/GranularGas/MESA_PD_KernelBenchmark.cpp
+++ b/apps/benchmarks/GranularGas/MESA_PD_KernelBenchmark.cpp
@@ -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());
diff --git a/apps/benchmarks/GranularGas/PE_GranularGas.cpp b/apps/benchmarks/GranularGas/PE_GranularGas.cpp
index d38f72278..ff927ca6f 100644
--- a/apps/benchmarks/GranularGas/PE_GranularGas.cpp
+++ b/apps/benchmarks/GranularGas/PE_GranularGas.cpp
@@ -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());
--
GitLab