Commit 2d9702c7 authored by Dave Moxey's avatar Dave Moxey

Update descriptions of packages

parent a29bcd41
......@@ -27,16 +27,14 @@ execute_process(COMMAND rpm --eval %{_arch}
MACRO(CONSTRUCT_DEBIAN_DEPS depends outvar)
SET(${outvar} "")
#MESSAGE(STATUS ${NEKTAR_LIBS})
FOREACH (pkg ${depends})
STRING(TOLOWER ${pkg} pkg_lower)
LIST(FIND NEKTAR_LIBS ${pkg_lower} islib)
IF(islib EQUAL -1)
SET(${outvar} "${DEB_DEPS}, nektar++-${pkg_lower} (>= ${NEKTAR_VERSION})")
SET(${outvar} "${${outvar}}, nektar++-${pkg_lower} (>= ${NEKTAR_VERSION})")
ELSE()
SET(${outvar} "${DEB_DEPS}, libnektar++-${pkg_lower} (>= ${NEKTAR_VERSION})")
SET(${outvar} "${${outvar}}, libnektar++-${pkg_lower} (>= ${NEKTAR_VERSION})")
ENDIF()
ENDFOREACH()
......@@ -47,7 +45,7 @@ MACRO(CONSTRUCT_DEBIAN_DEPS depends outvar)
ENDMACRO()
#
# FINALISE_CPACK_COMPONENT(name DESCRIPTION <description>)
# FINALISE_CPACK_COMPONENT(name SUMMARY <summary> DESCRIPTION <description>)
#
# Finalises the variables needed for a component (and only really a component
# containing executables) in order to be packaged by CPack. This should be
......@@ -61,13 +59,13 @@ ENDMACRO()
#
# Arguments:
# - `name`: component name.
# - `DESCRIPTION`: a brief summary of the package, which is used to describe
# the package when it is generated
# - `SUMMARY`: a brief summary of the package
# - `DESCRIPTION`: a more detailed description of the package
#
MACRO(FINALISE_CPACK_COMPONENT name)
# Don't both doing anything if we aren't building packages.
IF (NEKTAR_BUILD_PACKAGES)
CMAKE_PARSE_ARGUMENTS(COMP "" "DESCRIPTION" "" ${ARGN})
CMAKE_PARSE_ARGUMENTS(COMP "" "DESCRIPTION;SUMMARY" "" ${ARGN})
# Component names are stored as upper case in the CPack variable names.
STRING(TOUPPER ${name} COMPVAR)
......@@ -75,23 +73,27 @@ MACRO(FINALISE_CPACK_COMPONENT name)
# Set the component name to `nektar++-<name>`
SET(CPACK_COMPONENT_${COMPVAR}_DISPLAY_NAME nektar++-${name}
CACHE INTERNAL "")
SET(CPACK_COMPONENT_${COMPVAR}_DESCRIPTION ${COMP_DESCRIPTION} CACHE INTERNAL "")
SET(CPACK_COMPONENT_${COMPVAR}_DESCRIPTION ${COMP_DESCRIPTION}
CACHE INTERNAL "")
SET(CPACK_COMPONENT_${COMPVAR}_DESCRIPTION_SUMMARY ${COMP_SUMMARY}
CACHE INTERNAL "")
# Remove any duplicates from the existing CPack component dependencies
# which are set by NEKTAR_ADD_EXECUTABLE and NEKTAR_ADD_LIBRARY
SET(tmp ${CPACK_COMPONENT_${COMPVAR}_DEPENDS})
LIST(REMOVE_DUPLICATES tmp)
SET(CPACK_COMPONENT_${COMPVAR}_DEPENDS ${tmp} CACHE INTERNAL "")
SET(CPACK_COMPONENT_${COMPVAR}_DEPENDS ${tmp}
CACHE INTERNAL "")
# Construct list of Debian dependencies
CONSTRUCT_DEBIAN_DEPS(${CPACK_COMPONENT_${COMPVAR}_DEPENDS} "tmp")
SET(CPACK_DEBIAN_${COMPVAR}_PACKAGE_DEPENDS ${tmp} CACHE INTERNAL "")
CONSTRUCT_DEBIAN_DEPS("${CPACK_COMPONENT_${COMPVAR}_DEPENDS}" "tmp")
SET(CPACK_DEBIAN_${COMPVAR}_PACKAGE_DEPENDS ${tmp}
CACHE INTERNAL "")
# Other Debian details
SET(CPACK_DEBIAN_${COMPVAR}_FILE_NAME
"nektar++-${name}-${NEKTAR_VERSION}-${DPKG_ARCHITECTURE}.deb"
CACHE INTERNAL "")
ENDIF()
ENDMACRO()
......@@ -262,12 +264,14 @@ MACRO(ADD_NEKTAR_EXECUTABLE name)
LIST(APPEND tmp ${tmp2})
ENDFOREACH()
LIST(REMOVE_DUPLICATES tmp)
SET(CPACK_COMPONENT_${NEKEXE_COMPVAR}_DEPENDS ${tmp} CACHE INTERNAL "")
SET(CPACK_COMPONENT_${NEKEXE_COMPVAR}_DEPENDS ${tmp}
CACHE INTERNAL "")
ENDMACRO()
#
# ADD_NEKTAR_LIBRARY(name
# DESCRIPTION <description>
# SUMMARY <summary>
# DEPENDS dep1 dep2 ...
# SOURCES src1 src2 ...
# HEADERS head1 head2 ...)
......@@ -279,14 +283,15 @@ ENDMACRO()
#
# Arguments:
# - `name`: target name to construct
# - `DESCRIPTION`: a description of the library
# - `SUMMARY`: a brief summary of the library
# - `DESCRIPTION`: a more detailed description of the library
# - `DEPENDS`: a list of components on which this target depends on
# - `SOURCES`: a list of source files for this target
# - `HEADERS`: a list of header files for this target. These will be
# automatically put into a `dev` package.
#
MACRO(ADD_NEKTAR_LIBRARY name)
CMAKE_PARSE_ARGUMENTS(NEKLIB "" "DESCRIPTION" "DEPENDS;SOURCES;HEADERS" ${ARGN})
CMAKE_PARSE_ARGUMENTS(NEKLIB "" "DESCRIPTION;SUMMARY" "DEPENDS;SOURCES;HEADERS" ${ARGN})
ADD_LIBRARY(${name} ${NEKTAR_LIBRARY_TYPE} ${NEKLIB_SOURCES} ${NEKLIB_HEADERS})
......@@ -319,9 +324,12 @@ MACRO(ADD_NEKTAR_LIBRARY name)
# Add CPack information
SET(CPACK_COMPONENT_${NEKLIB_COMPVAR}_DISPLAY_NAME libnektar++-${NEKLIB_COMPONENT}
CACHE INTERNAL "")
SET(CPACK_COMPONENT_${NEKLIB_COMPVAR}_DISPLAY_GROUP lib CACHE INTERNAL "")
SET(CPACK_COMPONENT_${NEKLIB_COMPVAR}_DISPLAY_GROUP lib
CACHE INTERNAL "")
SET(CPACK_COMPONENT_${NEKLIB_COMPVAR}_DESCRIPTION ${NEKLIB_DESCRIPTION}
CACHE INTERNAL "")
SET(CPACK_COMPONENT_${NEKLIB_COMPVAR}_DESCRIPTION_SUMMARY ${NEKLIB_SUMMARY}
CACHE INTERNAL "")
# Debian specific information
SET(CPACK_DEBIAN_${NEKLIB_COMPVAR}_FILE_NAME
......
......@@ -19,10 +19,11 @@ SET(COLLECTIONS_HEADERS
)
ADD_NEKTAR_LIBRARY(Collections
DESCRIPTION "Nektar++ Collections library"
SOURCES ${COLLECTIONS_SOURCES}
HEADERS ${COLLECTIONS_HEADERS}
DEPENDS LocalRegions)
DEPENDS LocalRegions
SUMMARY "Nektar++ Collections library"
DESCRIPTION "This library provides efficient multi-expansion implementations of operators on the various supported regions.")
INSTALL(DIRECTORY ./
DESTINATION ${NEKTAR_INCLUDE_DIR}/Collections
......
......@@ -34,7 +34,9 @@ ADD_SUBDIRECTORY(ExtraDemos)
# Finalise demos package here, since this is the last subdirectory to be
# processed by CMake from the upper level CMakeLists.txt
FINALISE_CPACK_COMPONENT(demos DESCRIPTION "Nektar++ Demos")
FINALISE_CPACK_COMPONENT(demos
SUMMARY "Nektar++ demonstration applications"
DESCRIPTION "This package contains a number of example programs for solving simple problems using the spectral/hp element method.")
ADD_NEKTAR_TEST(Helmholtz1D_CG_P8)
ADD_NEKTAR_TEST(Helmholtz1D_CG_P8_periodic)
......
......@@ -17,7 +17,9 @@ ADD_NEKTAR_EXECUTABLE(SteadyLinearAdvectionReaction2D
ADD_NEKTAR_EXECUTABLE(PostProcessing
COMPONENT demos-extra DEPENDS MultiRegions SOURCES PostProcessing.cpp)
FINALISE_CPACK_COMPONENT(demos-extra DESCRIPTION "Nektar++ extra demos")
FINALISE_CPACK_COMPONENT(demos-extra
SUMMARY "Nektar++ extra demos"
DESCRIPTION "Additional demos for Nektar++.")
ADD_NEKTAR_TEST(ProjectionCont2D_P7)
IF (NEKTAR_USE_MPI)
......
......@@ -96,7 +96,8 @@ SET(FieldUtilsSources
)
ADD_NEKTAR_LIBRARY(FieldUtils
DESCRIPTION "Nektar++ FieldUtils library"
SUMMARY "Nektar++ FieldUtils library"
DESCRIPTION "Collection of post-processing modules for the FieldConvert utility and filter"
SOURCES ${FieldUtilsSources}
HEADERS ${FieldUtilsHeaders}
DEPENDS GlobalMapping)
\ No newline at end of file
DEPENDS GlobalMapping)
......@@ -23,7 +23,8 @@ SET(GLOBAL_MAPPING_HEADERS
ADD_DEFINITIONS(-DGLOBAL_MAPPING_EXPORTS)
ADD_NEKTAR_LIBRARY(GlobalMapping
DESCRIPTION "Nektar++ GlobalMapping library"
SOURCES ${GLOBAL_MAPPING_SOURCES}
HEADERS ${GLOBAL_MAPPING_HEADERS}
DEPENDS MultiRegions)
DEPENDS MultiRegions
SUMMARY "Nektar++ GlobalMapping library"
DESCRIPTION "This library provides deformation routines for Nektar++ simulations.")
......@@ -389,9 +389,10 @@ SET(LibUtilitySources
ADD_DEFINITIONS(-DLIB_UTILITIES_EXPORTS)
ADD_NEKTAR_LIBRARY(LibUtilities
DESCRIPTION "Nektar++ LibUtilities library"
SOURCES ${LibUtilitySources}
HEADERS ${LibUtilityHeaders})
HEADERS ${LibUtilityHeaders}
SUMMARY "Nektar++ LibUtilities library"
DESCRIPTION "This library provides core routines including linear algebra and integration with ThirdParty libraries.")
ADD_DEPENDENCIES(LibUtilities modmetis-5.1.0 boost tinyxml-2.6.2 zlib-1.2.7)
......
......@@ -40,13 +40,14 @@ TetExp.h
TriExp.h
)
ADD_DEFINITIONS(-DLOCAL_REGIONS_EXPORTS)
ADD_NEKTAR_LIBRARY(LocalRegions
DESCRIPTION "Nektar++ LocalRegions library"
SOURCES ${LOCAL_REGIONS_SOURCES}
HEADERS ${LOCAL_REGIONS_HEADERS}
DEPENDS SpatialDomains)
DEPENDS SpatialDomains
SUMMARY "Nektar++ LocalRegions library"
DESCRIPTION "This library provides physical space expansions on the various supported regions.")
INSTALL(DIRECTORY ./ DESTINATION ${NEKTAR_INCLUDE_DIR}/LocalRegions COMPONENT dev FILES_MATCHING PATTERN "*.h" PATTERN "*.hpp")
INSTALL(DIRECTORY ./ DESTINATION ${NEKTAR_INCLUDE_DIR}/LocalRegions
COMPONENT dev FILES_MATCHING PATTERN "*.h" PATTERN "*.hpp")
......@@ -131,10 +131,11 @@ ENDIF(NEKTAR_USE_PETSC)
ADD_DEFINITIONS(-DMULTI_REGIONS_EXPORTS)
ADD_NEKTAR_LIBRARY(MultiRegions
DESCRIPTION "Nektar++ MultiRegions library"
SOURCES ${MULTI_REGIONS_SOURCES}
HEADERS ${MULTI_REGIONS_HEADERS}
DEPENDS Collections)
DEPENDS Collections
SUMMARY "Nektar++ MultiRegions library"
DESCRIPTION "This library provides global expansions on multi-element domains.")
# MultiRegions uses additional routines from Metis
TARGET_LINK_LIBRARIES(MultiRegions LINK_PRIVATE ${METIS_LIB})
......
......@@ -100,17 +100,17 @@ ENDIF()
ADD_DEFINITIONS(-DNEKMESHUTILS_EXPORTS)
ADD_NEKTAR_LIBRARY(NekMeshUtils
DESCRIPTION "Nektar++ NekMeshUtils library"
SOURCES ${NEKMESHUTILS_SOURCES}
HEADERS ${NEKMESHUTILS_HEADERS}
DEPENDS LocalRegions)
DEPENDS LocalRegions
SUMMARY "Nektar++ NekMeshUtils library"
DESCRIPTION "This library provides mesh generation and routines for the NekMesh executable.")
IF(NEKTAR_USE_MESHGEN)
TARGET_LINK_LIBRARIES(NekMeshUtils LINK_PRIVATE ${TETGEN_LIBRARY})
TARGET_LINK_LIBRARIES(NekMeshUtils LINK_PUBLIC ${OCC_LIBRARIES})
ADD_DEPENDENCIES(NekMeshUtils oce-0.17 tetgen-1.5)
ENDIF()
IF(NEKTAR_USE_CFI)
......
......@@ -98,7 +98,8 @@ ENDIF (NEKTAR_USE_ARPACK)
ADD_DEFINITIONS(-DSOLVER_UTILS_EXPORTS)
ADD_NEKTAR_LIBRARY(SolverUtils
DESCRIPTION "Nektar++ SolverUtils library"
SOURCES ${SOLVER_UTILS_SOURCES}
HEADERS ${SOLVER_UTILS_HEADERS}
DEPENDS FieldUtils)
DEPENDS FieldUtils
SUMMARY "Nektar++ SolverUtils library"
DESCRIPTION "This library provides support classes and routines for constructing complete spectral/hp element solvers.")
......@@ -54,9 +54,11 @@ SpatialDomains.hpp
ADD_DEFINITIONS(-DSPATIAL_DOMAINS_EXPORTS)
ADD_NEKTAR_LIBRARY(SpatialDomains
DESCRIPTION "Nektar++ SpatialDomains library"
SOURCES ${SPATIAL_DOMAINS_SOURCES}
HEADERS ${SPATIAL_DOMAINS_HEADERS}
DEPENDS StdRegions)
DEPENDS StdRegions
SUMMARY "Nektar++ SpatialDomains library"
DESCRIPTION "This library provides the mappings between reference regions and physical regions in the domain.")
INSTALL(DIRECTORY ./ DESTINATION ${NEKTAR_INCLUDE_DIR}/SpatialDomains COMPONENT dev FILES_MATCHING PATTERN "*.h" PATTERN "*.hpp")
INSTALL(DIRECTORY ./ DESTINATION ${NEKTAR_INCLUDE_DIR}/SpatialDomains
COMPONENT dev FILES_MATCHING PATTERN "*.h" PATTERN "*.hpp")
......@@ -49,10 +49,11 @@ IndexMapKey.h
ADD_DEFINITIONS(-DSTD_REGIONS_EXPORTS)
ADD_NEKTAR_LIBRARY(StdRegions
DESCRIPTION "Nektar++ StdRegions library"
SOURCES ${STD_REGIONS_SOURCES}
HEADERS ${STD_REGIONS_HEADERS}
DEPENDS LibUtilities)
DEPENDS LibUtilities
SUMMARY "Nektar++ StdRegions library"
DESCRIPTION "This library provides construction of the reference expansions for the various 1D, 2D and 3D regions.")
INSTALL(DIRECTORY ./ DESTINATION ${NEKTAR_INCLUDE_DIR}/StdRegions COMPONENT dev FILES_MATCHING PATTERN "*.h" PATTERN "*.hpp")
......@@ -27,4 +27,4 @@ ADD_NEKTAR_EXECUTABLE(UnitTests
ADD_TEST(NAME UnitTests COMMAND UnitTests --detect_memory_leaks=0)
SUBDIRS(LibUtilities LocalRegions Collections)
FINALISE_CPACK_COMPONENT(unit-test DESCRIPTION "Nektar++ unit tests")
FINALISE_CPACK_COMPONENT(unit-test DESCRIPTION "Nektar++ unit tests" SUMMARY "Nektar++ unit tests")
......@@ -3,23 +3,25 @@ CMAKE_DEPENDENT_OPTION(NEKTAR_SOLVER_ADR
"NEKTAR_BUILD_SOLVERS" OFF)
IF( NEKTAR_SOLVER_ADR )
SET(ADRSolverSource
./ADRSolver.cpp
./EquationSystems/Helmholtz.cpp
./EquationSystems/Laplace.cpp
./EquationSystems/Poisson.cpp
./EquationSystems/Projection.cpp
./EquationSystems/SteadyAdvectionDiffusion.cpp
./EquationSystems/SteadyAdvectionDiffusionReaction.cpp
./EquationSystems/UnsteadyAdvection.cpp
./EquationSystems/UnsteadyDiffusion.cpp
./EquationSystems/UnsteadyAdvectionDiffusion.cpp
./EquationSystems/UnsteadyInviscidBurger.cpp
./EquationSystems/UnsteadyViscousBurgers.cpp
./EquationSystems/EigenValuesAdvection.cpp)
SET(ADRSolverSource
./ADRSolver.cpp
./EquationSystems/Helmholtz.cpp
./EquationSystems/Laplace.cpp
./EquationSystems/Poisson.cpp
./EquationSystems/Projection.cpp
./EquationSystems/SteadyAdvectionDiffusion.cpp
./EquationSystems/SteadyAdvectionDiffusionReaction.cpp
./EquationSystems/UnsteadyAdvection.cpp
./EquationSystems/UnsteadyDiffusion.cpp
./EquationSystems/UnsteadyAdvectionDiffusion.cpp
./EquationSystems/UnsteadyInviscidBurger.cpp
./EquationSystems/UnsteadyViscousBurgers.cpp
./EquationSystems/EigenValuesAdvection.cpp)
ADD_SOLVER_EXECUTABLE(ADRSolver SOURCES ${ADRSolverSource})
FINALISE_CPACK_COMPONENT(adrsolver DESCRIPTION "Nektar++ ADRSolver")
FINALISE_CPACK_COMPONENT(adr-solver
SUMMARY "Nektar++ advection-diffusion-reaction solver"
DESCRIPTION "Solves a range of advection, diffusion, reaction PDE problems.")
# 1D discontinuous advection (weak DG/flux reconstruction)
ADD_NEKTAR_TEST(Advection1D_FRDG_GLL_LAGRANGE_SEM LENGTHY)
......
......@@ -11,7 +11,9 @@ IF( NEKTAR_SOLVER_APE )
./RiemannSolvers/LaxFriedrichsSolver.cpp)
ADD_SOLVER_EXECUTABLE(APESolver SOURCES ${APESolverSource})
FINALISE_CPACK_COMPONENT(apesolver DESCRIPTION "Nektar++ APESolver")
FINALISE_CPACK_COMPONENT(ape-solver
SUMMARY "Nektar++ acoustic perturbation equation solver"
DESCRIPTION "Solves the acoustic perturbation equations for acoustics modelling")
# TODO: We have a bug somewhere in the 1D boundary conditions. Therefore 1D
# problems are currently disabled. This should get fixed in the future. (See APE.cpp:64)
......
MACRO(SOLVER_COMPONENT_NAME name var)
# Lower-case solver name
STRING(TOLOWER ${name} ${var})
# Then replace ending "solver" with "-solver"
STRING(REPLACE "solver" "-solver" ${var} ${${var}})
ENDMACRO()
MACRO(ADD_SOLVER_EXECUTABLE name)
CMAKE_PARSE_ARGUMENTS(SOLVER "" "COMPONENT" "SOURCES;LIBRARY_SOURCES" ${ARGN})
......@@ -8,7 +15,7 @@ MACRO(ADD_SOLVER_EXECUTABLE name)
ENDIF()
IF (NOT SOLVER_COMPONENT)
STRING(TOLOWER ${name} SOLVER_COMPONENT)
SOLVER_COMPONENT_NAME(${name} SOLVER_COMPONENT)
ENDIF()
ADD_NEKTAR_EXECUTABLE(${name}
......@@ -16,17 +23,19 @@ MACRO(ADD_SOLVER_EXECUTABLE name)
ENDMACRO()
MACRO(ADD_SOLVER_UTILITY name solver)
CMAKE_PARSE_ARGUMENTS(UTIL "USELIBRARY" "" "SOURCES" ${ARGN})
CMAKE_PARSE_ARGUMENTS(UTIL "USELIBRARY" "COMPONENT" "SOURCES" ${ARGN})
STRING(TOLOWER ${solver} SOLVER_COMPONENT)
IF (NOT UTIL_COMPONENT)
SOLVER_COMPONENT_NAME(${solver} UTIL_COMPONENT)
ENDIF()
IF (UTIL_USELIBRARY)
ADD_NEKTAR_EXECUTABLE(${name}
COMPONENT ${SOLVER_COMPONENT} DEPENDS SolverUtils
COMPONENT ${UTIL_COMPONENT} DEPENDS SolverUtils
SOURCES ${UTIL_SOURCES} $<TARGET_OBJECTS:${solver}-obj>)
ELSE()
ADD_NEKTAR_EXECUTABLE(${name}
COMPONENT ${SOLVER_COMPONENT} DEPENDS SolverUtils
COMPONENT ${UTIL_COMPONENT} DEPENDS SolverUtils
SOURCES ${UTIL_SOURCES})
ENDIF()
ENDMACRO()
......
......@@ -3,9 +3,6 @@ CMAKE_DEPENDENT_OPTION(NEKTAR_SOLVER_CARDIAC_EP
"NEKTAR_BUILD_SOLVERS" OFF)
IF( NEKTAR_SOLVER_CARDIAC_EP )
SET(CardiacEPSolverSource
)
ADD_SOLVER_EXECUTABLE(CardiacEPSolver
SOURCES CardiacEPSolver.cpp
LIBRARY_SOURCES
......@@ -36,5 +33,4 @@ IF( NEKTAR_SOLVER_CARDIAC_EP )
)
ADD_SUBDIRECTORY(Utilities)
FINALISE_CPACK_COMPONENT(cardiacepsolver DESCRIPTION "Nektar++ Cardiac EP Solver")
ENDIF( NEKTAR_SOLVER_CARDIAC_EP )
......@@ -6,3 +6,7 @@ ADD_SOLVER_UTILITY(PrePacing CardiacEPSolver SOURCES Prepacing.cpp USELIBRARY)
ADD_NEKTAR_TEST(Courtemanche)
ADD_NEKTAR_TEST(CourtemancheAF)
ADD_NEKTAR_TEST(FentonKarma)
FINALISE_CPACK_COMPONENT(cardiacep-solver
SUMMARY "Nektar++ cardiac electrophysiology solver"
DESCRIPTION "Solves the cardiac electrophysiology monodomain equations.")
......@@ -44,7 +44,6 @@ IF( NEKTAR_SOLVER_COMPRESSIBLE_FLOW )
ADD_SOLVER_EXECUTABLE(CompressibleFlowSolver SOURCES ${CompressibleFlowSolverSource})
SUBDIRS(Utilities)
FINALISE_CPACK_COMPONENT(compressibleflowsolver DESCRIPTION "Nektar++ Compressible Flow Solver")
ADD_NEKTAR_TEST(CylinderSubsonic_FRDG_SEM)
ADD_NEKTAR_TEST(CylinderSubsonic_FRDG_GAUSS)
......
ADD_SOLVER_UTILITY(ExtractSurface2DCFS CompressibleFlowSolver SOURCES ExtractSurface2DCFS.cpp)
ADD_SOLVER_UTILITY(ExtractSurface3DCFS CompressibleFlowSolver SOURCES ExtractSurface3DCFS.cpp)
ADD_SOLVER_UTILITY(CompressibleBL CompressibleFlowSolver SOURCES CompressibleBL.cpp)
FINALISE_CPACK_COMPONENT(compressibleflow-solver
SUMMARY "Nektar++ compressible Navier-Stokes flow solver"
DESCRIPTION "Solves the compressible Euler and compressible Navier-Stokes equations.")
......@@ -8,9 +8,11 @@ IF( NEKTAR_SOLVER_DIFFUSION )
SET(DiffusionSolverTimeIntSource
./DiffusionSolverTimeInt.cpp)
ADD_SOLVER_EXECUTABLE(DiffusionSolver SOURCES DiffusionSolver.cpp COMPONENT diffusionsolver)
ADD_SOLVER_EXECUTABLE(DiffusionSolver SOURCES DiffusionSolver.cpp)
ADD_SOLVER_EXECUTABLE(DiffusionSolverTimeInt SOURCES DiffusionSolverTimeInt COMPONENT diffusionsolver)
FINALISE_CPACK_COMPONENT(diffusionsolver DESCRIPTION "Nektar++ Diffusion Solver")
FINALISE_CPACK_COMPONENT(diffusion-solver
SUMMARY "Nektar++ Diffusion Solver"
DESCRIPTION "Solves the multi-dimensional diffusion equation and serves as a sample of writing a simple Nektar++ solver.")
ADD_NEKTAR_TEST(ImDiffusion_m6)
ADD_NEKTAR_TEST(ImDiffusion_m6_time_int)
......
......@@ -7,5 +7,7 @@ IF( NEKTAR_SOLVER_IMAGE_WARPING )
./ImageWarpingSolver.cpp
./EquationSystems/ImageWarpingSystem.cpp)
ADD_SOLVER_EXECUTABLE(ImageWarpingSolver SOURCES ${ImageWarpingSolverSource})
FINALISE_CPACK_COMPONENT(imagewarpingsolver DESCRIPTION "Nektar++ Image Warping Solver")
FINALISE_CPACK_COMPONENT(imagewarping-solver
SUMMARY "Nektar++ Image Warping Solver"
DESCRIPTION "Solves model image-warping equations.")
ENDIF( NEKTAR_SOLVER_IMAGE_WARPING )
......@@ -32,7 +32,6 @@ IF( NEKTAR_SOLVER_INCNAVIERSTOKES )
)
SUBDIRS(Utilities)
FINALISE_CPACK_COMPONENT(incnavierstokessolver DESCRIPTION "Nektar++ Incompressible Navier-Stokes solver")
ADD_NEKTAR_TEST(Kovasznay_Flow_3modes)
ADD_NEKTAR_TEST(ChanStability)
......
......@@ -7,3 +7,7 @@ ADD_SOLVER_UTILITY(FldAddFalknerSkanBL IncNavierStokesSolver SOURCES FldAddFalkn
ADD_SOLVER_UTILITY(AddModeTo2DFld IncNavierStokesSolver SOURCES AddModeTo2DFld.cpp)
ADD_SOLVER_UTILITY(ExtractMeanModeFromHomo1DFld IncNavierStokesSolver
SOURCES ExtractMeanModeFromHomo1DFld.cpp)
FINALISE_CPACK_COMPONENT(incnavierstokes-solver
SUMMARY "Nektar++ incompressible Navier-Stokes flow solver"
DESCRIPTION "Solves the incompressible Navier-Stokes equations using the Nektar++ high-order spectral/hp element framework")
......@@ -10,7 +10,9 @@ IF (NEKTAR_SOLVER_ELASTICITY)
./EquationSystems/CoupledAssemblyMap.cpp)
ADD_SOLVER_EXECUTABLE(LinearElasticSolver SOURCES ${LinearElasticSolverSource})
FINALISE_CPACK_COMPONENT(linearelasticsolver DESCRIPTION "Nektar++ linear elasticity solver")
FINALISE_CPACK_COMPONENT(linearelastic-solver
SUMMARY "Nektar++ linear elasticity solver"
DESCRIPTION "Solves the equations of linear elasticity.")
ADD_NEKTAR_TEST(L-domain)
IF (NEKTAR_USE_MPI)
......
......@@ -32,8 +32,7 @@ IF( NEKTAR_SOLVER_PULSEWAVE )
EquationSystems/ArterialPressureArea.cpp
)
SUBDIRS(Utilities)
FINALISE_CPACK_COMPONENT(pulsewavesolver DESCRIPTION "Nektar++ pulse wave solver")
SUBDIRS(Utilities)
ADD_NEKTAR_TEST(55_Artery_Network)
ADD_NEKTAR_TEST(Bifurcation)
......
ADD_SOLVER_UTILITY(Fld2Tecplot PulseWaveSolver SOURCES Fld2Tecplot.cpp USELIBRARY)
FINALISE_CPACK_COMPONENT(pulsewave-solver
SUMMARY "Nektar++ pulse wave solver"
DESCRIPTION "Models pulse wave propagation through a 1-dimensional network of arteries.")
......@@ -21,7 +21,9 @@ IF( NEKTAR_SOLVER_SHALLOW_WATER )
)
ADD_SOLVER_EXECUTABLE(ShallowWaterSolver SOURCES ${ShallowWaterSolverSource})
FINALISE_CPACK_COMPONENT(shallowwatersolver DESCRIPTION "Nektar++ shallow water solver")
FINALISE_CPACK_COMPONENT(shallowwater-solver
SUMMARY "Nektar++ shallow water equations solver"
DESCRIPTION "Solves the shallow water equations.")
ADD_NEKTAR_TEST(LinearSWE_StandingWave_WallBC_CG_P4)
ADD_NEKTAR_TEST(LinearSWE_StandingWave_WallBC_CG_P8)
......
......@@ -37,5 +37,7 @@ IF( NEKTAR_SOLVER_VORTEXWAVE )
ADD_SOLVER_UTILITY(CalcVWIplusPressure VortexWaveInteractionSolver SOURCES
${CalcVWIplusPressureSource})
FINALISE_CPACK_COMPONENT(vortexwaveinteractionsolver DESCRIPTION "Nektar++ vortex-wave interaction solver")
FINALISE_CPACK_COMPONENT(vortexwaveinteraction-solver
SUMMARY "Nektar++ vortex-wave interaction solver"
DESCRIPTION "Nektar++ vortex-wave interaction solver")
ENDIF( NEKTAR_SOLVER_VORTEXWAVE )
......@@ -6,4 +6,3 @@ ADD_SOLVER_UTILITY(ExpandMeshByRotation VortexWaveInteraction
SOURCES ExpandMeshByRotation.cpp)
ADD_SOLVER_UTILITY(MeshMove VortexWaveInteraction
SOURCES MeshMove.cpp)
FUNCTION(ADD_UTILITIES_EXECUTABLE name)
MACRO(ADD_UTILITIES_EXECUTABLE name)
CMAKE_PARSE_ARGUMENTS(UTIL "" "COMPONENT" "SOURCES;DEPENDS" ${ARGN})
IF(NOT UTIL_DEPENDS)
......@@ -7,7 +7,7 @@ FUNCTION(ADD_UTILITIES_EXECUTABLE name)
ADD_NEKTAR_EXECUTABLE(${name}
COMPONENT ${UTIL_COMPONENT} DEPENDS ${UTIL_DEPENDS} SOURCES ${UTIL_SOURCES})
ENDFUNCTION()
ENDMACRO()
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/library ${CMAKE_SOURCE_DIR}/utilities)
......
......@@ -53,8 +53,9 @@ ENDIF (NEKTAR_USE_MESHGEN)
ADD_UTILITIES_EXECUTABLE(NekMesh COMPONENT nekmesh
SOURCES ${NekMeshSources}
DEPENDS NekMeshUtils FieldUtils)
FINALISE_CPACK_COMPONENT(nekmesh DESCRIPTION "Nektar++ NekMesh utility")
FINALISE_CPACK_COMPONENT(nekmesh
SUMMARY "Nektar++ NekMesh utility"
DESCRIPTION "NekMesh is a high-order mesh generator, manipulator and converter utility for Nektar++ and other high-order mesh formats.")
IF (NEKTAR_USE_CCM)
TARGET_LINK_LIBRARIES(NekMesh ${CCMIO_LIBRARIES})
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment