Merge branch 'develop' into reorderDistributions

src/gpu/VirtualFluids_GPU/Communication/ExchangeData27Test.cfg

-# these two parameters need to be defined in each config file
-Path = /output/path
-GridPath = /path/to/grid
\ No newline at end of file

src/gpu/VirtualFluids_GPU/Communication/ExchangeData27Test.cpp

@@ -28,7 +28,7 @@ protected:
 
     void SetUp() override
     {
-        para = std::make_shared<Parameter>(1, 0);
+        para = std::make_shared<Parameter>();
         para->setMaxLevel(level + 1);       // setMaxLevel resizes parH
         para->initLBMSimulationParameter(); // init parH
 

src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/IndexRearrangementForStreamsTest.cfg

-# these two parameters need to be defined in each config file
-Path = /output/path
-GridPath = /path/to/grid
\ No newline at end of file

src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/IndexRearrangementForStreamsTest.cpp

@@ -214,7 +214,7 @@ private:
 
     void SetUp() override
     {
-        para        = std::make_shared<Parameter>(1, 0);
+        para        = std::make_shared<Parameter>();
         testSubject = createTestSubjectFCBorderBulk();
     }
 };
@@ -313,7 +313,7 @@ private:
 
     void SetUp() override
     {
-        para        = std::make_shared<Parameter>(1, 0);
+        para        = std::make_shared<Parameter>();
         testSubject = createTestSubjectReorderSendIndices();
     };
 };

src/gpu/VirtualFluids_GPU/Parameter/Parameter.h

@@ -45,14 +45,11 @@
 #include "VirtualFluids_GPU_export.h"
 
 struct curandStateXORWOW;
-typedef struct curandStateXORWOW curandState;
-namespace vf
-{
-namespace basics
+using curandState = struct curandStateXORWOW;
+namespace vf:: basics
 {
 class ConfigurationFile;
 }
-} // namespace vf
 class CudaStreamManager;
 
 //! \struct LBMSimulationParameter
@@ -377,8 +374,8 @@ struct LBMSimulationParameter {
 class VIRTUALFLUIDS_GPU_EXPORT Parameter
 {
 public:
-    Parameter(const vf::basics::ConfigurationFile &configData, int numberOfProcesses, int myId);
-    Parameter(int numberOfProcesses, int myId);
+    Parameter(const vf::basics::ConfigurationFile &configData, const int numberOfProcesses = 1, const int myId = 0);
+    Parameter(const int numberOfProcesses = 1, const int myId = 0);
     ~Parameter();
     void initLBMSimulationParameter();
 

src/gpu/VirtualFluids_GPU/Parameter/ParameterTest.cpp

@@ -39,7 +39,7 @@ TEST(ParameterTest, check_all_Parameter_CanBePassedToConstructor)
     vf::basics::ConfigurationFile config;
     config.load(filePath.string());
 
-    Parameter para(config, 1, 0);
+    Parameter para(config);
 
     // test optional parameter
     EXPECT_THAT(para.getOutputPath(), testing::Eq("/output/path/"));
@@ -151,7 +151,7 @@ TEST(ParameterTest, check_all_Parameter_CanBePassedToConstructor)
 
 TEST(ParameterTest, defaultGridPath)
 {
-    Parameter para(1, 0);
+    Parameter para;
     EXPECT_THAT(para.getGridPath(), testing::Eq("grid/"));
     EXPECT_THAT(para.getConcentration(), testing::Eq("grid/conc.dat"));
 }
@@ -190,7 +190,7 @@ TEST(ParameterTest, setGridPathOverridesConfigFile)
 
 TEST(ParameterTest, userMissedSlash)
 {
-    Parameter para(1, 0);
+    Parameter para;
     para.setGridPath("gridPathTest");
 
     EXPECT_THAT(para.getGridPath(), testing::Eq("gridPathTest/"));