Merge branch 'debug'

MintonGroup · Jan 27, 2022 · 4c828ec · 4c828ec
2 parents 69b8ffc + f4fb1ae
commit 4c828ec
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Makefile.Defines b/Makefile.Defines
@@ -66,8 +66,8 @@ LINKS = -L$(MKLROOT)/lib/intel64 -L$(NETCDF_FORTRAN_HOME)/lib  -lswiftest -lnetc
 FSTRICTFLAGS  = $(IPRODUCTION) $(STRICTREAL) 
 FFLAGS  = $(IPRODUCTION) -fp-model=fast
 
-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

diff --git 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))