Fixing few bugs

Author: ifilot

docs/installation.rst

@@ -64,10 +64,13 @@ of :program:`Den2Obj` using this module requires supplying an additional
 argument to CMake.
 
 .. warning::
-    The OpenVDB package in the latest Ubuntu LTS (22.04 LTS) is incompatible with the Thread Building Blocks (tbb) library. As a workaround, one is
-    required to compile a newer OpenVDB. OpenVDB v8.2 has been tried and
-    tested by us. If you are compiling for Ubuntu 22.04 LTS, please read the
-    additional instructions to compile OpenVDB.
+    A fairly recent version of OpenVDB is required for compatibility with 
+    modern dependencies. The version packaged in Ubuntu 22.04 LTS is 
+    incompatible with the current Thread Building Blocks (TBB) library. 
+    We have tested and verified compatibility with OpenVDB on Ubuntu 24.04 LTS. 
+    If you are working on Ubuntu 22.04 LTS, you might need to compile a recent
+    version of OpenVDB from source. The instructions below are for Ubuntu 
+    24.04 LTS.
 
 Ensure that the following libraries are installed by running::
 

docs/user_interface.rst

@@ -78,6 +78,10 @@ To perform the conversion, one executes::
 
     ./den2obj -i <path-to-scalarfield> -o <mesh-file> -t [-a <algo>]
 
+For example, to convert `genus.d2o` to a `vdb` file, one runs::
+
+    ./den2obj -i genus.d2o -o genus.vdb -t
+
 .. note::
 
     Creating `OpenVDB` files requires the OpenVDB module to be compiled. See

src/CMakeLists.txt

@@ -52,7 +52,7 @@ execute_process(
 SET(PROGNAME "DEN2OBJ")
 SET(VERSION_MAJOR "1")
 SET(VERSION_MINOR "2")
-SET(VERSION_MICRO "1")
+SET(VERSION_MICRO "2")
 message(STATUS "Writing configuration file in: ${CMAKE_CURRENT_SOURCE_DIR}/config.h")
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_SOURCE_DIR}/config.h @ONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/den2obj.pc.in ${CMAKE_BINARY_DIR}/den2obj.pc @ONLY)
@@ -104,9 +104,9 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}
 
 # enable OpenVDB support
 if(MOD_OPENVDB)
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMOD_OPENVDB -I/opt/openvdb/include")
-    SET(OPENVDB_LIBS "/opt/openvdb/lib/libopenvdb.a" "tbb" "blosc" "-lz")
+    SET(OPENVDB_LIBS "openvdb" "tbb" "blosc" "-lz")
     MESSAGE("Compiling with OpenVDB module")
+    add_compile_definitions(MOD_OPENVDB)
 endif()
 
 # Add sources

src/den2obj.cpp

@@ -79,6 +79,9 @@ int main(int argc, char* argv[]) {
         std::cout << "--------------------------------------------------------------" << std::endl;
         std::cout << "Compilation time: " << __DATE__ << " " << __TIME__ << std::endl;
         std::cout << "Git Hash: " << PROGRAM_GIT_HASH << std::endl;
+        #ifdef MOD_OPENVDB
+        std::cout << "Compiled with OpenVDB module" << std::endl;
+        #endif
         std::cout << "--------------------------------------------------------------" << std::endl;
 
         //**************************************

src/generator.cpp

@@ -103,9 +103,9 @@ std::vector<fpt> Generator::genus2(fpt sz, size_t npts) const {
 
     // build grid
     std::vector<fpt> f(npts*npts*npts);
+    boost::timer::progress_display progress(npts);
     for(unsigned int i=0; i<npts; i++) { // loop over z
         const float z = xx[i];
-        boost::timer::progress_display progress(npts);
         for(unsigned int j=0; j<npts; j++) { // loop over y
             const float y = xx[j];
             #pragma omp parallel for schedule(static)