Merge branch 'master' into script_devel to update to duìynamic_libs (0ece2d28) · Commits · Giacomo Mulas / NP_TMcode

.gitignore

+1 −1

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@ build/error.log
		build/inclusion/*
		build/libnptm/*
		build/libtool
		build/Makefile
		build/Makefile.in
		build/sphere/*
		build/testing/*
		build/trapping/*

.gitlab-ci.yml

+14 −14

Original line number	Diff line number	Diff line
		@@ -48,7 +48,7 @@ compatibility_stage:
		- cd build_gnu11
		- cp -r ../build/* .
		- CXX=g++-11 F77=gfortran-11 ./configure
		- make clean
		- make wipe
		- make -j
		- echo "Running make with gnu compilers version 12..."
		- cd ..
		@@ -57,7 +57,7 @@ compatibility_stage:
		- cd build_gnu12
		- cp -r ../build/* .
		- CXX=g++-12 F77=gfortran-12 ./configure
		- make clean
		- make wipe
		- make -j
		- echo "Running make with gnu compilers version 13..."
		- cd ..
		@@ -66,7 +66,7 @@ compatibility_stage:
		- cd build_gnu13
		- cp -r ../build/* .
		- CXX=g++-13 F77=gfortran-13 ./configure
		- make clean
		- make wipe
		- make -j
		- echo "Running make with gnu compilers version 14..."
		- cd ..
		@@ -75,7 +75,7 @@ compatibility_stage:
		- cd build_gnu14
		- cp -r ../build/* .
		- CXX=g++-14 F77=gfortran-14 ./configure
		- make clean
		- make wipe
		- make -j
		- echo "Running make with refinement with gnu compilers version 14..."
		- cd ..
		@@ -84,7 +84,7 @@ compatibility_stage:
		- cd build_gnu14_refine
		- cp -r ../build/* .
		- CXX=g++-14 F77=gfortran-14 ./configure --enable-refinement
		- make clean
		- make wipe
		- make -j
		- echo "Running make with flang version 16 and clang version 16..."
		- cd ..
		@@ -92,8 +92,8 @@ compatibility_stage:
		- mkdir build_clang16
		- cd build_clang16
		- cp -r ../build/* .
		- CXX=clang++-16 F77=flang-new-16 ./configure --with-fflags="-O3" --with-include="-I/usr/include/c++/13 -I/usr/include/x86_64-linux-gnu/c++/13" --with-ldflags="-L/usr/lib/llvm-16/lib -L/usr/lib/gcc/x86_64-linux-gnu/13" --disable-openmp
		- make clean
		- CXX=clang++-16 F77=flang-new-16 ./configure --with-fflags="-O3 -std=legacy" --with-include="-I/usr/include/c++/13 -I/usr/include/x86_64-linux-gnu/c++/13" --with-ldflags="-L/usr/lib/llvm-16/lib -L/usr/lib/gcc/x86_64-linux-gnu/13" --disable-openmp
		- make wipe
		- make -j
		- echo "Running make with flang version 17 and clang version 17..."
		- cd ..
		@@ -101,8 +101,8 @@ compatibility_stage:
		- mkdir build_clang17
		- cd build_clang17
		- cp -r ../build/* .
		- CXX=clang++-17 F77=flang-new-17 ./configure --with-fflags="-O3" --with-include="-I/usr/include/c++/13 -I/usr/include/x86_64-linux-gnu/c++/13" --with-ldflags="-L/usr/lib/llvm-17/lib -L/usr/lib/gcc/x86_64-linux-gnu/13" --disable-openmp
		- make clean
		- CXX=clang++-17 F77=flang-new-17 ./configure --with-fflags="-O3 -std=legacy" --with-include="-I/usr/include/c++/13 -I/usr/include/x86_64-linux-gnu/c++/13" --with-ldflags="-L/usr/lib/llvm-17/lib -L/usr/lib/gcc/x86_64-linux-gnu/13" --disable-openmp
		- make wipe
		- make -j
		#- echo "Running make with Intel ifort and Intel icpx..."
		- cd ..
		@@ -113,7 +113,7 @@ compatibility_stage:
		#- export LD_LIBRARY_PATH=/opt/intel/oneapi/compiler/latest/lib
		#- export PATH=/opt/intel/oneapi/compiler/latest/bin:$PATH
		#- CXX=icpx F77=ifort ./configure --with-fflags="-O3 -diag-disable=10448" --disable-openmp
		#- make clean
		#- make wipe
		#- make -j
		- echo "Running make with Intel ifx and Intel icpx..."
		#- cd ..
		@@ -123,8 +123,8 @@ compatibility_stage:
		- cp -r ../build/* .
		- export LD_LIBRARY_PATH=/opt/intel/oneapi/compiler/latest/lib
		- export PATH=/opt/intel/oneapi/compiler/latest/bin:$PATH
		- CXX=icpx F77=ifx ./configure --with-fflags="-O3" --disable-openmp
		- make clean
		- CXX=icpx F77=ifx ./configure --with-fflags="-O3 -std=legacy" --disable-openmp
		- make wipe
		- make -j

		building_stage:
		@@ -154,8 +154,8 @@ building_stage:
		- cat /etc/os-release
		- cd build
		- echo "Configuring with default compilers (MAGMA disabled)..."
		- ./configure --without-magma --disable-offload --enable-refinement
		- make clean
		- ./configure --without-magma --without-cublas --disable-offload --enable-refinement
		- make wipe
		- echo "Building the default configuration..."
		- make -j
		- echo "Building the documentation..."

build/Makefile

0 → 100644

+148 −0

Original line number	Diff line number	Diff line
		include Makefile.in

		ifeq ($(BUILDFORTRAN), yes)
		FORTRAN_OBJS=../src/cluster/clu.o ../src/cluster/edfb_clu.o ../src/inclusion/edfb_inclu.o ../src/inclusion/inclu.o ../src/sphere/edfb_sph.o ../src/sphere/sph.o ../src/trapping/frfme.o ../src/trapping/lffft.o
		FORTRAN_BINS=cluster/clu cluster/edfb_clu inclusion/edfb_inclu inclusion/inclu sphere/edfb_sph sphere/sph trapping/frfme trapping/lffft
		else
		FORTRAN_OBJS=
		FORTRAN_BINS=
		endif # BUILDFORTRAN
		ifeq ($(LIBMODE), shared)
		NPTM_LIB=libnptm/libnptm.so
		CXXFLAGSLIB=-fPIC -DPIC
		else
		NPTM_LIB=libnptm/libnptm.a
		CXXFLAGSLIB=-static
		endif # LIBMODE
		NP_LIBNPTM_SRCS=../src/libnptm/algebraic.cpp ../src/libnptm/clu_subs.cpp ../src/libnptm/Commons.cpp ../src/libnptm/Configuration.cpp ../src/libnptm/cublas_calls.cpp ../src/libnptm/file_io.cpp ../src/libnptm/inclu_subs.cpp ../src/libnptm/logging.cpp ../src/libnptm/lapack_calls.cpp ../src/libnptm/magma_calls.cpp ../src/libnptm/Parsers.cpp ../src/libnptm/sph_subs.cpp ../src/libnptm/tfrfme.cpp ../src/libnptm/tra_subs.cpp ../src/libnptm/TransitionMatrix.cpp ../src/libnptm/utils.cpp
		NP_LIBNPTM_OBJS=../src/libnptm/algebraic.o ../src/libnptm/clu_subs.o ../src/libnptm/Commons.o ../src/libnptm/Configuration.o ../src/libnptm/cublas_calls.o ../src/libnptm/file_io.o ../src/libnptm/inclu_subs.o ../src/libnptm/logging.o ../src/libnptm/lapack_calls.o ../src/libnptm/magma_calls.o ../src/libnptm/Parsers.o ../src/libnptm/sph_subs.o ../src/libnptm/tfrfme.o ../src/libnptm/tra_subs.o ../src/libnptm/TransitionMatrix.o ../src/libnptm/utils.o
		NP_CLUSTER_OBJS=../src/cluster/np_cluster.o ../src/cluster/cluster.o
		NP_CLUSTER_BINS=cluster/np_cluster
		NP_INCLUSION_OBJS=../src/inclusion/np_inclusion.o ../src/inclusion/inclusion.o
		NP_INCLUSION_BINS=inclusion/np_inclusion
		NP_SPHERE_OBJS=../src/sphere/np_sphere.o ../src/sphere/sphere.o
		NP_SPHERE_BINS=sphere/np_sphere
		NP_TRAPPING_OBJS=../src/trapping/np_trapping.o ../src/trapping/cfrfme.o ../src/trapping/clffft.o
		NP_TRAPPING_BINS=trapping/np_trapping
		NP_TESTING_OBJS=../src/testing/test_ParticleDescriptor.o ../src/testing/test_TEDF.o ../src/testing/test_TTMS.o
		NP_TESTING_BINS=testing/test_ParticleDescriptor testing/test_TEDF testing/test_TTMS

		all: $(NPTM_LIB) $(FORTRAN_BINS) $(NP_CLUSTER_BINS) $(NP_INCLUSION_BINS) $(NP_SPHERE_BINS) $(NP_TRAPPING_BINS) $(NP_TESTING_BINS)

		libnptm/libnptm.a: $(NP_LIBNPTM_OBJS)
		$(AR) $(ARFLAGS) $@ $(NP_LIBNPTM_OBJS)

		libnptm/libnptm.so: $(NP_LIBNPTM_OBJS)
		$(CXX) $(CXXFLAGS) $(NP_LIBNPTM_OBJS) -shared -o $@ $(CXXLDFLAGS)
		chmod ugo-x $@

		cluster/clu: ../src/cluster/clu.o
		$(FC) $(FCFLAGS) $? -o $@

		cluster/edfb_clu: ../src/cluster/edfb_clu.o
		$(FC) $(FCFLAGS) $? -o $@

		cluster/np_cluster: $(NPTM_LIB) $(NP_CLUSTER_OBJS)
		$(CXX) $(CXXFLAGS) $(NP_CLUSTER_OBJS) -o $@ $(CXXLDFLAGS)

		inclusion/edfb_inclu: ../src/inclusion/edfb_inclu.o
		$(FC) $(FCFLAGS) $? -o $@

		inclusion/inclu: ../src/inclusion/inclu.o
		$(FC) $(FCFLAGS) $? -o $@

		inclusion/np_inclusion: $(NPTM_LIB) $(NP_INCLUSION_OBJS)
		$(CXX) $(CXXFLAGS) $(NP_INCLUSION_OBJS) -o $@ $(CXXLDFLAGS)

		sphere/edfb_sph: ../src/sphere/edfb_sph.o
		$(FC) $(FCFLAGS) $? -o $@

		sphere/sph: ../src/sphere/sph.o
		$(FC) $(FCFLAGS) $? -o $@

		sphere/np_sphere: $(NPTM_LIB) $(NP_SPHERE_OBJS)
		$(CXX) $(CXXFLAGS) $(NP_SPHERE_OBJS) -o $@ $(CXXLDFLAGS)

		trapping/frfme: ../src/trapping/frfme.o
		$(FC) $(FCFLAGS) $? -o $@

		trapping/lffft: ../src/trapping/lffft.o
		$(FC) $(FCFLAGS) $? -o $@

		trapping/np_trapping: $(NPTM_LIB) $(NP_TRAPPING_OBJS)
		$(CXX) $(CXXFLAGS) $(NP_TRAPPING_OBJS) -o $@ $(CXXLDFLAGS)

		testing/test_ParticleDescriptor: $(NPTM_LIB) ../src/testing/test_ParticleDescriptor.o
		$(CXX) $(CXXFLAGS) ../src/testing/test_ParticleDescriptor.o -o $@ $(CXXLDFLAGS)

		testing/test_TEDF: $(NPTM_LIB) ../src/testing/test_TEDF.o
		$(CXX) $(CXXFLAGS) ../src/testing/test_TEDF.o -o $@ $(CXXLDFLAGS)

		testing/test_TTMS: $(NPTM_LIB) ../src/testing/test_TTMS.o
		$(CXX) $(CXXFLAGS) ../src/testing/test_TTMS.o -o $@ $(CXXLDFLAGS)

		../src/cluster/clu.o: ../src/cluster/clu.f
		$(FC) $(FCFLAGS) -c $? -o $@

		../src/cluster/edfb_clu.o: ../src/cluster/edfb_clu.f
		$(FC) $(FCFLAGS) -c $? -o $@

		../src/cluster/np_cluster.o: ../src/cluster/np_cluster.cpp
		$(CXX) $(CXXFLAGS) -c $< -o $@

		../src/cluster/cluster.o: ../src/cluster/cluster.cpp
		$(CXX) $(CXXFLAGS) -c $< -o $@

		../src/inclusion/edfb_inclu.o: ../src/inclusion/edfb_inclu.f
		$(FC) $(FCFLAGS) -c $? -o $@

		../src/inclusion/inclu.o: ../src/inclusion/inclu.f
		$(FC) $(FCFLAGS) -c $? -o $@

		../src/inclusion/np_inclusion.o: ../src/inclusion/np_inclusion.cpp
		$(CXX) $(CXXFLAGS) -c $< -o $@

		../src/inclusion/inclusion.o: ../src/inclusion/inclusion.cpp
		$(CXX) $(CXXFLAGS) -c $< -o $@

		../src/sphere/edfb_sph.o: ../src/sphere/edfb_sph.f
		$(FC) $(FCFLAGS) -c $? -o $@

		../src/sphere/sph.o: ../src/sphere/sph.f
		$(FC) $(FCFLAGS) -c $? -o $@

		../src/sphere/np_sphere.o: ../src/sphere/np_sphere.cpp
		$(CXX) $(CXXFLAGS) -c $< -o $@

		../src/sphere/sphere.o: ../src/sphere/sphere.cpp
		$(CXX) $(CXXFLAGS) -c $< -o $@

		../src/trapping/frfme.o: ../src/trapping/frfme.f
		$(FC) $(FCFLAGS) -c $? -o $@

		../src/trapping/lffft.o: ../src/trapping/lffft.f
		$(FC) $(FCFLAGS) -c $? -o $@

		../src/trapping/np_trapping.o: ../src/trapping/np_trapping.cpp
		$(CXX) $(CXXFLAGS) -c $< -o $@

		../src/trapping/cfrfme.o: ../src/trapping/cfrfme.cpp
		$(CXX) $(CXXFLAGS) -c $< -o $@

		../src/trapping/clffft.o: ../src/trapping/clffft.cpp
		$(CXX) $(CXXFLAGS) -c $< -o $@

		../src/libnptm/%.o: ../src/libnptm/%.cpp
		$(CXX) $(CXXFLAGS) $(CXXFLAGSLIB) -c $< -o $@

		../src/testing/%.o: ../src/testing/%.cpp
		$(CXX) $(CXXFLAGS) -c $< -o $@

		.PHONY: clean wipe

		clean:
		rm -rf $(FORTRAN_OBJS) $(NP_LIBNPTM_OBJS) $(NP_CLUSTER_OBJS) $(NP_INCLUSION_OBJS) $(NP_SPHERE_OBJS) $(NP_TRAPPING_OBJS) $(NP_TESTING_OBJS)

		wipe:
		rm -rf $(FORTRAN_OBJS) $(NP_LIBNPTM_OBJS) $(NP_CLUSTER_OBJS) $(NP_INCLUSION_OBJS) $(NP_SPHERE_OBJS) $(NP_TRAPPING_OBJS) $(NP_TESTING_OBJS)
		rm -rf $(FORTRAN_BINS) $(NPTM_LIB) $(NP_CLUSTER_BINS) $(NP_INCLUSION_BINS) $(NP_SPHERE_BINS) $(NP_TRAPPING_BINS) $(NP_TESTING_BINS)

build/Makefile.am→build/Makefile_am.bak

+2 −2

Original line number	Diff line number	Diff line
		LDADD=libnptm/libnptm.la -L/usr/lib64 ${USER_LDFLAGS} ${HDF5_LDFLAGS} ${LAPACKLDFLAGS} ${BLASLDFLAGS} ${MAGMALDFLAGS}
		LDADD=libnptm/libnptm.la -L/usr/lib64 ${USER_LDFLAGS} ${HDF5_LDFLAGS} ${LAPACKLDFLAGS} ${BLASLDFLAGS} ${CUBLASLDFLAGS} ${MAGMALDFLAGS}
		lib_LTLIBRARIES=libnptm/libnptm.la
		libnptm_libnptm_la_SOURCES=../src/libnptm/algebraic.cpp ../src/libnptm/clu_subs.cpp ../src/libnptm/Commons.cpp ../src/libnptm/Configuration.cpp ../src/libnptm/file_io.cpp ../src/libnptm/inclu_subs.cpp ../src/libnptm/lapack_calls.cpp ../src/libnptm/logging.cpp ../src/libnptm/magma_calls.cpp ../src/libnptm/Parsers.cpp ../src/libnptm/sph_subs.cpp ../src/libnptm/utils.cpp ../src/libnptm/tfrfme.cpp ../src/libnptm/TransitionMatrix.cpp ../src/libnptm/tra_subs.cpp
		libnptm_libnptm_la_SOURCES=../src/libnptm/algebraic.cpp ../src/libnptm/clu_subs.cpp ../src/libnptm/Commons.cpp ../src/libnptm/Configuration.cpp ../src/libnptm/file_io.cpp ../src/libnptm/inclu_subs.cpp ../src/libnptm/lapack_calls.cpp ../src/libnptm/logging.cpp ../src/libnptm/magma_calls.cpp ../src/libnptm/cublas_calls.cpp ../src/libnptm/Parsers.cpp ../src/libnptm/sph_subs.cpp ../src/libnptm/utils.cpp ../src/libnptm/tfrfme.cpp ../src/libnptm/TransitionMatrix.cpp ../src/libnptm/tra_subs.cpp
		if BUILDFORTRAN
		PROGS=cluster/edfb_clu cluster/clu cluster/np_cluster inclusion/edfb_inclu inclusion/inclu inclusion/np_inclusion sphere/edfb_sph sphere/sph sphere/np_sphere trapping/frfme trapping/lffft trapping/np_trapping testing/test_ParticleDescriptor testing/test_TEDF testing/test_TTMS
		bin_PROGRAMS=$(PROGS)

build/Makefile.in→build/Makefile_in.bak

+33 −20

Original line number	Diff line number	Diff line
		@@ -162,9 +162,10 @@ am_libnptm_libnptm_la_OBJECTS = ../src/libnptm/algebraic.lo \
		../src/libnptm/Configuration.lo ../src/libnptm/file_io.lo \
		../src/libnptm/inclu_subs.lo ../src/libnptm/lapack_calls.lo \
		../src/libnptm/logging.lo ../src/libnptm/magma_calls.lo \
		../src/libnptm/Parsers.lo ../src/libnptm/sph_subs.lo \
		../src/libnptm/utils.lo ../src/libnptm/tfrfme.lo \
		../src/libnptm/TransitionMatrix.lo ../src/libnptm/tra_subs.lo
		../src/libnptm/cublas_calls.lo ../src/libnptm/Parsers.lo \
		../src/libnptm/sph_subs.lo ../src/libnptm/utils.lo \
		../src/libnptm/tfrfme.lo ../src/libnptm/TransitionMatrix.lo \
		../src/libnptm/tra_subs.lo
		libnptm_libnptm_la_OBJECTS = $(am_libnptm_libnptm_la_OBJECTS)
		AM_V_lt = $(am__v_lt_@AM_V@)
		am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
		@@ -178,7 +179,8 @@ cluster_clu_LDADD = $(LDADD)
		am__DEPENDENCIES_1 =
		cluster_clu_DEPENDENCIES = libnptm/libnptm.la $(am__DEPENDENCIES_1) \
		$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
		$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
		$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
		$(am__DEPENDENCIES_1)
		am__cluster_edfb_clu_SOURCES_DIST = ../src/cluster/edfb_clu.f
		@BUILDFORTRAN_TRUE@am__objects_2 = ../src/cluster/edfb_clu.$(OBJEXT)
		@BUILDFORTRAN_TRUE@am_cluster_edfb_clu_OBJECTS = $(am__objects_2)
		@@ -187,7 +189,7 @@ cluster_edfb_clu_LDADD = $(LDADD)
		cluster_edfb_clu_DEPENDENCIES = libnptm/libnptm.la \
		$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
		$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
		$(am__DEPENDENCIES_1)
		$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
		am__cluster_np_cluster_SOURCES_DIST = ../src/cluster/np_cluster.cpp \
		../src/cluster/cluster.cpp
		@BUILDFORTRAN_FALSE@am_cluster_np_cluster_OBJECTS = \
		@@ -201,7 +203,7 @@ cluster_np_cluster_LDADD = $(LDADD)
		cluster_np_cluster_DEPENDENCIES = libnptm/libnptm.la \
		$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
		$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
		$(am__DEPENDENCIES_1)
		$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
		am__inclusion_edfb_inclu_SOURCES_DIST = ../src/inclusion/edfb_inclu.f
		@BUILDFORTRAN_TRUE@am__objects_3 = \
		@BUILDFORTRAN_TRUE@ ../src/inclusion/edfb_inclu.$(OBJEXT)
		@@ -211,7 +213,7 @@ inclusion_edfb_inclu_LDADD = $(LDADD)
		inclusion_edfb_inclu_DEPENDENCIES = libnptm/libnptm.la \
		$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
		$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
		$(am__DEPENDENCIES_1)
		$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
		am__inclusion_inclu_SOURCES_DIST = ../src/inclusion/inclu.f
		@BUILDFORTRAN_TRUE@am__objects_4 = ../src/inclusion/inclu.$(OBJEXT)
		@BUILDFORTRAN_TRUE@am_inclusion_inclu_OBJECTS = $(am__objects_4)
		@@ -220,7 +222,7 @@ inclusion_inclu_LDADD = $(LDADD)
		inclusion_inclu_DEPENDENCIES = libnptm/libnptm.la \
		$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
		$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
		$(am__DEPENDENCIES_1)
		$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
		am__inclusion_np_inclusion_SOURCES_DIST = \
		../src/inclusion/np_inclusion.cpp \
		../src/inclusion/inclusion.cpp
		@@ -235,7 +237,7 @@ inclusion_np_inclusion_LDADD = $(LDADD)
		inclusion_np_inclusion_DEPENDENCIES = libnptm/libnptm.la \
		$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
		$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
		$(am__DEPENDENCIES_1)
		$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
		am__sphere_edfb_sph_SOURCES_DIST = ../src/sphere/edfb_sph.f
		@BUILDFORTRAN_TRUE@am__objects_5 = ../src/sphere/edfb_sph.$(OBJEXT)
		@BUILDFORTRAN_TRUE@am_sphere_edfb_sph_OBJECTS = $(am__objects_5)
		@@ -244,7 +246,7 @@ sphere_edfb_sph_LDADD = $(LDADD)
		sphere_edfb_sph_DEPENDENCIES = libnptm/libnptm.la \
		$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
		$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
		$(am__DEPENDENCIES_1)
		$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
		am__sphere_np_sphere_SOURCES_DIST = ../src/sphere/np_sphere.cpp \
		../src/sphere/sphere.cpp
		@BUILDFORTRAN_FALSE@am_sphere_np_sphere_OBJECTS = \
		@@ -258,7 +260,7 @@ sphere_np_sphere_LDADD = $(LDADD)
		sphere_np_sphere_DEPENDENCIES = libnptm/libnptm.la \
		$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
		$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
		$(am__DEPENDENCIES_1)
		$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
		am__sphere_sph_SOURCES_DIST = ../src/sphere/sph.f
		@BUILDFORTRAN_TRUE@am__objects_6 = ../src/sphere/sph.$(OBJEXT)
		@BUILDFORTRAN_TRUE@am_sphere_sph_OBJECTS = $(am__objects_6)
		@@ -266,7 +268,8 @@ sphere_sph_OBJECTS = $(am_sphere_sph_OBJECTS)
		sphere_sph_LDADD = $(LDADD)
		sphere_sph_DEPENDENCIES = libnptm/libnptm.la $(am__DEPENDENCIES_1) \
		$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
		$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
		$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
		$(am__DEPENDENCIES_1)
		am__testing_test_ParticleDescriptor_SOURCES_DIST = \
		../src/testing/test_ParticleDescriptor.cpp
		@BUILDFORTRAN_FALSE@am_testing_test_ParticleDescriptor_OBJECTS = ../src/testing/test_ParticleDescriptor.$(OBJEXT)
		@@ -277,7 +280,7 @@ testing_test_ParticleDescriptor_LDADD = $(LDADD)
		testing_test_ParticleDescriptor_DEPENDENCIES = libnptm/libnptm.la \
		$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
		$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
		$(am__DEPENDENCIES_1)
		$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
		am__testing_test_TEDF_SOURCES_DIST = ../src/testing/test_TEDF.cpp
		@BUILDFORTRAN_FALSE@am_testing_test_TEDF_OBJECTS = \
		@BUILDFORTRAN_FALSE@ ../src/testing/test_TEDF.$(OBJEXT)
		@@ -288,7 +291,7 @@ testing_test_TEDF_LDADD = $(LDADD)
		testing_test_TEDF_DEPENDENCIES = libnptm/libnptm.la \
		$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
		$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
		$(am__DEPENDENCIES_1)
		$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
		am__testing_test_TTMS_SOURCES_DIST = ../src/testing/test_TTMS.cpp
		@BUILDFORTRAN_FALSE@am_testing_test_TTMS_OBJECTS = \
		@BUILDFORTRAN_FALSE@ ../src/testing/test_TTMS.$(OBJEXT)
		@@ -299,7 +302,7 @@ testing_test_TTMS_LDADD = $(LDADD)
		testing_test_TTMS_DEPENDENCIES = libnptm/libnptm.la \
		$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
		$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
		$(am__DEPENDENCIES_1)
		$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
		am__trapping_frfme_SOURCES_DIST = ../src/trapping/frfme.f
		@BUILDFORTRAN_TRUE@am__objects_7 = ../src/trapping/frfme.$(OBJEXT)
		@BUILDFORTRAN_TRUE@am_trapping_frfme_OBJECTS = $(am__objects_7)
		@@ -307,7 +310,8 @@ trapping_frfme_OBJECTS = $(am_trapping_frfme_OBJECTS)
		trapping_frfme_LDADD = $(LDADD)
		trapping_frfme_DEPENDENCIES = libnptm/libnptm.la $(am__DEPENDENCIES_1) \
		$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
		$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
		$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
		$(am__DEPENDENCIES_1)
		am__trapping_lffft_SOURCES_DIST = ../src/trapping/lffft.f
		@BUILDFORTRAN_TRUE@am__objects_8 = ../src/trapping/lffft.$(OBJEXT)
		@BUILDFORTRAN_TRUE@am_trapping_lffft_OBJECTS = $(am__objects_8)
		@@ -315,7 +319,8 @@ trapping_lffft_OBJECTS = $(am_trapping_lffft_OBJECTS)
		trapping_lffft_LDADD = $(LDADD)
		trapping_lffft_DEPENDENCIES = libnptm/libnptm.la $(am__DEPENDENCIES_1) \
		$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
		$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
		$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
		$(am__DEPENDENCIES_1)
		am__trapping_np_trapping_SOURCES_DIST = \
		../src/trapping/np_trapping.cpp ../src/trapping/cfrfme.cpp \
		../src/trapping/clffft.cpp
		@@ -332,7 +337,7 @@ trapping_np_trapping_LDADD = $(LDADD)
		trapping_np_trapping_DEPENDENCIES = libnptm/libnptm.la \
		$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
		$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
		$(am__DEPENDENCIES_1)
		$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
		AM_V_P = $(am__v_P_@AM_V@)
		am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
		am__v_P_0 = false
		@@ -358,6 +363,7 @@ am__depfiles_remade = ../src/cluster/$(DEPDIR)/cluster.Po \
		../src/libnptm/$(DEPDIR)/TransitionMatrix.Plo \
		../src/libnptm/$(DEPDIR)/algebraic.Plo \
		../src/libnptm/$(DEPDIR)/clu_subs.Plo \
		../src/libnptm/$(DEPDIR)/cublas_calls.Plo \
		../src/libnptm/$(DEPDIR)/file_io.Plo \
		../src/libnptm/$(DEPDIR)/inclu_subs.Plo \
		../src/libnptm/$(DEPDIR)/lapack_calls.Plo \
		@@ -522,6 +528,8 @@ CLANGFLAGS = @CLANGFLAGS@
		CPPFLAGS = @CPPFLAGS@
		CSCOPE = @CSCOPE@
		CTAGS = @CTAGS@
		CUBLASFLAGS = @CUBLASFLAGS@
		CUBLASLDFLAGS = @CUBLASLDFLAGS@
		CXX = @CXX@
		CXXCPP = @CXXCPP@
		CXXDEPMODE = @CXXDEPMODE@
		@@ -650,9 +658,9 @@ target_alias = @target_alias@
		top_build_prefix = @top_build_prefix@
		top_builddir = @top_builddir@
		top_srcdir = @top_srcdir@
		LDADD = libnptm/libnptm.la -L/usr/lib64 ${USER_LDFLAGS} ${HDF5_LDFLAGS} ${LAPACKLDFLAGS} ${BLASLDFLAGS} ${MAGMALDFLAGS}
		LDADD = libnptm/libnptm.la -L/usr/lib64 ${USER_LDFLAGS} ${HDF5_LDFLAGS} ${LAPACKLDFLAGS} ${BLASLDFLAGS} ${CUBLASLDFLAGS} ${MAGMALDFLAGS}
		lib_LTLIBRARIES = libnptm/libnptm.la
		libnptm_libnptm_la_SOURCES = ../src/libnptm/algebraic.cpp ../src/libnptm/clu_subs.cpp ../src/libnptm/Commons.cpp ../src/libnptm/Configuration.cpp ../src/libnptm/file_io.cpp ../src/libnptm/inclu_subs.cpp ../src/libnptm/lapack_calls.cpp ../src/libnptm/logging.cpp ../src/libnptm/magma_calls.cpp ../src/libnptm/Parsers.cpp ../src/libnptm/sph_subs.cpp ../src/libnptm/utils.cpp ../src/libnptm/tfrfme.cpp ../src/libnptm/TransitionMatrix.cpp ../src/libnptm/tra_subs.cpp
		libnptm_libnptm_la_SOURCES = ../src/libnptm/algebraic.cpp ../src/libnptm/clu_subs.cpp ../src/libnptm/Commons.cpp ../src/libnptm/Configuration.cpp ../src/libnptm/file_io.cpp ../src/libnptm/inclu_subs.cpp ../src/libnptm/lapack_calls.cpp ../src/libnptm/logging.cpp ../src/libnptm/magma_calls.cpp ../src/libnptm/cublas_calls.cpp ../src/libnptm/Parsers.cpp ../src/libnptm/sph_subs.cpp ../src/libnptm/utils.cpp ../src/libnptm/tfrfme.cpp ../src/libnptm/TransitionMatrix.cpp ../src/libnptm/tra_subs.cpp
		@BUILDFORTRAN_FALSE@PROGS = cluster/np_cluster inclusion/np_inclusion sphere/np_sphere trapping/np_trapping testing/test_ParticleDescriptor testing/test_TEDF testing/test_TTMS
		@BUILDFORTRAN_TRUE@PROGS = cluster/edfb_clu cluster/clu cluster/np_cluster inclusion/edfb_inclu inclusion/inclu inclusion/np_inclusion sphere/edfb_sph sphere/sph sphere/np_sphere trapping/frfme trapping/lffft trapping/np_trapping testing/test_ParticleDescriptor testing/test_TEDF testing/test_TTMS
		@BUILDFORTRAN_TRUE@EDFBCLUSOURCES = ../src/cluster/edfb_clu.f
		@@ -830,6 +838,8 @@ clean-libLTLIBRARIES:
		../src/libnptm/$(DEPDIR)/$(am__dirstamp)
		../src/libnptm/magma_calls.lo: ../src/libnptm/$(am__dirstamp) \
		../src/libnptm/$(DEPDIR)/$(am__dirstamp)
		../src/libnptm/cublas_calls.lo: ../src/libnptm/$(am__dirstamp) \
		../src/libnptm/$(DEPDIR)/$(am__dirstamp)
		../src/libnptm/Parsers.lo: ../src/libnptm/$(am__dirstamp) \
		../src/libnptm/$(DEPDIR)/$(am__dirstamp)
		../src/libnptm/sph_subs.lo: ../src/libnptm/$(am__dirstamp) \
		@@ -1022,6 +1032,7 @@ distclean-compile:
		@AMDEP_TRUE@@am__include@ @am__quote@../src/libnptm/$(DEPDIR)/TransitionMatrix.Plo@am__quote@ # am--include-marker
		@AMDEP_TRUE@@am__include@ @am__quote@../src/libnptm/$(DEPDIR)/algebraic.Plo@am__quote@ # am--include-marker
		@AMDEP_TRUE@@am__include@ @am__quote@../src/libnptm/$(DEPDIR)/clu_subs.Plo@am__quote@ # am--include-marker
		@AMDEP_TRUE@@am__include@ @am__quote@../src/libnptm/$(DEPDIR)/cublas_calls.Plo@am__quote@ # am--include-marker
		@AMDEP_TRUE@@am__include@ @am__quote@../src/libnptm/$(DEPDIR)/file_io.Plo@am__quote@ # am--include-marker
		@AMDEP_TRUE@@am__include@ @am__quote@../src/libnptm/$(DEPDIR)/inclu_subs.Plo@am__quote@ # am--include-marker
		@AMDEP_TRUE@@am__include@ @am__quote@../src/libnptm/$(DEPDIR)/lapack_calls.Plo@am__quote@ # am--include-marker
		@@ -1399,6 +1410,7 @@ distclean: distclean-am
		-rm -f ../src/libnptm/$(DEPDIR)/TransitionMatrix.Plo
		-rm -f ../src/libnptm/$(DEPDIR)/algebraic.Plo
		-rm -f ../src/libnptm/$(DEPDIR)/clu_subs.Plo
		-rm -f ../src/libnptm/$(DEPDIR)/cublas_calls.Plo
		-rm -f ../src/libnptm/$(DEPDIR)/file_io.Plo
		-rm -f ../src/libnptm/$(DEPDIR)/inclu_subs.Plo
		-rm -f ../src/libnptm/$(DEPDIR)/lapack_calls.Plo
		@@ -1473,6 +1485,7 @@ maintainer-clean: maintainer-clean-am
		-rm -f ../src/libnptm/$(DEPDIR)/TransitionMatrix.Plo
		-rm -f ../src/libnptm/$(DEPDIR)/algebraic.Plo
		-rm -f ../src/libnptm/$(DEPDIR)/clu_subs.Plo
		-rm -f ../src/libnptm/$(DEPDIR)/cublas_calls.Plo
		-rm -f ../src/libnptm/$(DEPDIR)/file_io.Plo
		-rm -f ../src/libnptm/$(DEPDIR)/inclu_subs.Plo
		-rm -f ../src/libnptm/$(DEPDIR)/lapack_calls.Plo