From 50fed7a182cb73374c4dfc5837b23015c784f662 Mon Sep 17 00:00:00 2001 From: David A Minton Date: Thu, 13 Jan 2022 08:15:54 -0500 Subject: [PATCH 1/2] Set compiler flags back to debug --- Makefile.Defines | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.Defines b/Makefile.Defines index 9264c39c6..99509da32 100644 --- a/Makefile.Defines +++ b/Makefile.Defines @@ -71,11 +71,11 @@ GPRODUCTION = -O3 -ffree-line-length-none $(GPAR) INCLUDES = -I$(SWIFTEST_HOME)/include -I$(NETCDF_FORTRAN_HOME)/include -I$(MKLROOT)/include LINKS = -L$(MKLROOT)/lib/intel64 -L$(NETCDF_FORTRAN_HOME)/lib -lswiftest -lnetcdf -lnetcdff -qopt-matmul $(PAR) -#FSTRICTFLAGS = $(IDEBUG) $(SIMDVEC) $(PAR) -#FFLAGS = $(IDEBUG) $(SIMDVEC) $(PAR) +FSTRICTFLAGS = $(IDEBUG) $(SIMDVEC) $(PAR) +FFLAGS = $(IDEBUG) $(SIMDVEC) $(PAR) -FSTRICTFLAGS = $(ADVIXE_FLAGS) $(PAR) $(SIMDVEC) $(STRICTREAL) -FFLAGS = $(ADVIXE_FLAGS) $(PAR) $(SIMDVEC) -fp-model=fast +# FSTRICTFLAGS = $(ADVIXE_FLAGS) $(PAR) $(SIMDVEC) $(STRICTREAL) +# FFLAGS = $(ADVIXE_FLAGS) $(PAR) $(SIMDVEC) -fp-model=fast FORTRAN = ifort AR = xiar CC = icc From f4fb1aedd274ba01c5f2037516973aa25865e8d3 Mon Sep 17 00:00:00 2001 From: David A Minton Date: Thu, 27 Jan 2022 09:58:26 -0500 Subject: [PATCH 2/2] Removed bad array index in potential energy summation. --- src/util/util_get_energy_momentum.f90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/util_get_energy_momentum.f90 b/src/util/util_get_energy_momentum.f90 index b935a680c..ae59c158a 100644 --- a/src/util/util_get_energy_momentum.f90 +++ b/src/util/util_get_energy_momentum.f90 @@ -199,7 +199,7 @@ subroutine util_get_energy_potential_triangular(npl, lmask, GMcb, Gmass, mass, x do concurrent(j = i+1:npl, lmask(i) .and. lmask(j)) pepl(j) = - (Gmass(i) * mass(j)) / norm2(xb(:, i) - xb(:, j)) end do - pe = pe + sum(pepl(i+1:npl), lmask(i) .and. lmask(j)) + pe = pe + sum(pepl(i+1:npl), lmask(i)) end do !$omp end parallel do pe = pe + sum(pecb(1:npl), lmask(1:npl))