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
2 changes: 2 additions & 0 deletions RELEASE-NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ The Axom project release numbers follow [Semantic Versioning](http://semver.org/
- Primal: Adds ability to perform sample-based shaping on tetrahedral shapes.
- Improves efficiency of volume fraction computation from quadrature samples during sample-based shaping.
- Adds a `axom::DeviceHash` type as a GPU-enabled version of the `std::hash` interface.
- Added a new `quest::STLWriter` class that writes mint meshes to STL format.

### Changed
- Fixed `Timer::elapsed*()` methods so they properly report the sum of all start/stop cycles
Expand All @@ -53,6 +54,7 @@ The Axom project release numbers follow [Semantic Versioning](http://semver.org/
- The `primal::BoundingBox` class' `expand()` and `shift()` methods were modified so they do
nothing when called on invalid bounding boxes.
- Updates to [MFEM version 4.8.0][https://github.com/mfem/mfem/releases/tag/v4.8]
- Readers in Quest were moved from a `quest/readers` directory to `quest/io`.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍


### Fixed
- Core: prevent incorrect instantiations of `axom::Array` from a host-only compile, when Axom is compiled
Expand Down
30 changes: 16 additions & 14 deletions src/axom/quest/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,10 @@ set( quest_headers
detail/PointFinder.hpp
detail/PointInCellMeshWrapper_mfem.hpp

## File readers
readers/STLReader.hpp
readers/ProEReader.hpp
## File I/O
io/STLReader.hpp
io/STLWriter.hpp
io/ProEReader.hpp

## quest interface
interface/internal/mpicomm_wrapper.hpp
Expand All @@ -75,9 +76,10 @@ set( quest_sources
## Mesh tester
MeshTester.cpp

## File readers
readers/STLReader.cpp
readers/ProEReader.cpp
## File I/O
io/STLReader.cpp
io/STLWriter.cpp
io/ProEReader.cpp

## quest interface
interface/internal/QuestHelpers.cpp
Expand Down Expand Up @@ -150,19 +152,19 @@ if(AXOM_ENABLE_KLEE AND AXOM_ENABLE_SIDRE)
endif()

if(C2C_FOUND)
list(APPEND quest_headers readers/C2CReader.hpp)
list(APPEND quest_sources readers/C2CReader.cpp)
list(APPEND quest_headers io/C2CReader.hpp)
list(APPEND quest_sources io/C2CReader.cpp)
list(APPEND quest_depends_on c2c)
endif()

if (AXOM_ENABLE_MPI)
list(APPEND quest_headers readers/PSTLReader.hpp
readers/PProEReader.hpp)
blt_list_append(TO quest_headers IF C2C_FOUND ELEMENTS readers/PC2CReader.hpp)
list(APPEND quest_headers io/PSTLReader.hpp
io/PProEReader.hpp)
blt_list_append(TO quest_headers IF C2C_FOUND ELEMENTS io/PC2CReader.hpp)

list(APPEND quest_sources readers/PSTLReader.cpp
readers/PProEReader.cpp)
blt_list_append(TO quest_sources IF C2C_FOUND ELEMENTS readers/PC2CReader.cpp)
list(APPEND quest_sources io/PSTLReader.cpp
io/PProEReader.cpp)
blt_list_append(TO quest_sources IF C2C_FOUND ELEMENTS io/PC2CReader.cpp)
endif()

if (SHROUD_FOUND)
Expand Down
2 changes: 1 addition & 1 deletion src/axom/quest/examples/quest_proe_bbox.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
// _read_proe_include2_end

// _read_proe_include1_start
#include "axom/quest/readers/ProEReader.hpp"
#include "axom/quest/io/ProEReader.hpp"
// _read_proe_include1_end

// _read_proe_typealiases_start
Expand Down
8 changes: 4 additions & 4 deletions src/axom/quest/interface/internal/QuestHelpers.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@

// Quest includes
#ifdef AXOM_USE_MPI
#include "axom/quest/readers/PSTLReader.hpp"
#include "axom/quest/readers/PProEReader.hpp"
#include "axom/quest/io/PSTLReader.hpp"
#include "axom/quest/io/PProEReader.hpp"
#endif

#if defined(AXOM_USE_C2C)
#if defined(AXOM_USE_MPI)
#include "axom/quest/readers/PC2CReader.hpp"
#include "axom/quest/io/PC2CReader.hpp"
#else
#include "axom/quest/readers/C2CReader.hpp"
#include "axom/quest/io/C2CReader.hpp"
#endif
#endif

Expand Down
4 changes: 2 additions & 2 deletions src/axom/quest/interface/internal/QuestHelpers.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
#include "axom/slic.hpp"
#include "axom/mint/mesh/Mesh.hpp"
#include "axom/quest/interface/internal/mpicomm_wrapper.hpp"
#include "axom/quest/readers/STLReader.hpp"
#include "axom/quest/readers/ProEReader.hpp"
#include "axom/quest/io/STLReader.hpp"
#include "axom/quest/io/ProEReader.hpp"

// C/C++ includes
#include <string>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
//
// SPDX-License-Identifier: (BSD-3-Clause)

#include "axom/quest/readers/C2CReader.hpp"
#include "axom/quest/io/C2CReader.hpp"

#ifndef AXOM_USE_C2C
#error C2CReader should only be included when Axom is configured with C2C
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
//
// SPDX-License-Identifier: (BSD-3-Clause)

#include "axom/quest/readers/PC2CReader.hpp"
#include "axom/quest/io/PC2CReader.hpp"

#ifndef AXOM_USE_C2C
#error PC2CReader should only be included when Axom is configured with C2C
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#endif

#include "axom/core/Macros.hpp"
#include "axom/quest/readers/C2CReader.hpp" // base class
#include "axom/quest/io/C2CReader.hpp" // base class

#include "mpi.h"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
//
// SPDX-License-Identifier: (BSD-3-Clause)

#include "axom/quest/readers/PProEReader.hpp"
#include "axom/quest/io/PProEReader.hpp"

namespace axom
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#include "axom/config.hpp"
#include "axom/core/Macros.hpp"
#include "axom/quest/readers/ProEReader.hpp" // base class
#include "axom/quest/io/ProEReader.hpp" // base class

#include "mpi.h"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
//
// SPDX-License-Identifier: (BSD-3-Clause)

#include "axom/quest/readers/PSTLReader.hpp"
#include "axom/quest/io/PSTLReader.hpp"

namespace axom
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#include "axom/config.hpp"
#include "axom/core/Macros.hpp"
#include "axom/quest/readers/STLReader.hpp" // base class
#include "axom/quest/io/STLReader.hpp" // base class

#include "mpi.h"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
//
// SPDX-License-Identifier: (BSD-3-Clause)

#include "axom/quest/readers/ProEReader.hpp"
#include "axom/quest/io/ProEReader.hpp"

// Axom includes
#include "axom/core/utilities/Utilities.hpp"
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
//
// SPDX-License-Identifier: (BSD-3-Clause)

#include "axom/quest/readers/STLReader.hpp"
#include "axom/quest/io/STLReader.hpp"

// Axom includes
#include "axom/core/utilities/Utilities.hpp"
Expand Down
File renamed without changes.
Loading