Skip to content

GitLab

S
src
Commit 595b4b83 authored by Christof Metzger-Kraus's avatar Christof Metzger-Kraus
6 Browse files
Options

All changes from project 'OPAL3D'. Couldn't keep DKS stuff in 

ParallelTTracker. Particle-Matter interaction doesn't work either at the moment.

I hope that I didn't create too much of a mess when merging!
parent dfc106b6
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 14301 additions and 14578 deletions
CMakeLists.txt
View file @ 595b4b83
CMAKE_MINIMUM_REQUIRED (VERSION 2.8.10)
PROJECT (OPAL)
SET (OPAL_VERSION_MAJOR 1)
SET (OPAL_VERSION_MINOR 5.00.2)
SET (OPAL_VERSION_MINOR 9.00)
set (PACKAGE \"opal\")
set (PACKAGE_BUGREPORT \"opal@lists.psi.ch\")
set (PACKAGE_NAME \"OPAL\")
set (PACKAGE_TARNAME \"opal\")
set (PACKAGE_VERSION "\"${OPAL_VERSION_MAJOR}.${OPAL_VERSION_MINOR}\"")
set (OPAL_VERSION "${OPAL_VERSION_MAJOR}.${OPAL_VERSION_MINOR}")
STRING (REGEX REPLACE "\\.([0-9])\\." ".0\\1." PACKAGE_VERSION ${OPAL_VERSION})
set (PACKAGE_VERSION_STR "\"${PACKAGE_VERSION}\"")
STRING (REGEX REPLACE "\\." "" PACKAGE_VERSION ${PACKAGE_VERSION})
IF (NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
SET (CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING
......@@ -61,7 +64,7 @@ set (BOOSTROOT $ENV{BOOST_DIR})
set(Boost_USE_STATIC_LIBS ON)
set(Boost_USE_MULTITHREADED OFF)
set(Boost_USE_STATIC_RUNTIME OFF)
find_package (Boost 1.55.0 REQUIRED COMPONENTS regex filesystem system)
find_package (Boost 1.54.0 REQUIRED COMPONENTS regex filesystem system iostreams)
if (Boost_INCLUDE_DIRS)
message (STATUS "Found boost include dir: ${Boost_INCLUDE_DIR}")
message (STATUS "Found boost library dir: ${Boost_LIBRARY_DIR}")
......@@ -85,7 +88,7 @@ IF (ENABLE_DKS)
### CUDA compiler flags ###
SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -lcudart -lcufft -lcublas -lnvToolsExt -DDKS_CUDA")
### if any accelerator enabled set flag to use DKS ###
SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DIPPL_DKS -DIPPL_DKS_CUDA -DOPAL_DKS")
ENDIF (ENABLE_DKS)
......@@ -105,6 +108,11 @@ OPTION (NOCPLUSPLUS11_NULLPTR "Disable C++11 nullptr support" OFF)
OPTION (NO_FIELD_ASSIGN_OPTIMIZATION "Disable compiler optimization of IPPL field assignment" OFF)
IF (BUILD_OPAL_UNIT_TESTS)
FIND_PACKAGE (GTest REQUIRED)
SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DWITH_UNIT_TESTS")
ENDIF (BUILD_OPAL_UNIT_TESTS)
IF (USE_H5HUT2)
SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSE_H5HUT2")
ENDIF (USE_H5HUT2)
......@@ -161,8 +169,8 @@ STRING(REGEX MATCH "[^0-9]*" HOSTNAME_BASE "${HOSTNAME}")
# cray-tpsl/16.06.1 libraries -> Linker error.
# We can avoid this issue by not going into the if-statement
if (NOT ${HOSTNAME_BASE} MATCHES "edison" AND NOT ${HOSTNAME_BASE} MATCHES "cori" AND (ENABLE_SAAMG_SOLVER OR ENABLE_AMR_SOLVER) )
MESSAGE ("Enable SAAMG_SOLVER " ${ENABLE_SAAMG_SOLVER})
MESSAGE ("Enable AMR_SOLVER " ${ENABLE_AMR_SOLVER})
MESSAGE (STATUS "Enable SAAMG_SOLVER " ${ENABLE_SAAMG_SOLVER})
MESSAGE (STATUS "Enable AMR_SOLVER " ${ENABLE_AMR_SOLVER})
find_package (Trilinos REQUIRED HINTS $ENV{TRILINOS_PREFIX} $ENV{TRILINOS_DIR} $ENV{TRILINOS})
message (STATUS "Found Trilinos: ${Trilinos_DIR}")
......@@ -237,6 +245,8 @@ ENDIF()
SET (IPPL_USED_FROM_OPAL "TRUE")
ADD_SUBDIRECTORY (ippl)
ADD_SUBDIRECTORY (src)
ADD_SUBDIRECTORY (tools)
ADD_SUBDIRECTORY (doc/user_guide)
IF (BUILD_OPAL_UNIT_TESTS)
ADD_SUBDIRECTORY(tests)
......@@ -249,4 +259,4 @@ set(OPAL_CXX_FLAGS ${OPAL_CXX_FLAGS}
set(OPAL_LIBS ${OPAL_LIBS}
CACHE INTERNAL "" FORCE
)
)
\ No newline at end of file
CMakeModules/CCSEOptions.cmake
View file @ 595b4b83
......@@ -21,7 +21,7 @@ elseif(FortranCInterface_GLOBAL_SUFFIX STREQUAL "_" AND FortranCInterface_GLOBAL
# message(STATUS " Fortran name mangling scheme to UNDERSCORE (lower case, append underscore)")
set(BL_FORTLINK "UNDERSCORE")
#else()
# message(AUTHOR_WARNING "Fortran to C mangling not backward compatible with older style BoxLib code")
# message(AUTHOR_WARNING "Fortran to C mangling not backward compatible with older style BoxLib code")
endif()
set(BL_MACHINE ${CMAKE_SYSTEM_NAME})
......
CMakeModules/FindCCSE.cmake
View file @ 595b4b83
......@@ -6,7 +6,7 @@
# Control the search through CCSE_DIR or setting environment variable
# CCSE_ROOT to the ccse installation prefix.
#
# This module does not search default paths!
# This module does not search default paths!
#
# Following variables are set:
# CCSE_FOUND (BOOL) Flag indicating if CCSE was found
......@@ -46,12 +46,12 @@ else(CCSE_LIBRARIES AND CCSE_INCLUDE_DIRS AND CCSE_PERL_DIR)
if(CCSE_LIBRARY_DIR)
set(CCSE_LIBRARY_DIR "${CCSE_LIBRARY_DIR}" CACHE PATH "Path to search for CCSE library files")
endif()
if(CCSE_PERL_DIR)
set(CCSE_PERL_DIR "${CCSE_PERL_DIR}" CACHE PATH "Path to search for CCSE perl scripts")
endif()
# Search for include files
# Search order preference:
# (1) CCSE_INCLUDE_DIR - check existence of path AND if the include files exist
......@@ -77,7 +77,7 @@ else(CCSE_LIBRARIES AND CCSE_INCLUDE_DIRS AND CCSE_PERL_DIR)
set(CCSE_INCLUDE_DIR "CCSE_INCLUDE_DIR-NOTFOUND")
endif()
else()
else()
set(ccse_inc_suffixes "include")
if(CCSE_DIR)
......@@ -93,7 +93,7 @@ else(CCSE_LIBRARIES AND CCSE_INCLUDE_DIRS AND CCSE_PERL_DIR)
else()
message(SEND_ERROR "CCSE_DIR=${CCSE_DIR} does not exist")
set(CCSE_INCLUDE_DIR "CCSE_INCLUDE_DIR-NOTFOUND")
endif()
endif()
else()
......@@ -112,7 +112,7 @@ else(CCSE_LIBRARIES AND CCSE_INCLUDE_DIRS AND CCSE_PERL_DIR)
set(CCSE_INCLUDE_DIRS ${CCSE_INCLUDE_DIR})
endif()
# Search for libraries
# Search for libraries
# Search order preference:
# (1) CCSE_LIBRARY_DIR - check existence of path AND if the include files exist
# (2) CCSE_DIR/<lib,Lib>
......@@ -132,7 +132,7 @@ else(CCSE_LIBRARIES AND CCSE_INCLUDE_DIRS AND CCSE_PERL_DIR)
set(CCSE_LIBRARY "CCSE_LIBRARY-NOTFOUND")
endif()
else()
else()
if(CCSE_DIR)
......@@ -148,7 +148,7 @@ else(CCSE_LIBRARIES AND CCSE_INCLUDE_DIRS AND CCSE_PERL_DIR)
else()
message(SEND_ERROR "CCSE libs not found in CCSE_DIR/lib${CCSE_LIBDIR_MPI_SUFFIX}${CCSE_LIBDIR_OMP_SUFFIX}, (CCSE_DIR=${CCSE_DIR})")
set(CCSE_LIBRARY "CCSE_LIBRARY-NOTFOUND")
endif()
endif()
else()
......@@ -156,7 +156,7 @@ else(CCSE_LIBRARIES AND CCSE_INCLUDE_DIRS AND CCSE_PERL_DIR)
NAMES ${ccse_lib_name})
get_filename_component(CCSE_LIBRARY_DIR "${CCSE_LIBRARY}" PATH)
endif()
endif()
......@@ -199,7 +199,7 @@ else(CCSE_LIBRARIES AND CCSE_INCLUDE_DIRS AND CCSE_PERL_DIR)
set(CCSE_PERL "CCSE_PERL-NOTFOUND")
endif()
else()
else()
if(CCSE_DIR)
......@@ -214,7 +214,7 @@ else(CCSE_LIBRARIES AND CCSE_INCLUDE_DIRS AND CCSE_PERL_DIR)
message(SEND_ERROR "CCSE Perl scripts not in CCSE_DIR/perl=${CCSE_DIR}/perl")
else()
set(CCSE_PERL_DIR ${CCSE_PERL})
endif()
endif()
else()
......@@ -230,7 +230,7 @@ else(CCSE_LIBRARIES AND CCSE_INCLUDE_DIRS AND CCSE_PERL_DIR)
set(CCSE_EXT_LIBRARIES "")
endif(CCSE_LIBRARIES AND CCSE_INCLUDE_DIRS AND CCSE_PERL_DIR)
endif(CCSE_LIBRARIES AND CCSE_INCLUDE_DIRS AND CCSE_PERL_DIR)
# Send useful message if everything is found
find_package_handle_standard_args(CCSE DEFAULT_MSG
......
Doxyfile
View file @ 595b4b83
......@@ -765,7 +765,8 @@ WARN_LOGFILE =
# Note: If this tag is empty the current directory is searched.
INPUT = ./src \
./ippl
./src/Classic \
./ippl/src
# This tag can be used to specify the character encoding of the source files
# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
......@@ -994,7 +995,6 @@ USE_HTAGS = NO
# The default value is: YES.
VERBATIM_HEADERS = YES
#---------------------------------------------------------------------------
# Configuration options related to the alphabetical class index
#---------------------------------------------------------------------------
......@@ -1772,7 +1772,6 @@ RTF_EXTENSIONS_FILE =
# classes and files.
# The default value is: NO.
GENERATE_MAN = NO
# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
......@@ -1836,7 +1835,7 @@ XML_OUTPUT = xml
XML_PROGRAMLISTING = YES
#---------------------------------------------------------------------------
# Configuration options related to the DOCBOOK output
# Configuration options for the AutoGen Definitions output
#---------------------------------------------------------------------------
# If the GENERATE_DOCBOOK tag is set to YES doxygen will generate Docbook files
......@@ -1983,7 +1982,7 @@ EXPAND_AS_DEFINED =
SKIP_FUNCTION_MACROS = YES
#---------------------------------------------------------------------------
# Configuration options related to external references
# Configuration additions related to external references
#---------------------------------------------------------------------------
# The TAGFILES tag can be used to specify one or more tag files. For each tag
......@@ -2326,4 +2325,4 @@ GENERATE_LEGEND = YES
# The default value is: YES.
# This tag requires that the tag HAVE_DOT is set to YES.
DOT_CLEANUP = YES
DOT_CLEANUP = YES
\ No newline at end of file
README.md
View file @ 595b4b83
OPAL
\ No newline at end of file
OPAL
\ No newline at end of file
hooks/post-applypatch
View file @ 595b4b83
......@@ -6,8 +6,7 @@ echo "#define GIT_VERSION \"$REV\"" > revision.tmp
diff revision.tmp src/revision.h 2>&1 > /dev/null
if [ $? -eq 1 ];then
cp revision.tmp src/revision.h
mv revision.tmp classic/5.0/src/revision.h
mv revision.tmp src/revision.h
else
rm revision.tmp
fi
\ No newline at end of file
hooks/post-checkout
View file @ 595b4b83
......@@ -6,8 +6,7 @@ echo "#define GIT_VERSION \"$REV\"" > revision.tmp
diff revision.tmp src/revision.h 2>&1 > /dev/null
if [ $? -eq 1 ];then
cp revision.tmp src/revision.h
mv revision.tmp classic/5.0/src/revision.h
mv revision.tmp src/revision.h
else
rm revision.tmp
fi
\ No newline at end of file
hooks/post-commit
View file @ 595b4b83
......@@ -6,8 +6,7 @@ echo "#define GIT_VERSION \"$REV\"" > revision.tmp
diff revision.tmp src/revision.h 2>&1 > /dev/null
if [ $? -eq 1 ];then
cp revision.tmp src/revision.h
mv revision.tmp classic/5.0/src/revision.h
mv revision.tmp src/revision.h
else
rm revision.tmp
fi
\ No newline at end of file
hooks/post-merge
View file @ 595b4b83
......@@ -6,8 +6,7 @@ echo "#define GIT_VERSION \"$REV\"" > revision.tmp
diff revision.tmp src/revision.h 2>&1 > /dev/null
if [ $? -eq 1 ];then
cp revision.tmp src/revision.h
mv revision.tmp classic/5.0/src/revision.h
mv revision.tmp src/revision.h
else
rm revision.tmp
fi
\ No newline at end of file
ippl/CMakeLists.txt
View file @ 595b4b83
......@@ -76,7 +76,7 @@ IF (ENABLE_DKS)
### CUDA compiler flags ###
SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -lcudart -lcufft -lcublas -lnvToolsExt -DDKS_CUDA")
### if any accelerator enabled set flag to use DKS ###
SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DIPPL_DKS -DIPPL_DKS_CUDA -DOPAL_DKS")
ENDIF (ENABLE_DKS)
......@@ -99,19 +99,19 @@ OPTION (NO_FIELD_ASSIGN_OPTIMIZATION "Disable compiler optimization of IPPL fiel
IF (ENABLE_AMR_SOLVER)
# set specific parameters for BoxLib used in OPAL
ENABLE_LANGUAGE (Fortran)
SET ( CCSE_DIR $ENV{BOXLIB_PREFIX} )
SET ( CCSE_LIBRARY_DIR $ENV{BOXLIB_LIBRARY_DIR} )
FIND_PACKAGE (CCSE REQUIRED)
IF (CCSE_FOUND)
MESSAGE (STATUS "Found BoxLib include dir: ${CCSE_INCLUDE_DIR}")
MESSAGE (STATUS "Found BoxLib library dir: ${CCSE_LIBRARY_DIR}")
MESSAGE (STATUS "Found BoxLib perl dir: ${CCSE_PERL_DIR}")
INCLUDE_DIRECTORIES (${CCSE_INCLUDE_DIR})
ENDIF (CCSE_FOUND)
SET (BL_SPACEDIM 3 CACHE INT "Dimension of BoxLib build")
SET (ENABLE_MPI 1 CACHE INT "Enable build with MPI")
SET (ENABLE_OpenMP 0 CACHE INT "Enable build with OpenMP")
......@@ -119,10 +119,10 @@ IF (ENABLE_AMR_SOLVER)
SET (BL_USE_PARTICLES 1 CACHE INT "Include Particles classes in BoxLib build")
SET (ENABLE_PROFILING 0 CACHE INT "Include profiling information in BoxLib build")
SET (ENABLE_BACKTRACE 0 CACHE INT "Include backtrace information in BoxLib build")
# disable due to BoxLib
SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-variable")
SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBL_PRECISION=${BL_PRECISION}")
SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_MPI=${ENABLE_MPI}")
SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_OpenMP=${ENABLE_OpenMP}")
......@@ -130,7 +130,7 @@ IF (ENABLE_AMR_SOLVER)
SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBL_DEBUG=${BL_DEBUG}")
SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_BACKTRACE=${ENABLE_BACKTRACE}")
SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_PROFILING=${ENABLE_PROFILING}")
MESSAGE (STATUS "Use following BoxLib settings:")
MESSAGE (STATUS " BL_SPACEDIM = ${BL_SPACEDIM} (INT: 1, 2, 3)")
MESSAGE (STATUS " BL_MACHINE = ${BL_MACHINE} (STRING: <ARCH>)")
......@@ -217,8 +217,8 @@ ENDIF()
SET (IPPL_USED_FROM_OPAL "TRUE")
ADD_SUBDIRECTORY (ippl)
ADD_SUBDIRECTORY (classic/5.0/src)
ADD_SUBDIRECTORY (src)
#ADD_SUBDIRECTORY (classic/5.0/src)
#ADD_SUBDIRECTORY (src)
IF (BUILD_OPAL_UNIT_TESTS)
ADD_SUBDIRECTORY(tests)
......@@ -279,45 +279,6 @@ SET (IPPL_CXX_FLAGS
"-DIPPL_MPI -DMPICH_SKIP_MPICXX -DIPPL_DONT_POOL -DIPPL_USE_XDIV_RNG -DPETE_BITWISE_COPY -DIPPL_HAS_TEMPLATED_COMPLEX -DIPPL_USE_PARTIAL_SPECIALIZATION -Drestrict=__restrict__ -DNOCTAssert ${IPPL_CXX_FLAGS}"
)
### CXX_FLAGS common to all compilers and platforms which ###
### may *not* be written to the configure file ###
SET (OTHER_CXX_FLAGS
......@@ -443,4 +404,4 @@ IF (LINUXGCC)
RENAME ${PROJECT_NAME}Config.cmake
)
ENDIF (NOT IPPL_USED_FROM_OPAL)
ENDIF (NOT IPPL_USED_FROM_OPAL)
\ No newline at end of file
ippl/doc/tex/introduction.tex
View file @ 595b4b83
This diff is collapsed.
ippl/doc/tex/ippl_particles.tex
View file @ 595b4b83
This diff is collapsed.
ippl/doc/tex/ippl_setup.tex
View file @ 595b4b83
......@@ -61,7 +61,7 @@ The argument to the macro is then given to the associated \texttt{Inform} object
\subsection{Timer Class}
Timer is used to perform simple timings within a program for use in, e.g., benchmarking. It tracks real (clock) time elapsed, user time, and system time. It acts essentially as a stopwatch:
initially it is stopped, and YOU tell it to stop and start with method calls. The Timer constructor takes no arguments; you create a new Timer object, and use the following methods:
initially it is stopped, and YOU tell it to stop and start with method calls. The Timer constructor takes no arguments; you create a new Timer object, and use the following methods:
\begin{smallcode}
//Start the clock running. Time only accumulates in the Timer when it is running.
void start()
......
ippl/src/AppTypes/CMakeLists.txt
View file @ 595b4b83
......@@ -23,7 +23,7 @@ INCLUDE_DIRECTORIES (
${CMAKE_CURRENT_SOURCE_DIR}
)
ADD_SOURCES (${_SRCS})
ADD_HEADERS (${_HDRS})
ADD_IPPL_SOURCES (${_SRCS})
ADD_IPPL_HEADERS (${_HDRS})
INSTALL (FILES ${_HDRS} DESTINATION include/AppTypes)
ippl/src/AppTypes/Vektor.h
View file @ 595b4b83
......@@ -195,41 +195,29 @@ private:
template<class T, unsigned D>
typename Vektor<T,D>::Element_t& Vektor<T,D>::operator[](unsigned int i)
{
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Warray-bounds"
PAssert (i<D);
return X[i];
#pragma GCC diagnostic pop
}
template<class T, unsigned D>
typename Vektor<T,D>::Element_t Vektor<T,D>::operator[](unsigned int i) const
{
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Warray-bounds"
PAssert (i<D);
return X[i];
#pragma GCC diagnostic pop
}
template<class T, unsigned D>
typename Vektor<T,D>::Element_t& Vektor<T,D>::operator()(unsigned int i)
{
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Warray-bounds"
PAssert (i<D);
return X[i];
#pragma GCC diagnostic pop
}
template<class T, unsigned D>
typename Vektor<T,D>::Element_t Vektor<T,D>::operator()( unsigned int i) const
{
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Warray-bounds"
PAssert (i<D);
return X[i];
#pragma GCC diagnostic pop
}
//////////////////////////////////////////////////////////////////////
......@@ -318,4 +306,4 @@ inline std::ostream& operator<<(std::ostream& out, const Vektor<T,D>& rhs)
* $RCSfile: Vektor.h,v $ $Author: adelmann $
* $Revision: 1.1.1.1 $ $Date: 2003/01/23 07:40:24 $
* IPPL_VERSION_ID: $Id: Vektor.h,v 1.1.1.1 2003/01/23 07:40:24 adelmann Exp $
***************************************************************************/
***************************************************************************/
\ No newline at end of file
ippl/src/CMakeLists.txt
View file @ 595b4b83
......@@ -35,11 +35,7 @@ SET (IPPL_COMPILE_DATE \"${DATE_OUT}\")
SET (IPPL_COMPILE_MACHINE \"${UNAME_OUT}\")
SET (IPPL_COMPILE_OPTIONS \"${CXXDEFINES}\")
SET (IPPL_COMPILE_USER \"${WHOAMI_OUT}\")
EXECUTE_PROCESS (
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
COMMAND bin/findFiles.sh
OUTPUT_VARIABLE IPPL_VERSION_LOG
)
CONFIGURE_FILE (IpplVersions.h.in ${CMAKE_CURRENT_SOURCE_DIR}/IpplVersions.h)
### print the compiler flags #############################
......@@ -87,7 +83,7 @@ SET (IPPL_SRCS_FORT
)
SET (IPPL_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR})
MACRO (ADD_SOURCES )
MACRO (ADD_IPPL_SOURCES )
FILE (RELATIVE_PATH _relPath "${IPPL_SRC_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
FOREACH (_src ${ARGN})
IF (_relPath)
......@@ -102,7 +98,7 @@ MACRO (ADD_SOURCES )
ENDIF ()
ENDMACRO ()
MACRO (ADD_HEADERS )
MACRO (ADD_IPPL_HEADERS )
FILE (RELATIVE_PATH _relPath "${IPPL_SRC_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
FOREACH (_hdr ${ARGN})
IF (_relPath)
......@@ -121,7 +117,7 @@ SET (IPPL_BASEDIR_HDRS
Ippl.h
IpplVersions.h
)
ADD_HEADERS (${IPPL_BASEDIR_HDRS})
ADD_IPPL_HEADERS (${IPPL_BASEDIR_HDRS})
ADD_SUBDIRECTORY (AppTypes)
ADD_SUBDIRECTORY (DataSource)
......@@ -160,7 +156,7 @@ ADD_LIBRARY ( ippl ${IPPL_SRCS} ${IPPL_SRCS_FORT} )
IF (ENABLE_DKS)
#TARGET_LINK_LIBRARIES(ippl dks)
TARGET_LINK_LIBRARIES(ippl ${DKS_LIBRARY_DIR}/libdks.a -lgfortran)
TARGET_LINK_LIBRARIES(ippl ${DKS_LIBRARY_DIR}/libdks.a -lgfortran)
ELSE ()
TARGET_LINK_LIBRARIES(ippl -lgfortran)
ENDIF (ENABLE_DKS)
......
ippl/src/DataSource/CMakeLists.txt
View file @ 595b4b83
......@@ -35,7 +35,7 @@ INCLUDE_DIRECTORIES (
${CMAKE_CURRENT_SOURCE_DIR}
)
ADD_SOURCES (${_SRCS})
ADD_HEADERS (${_HDRS})
ADD_IPPL_SOURCES (${_SRCS})
ADD_IPPL_HEADERS (${_HDRS})
INSTALL (FILES ${_HDRS} DESTINATION include/DataSource)
ippl/src/DataSource/FilePtclBaseDataSource.h
View file @ 595b4b83
......@@ -2,7 +2,7 @@
/***************************************************************************
*