Merge pull request #7 from ViennaTools/refactor-vector-type

Refactor vector type

Author: tobre1

.gitignore

@@ -1,5 +1,7 @@
 build/
 .vscode/
+.idea/
+cmake-build-*
 
 # Prerequisites
 *.d

CMakeLists.txt

@@ -1,21 +1,21 @@
 cmake_minimum_required(VERSION 3.20 FATAL_ERROR)
 project(
-        ViennaCS
-        LANGUAGES CXX
-        VERSION 1.0.0)
+  ViennaCS
+  LANGUAGES CXX
+  VERSION 1.1.0)
 
 # --------------------------------------------------------------------------------------------------------
 # Library options
 # --------------------------------------------------------------------------------------------------------
 
-option(VIENNACS_BUILD_PYTHON "Build python bindings" ON)
+option(VIENNACS_BUILD_PYTHON "Build python bindings" OFF)
 
-option(VIENNACS_BUILD_EXAMPLES "Build examples" ON)
-option(VIENNACS_BUILD_TESTS "Build tests" ON)
+option(VIENNACS_BUILD_EXAMPLES "Build examples" OFF)
+option(VIENNACS_BUILD_TESTS "Build tests" OFF)
 
 set(VIENNACS_LOOKUP_DIRS
-        ""
-        CACHE STRING "Directories to account for when searching installed dependencies")
+    ""
+    CACHE STRING "Directories to account for when searching installed dependencies")
 
 list(APPEND CMAKE_PREFIX_PATH ${VIENNACS_LOOKUP_DIRS})
 
@@ -28,24 +28,24 @@ add_library(ViennaTools::${PROJECT_NAME} ALIAS ${PROJECT_NAME})
 
 target_compile_features(${PROJECT_NAME} INTERFACE cxx_std_17)
 set_target_properties(
-        ${PROJECT_NAME}
-        PROPERTIES CXX_STANDARD 17
-        CXX_EXTENSIONS OFF
-        CXX_STANDARD_REQUIRED ON)
+  ${PROJECT_NAME}
+  PROPERTIES CXX_STANDARD 17
+             CXX_EXTENSIONS OFF
+             CXX_STANDARD_REQUIRED ON)
 
-if (MSVC)
-    # https://learn.microsoft.com/cpp/c-runtime-library/math-constants
-    # TODO: In case C++20 is adpoted any time soon: https://cppreference.com/w/cpp/numeric/constants
-    target_compile_definitions(${PROJECT_NAME} INTERFACE _USE_MATH_DEFINES=1)
-endif ()
+if(MSVC)
+  # https://learn.microsoft.com/cpp/c-runtime-library/math-constants
+  # TODO: In case C++20 is adpoted any time soon: https://cppreference.com/w/cpp/numeric/constants
+  target_compile_definitions(${PROJECT_NAME} INTERFACE _USE_MATH_DEFINES=1)
+endif()
 
 # --------------------------------------------------------------------------------------------------------
 # Include directories
 # --------------------------------------------------------------------------------------------------------
 
 target_include_directories(
-        ${PROJECT_NAME} INTERFACE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include/viennacs>
-        $<INSTALL_INTERFACE:include/viennacs-${PROJECT_VERSION}>)
+  ${PROJECT_NAME} INTERFACE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include/viennacs>
+                            $<INSTALL_INTERFACE:include/viennacs-${PROJECT_VERSION}>)
 
 # --------------------------------------------------------------------------------------------------------
 # Check whether or not dependencies are installed on the system
@@ -58,12 +58,12 @@ find_package(ViennaRay QUIET)
 find_package(ViennaLS QUIET)
 
 set(VIENNACS_SYSTEM_VIENNARAY
-        ${ViennaRay_FOUND}
-        CACHE INTERNAL "")
+    ${ViennaRay_FOUND}
+    CACHE INTERNAL "")
 
 set(VIENNACS_SYSTEM_VIENNALS
-        ${ViennaLS_FOUND}
-        CACHE INTERNAL "")
+    ${ViennaLS_FOUND}
+    CACHE INTERNAL "")
 
 # --------------------------------------------------------------------------------------------------------
 # Setup Dependencies
@@ -72,71 +72,70 @@ set(VIENNACS_SYSTEM_VIENNALS
 include("cmake/cpm.cmake")
 
 CPMAddPackage(
-        NAME ViennaCore
-        VERSION 1.3.0
-        GIT_REPOSITORY "https://github.com/ViennaTools/ViennaCore"
-        OPTIONS "VIENNACORE_FORMAT_EXCLUDE docs/")
+  NAME ViennaCore
+  VERSION 1.4.0
+  GIT_REPOSITORY "https://github.com/ViennaTools/ViennaCore")
 
 CPMAddPackage(
-        NAME PackageProject
-        VERSION 1.13.0
-        GIT_REPOSITORY "https://github.com/TheLartians/PackageProject.cmake"
-        EXCLUDE_FROM_ALL ${VIENNACS_BUILD_PYTHON})
+  NAME PackageProject
+  VERSION 1.13.0
+  GIT_REPOSITORY "https://github.com/TheLartians/PackageProject.cmake"
+  EXCLUDE_FROM_ALL ${VIENNACS_BUILD_PYTHON})
 
 CPMFindPackage(
-        NAME ViennaRay
-        VERSION 3.3.0
-        GIT_REPOSITORY "https://github.com/ViennaTools/ViennaRay"
-        EXCLUDE_FROM_ALL ${VIENNACS_BUILD_PYTHON})
+  NAME ViennaRay
+  VERSION 3.4.0
+  GIT_REPOSITORY "https://github.com/ViennaTools/ViennaRay"
+  EXCLUDE_FROM_ALL ${VIENNACS_BUILD_PYTHON})
 
 CPMFindPackage(
-        NAME ViennaLS
-        VERSION 4.2.2
-        GIT_REPOSITORY "https://github.com/ViennaTools/ViennaLS"
-        EXCLUDE_FROM_ALL ${VIENNACS_BUILD_PYTHON})
+  NAME ViennaLS
+  VERSION 4.3.0
+  GIT_REPOSITORY "https://github.com/ViennaTools/ViennaLS"
+  EXCLUDE_FROM_ALL ${VIENNACS_BUILD_PYTHON})
 
 target_link_libraries(${PROJECT_NAME} INTERFACE ViennaTools::ViennaCore ViennaTools::ViennaLS
-        ViennaTools::ViennaRay)
+                                                ViennaTools::ViennaRay)
 
 # --------------------------------------------------------------------------------------------------------
 # Setup Examples
 # --------------------------------------------------------------------------------------------------------
 
-if (VIENNACS_BUILD_EXAMPLES)
-    message(STATUS "[ViennaCS] Building Examples")
-    add_subdirectory(examples)
-endif ()
+if(VIENNACS_BUILD_EXAMPLES)
+  message(STATUS "[ViennaCS] Building Examples")
+  add_subdirectory(examples)
+endif()
 
 # --------------------------------------------------------------------------------------------------------
 # Setup Tests
 # --------------------------------------------------------------------------------------------------------
 
-if (VIENNACS_BUILD_TESTS)
-    message(STATUS "[ViennaCS] Building Tests")
+if(VIENNACS_BUILD_TESTS)
+  message(STATUS "[ViennaCS] Building Tests")
 
-    enable_testing()
-    add_subdirectory(tests)
-endif ()
+  enable_testing()
+  add_subdirectory(tests)
+endif()
 
 # --------------------------------------------------------------------------------------------------------
 # Setup Python Bindings
 # --------------------------------------------------------------------------------------------------------
 
-if (VIENNACS_BUILD_PYTHON)
-    message(STATUS "[ViennaPS] Building Python Bindings")
-    add_subdirectory(python)
-    return()
-endif ()
+if(VIENNACS_BUILD_PYTHON)
+  message(STATUS "[ViennaCS] Building Python Bindings")
+  add_subdirectory(python)
+  return()
+endif()
 
 # --------------------------------------------------------------------------------------------------------
 # Install Target
 # --------------------------------------------------------------------------------------------------------
 
 packageProject(
-        NAME ${PROJECT_NAME} NAMESPACE ViennaTools
-        VERSION ${PROJECT_VERSION}
-        BINARY_DIR ${PROJECT_BINARY_DIR}
-        INCLUDE_DIR ${PROJECT_SOURCE_DIR}/include/viennacs
-        INCLUDE_DESTINATION include/viennacs-${PROJECT_VERSION}
-        COMPATIBILITY SameMajorVersion
-        DEPENDENCIES "ViennaCore;ViennaLS;ViennaRay")
+  NAME ${PROJECT_NAME} NAMESPACE ViennaTools
+  VERSION ${PROJECT_VERSION}
+  BINARY_DIR ${PROJECT_BINARY_DIR}
+  INCLUDE_DIR ${PROJECT_SOURCE_DIR}/include/viennacs
+  INCLUDE_DESTINATION include/viennacs-${PROJECT_VERSION}
+  COMPATIBILITY SameMajorVersion
+  DEPENDENCIES "ViennaCore;ViennaLS;ViennaRay")

LICENSE

@@ -3,7 +3,7 @@ licenses. The individual licenses apply for this specific part. Please consult
 the respective LICENSE files.
 
 
-Copyright (c) 2015      Institute for Microelectronics, TU Wien.
+Copyright (c) 2025      Institute for Microelectronics, TU Wien.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -90,7 +90,7 @@ We recommend using [CPM.cmake](https://github.com/cpm-cmake/CPM.cmake) to consum
 
 * Installation with CPM
   ```cmake
-  CPMAddPackage("gh:viennatools/viennacs@1.0.0")
+  CPMAddPackage("gh:viennatools/viennacs@1.1.0")
   ```
 
 * With a local installation
@@ -144,8 +144,6 @@ cmake --build build --target format
 
 ## Authors
 
-Current contributors: Tobias Reiter, Felix Strasser
-
 Contact us via: [email protected]
 
 ViennaCS was developed under the aegis of the 'Institute for Microelectronics' at the 'TU Wien'.

cmake/cpm.cmake

@@ -17,7 +17,7 @@ endif()
 get_filename_component(CPM_DOWNLOAD_LOCATION ${CPM_DOWNLOAD_LOCATION} ABSOLUTE)
 
 file(DOWNLOAD
-        https://github.com/cpm-cmake/CPM.cmake/releases/download/v${CPM_DOWNLOAD_VERSION}/CPM.cmake
-        ${CPM_DOWNLOAD_LOCATION} EXPECTED_HASH SHA256=${CPM_HASH_SUM})
+     https://github.com/cpm-cmake/CPM.cmake/releases/download/v${CPM_DOWNLOAD_VERSION}/CPM.cmake
+     ${CPM_DOWNLOAD_LOCATION} EXPECTED_HASH SHA256=${CPM_HASH_SUM})
 
 include(${CPM_DOWNLOAD_LOCATION})

include/viennacs/csAtomicLayerProcess.hpp

@@ -204,14 +204,21 @@ template <class NumericType, int D> class AtomicLayerProcess {
     const NumericType dtdx2 = dt / (gridDelta * gridDelta);
 
     // shared
-    const unsigned numThreads = omp_get_max_threads();
+    unsigned numThreads = 1;
+#ifdef _OPENMP
+    numThreads = omp_get_max_threads();
+#endif
     std::vector<NumericType> newFlux(cellType->size(), 0.);
     std::vector<std::vector<NumericType>> reduceFluxes(numThreads);
 
 #pragma omp parallel
     {
       // local
-      auto &reduceFlux = reduceFluxes[omp_get_thread_num()];
+      int p = 0;
+#ifdef _OPENMP
+      p = omp_get_thread_num();
+#endif
+      auto &reduceFlux = reduceFluxes[p];
       reduceFlux.resize(cellType->size(), 0.);
 
 #pragma omp for

include/viennacs/csBVH.hpp

@@ -11,7 +11,7 @@ using namespace viennacore;
 template <class T, int D> class BVH {
 private:
   using BVPtrType = SmartPointer<BoundingVolume<T, D>>;
-  using BoundsType = Vec2D<std::array<T, D>>;
+  using BoundsType = std::array<VectorType<T, D>, 2>;
   using CellIdsPtr = std::set<unsigned> *;
 
   unsigned numLayers = 1;
@@ -24,13 +24,11 @@ template <class T, int D> class BVH {
 
   BVPtrType getTopBV() { return BV; }
 
-  void getLowestBVBounds(const std::array<T, 3> &point) {
+  void getLowestBVBounds(const Vec3D<T> &point) {
     BV->getBoundingVolumeBounds(point);
   }
 
-  CellIdsPtr getCellIds(const std::array<T, 3> &point) {
-    return BV->getCellIds(point);
-  }
+  CellIdsPtr getCellIds(const Vec3D<T> &point) { return BV->getCellIds(point); }
 
   void clearCellIds() { BV->clear(); }