Nbody6++GPU-Dec2019-bugfix. Mainly fixed a problem in hrplot.F. See Rainer's email at 2020 July 8th or 9th for detail.

Author: kaiwu-astro

Makefile

@@ -6,7 +6,7 @@
 #    make install
 #
 
-RESULT = nbody6++.sse.gpu.mpi
+RESULT = nbody6++.avx
 INSTALLDIR = /usr/local
 EXTRATOOLS = nb6++dumpb2a libinitial.so libnb6out3.so nb6++snapshot
 ifeq ("x", "x $(EXTRATOOLS)")

config.status

@@ -417,7 +417,7 @@ $config_files
 
 Report bugs to <[email protected]>."
 
-ac_cs_config="'--with-par=b1m' '--enable-simd=sse' '--enable-mcmodel=large'"
+ac_cs_config="'--disable-mpi' '--disable-gpu' '--with-par=128k'"
 ac_cs_version="\
 Nbody6++ config.status 1.0
 configured by ./configure, generated by GNU Autoconf 2.69,
@@ -427,9 +427,9 @@ Copyright (C) 2012 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
-ac_pwd='/p/home/jusers/spurzem2/jusuf/Nbody/Nbody6++GPU-Dec2019-bugfix'
+ac_pwd='/work/Tux1/spurzem/Nbody/Nbody6++GPU-Dec2019'
 srcdir='.'
-AWK='gawk'
+AWK=''
 test -n "$AWK" || AWK=awk
 # The default lists apply if the user does not specify any file.
 ac_need_defaults=:
@@ -496,7 +496,7 @@ if $ac_cs_silent; then
 fi
 
 if $ac_cs_recheck; then
-  set X /bin/sh './configure'  '--with-par=b1m' '--enable-simd=sse' '--enable-mcmodel=large' $ac_configure_extra_args --no-create --no-recursion
+  set X /bin/sh './configure'  '--disable-mpi' '--disable-gpu' '--with-par=128k' $ac_configure_extra_args --no-create --no-recursion
   shift
   $as_echo "running CONFIG_SHELL=/bin/sh $*" >&6
   CONFIG_SHELL='/bin/sh'
@@ -585,18 +585,18 @@ fi
 echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
 cat >>"$ac_tmp/subs1.awk" <<\_ACAWK &&
 S["LTLIBOBJS"]=""
-S["MMAX"]="2048"
+S["MMAX"]="1024"
 S["LMAX"]="600"
-S["KMAX"]="512000"
-S["NMAX"]="1510720"
+S["KMAX"]="65536"
+S["NMAX"]="131072"
 S["EXTRARESULT"]=""
-S["EXTRAOBJ"]=" $(CUDA_OBJECTS) ${IRRSSE_OBJECTS}"
-S["EXTRASRC"]=" $(GPU_FSOURCES) $(MPI_FSOURCES)"
-S["RESULT"]=".sse.gpu.mpi"
-S["CUFLAGS"]=" -O3 -D CUDA_5 -I /p/software/jusuf/stages/2019a/software/CUDA/10.1.105/samples/common/inc"
-S["AWK"]="gawk"
-S["SED"]="/usr/bin/sed"
-S["NVCC"]="nvcc"
+S["EXTRAOBJ"]=" ${AVX_OBJECTS}"
+S["EXTRASRC"]=" $(GPU_FSOURCES)"
+S["RESULT"]=".avx"
+S["CUFLAGS"]=""
+S["AWK"]=""
+S["SED"]=""
+S["NVCC"]=""
 S["LIBOBJS"]=""
 S["EGREP"]="/usr/bin/grep -E"
 S["CXXCPP"]="g++ -E"
@@ -607,19 +607,19 @@ S["CFLAGS"]="-g -O2"
 S["CC"]="gcc"
 S["ac_ct_CXX"]="g++"
 S["CPPFLAGS"]=""
-S["CXXFLAGS"]=" -O3 -fopenmp -I../include -march=native -fPIC -mcmodel=large -msse ${OMP_FLAGS}"
+S["CXXFLAGS"]=" -O3 -fopenmp -I../include -march=native -fPIC -mcmodel=medium -mavx ${OMP_FLAGS}"
 S["CXX"]="g++"
 S["OPENMP_FCFLAGS"]="-fopenmp"
 S["OBJEXT"]="o"
 S["EXEEXT"]=""
 S["ac_ct_FC"]="gfortran"
-S["LDFLAGS"]=" -L"
-S["FCFLAGS"]=" -O3 -fPIC -mcmodel=large -fopenmp -I../include $(GPU_FLAGS) $(MPI_FLAGS) ${SIMD_FLAGS} ${OMP_FLAGS}"
-S["FC"]="mpif77"
+S["LDFLAGS"]=""
+S["FCFLAGS"]=" -I../extra_inc/nompi -O3 -fPIC -mcmodel=medium -fopenmp -I../include ${SIMD_FLAGS} $(GPU_FLAGS) ${OMP_FLAGS}"
+S["FC"]="gfortran"
 S["target_alias"]=""
 S["host_alias"]=""
 S["build_alias"]=""
-S["LIBS"]=" -lstdc++ -lcudart"
+S["LIBS"]=" -lstdc++"
 S["ECHO_T"]=""
 S["ECHO_N"]="-n"
 S["ECHO_C"]=""
@@ -629,7 +629,7 @@ S["DEFS"]="-DPACKAGE_NAME=\\\"Nbody6++\\\" -DPACKAGE_TARNAME=\\\"nbody6--\\\" -D
 "E_H=1 -DHAVE_UNISTD_H=1 -DHAVE_STDLIB_H=1 -DHAVE_MALLOC=1 -DHAVE_GETTIMEOFDAY=1 -DHAVE_MEMSET=1 -DHAVE_SQRT=1 -DHAVE_STRCHR=1"
 S["mandir"]="${datarootdir}/man"
 S["localedir"]="${datarootdir}/locale"
-S["libdir"]="${exec_prefix}/lib"
+S["libdir"]="${exec_prefix}/lib64"
 S["psdir"]="${docdir}"
 S["pdfdir"]="${docdir}"
 S["dvidir"]="${docdir}"
@@ -643,7 +643,7 @@ S["sharedstatedir"]="${prefix}/com"
 S["sysconfdir"]="${prefix}/etc"
 S["datadir"]="${datarootdir}"
 S["datarootdir"]="${prefix}/share"
-S["libexecdir"]="${exec_prefix}/libexec"
+S["libexecdir"]="${exec_prefix}/lib"
 S["sbindir"]="${exec_prefix}/sbin"
 S["bindir"]="${exec_prefix}/bin"
 S["program_transform_name"]="s,x,x,"