Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ foreach(_module ${PRISMS_PF_MODULES})
endforeach()

message(STATUS "Using PRISMS_PF_WITH_ZLIB = '${PRISMS_PF_WITH_ZLIB}'")
message(STATUS "Using PRISMS_PF_WITH_VTK = '${PRISMS_PF_WITH_VTK}'")
message(STATUS "Using PRISMS_PF_WITH_HDF5 = '${PRISMS_PF_WITH_HDF5}'")
message(STATUS "Using PRISMS_PF_WITH_SUNDIALS = '${PRISMS_PF_WITH_SUNDIALS}'")
message(STATUS "Using PRISMS_PF_WITH_CUDA = '${PRISMS_PF_WITH_CUDA}'")
Expand Down
2 changes: 1 addition & 1 deletion cmake/modules/FindPRISMS_PF_VTK.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

# If deal.II wasn't built with VTK we have to check for the installation
# elsewhere
if(NOT DEAL_II_WITH_VTK)
if(NOT DEAL_II_WITH_VTK AND PRISMS_PF_WITH_VTK)
message(
STATUS
"deal.II wasn't built with VTK, checking for separate installation"
Expand Down
3 changes: 2 additions & 1 deletion cmake/prisms_pf_config.cmake.in
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# PRISMS-PF configuration variables

set(PRISMS_PF_WITH_CALIPER @PRISMS_PF_WITH_CALIPER@ CACHE BOOL "Whether Caliper is enabled" FORCE)
set(PRISMS_PF_WITH_VTK @PRISMS_PF_WITH_VTK@ CACHE BOOL "Whether VTK is enabled" FORCE)
set(PRISMS_PF_WITH_ZLIB @PRISMS_PF_WITH_ZLIB@ CACHE BOOL "Whether zlib is enabled" FORCE)
set(PRISMS_PF_WITH_SUNDIALS @PRISMS_PF_WITH_SUNDIALS@ CACHE BOOL "Whether SUNDIALS is enabled" FORCE)
set(PRISMS_PF_WITH_CUDA @PRISMS_PF_WTIH_CUDA@ CACHE BOOL "Whether CUDA is enabled" FORCE)
set(PRISMS_PF_WITH_CUDA @PRISMS_PF_WTIH_CUDA@ CACHE BOOL "Whether CUDA is enabled" FORCE)
6 changes: 6 additions & 0 deletions cmake/setup_prisms_pf.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,12 @@ option(
ON
)

option(
PRISMS_PF_WITH_VTK
"Whether the user wants to compiler PRISMS-PF with vtk, or not"
OFF
)

option(
PRISMS_PF_WITH_HDF5
"Whether the user wants to compile PRISMS-PF with deal.II's HDF5 dependency, or not."
Expand Down
1 change: 1 addition & 0 deletions cmake/write_config.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ write_to_both("#
# PRISMS_PF_AUTODETECTION: ${PRISMS_PF_AUTODETECTION}
#
# PRISMS_PF_WITH_ZLIB: ${PRISMS_PF_WITH_ZLIB}
# PRISMS_PF_WITH_VTK: ${PRISMS_PF_WITH_VTK}
# PRISMS_PF_WITH_HDF5: ${PRISMS_PF_WITH_HDF5}
# PRISMS_PF_WITH_SUNDIALS: ${PRISMS_PF_WITH_SUNDIALS}
# PRISMS_PF_WITH_CALIPER: ${PRISMS_PF_WITH_CALIPER}
Expand Down
7 changes: 6 additions & 1 deletion doc/doxygen/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,12 @@ cmake_minimum_required(VERSION 3.27)
cmake_policy(VERSION 3.27)

# Grab the version of PRISMS-PF
file(STRINGS "${CMAKE_SOURCE_DIR}/../../VERSION" PRISMS_PF_VERSION LIMIT_COUNT 1)
file(
STRINGS
"${CMAKE_SOURCE_DIR}/../../VERSION"
PRISMS_PF_VERSION
LIMIT_COUNT 1
)

message(STATUS "")
message(STATUS "=========================================================")
Expand Down
17 changes: 11 additions & 6 deletions include/prismspf/field_input/read_field_factory.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,9 @@

#include <prismspf/field_input/read_binary.h>
#include <prismspf/field_input/read_field_base.h>
#include <prismspf/field_input/read_vtk.h>

#if DEAL_II_VERSION_MAJOR >= 9 && DEAL_II_VERSION_MINOR >= 7
# include <deal.II/base/exception_macros.h>
#else
# include <deal.II/base/exceptions.h>
#ifdef PRISMS_PF_WITH_VTK
# include <prismspf/field_input/read_vtk.h>
#endif

PRISMS_PF_BEGIN_NAMESPACE
Expand All @@ -43,13 +40,21 @@ create_reader(const InitialConditionFile &ic_file,
switch (ic_file.dataset_format)
{
case DataFormatType::VTKUnstructuredGrid:
#ifdef PRISMS_PF_WITH_VTK
return std::make_shared<ReadUnstructuredVTK<dim, number>>(ic_file,
spatial_discretization);
#else
AssertThrow(false,
dealii::ExcMessage(
"You are trying to read a VTK file as an input; however, PRISMS-PF "
"was not built with VTK. Please reconfig PRISMS-PF with VTK using "
"-D PRISMS_PF_WITH_VTK=ON"));
#endif
case DataFormatType::FlatBinary:
return std::make_shared<ReadBinary<dim, number>>(ic_file, spatial_discretization);
default:
AssertThrow(false, UnreachableCode());
}
}

PRISMS_PF_END_NAMESPACE
PRISMS_PF_END_NAMESPACE
6 changes: 1 addition & 5 deletions src/core/timer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@
# include <caliper/cali.h>
#endif

#if DEAL_II_VERSION_MAJOR >= 9 && DEAL_II_VERSION_MINOR >= 7
# include <deal.II/base/exception_macros.h>
#endif

PRISMS_PF_BEGIN_NAMESPACE

void
Expand Down Expand Up @@ -96,4 +92,4 @@ Timer::print_summary()
}
}

PRISMS_PF_END_NAMESPACE
PRISMS_PF_END_NAMESPACE
4 changes: 0 additions & 4 deletions src/core/variable_attribute_loader.cc
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,6 @@
#include <utility>
#include <vector>

#if DEAL_II_VERSION_MAJOR >= 9 && DEAL_II_VERSION_MINOR >= 7
# include <deal.II/base/exception_macros.h>
#endif

PRISMS_PF_BEGIN_NAMESPACE

void
Expand Down
4 changes: 0 additions & 4 deletions src/core/variable_attributes.cc
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,6 @@
#include <utility>
#include <vector>

#if DEAL_II_VERSION_MAJOR >= 9 && DEAL_II_VERSION_MINOR >= 7
# include <deal.II/base/exception_macros.h>
#endif

PRISMS_PF_BEGIN_NAMESPACE

void
Expand Down
4 changes: 0 additions & 4 deletions src/user_inputs/input_file_reader.cc
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,6 @@
#include <string>
#include <utility>

#if DEAL_II_VERSION_MAJOR >= 9 && DEAL_II_VERSION_MINOR >= 7
# include <deal.II/base/exception_macros.h>
#endif

PRISMS_PF_BEGIN_NAMESPACE

InputFileReader::InputFileReader(
Expand Down
6 changes: 0 additions & 6 deletions src/user_inputs/user_input_parameters.cc
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,6 @@
#include <string>
#include <vector>

#if DEAL_II_VERSION_MAJOR >= 9 && DEAL_II_VERSION_MINOR >= 7
# include <deal.II/base/exception_macros.h>
#else
# include <deal.II/base/exceptions.h>
#endif

PRISMS_PF_BEGIN_NAMESPACE

template <unsigned int dim>
Expand Down
Loading