diff --git a/apps/gpu/LBM/DrivenCavityMultiGPU/DrivenCavityMultiGPU.cpp b/apps/gpu/LBM/DrivenCavityMultiGPU/DrivenCavityMultiGPU.cpp index 60ba72a8a76b79945741e09a3e0e2135d9afe12a..5a1ad9800262a12cc8a21a93f6f04c601fd98323 100755 --- a/apps/gpu/LBM/DrivenCavityMultiGPU/DrivenCavityMultiGPU.cpp +++ b/apps/gpu/LBM/DrivenCavityMultiGPU/DrivenCavityMultiGPU.cpp @@ -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); ////////////////////////////////////////////////////////////////////////// diff --git a/apps/gpu/LBM/MusselOyster/MusselOyster.cpp b/apps/gpu/LBM/MusselOyster/MusselOyster.cpp index 30acac7ccd183336cf6cb7e0340602885394b320..5b6456c499b62af04615e4d708f895acae161236 100644 --- a/apps/gpu/LBM/MusselOyster/MusselOyster.cpp +++ b/apps/gpu/LBM/MusselOyster/MusselOyster.cpp @@ -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); ////////////////////////////////////////////////////////////////////////// diff --git a/apps/gpu/LBM/SphereGPU/Sphere.cpp b/apps/gpu/LBM/SphereGPU/Sphere.cpp index 2dbeb81903fcb904336e25d2fe9d0510a3ffa513..3c4a7fb92e8299454402cb927e7f03f71bcf09fd 100644 --- a/apps/gpu/LBM/SphereGPU/Sphere.cpp +++ b/apps/gpu/LBM/SphereGPU/Sphere.cpp @@ -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>(); diff --git a/apps/gpu/LBM/SphereScaling/SphereScaling.cpp b/apps/gpu/LBM/SphereScaling/SphereScaling.cpp index 20ec8e963026eb39ecf196b1a17fa1d2eade3cca..d7b6ddbe808b507a39a84ce3dfe5b0a347c0fcc4 100755 --- a/apps/gpu/LBM/SphereScaling/SphereScaling.cpp +++ b/apps/gpu/LBM/SphereScaling/SphereScaling.cpp @@ -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); ////////////////////////////////////////////////////////////////////////// diff --git a/src/basics/config/ConfigurationFile.h b/src/basics/config/ConfigurationFile.h index c0cd06ca8310641b4adc86139a357f2a5993ce78..aed29f31efd21077e9ceb1bd979020087f9b8909 100644 --- a/src/basics/config/ConfigurationFile.h +++ b/src/basics/config/ConfigurationFile.h @@ -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;