ORG make everything C++-17 and a few small fixes

Author: haugboel

module1/SIR.cpp

@@ -8,6 +8,7 @@
 // gamma: recovery rate
 // dt: time step
 std::vector<float> take_step(std::vector<float> state, float beta, float gamma, float dt){
+    std::vector<float> new_state;
     //todo: implement the SIR model
     return new_state;
 }

module2/Makefile

@@ -13,7 +13,7 @@ OPT=-O1 -pg
 # Faster compilation time
 OPT=-O1
 
-CXXFLAGS := $(OPT) -Wall -march=znver1 -g -std=c++14
+CXXFLAGS := $(OPT) -Wall -march=native -g -std=c++17
 
 default: seq vec
 

module3/Makefile

@@ -7,7 +7,7 @@ CXX := mpic++
 # Fastest executable (-ffast-math removes checking for NaNs and other things)
 OPT=-O3
 
-CXXFLAGS := $(OPT) -Wall -Wno-unused-const-variable -std=c++14 -march=native
+CXXFLAGS := $(OPT) -Wall -Wno-unused-const-variable -std=c++17 -march=native
 
 default: task_farm task_farm_HEP task_farm_HEP_seq
 

module4/Makefile

@@ -14,7 +14,7 @@ OPT=-O3 -ffast-math
 # Faster compilation time
 #OPT=-O1
 
-CXXFLAGS := $(OPT) -Wall -march=native -g -std=c++14
+CXXFLAGS := $(OPT) -Wall -march=native -g -std=c++17
 
 default: seq mp
 

module4/seismogram_omp.cpp

@@ -156,7 +156,7 @@ DoubleVector propagator(std::vector<double> wave,
     long lc = std::lround(std::floor(nfreq*0.01)); // low-cut indices
     double mean_wave = 0.;                 // wave zero point
 
-    std::chrono::time_point<std::chrono::system_clock> tstart1,tstart2,tend1,tend2;
+    std::chrono::time_point<std::chrono::high_resolution_clock> tstart1,tstart2,tend1,tend2;
 
     auto tstart = std::chrono::high_resolution_clock::now(); // start time (nano-seconds)
 

module4/seismogram_seq.cpp

@@ -93,7 +93,7 @@ std::vector<double> propagator(std::vector<double> wave,
     long lc = std::lround(std::floor(nfreq*0.01)); // low-cut indices
     double mean_wave = 0.;                 // wave zero point
 
-    std::chrono::time_point<std::chrono::system_clock> tstart1,tstart2,tend1,tend2;
+    std::chrono::time_point<std::chrono::high_resolution_clock> tstart1,tstart2,tend1,tend2;
 
         // Compute seismic impedance
     for (long i=0; i < nlayers; i++)

module5/Makefile

@@ -16,7 +16,7 @@ OPT=-O3 -fast
 
 INCLUDE := -I../include
 
-CXXFLAGS := $(INCLUDE) $(OPT) -Wall -march=native -g -std=c++14
+CXXFLAGS := $(INCLUDE) $(OPT) -Wall -march=native -g -std=c++17
 
 # use on CPU for testing and development
 ACC := -acc=multicore -Minfo=acc

module6/Makefile

@@ -1,7 +1,7 @@
 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
+FLAGS = -O3 -DNDEBUG -g -Wall -march=native -std=c++17
 
 .PHONY: clean all