FIX setup for new OS on ERDA MODI

Author: haugboel

module6/Makefile

@@ -1,5 +1,5 @@
-LIB = -lm -L/usr/lib -pthread -L/usr/lib/x86_64-linux-gnu/openmpi/lib -lmpi_cxx -lmpi
-INC = -I/usr/lib/x86_64-linux-gnu/openmpi/include/openmpi -I/usr/lib/x86_64-linux-gnu/openmpi/include -pthread
+LIB = -L/opt/openmpi-4.1.6/lib -Wl,-rpath -Wl,/opt/openmpi-4.1.6/lib -Wl,--enable-new-dtags -lmpi
+INC = -I/opt/openmpi-4.1.6/include
 
 FLAGS = -O3 -DNDEBUG -g -Wall
 

module6/fwc_parallel.cpp

@@ -280,6 +280,7 @@ void simulate(uint64_t num_of_iterations, const std::string& model_filename, con
     }
     auto end = std::chrono::steady_clock::now();
 
+    stat(world);
     std::cout << "checksum      : " << checksum(world) << std::endl;
     std::cout << "elapsed time  : " << (end - begin).count() / 1000000000.0 << " sec" << std::endl;
 }

module6/fwc_sequential.cpp

@@ -250,21 +250,21 @@ void simulate(uint64_t num_of_iterations, const std::string& model_filename, con
         integrate(world);
 
         // remove ghostzones and construct global data from local data
-        for (uint64_t i = 1; i < latitude-1; ++i)
-        for (uint64_t j = 1; j < longitude-1; ++j) {
-            uint64_t k_global = (i + offset_latitude) * global_world.longitude
-                              + (j + offset_longitude);
-            global_world.data[k_global] = world.data[i * longitude + j];
-        }
-
         if (!output_filename.empty()) {
+            for (uint64_t i = 1; i < latitude-1; ++i)
+            for (uint64_t j = 1; j < longitude-1; ++j) {
+                uint64_t k_global = (i + offset_latitude) * global_world.longitude
+                                + (j + offset_longitude);
+                global_world.data[k_global] = world.data[i * longitude + j];
+            }
             write_hdf5(global_world, output_filename, iteration);
             std::cout << iteration << " -- ";
             stat(world);
         }
     }
     auto end = std::chrono::steady_clock::now();
 
+    stat(world);
     std::cout << "checksum      : " << checksum(world) << std::endl;
     std::cout << "elapsed time  : " << (end - begin).count() / 1000000000.0 << " sec" << std::endl;
 }