Commit f856309f authored by Sebastian Eibl's avatar Sebastian Eibl
Browse files

updated all benchmarks

parent 7327d352
GranularGas
{
simulationCorner < 0, 0, 0 >;
simulationDomain < 40, 40, 40 >;
simulationDomain < 80, 80, 80 >;
blocks < 2,2,2 >;
isPeriodic < 1, 1, 1 >;
initialRefinementLevel 0;
sorting none;
isPeriodic < 0, 0, 0 >;
initialRefinementLevel 2;
sorting linear;
normal <1,1,1>;
radius 0.6;
spacing 1.0;
vMax 0.0;
......
......@@ -90,7 +90,7 @@ int main( int argc, char ** argv )
auto cfg = env.config();
if (cfg == nullptr) WALBERLA_ABORT("No config specified!");
const Config::BlockHandle mainConf = cfg->getBlock( "GranularGas" );
Parameters params;
mesa_pd::Parameters params;
loadFromConfig(params, mainConf);
WALBERLA_LOG_INFO_ON_ROOT("*** GLOBALBODYSTORAGE ***");
......
......@@ -29,12 +29,16 @@
#include <core/logging/Logging.h>
namespace walberla {
namespace mesa_pd {
void loadFromConfig(Parameters& params, const Config::BlockHandle& cfg)
{
params.sorting = cfg.getParameter<std::string>("sorting", "none" );
WALBERLA_LOG_INFO_ON_ROOT("sorting: " << params.sorting);
params.normal = cfg.getParameter<Vec3>("normal", Vec3(real_t(1.0), real_t(1.0), real_t(1.0)) );
WALBERLA_LOG_INFO_ON_ROOT("normal: " << params.normal);
params.spacing = cfg.getParameter<real_t>("spacing", real_t(1.0) );
WALBERLA_LOG_INFO_ON_ROOT("spacing: " << params.spacing);
......@@ -107,6 +111,7 @@ void saveToSQL(const Parameters& params,
{
stringProperties["sorting"] = params.sorting;
realProperties["spacing"] = double_c(params.spacing);
realProperties["radius"] = double_c(params.radius);
......@@ -145,4 +150,5 @@ void saveToSQL(const Parameters& params,
}
} //namespace mesa_pd
} //namespace walberla
\ No newline at end of file
......@@ -27,15 +27,17 @@
#pragma once
#include <core/config/Config.h>
#include <core/DataTypes.h>
#include <mesa_pd/data/DataTypes.h>
#include <string>
namespace walberla {
namespace mesa_pd {
struct Parameters
{
std::string sorting = "none";
Vec3 normal = Vec3(real_t(1.0), real_t(1.0), real_t(1.0));
real_t spacing = real_t(1.0);
real_t radius = real_t(0.5);
bool bBarrier = false;
......@@ -67,4 +69,5 @@ void saveToSQL(const Parameters& params,
std::map< std::string, double >& realProperties,
std::map< std::string, std::string >& stringProperties );
} //namespace mesa_pd
} //namespace walberla
\ No newline at end of file
......@@ -29,6 +29,7 @@
#include <core/logging/Logging.h>
namespace walberla {
namespace mesa_pd {
void loadFromConfig(Parameters& params, const Config::BlockHandle& cfg)
{
......@@ -56,4 +57,5 @@ void saveToSQL(const Parameters& params,
{% endfor %}
}
} //namespace mesa_pd
} //namespace walberla
......@@ -27,11 +27,12 @@
#pragma once
#include <core/config/Config.h>
#include <core/DataTypes.h>
#include <mesa_pd/data/DataTypes.h>
#include <string>
namespace walberla {
namespace mesa_pd {
struct Parameters
{
......@@ -48,4 +49,5 @@ void saveToSQL(const Parameters& params,
std::map< std::string, double >& realProperties,
std::map< std::string, std::string >& stringProperties );
} //namespace mesa_pd
} //namespace walberla
......@@ -5,6 +5,7 @@ from ConfigGenerator import Config
cfg = Config()
cfg.addParameter("sorting", "std::string", '"none"')
cfg.addParameter("normal", "Vec3", "Vec3(real_t(1.0), real_t(1.0), real_t(1.0))")
cfg.addParameter("spacing", "real_t", "real_t(1.0)")
cfg.addParameter("radius", "real_t", "real_t(0.5)")
cfg.addParameter("bBarrier", "bool", "false")
......@@ -28,5 +29,4 @@ cfg.addParameter("metisAlgorithm", "std::string", '"PART_GEOM_KWAY"' );
cfg.addParameter("metisWeightsToUse", "std::string", '"BOTH_WEIGHTS"' );
cfg.addParameter("metisEdgeSource", "std::string", '"EDGES_FROM_EDGE_WEIGHTS"' );
cfg.generate()
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