diff --git a/apps/gpu/LBM/MusselOyster/MusselOyster.cpp b/apps/gpu/LBM/MusselOyster/MusselOyster.cpp index 68a584167af2118bc510712d92b2fef26aef15c8..5ca312470a4cc512df0ec21a2ad693388398c141 100644 --- a/apps/gpu/LBM/MusselOyster/MusselOyster.cpp +++ b/apps/gpu/LBM/MusselOyster/MusselOyster.cpp @@ -470,13 +470,12 @@ int main( int argc, char* argv[]) { //str = static_cast<std::string>(argv[0]); - try - { + try { ////////////////////////////////////////////////////////////////////////// - std::string targetPath; + std::string targetPath; - targetPath = __FILE__; + targetPath = __FILE__; if (argc == 2) { configFile = argv[1]; @@ -489,16 +488,16 @@ int main( int argc, char* argv[]) targetPath = targetPath.substr(0, targetPath.find_last_of('/') + 1); #endif - std::cout << targetPath << std::endl; + std::cout << targetPath << std::endl; - if (configFile.size()==0) { + if (configFile.size() == 0) { configFile = targetPath + "configMusselOyster.txt"; } - multipleLevel(configFile); + multipleLevel(configFile); ////////////////////////////////////////////////////////////////////////// - } + } catch (const std::bad_alloc& e) { *logging::out << logging::Logger::LOGGER_ERROR << "Bad Alloc:" << e.what() << "\n"; diff --git a/apps/gpu/LBM/MusselOyster2x/MusselOyster2x.cpp b/apps/gpu/LBM/MusselOyster2x/MusselOyster2x.cpp index dadd433c935b41a52baa3a9cea170d82980380d2..ca8cba6c3e9d77743ac105f31b4823af3530f077 100644 --- a/apps/gpu/LBM/MusselOyster2x/MusselOyster2x.cpp +++ b/apps/gpu/LBM/MusselOyster2x/MusselOyster2x.cpp @@ -368,19 +368,16 @@ int main( int argc, char* argv[]) { //str = static_cast<std::string>(argv[0]); - try - { + try { ////////////////////////////////////////////////////////////////////////// - std::string targetPath; + std::string targetPath; - targetPath = __FILE__; + targetPath = __FILE__; if (argc == 2) { configFile = argv[1]; std::cout << "Using configFile command line argument: " << configFile << std::endl; - } else { - configFile = targetPath + "configMusselOyster.txt"; } #ifdef _WIN32 @@ -389,12 +386,16 @@ int main( int argc, char* argv[]) targetPath = targetPath.substr(0, targetPath.find_last_of('/') + 1); #endif - std::cout << targetPath << std::endl; + std::cout << targetPath << std::endl; + + if (configFile.size() == 0) { + configFile = targetPath + "configMusselOyster.txt"; + } - multipleLevel(configFile); + multipleLevel(configFile); ////////////////////////////////////////////////////////////////////////// - } + } catch (const std::bad_alloc& e) { *logging::out << logging::Logger::LOGGER_ERROR << "Bad Alloc:" << e.what() << "\n"; diff --git a/apps/gpu/LBM/MusselOyster3z/MusselOyster3z.cpp b/apps/gpu/LBM/MusselOyster3z/MusselOyster3z.cpp index 577d217e6c269ab9f7d8dbcfe8d955550c4823c5..0bc6d2e872f41e80a910fc910eb4d1b1eb07bd66 100644 --- a/apps/gpu/LBM/MusselOyster3z/MusselOyster3z.cpp +++ b/apps/gpu/LBM/MusselOyster3z/MusselOyster3z.cpp @@ -380,9 +380,7 @@ int main( int argc, char* argv[]) if (argc == 2) { configFile = argv[1]; std::cout << "Using configFile command line argument: " << configFile << std::endl; - } else { - configFile = targetPath + "configMusselOyster.txt"; - } + } #ifdef _WIN32 targetPath = targetPath.substr(0, targetPath.find_last_of('\\') + 1); @@ -392,6 +390,10 @@ int main( int argc, char* argv[]) std::cout << targetPath << std::endl; + if (configFile.size() == 0) { + configFile = targetPath + "configMusselOyster.txt"; + } + multipleLevel(configFile); //////////////////////////////////////////////////////////////////////////