Merge branch 'dev_hdf5' into gpu

AlexJamesWright · Jan 18, 2021 · 7bd3cc1 · 7bd3cc1
2 parents de16673 + ad3492b
commit 7bd3cc1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Examples/KelvinHelmholtz/SingleFluidIdealRandomMPIHDF5CheckpointRestart/main.cc b/Examples/KelvinHelmholtz/SingleFluidIdealRandomMPIHDF5CheckpointRestart/main.cc
@@ -50,7 +50,7 @@ int main(int argc, char *argv[]) {
             //cfl, Ng, gamma, sigma, cp, mu1, mu2, frameSkip, reportItersPeriod);
 
   ParallelCheckpointArgs checkpointArgs(filename, &env);
-  checkpointArgs.endTime=3.0;
+  checkpointArgs.endTime=endTime;
 
   Data data(checkpointArgs, &env, mu1, mu2, frameSkip, reportItersPeriod);
 

diff --git a/Examples/KelvinHelmholtz/SingleFluidIdealRandomSerialHDF5CheckpointRestart/main.cc b/Examples/KelvinHelmholtz/SingleFluidIdealRandomSerialHDF5CheckpointRestart/main.cc
@@ -50,7 +50,7 @@ int main(int argc, char *argv[]) {
   //          cfl, Ng, gamma, sigma, cp, mu1, mu2, frameSkip, reportItersPeriod);
 
   CheckpointArgs checkpointArgs(filename, &env);
-  checkpointArgs.endTime=3.0;
+  checkpointArgs.endTime=endTime;
 
   Data data(checkpointArgs, &env, mu1, mu2, frameSkip, reportItersPeriod);
 

diff --git a/Project/CPU/Src/serialCheckpointArgs.cc b/Project/CPU/Src/serialCheckpointArgs.cc
@@ -8,7 +8,7 @@
 #include <stdexcept>
 
 
-SerialCheckpointArgs::SerialCheckpointArgs(const char* name, PlatformEnv *env) : CheckpointArgs
+SerialCheckpointArgs::SerialCheckpointArgs(const char* name, PlatformEnv *env) : CheckpointArgs()
 {
 	herr_t error=0, tmpError=-1;
 	hid_t file = H5Fopen(name, H5F_ACC_RDONLY, H5P_DEFAULT);