Skip to content
Snippets Groups Projects
Commit 9830aa11 authored by Anna Wellmann's avatar Anna Wellmann
Browse files

Do not expect that the default config file is stored in parallel to the main

parent db85b2f7
No related branches found
No related tags found
1 merge request!219Add helper function for creating configReader
......@@ -516,7 +516,7 @@ int main(int argc, char *argv[])
if (argv != NULL) {
try {
vf::basics::ConfigurationFile config = vf::basics::ConfigurationFile::loadConfig(argc, argv, __FILE__, "configDrivenCavityMultiGPU.txt");
vf::basics::ConfigurationFile config = vf::basics::ConfigurationFile::loadConfig(argc, argv, "./apps/gpu/LBM/DrivenCavityMultiGPU/configDrivenCavityMultiGPU.txt");
multipleLevel(config);
//////////////////////////////////////////////////////////////////////////
......
......@@ -583,7 +583,7 @@ int main(int argc, char *argv[])
if (argv != NULL) {
try {
vf::basics::ConfigurationFile config = vf::basics::ConfigurationFile::loadConfig(argc, argv, __FILE__, "configMusselOyster.txt");
vf::basics::ConfigurationFile config = vf::basics::ConfigurationFile::loadConfig(argc, argv, "./apps/gpu/LBM/MusselOyster/configMusselOyster.txt");
multipleLevel(config);
//////////////////////////////////////////////////////////////////////////
......
......@@ -102,7 +102,7 @@ int main(int argc, char *argv[])
GridScalingFactory scalingFactory = GridScalingFactory();
vf::basics::ConfigurationFile config;
if (useConfigFile) {
vf::basics::ConfigurationFile config = vf::basics::ConfigurationFile::loadConfig(argc, argv, __FILE__, "config.txt");
vf::basics::ConfigurationFile config = vf::basics::ConfigurationFile::loadConfig(argc, argv, "./apps/gpu/LBM/SphereGPU/config.txt");
para = std::make_shared<Parameter>(&config);
} else {
para = std::make_shared<Parameter>();
......
......@@ -657,7 +657,7 @@ int main(int argc, char *argv[])
if (argv != NULL) {
try {
vf::basics::ConfigurationFile config = vf::basics::ConfigurationFile::loadConfig(argc, argv, __FILE__, "config.txt");
vf::basics::ConfigurationFile config = vf::basics::ConfigurationFile::loadConfig(argc, argv, "./apps/gpu/LBM/SphereScaling/config.txt");
multipleLevel(config);
//////////////////////////////////////////////////////////////////////////
......
......@@ -70,21 +70,18 @@ public:
template<class T>
T getValue(const std::string& key, T defaultValue) const;
static ConfigurationFile loadConfig(int argc, char *argv[], std::filesystem::path configPath, std::string defaultConfigName = "config.txt")
static ConfigurationFile loadConfig(int argc, char *argv[], std::filesystem::path configPath = "./config.txt")
{
// the config file's default name can be replaced by passing a command line argument
std::string configName = defaultConfigName;
// the config file's default path can be replaced by passing a command line argument
if (argc > 1)
{
configName = argv[1];
VF_LOG_INFO("Using configFile command line argument: {}", configName);
configPath = argv[1];
VF_LOG_INFO("Using command line argument for config path: {}", configPath.string());
} else {
VF_LOG_INFO("Using default config name: {}", configName);
VF_LOG_INFO("Using default config path: {}", configPath.string());
}
configPath.replace_filename(configName);
vf::basics::ConfigurationFile config;
config.load(configPath.string());
return config;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment