Merge pull request #60 from kjetil-lye/master

Version bump
alsvinn · Jun 30, 2019 · 6ecbada · 6ecbada
2 parents 3d3f3d9 + 505aa35
commit 6ecbada
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -19,7 +19,7 @@ ELSE()
 	ENDMACRO()
 ENDIF()
 
-project (alsvinn VERSION 0.5.2 LANGUAGES C CXX )
+project (alsvinn VERSION 0.5.3 LANGUAGES C CXX )
 SET(ALSVINN_USE_FLOAT OFF CACHE BOOL "Do all computations with 32 bits
 floating point numbers, instead of 64 bit double precision")
 SET(ALSVINN_USE_CUDA ON CACHE BOOL "Build with CUDA")

diff --git a/documentation/Doxyfile b/documentation/Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME           = "Alsvinn"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 0.5.2
+PROJECT_NUMBER         = 0.5.3
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

diff --git a/documentation/Doxyfile_readthedocs b/documentation/Doxyfile_readthedocs
@@ -38,7 +38,7 @@ PROJECT_NAME           = "Alsvinn"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 0.5.2
+PROJECT_NUMBER         = 0.5.3
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

diff --git a/library_examples/alsuq/structure_standalone/src/main.cpp b/library_examples/alsuq/structure_standalone/src/main.cpp
@@ -329,6 +329,12 @@ int main(int argc, char** argv) {
 
     //ALSVINN_LOG(INFO, "Reading from " << filenameInput);
     auto rank = mpiConfiguration->getRank();
+
+    alsutils::log::setLogFile("structure_standalone_mpi_log_"
+        + std::to_string(p) + "_"
+        + filenameOutput +  "_"
+        + std::to_string(rank) + ".txt");
+
     auto numberOfProcessors = mpiConfiguration->getNumberOfProcesses();
 
     if (numberOfSamples % numberOfProcessors != 0) {
@@ -365,11 +371,6 @@ int main(int argc, char** argv) {
     const auto sampleEnd = (rank + 1) * samplesPerProcessor;
 
 
-    alsutils::log::setLogFile("structure_standalone_mpi_log_"
-        + std::to_string(p) + "_"
-        + std::to_string(timestepInformation.getCurrentTime()) + "_"
-        + std::to_string(rank)
-        + ".txt");
 
     for (int sample = sampleStart; sample < sampleEnd; ++sample) {
         auto start = std::chrono::high_resolution_clock::now();