diff --git a/CHANGELOG b/CHANGELOG index e0f3235f..15c5e145 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -9,8 +9,8 @@ https://glvis.org -Version 4.3.3 (development) -=========================== +Version 4.4 released on May 1, 2025 +=================================== - Added more flexible representations for color palette and textures, enabling specification at both compile and run time. Run time palettes are specified @@ -23,20 +23,19 @@ Version 4.3.3 (development) - Palettes can now also be specified with explicit alpha channels. See the example file share/palettes-variable-opacity.txt. -- Added loading of data collections (VisIt, Sidre, FMS and Conduit) through - parameters '-visit', '-sidre', '-fms' and '-conduit' respectively. The name - of the field can be specified through '-g' or '-q' for a quadrature field. - Optionally, the cycle and protocol can be provided through 'dc-cycle' and - 'dc-prot' parameters respectively. Note GLVis must be compiled with MFEM - configured with the associated libraries. - -- Fixed a bug where discrete textures would not repeat. +- Added loading of MFEM data collections (VisIt, Sidre, FMS and Conduit) through + command line arguments '-visit', '-sidre', '-fms' and '-conduit' respectively. + The field to plot can be specified using '-g' or '-q' for a quadrature field. + Optionally, the cycle and protocol can be provided through the 'dc-cycle' and + 'dc-prot' parameters. Note that GLVis must be built using MFEM configured with + the associated libraries. - Added support for 1D/2D data (mesh and grid function) using scalar finite - elements with up to 3 vector dimensions + elements with up to 3 vector dimensions. -- Added support for 1D/2D vector finite elements with 3 range dimensions - (requires MFEM v4.8). +- Added support for 1D/2D vector finite elements with 3 range dimensions. + +- Fixed a bug where discrete textures would not repeat. Version 4.3.2 released on Sep 27, 2024 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 40dff310..623a34a9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -3,7 +3,7 @@

-Release +Release Build License Doxygen diff --git a/README.md b/README.md index a8c05f5c..ee4c3dee 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ https://glvis.org -Release +Release Build License Doxygen diff --git a/glvis.cpp b/glvis.cpp index ee72f466..8c5721d3 100644 --- a/glvis.cpp +++ b/glvis.cpp @@ -1409,11 +1409,9 @@ int main (int argc, char *argv[]) #endif // variables for command line arguments const char *visit_coll = string_none; - //const char *paraview_coll = string_none; // reader not implemented const char *sidre_coll = string_none; const char *fms_coll = string_none; const char *conduit_coll = string_none; - //const char *adios2_coll = string_none; // reader not implemented int np = 0; bool save_stream = false; const char *stream_file = string_none; @@ -1448,8 +1446,6 @@ int main (int argc, char *argv[]) "Vector solution (vertex values) file to visualize."); args.AddOption(&visit_coll, "-visit", "--visit-datafiles", "VisIt collection to load"); - //args.AddOption(¶view_coll, "-paraview", "--paraview-datafiles", - // "ParaView collection to load"); #ifdef MFEM_USE_SIDRE args.AddOption(&sidre_coll, "-sidre", "--sidre-datafiles", "Sidre collection to load"); @@ -1462,10 +1458,6 @@ int main (int argc, char *argv[]) args.AddOption(&conduit_coll, "-conduit", "--conduit-datafiles", "Conduit collection to load"); #endif // MFEM_USE_CONDUIT -#ifdef MFEM_USE_ADIOS2 - //args.AddOption(&adios2_coll, "-adios2", "--adios2-datafiles", - // "ADIOS2 collection to load"); -#endif // MFEM_USE_ADIOS2 args.AddOption(&dc_protocol, "-dc-prot", "--data-collection-protocol", "Protocol of the data collection to load"); args.AddOption(&dc_cycle, "-dc-cycle", "--data-collection-cycle", @@ -1579,11 +1571,6 @@ int main (int argc, char *argv[]) mesh_file = visit_coll; input |= INPUT_DATA_COLL; } - /*else if (paraview_coll != string_none) - { - mesh_file = paraview_coll; - input |= INPUT_DATA_COLL; - }*/ else if (sidre_coll != string_none) { mesh_file = sidre_coll; @@ -1599,11 +1586,6 @@ int main (int argc, char *argv[]) mesh_file = conduit_coll; input |= INPUT_DATA_COLL; } - /*else if (adios2_coll != string_none) - { - mesh_file = adios2_coll; - input |= INPUT_DATA_COLL; - }*/ if (np > 0) { @@ -1787,10 +1769,6 @@ int main (int argc, char *argv[]) { coll_type = DataCollectionReader::CollType::VISIT; } - /*else if (paraview_coll != string_none) - { - coll_type = DataCollectionReader::CollType::PARAVIEW; - }*/ else if (sidre_coll != string_none) { coll_type = DataCollectionReader::CollType::SIDRE; @@ -1803,10 +1781,6 @@ int main (int argc, char *argv[]) { coll_type = DataCollectionReader::CollType::CONDUIT; } - /*else if (adios2_coll != string_none) - { - coll_type = DataCollectionReader::CollType::ADIOS2; - }*/ if (input & INPUT_GRID_FUNC) { diff --git a/lib/coll_reader.cpp b/lib/coll_reader.cpp index 4ee6357d..a50fafe3 100644 --- a/lib/coll_reader.cpp +++ b/lib/coll_reader.cpp @@ -28,10 +28,6 @@ int DataCollectionReader::ReadSerial(CollType ct, const char *coll_file, data.SetDataCollectionField(dc, ti, field, quad, component); } break; - //case CollType::PARAVIEW: // reader not implemented - // data.SetDataCollectionField(new ParaViewDataCollection(coll_file), ti, field, - // quad, component); - // break; #ifdef MFEM_USE_SIDRE case CollType::SIDRE: { @@ -61,12 +57,6 @@ int DataCollectionReader::ReadSerial(CollType ct, const char *coll_file, } break; #endif // MFEM_USE_CONDUIT -#ifdef MFEM_USE_ADIOS2 - //case CollType::ADIOS2: // reader not implemented - // data.SetDataCollectionField(new ADIOS2DataCollection(coll_file), ti, field, - // quad, component); - // break; -#endif // MFEM_USE_ADIOS2 default: cerr << "Unknown collection type. Exit" << endl; exit(1); diff --git a/lib/coll_reader.hpp b/lib/coll_reader.hpp index eae9ab14..a0c6f86c 100644 --- a/lib/coll_reader.hpp +++ b/lib/coll_reader.hpp @@ -26,11 +26,11 @@ class DataCollectionReader enum class CollType { VISIT, - PARAVIEW, + PARAVIEW, // not currently implemented SIDRE, FMS, CONDUIT, - ADIOS2, + ADIOS2, // not currently implemented }; DataCollectionReader(DataState &data_) : data(data_) { } diff --git a/lib/data_state.hpp b/lib/data_state.hpp index 45e94fa8..47fdc639 100644 --- a/lib/data_state.hpp +++ b/lib/data_state.hpp @@ -87,7 +87,7 @@ struct DataState @see SetMesh(std::unique_ptr &&pmesh) */ void SetMesh(mfem::Mesh *mesh); - /// Set a mesh (unqiue pointer version) + /// Set a mesh (unique pointer version) /** Sets the mesh and resets grid/quadrature functions if they do not use the same one. */ void SetMesh(std::unique_ptr &&pmesh); diff --git a/lib/sdl_windows.cpp b/lib/sdl_windows.cpp index c222949d..2804cefa 100644 --- a/lib/sdl_windows.cpp +++ b/lib/sdl_windows.cpp @@ -25,7 +25,7 @@ struct SdlWindowsPlatform::Impl }; SdlWindowsPlatform::SdlWindowsPlatform() - : m_impl(new Impl) + : m_impl(new Impl) { m_impl->signal_evt = CreateEventA(nullptr, false, false, ""); if (m_impl->signal_evt == NULL) diff --git a/makefile b/makefile index d66fcc84..17548919 100644 --- a/makefile +++ b/makefile @@ -250,13 +250,15 @@ Ccc = $(strip $(CC) $(CFLAGS) $(GL_OPTS)) # generated with 'echo lib/gl/*.c* lib/*.c*', does not include lib/*.m (Obj-C) ALL_SOURCE_FILES = \ - lib/gl/renderer.cpp lib/gl/renderer_core.cpp lib/gl/renderer_ff.cpp \ - lib/gl/shader.cpp lib/gl/types.cpp lib/aux_js.cpp lib/aux_vis.cpp \ - lib/coll_reader.cpp lib/data_state.cpp lib/file_reader.cpp lib/font.cpp \ - lib/gl2ps.c lib/gltf.cpp lib/material.cpp lib/openglvis.cpp lib/palettes.cpp \ - lib/palettes_base.cpp lib/sdl.cpp lib/sdl_helper.cpp lib/sdl_main.cpp \ - lib/stream_reader.cpp lib/threads.cpp lib/vsdata.cpp lib/vssolution.cpp \ - lib/vssolution3d.cpp lib/vsvector.cpp lib/vsvector3d.cpp + lib/gl/renderer.cpp lib/gl/renderer_core.cpp lib/gl/renderer_ff.cpp \ + lib/gl/shader.cpp lib/gl/types.cpp lib/aux_js.cpp lib/aux_vis.cpp \ + lib/coll_reader.cpp lib/data_state.cpp lib/file_reader.cpp \ + lib/font.cpp lib/gl2ps.c lib/gltf.cpp lib/material.cpp \ + lib/openglvis.cpp lib/palettes.cpp lib/palettes_base.cpp lib/sdl.cpp \ + lib/sdl_helper.cpp lib/sdl_main.cpp lib/sdl_windows.cpp \ + lib/sdl_x11.cpp lib/stream_reader.cpp lib/threads.cpp lib/vsdata.cpp \ + lib/vssolution.cpp lib/vssolution3d.cpp lib/vsvector.cpp \ + lib/vsvector3d.cpp OBJC_SOURCE_FILES = $(if $(NOTMAC),,lib/sdl_mac.mm) DESKTOP_ONLY_SOURCE_FILES = \ lib/gl/renderer_ff.cpp lib/threads.cpp lib/gl2ps.c lib/sdl_x11.cpp @@ -268,15 +270,17 @@ COMMON_SOURCE_FILES = $(filter-out \ # generated with 'echo lib/gl/*.h* lib/*.h*' HEADER_FILES = \ - lib/gl/attr_traits.hpp lib/gl/platform_gl.hpp lib/gl/renderer.hpp \ - lib/gl/shader.hpp lib/gl/renderer_core.hpp lib/gl/renderer_ff.hpp \ - lib/gl/types.hpp lib/aux_vis.hpp lib/coll_reader.hpp lib/data_state.hpp \ - lib/file_reader.hpp lib/font.hpp lib/geom_utils.hpp lib/gl2ps.h \ - lib/logo.hpp lib/material.hpp lib/openglvis.hpp lib/palettes.hpp \ - lib/palettes_base.hpp lib/sdl.hpp lib/sdl_helper.hpp lib/sdl_mac.hpp \ - lib/sdl_main.hpp lib/sdl_x11.hpp lib/stream_reader.hpp lib/threads.hpp \ - lib/visual.hpp lib/vsdata.hpp lib/vssolution.hpp lib/vssolution3d.hpp \ - lib/vsvector.hpp lib/vsvector3d.hpp + lib/gl/attr_traits.hpp lib/gl/platform_gl.hpp lib/gl/renderer.hpp \ + lib/gl/shader.hpp lib/gl/renderer_core.hpp lib/gl/renderer_ff.hpp \ + lib/gl/types.hpp lib/aux_vis.hpp lib/coll_reader.hpp \ + lib/data_state.hpp lib/file_reader.hpp lib/font.hpp \ + lib/geom_utils.hpp lib/gl2ps.h lib/gltf.hpp lib/logo.hpp \ + lib/material.hpp lib/openglvis.hpp lib/palettes.hpp \ + lib/palettes_base.hpp lib/sdl.hpp lib/sdl_helper.hpp lib/sdl_mac.hpp \ + lib/sdl_main.hpp lib/sdl_windows.hpp lib/sdl_x11.hpp \ + lib/stream_reader.hpp lib/threads.hpp lib/visual.hpp lib/vsdata.hpp \ + lib/vssolution.hpp lib/vssolution3d.hpp lib/vsvector.hpp \ + lib/vsvector3d.hpp DESKTOP_SOURCE_FILES = $(COMMON_SOURCE_FILES) $(DESKTOP_ONLY_SOURCE_FILES) $(LOGO_FILE_CPP) WEB_SOURCE_FILES = $(COMMON_SOURCE_FILES) $(WEB_ONLY_SOURCE_FILES) diff --git a/share/Info.cmake.plist.in b/share/Info.cmake.plist.in index 3e26125b..54d0ff0d 100644 --- a/share/Info.cmake.plist.in +++ b/share/Info.cmake.plist.in @@ -11,7 +11,7 @@ CFBundleIconFile GLVis.icns CFBundleShortVersionString - 4.3.2 + 4.4 CFBundleInfoDictionaryVersion 6.0 CFBundlePackageType diff --git a/share/Info.plist b/share/Info.plist index db955e36..609ed69b 100644 --- a/share/Info.plist +++ b/share/Info.plist @@ -11,7 +11,7 @@ CFBundleIconFile GLVis.icns CFBundleShortVersionString - 4.3.2 + 4.4 CFBundleInfoDictionaryVersion 6.0 CFBundlePackageType diff --git a/share/palettes-cet.txt b/share/palettes-cet.txt index 5975bc95..0e21be54 100644 --- a/share/palettes-cet.txt +++ b/share/palettes-cet.txt @@ -12928,4 +12928,3 @@ palette cet-r3 RGBf 0.85083 0.038404 0.048987 0.84687 0.028128 0.024389 0.84287 0.018301 0.0015175 - diff --git a/vcpkg.json b/vcpkg.json index 6a041195..52846354 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,7 +1,7 @@ { "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json", "name": "glvis", - "version": "4.3.2", + "version": "4.4", "dependencies": [ "fontconfig", "freetype",