diff --git a/NESO-Spack b/NESO-Spack index 90556f5a..7b0f35db 160000 --- a/NESO-Spack +++ b/NESO-Spack @@ -1 +1 @@ -Subproject commit 90556f5a1e3c93e9de91f8b760c4ac4a07aaefa0 +Subproject commit 7b0f35dba288b7cd57d06ae1a07821fd194595f8 diff --git a/include/nektar_interface/bounding_box_intersection.hpp b/include/nektar_interface/bounding_box_intersection.hpp index 8de19b92..e8c431d1 100644 --- a/include/nektar_interface/bounding_box_intersection.hpp +++ b/include/nektar_interface/bounding_box_intersection.hpp @@ -67,7 +67,7 @@ inline void reset_bounding_box(std::array &bounding_box) { for (int dimx = 0; dimx < ndim; dimx++) { bounding_box[dimx] = std::numeric_limits::max(); - bounding_box[dimx + ndim] = std::numeric_limits::min(); + bounding_box[dimx + ndim] = std::numeric_limits::lowest(); } } @@ -206,7 +206,7 @@ class MeshHierarchyBoundingBoxIntersection { // owned cells. for (int dimx = 0; dimx < 3; dimx++) { this->bounding_box[dimx] = std::numeric_limits::max(); - this->bounding_box[dimx + 3] = std::numeric_limits::min(); + this->bounding_box[dimx + 3] = std::numeric_limits::lowest(); } const int num_cells = owned_cells.size(); this->bounding_boxes.resize(num_cells); diff --git a/include/nektar_interface/cell_id_translation.hpp b/include/nektar_interface/cell_id_translation.hpp index 5881c675..562c856f 100644 --- a/include/nektar_interface/cell_id_translation.hpp +++ b/include/nektar_interface/cell_id_translation.hpp @@ -40,7 +40,7 @@ class CellIDTranslation { inline void construct_maps(std::map> &geoms) { const int nelements = geoms.size(); int id_min = std::numeric_limits::max(); - int id_max = std::numeric_limits::min(); + int id_max = std::numeric_limits::lowest(); this->map_to_nektar.resize(nelements); this->dh_map_to_geom_type.realloc_no_copy(nelements); diff --git a/include/nektar_interface/particle_boundary_conditions.hpp b/include/nektar_interface/particle_boundary_conditions.hpp index 563e1211..963d01d2 100644 --- a/include/nektar_interface/particle_boundary_conditions.hpp +++ b/include/nektar_interface/particle_boundary_conditions.hpp @@ -64,7 +64,7 @@ class NektarCartesianPeriodic { double extent[3]; for (int dimx = 0; dimx < 3; dimx++) { origin[dimx] = std::numeric_limits::max(); - extent[dimx] = std::numeric_limits::min(); + extent[dimx] = std::numeric_limits::lowest(); } for (auto &vx : verticies) { diff --git a/include/nektar_interface/particle_mesh_interface.hpp b/include/nektar_interface/particle_mesh_interface.hpp index 00a02772..76a30bc0 100644 --- a/include/nektar_interface/particle_mesh_interface.hpp +++ b/include/nektar_interface/particle_mesh_interface.hpp @@ -514,7 +514,7 @@ class ParticleMeshInterface : public HMesh { // Compute a set of coarse mesh sizes and dimensions for the mesh hierarchy double min_extent = std::numeric_limits::max(); - double max_extent = std::numeric_limits::min(); + double max_extent = std::numeric_limits::lowest(); for (int dimx = 0; dimx < this->ndim; dimx++) { const double tmp_global_extent = this->global_bounding_box[dimx + 3] - this->global_bounding_box[dimx]; diff --git a/neso-particles b/neso-particles index 7aa2f8f9..ba6750d4 160000 --- a/neso-particles +++ b/neso-particles @@ -1 +1 @@ -Subproject commit 7aa2f8f95c0cf1596df4b932e402c8e8845cdd6b +Subproject commit ba6750d429fe15bbec9b9c507b795cd3117b79b4 diff --git a/solvers/Electrostatic2D3V/Diagnostics/generic_hdf5_writer.hpp b/solvers/Electrostatic2D3V/Diagnostics/generic_hdf5_writer.hpp index db97e157..27758f38 100644 --- a/solvers/Electrostatic2D3V/Diagnostics/generic_hdf5_writer.hpp +++ b/solvers/Electrostatic2D3V/Diagnostics/generic_hdf5_writer.hpp @@ -1,6 +1,7 @@ #ifndef __GENERIC_HDF5_WRITER_H_ #define __GENERIC_HDF5_WRITER_H_ +#include #include #include @@ -12,7 +13,9 @@ class GenericHDF5Writer { hid_t group_steps; hid_t group_step; hid_t group_global; - inline void ghw_H5CHK(const bool flag) { ASSERTL1((cmd) >= 0, "HDF5 ERROR"); } + inline void ghw_H5CHK(const bool flag) { + ASSERTL0((flag) >= 0, "HDF5 ERROR"); + } inline void write_dataspace(hid_t group, std::string key, hid_t dataspace, double *value) { @@ -52,7 +55,7 @@ class GenericHDF5Writer { : filename(filename), step(-1), group_step(-1) { this->file = H5Fcreate(this->filename.c_str(), H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); - ASSERTL1(this->file != H5I_INVALID_HID, "Invalid HDF5 file identifier"); + ASSERTL0(this->file != H5I_INVALID_HID, "Invalid HDF5 file identifier"); // Create the group for global data. std::string group_name = "global_data"; this->group_global = H5Gcreate(this->file, group_name.c_str(), H5P_DEFAULT, diff --git a/spack.yaml b/spack.yaml index cdaaf037..bf43960c 100644 --- a/spack.yaml +++ b/spack.yaml @@ -31,6 +31,6 @@ spack: path: . spec: neso@working nektar: - spec: nektar@5.2.0-2022-09-03 + spec: nektar@5.3.0-2022-09-03 neso-particles: spec: neso-particles@working diff --git a/test/unit/nektar_interface/test_particle_geometry_interface.cpp b/test/unit/nektar_interface/test_particle_geometry_interface.cpp index 0ebb6eb0..202184d9 100644 --- a/test/unit/nektar_interface/test_particle_geometry_interface.cpp +++ b/test/unit/nektar_interface/test_particle_geometry_interface.cpp @@ -63,7 +63,7 @@ TEST(ParticleGeometryInterface, BoundingBox) { std::array bounding_box; for (int dimx = 0; dimx < 3; dimx++) { bounding_box[dimx] = std::numeric_limits::max(); - bounding_box[dimx + 3] = std::numeric_limits::min(); + bounding_box[dimx + 3] = std::numeric_limits::lowest(); } expand_bounding_box(e0, bounding_box);