From c9d2cd17f65b422c448885589a807e2ce28c0d33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-S=C3=A9bastien?= Date: Mon, 6 Dec 2021 15:05:34 +0100 Subject: [PATCH] Go for gcc-11.2 --- Makefile | 2 +- src/EXECS/LiebLin_Data_Daemon_Nscaling.cc | 4 ++++ src/EXECS/LiebLin_Fourier_to_x_t_from_RAW.cc | 9 +++++++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 96d98ca..abd5016 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,7 @@ BIN_DIR = $(BASE_DIR)/bin SRC_EXT = cc # Compiler choice -CXX = g++ +CXX = g++-11.2 CXXFLAGS = -fopenmp LDFLAGS = -O3 -w -fopenmp # Compilation command diff --git a/src/EXECS/LiebLin_Data_Daemon_Nscaling.cc b/src/EXECS/LiebLin_Data_Daemon_Nscaling.cc index 39d5058..5ee024c 100644 --- a/src/EXECS/LiebLin_Data_Daemon_Nscaling.cc +++ b/src/EXECS/LiebLin_Data_Daemon_Nscaling.cc @@ -60,6 +60,10 @@ int main(int argc, char* argv[]) while (Secs_left > 0) { + cout << "StartTime = " << StartTime << endl; + cout << "ActualTime = " << ActualTime << endl; + cout << "Secs_left = " << Secs_left << endl; + iN += 1; int N = Nstep * iN; DP L = N; diff --git a/src/EXECS/LiebLin_Fourier_to_x_t_from_RAW.cc b/src/EXECS/LiebLin_Fourier_to_x_t_from_RAW.cc index 2285456..7fc0746 100644 --- a/src/EXECS/LiebLin_Fourier_to_x_t_from_RAW.cc +++ b/src/EXECS/LiebLin_Fourier_to_x_t_from_RAW.cc @@ -81,12 +81,17 @@ int main(int argc, char* argv[]) RecMat > FT(0.0, Npts_x, Npts_t); DP twopioverL = twoPI/L; - + DP FFsq; + complex exp_ik, exp_miomega; while (RAW_infile.peek() != EOF) { RAW_infile >> omega >> iK >> FF >> dev >> label; + FFsq = FF * FF; + exp_ik = exp(II * (iK * twopioverL)); + exp_miomega = exp(-II * omega); for (int ix = 0; ix < Npts_x; ++ix) for (int it = 0; it < Npts_t; ++it) - FT[ix][it] += FF * FF * exp(II * (iK * twopioverL * xlattice[ix] - omega * tlattice[it])); + //FT[ix][it] += FF * FF * exp(II * (iK * twopioverL * xlattice[ix] - omega * tlattice[it])); + FT[ix][it] = FFsq * pow(exp_ik, xlattice[ix]) * pow(exp_miomega, tlattice[it]); } RAW_infile.close();