polyhedral-gravity 3.2.1__tar.gz → 3.3__tar.gz

{polyhedral_gravity-3.2.1 → polyhedral_gravity-3.3}/CMakeLists.txt

@@ -4,6 +4,9 @@ project(polyhedralGravity)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
+# Appends the the module path to contain additional CMake modules for this project
+# and include everything necessary
+list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
 include(CMakeDependentOption)
 
 #####################################
@@ -14,61 +17,73 @@ set(POLYHEDRAL_GRAVITY_PARALLELIZATION "CPP" CACHE STRING "Host parallelization
  (CPP= Serial, OMP = OpenMP, TBB = Intel Threading Building Blocks")
 set_property(CACHE POLYHEDRAL_GRAVITY_PARALLELIZATION PROPERTY STRINGS CPP, OMP, TBB)
 
-# Enforce to use an already installed tbb library instead of compiling from source
-option(USE_LOCAL_TBB "Uses the local tbb installation rather than on using the automatically fetched version from
-GitHub via CMake (Default: OFF)" OFF)
-
 # Set the Logging Level
-set(LOGGING_LEVEL_LIST "TRACE" "DEBUG" "INFO" "WARN" "ERROR" "CRITICAL" "OFF")
-set(LOGGING_LEVEL "INFO" CACHE STRING "Set the Logging level, default (INFO), available options: TRACE, DEBUG, INFO, WARN, ERROR, CRITICAL, OFF")
-set_property(CACHE LOGGING_LEVEL PROPERTY STRINGS ${LOGGING_LEVEL_LIST})
+set(POLYHEDRAL_GRAVITY_LOGGING_LEVEL_LIST "TRACE" "DEBUG" "INFO" "WARN" "ERROR" "CRITICAL" "OFF")
+set(POLYHEDRAL_GRAVITY_LOGGING_LEVEL "INFO" CACHE STRING "Set the Logging level, default (INFO), available options: TRACE, DEBUG, INFO, WARN, ERROR, CRITICAL, OFF")
+set_property(CACHE POLYHEDRAL_GRAVITY_LOGGING_LEVEL PROPERTY STRINGS ${POLYHEDRAL_GRAVITY_LOGGING_LEVEL_LIST})
 # Convert the logging level string to its corresponding number
-list(FIND LOGGING_LEVEL_LIST ${LOGGING_LEVEL} LOGGING_LEVEL_INDEX)
+list(FIND POLYHEDRAL_GRAVITY_LOGGING_LEVEL_LIST ${POLYHEDRAL_GRAVITY_LOGGING_LEVEL} LOGGING_LEVEL_INDEX)
 if (${LOGGING_LEVEL_INDEX} EQUAL -1)
-    message(FATAL_ERROR "Invalid logging level: ${LOGGING_LEVEL}")
+    message(FATAL_ERROR "Invalid logging level: ${POLYHEDRAL_GRAVITY_LOGGING_LEVEL}")
 endif ()
 add_compile_definitions(SPDLOG_ACTIVE_LEVEL=${LOGGING_LEVEL_INDEX})
-message(STATUS "Logging level set to ${LOGGING_LEVEL} (=${LOGGING_LEVEL_INDEX})")
-
-###################################
-# What actually to build? - Options
-###################################
 
+#########################################################
+# What actually to build? - Options, Versions and Output
+#########################################################
 # Build docs
 option(BUILD_POLYHEDRAL_GRAVITY_DOCS "Builds the documentation (Default: OFF)" OFF)
-message(STATUS "BUILD_POLYHEDRAL_GRAVITY_DOCS = ${BUILD_POLYHEDRAL_GRAVITY_DOCS}")
 # Build C++ executable
 option(BUILD_POLYHEDRAL_GRAVITY_EXECUTABLE "Builds the C++ executable (Default: ON)" ON)
-message(STATUS "BUILD_POLYHEDRAL_GRAVITY_EXECUTABLE = ${BUILD_POLYHEDRAL_GRAVITY_EXECUTABLE}")
 # Build library (default ON), if the executable or tests are built this forced to ON
 cmake_dependent_option(BUILD_POLYHEDRAL_GRAVITY_LIBRARY "Builds the library (Default: ON)" ON
         "NOT BUILD_POLYHEDRAL_GRAVITY_EXECUTABLE AND NOT BUILD_POLYHEDRAL_GRAVITY_TESTS" ON)
-message(STATUS "BUILD_POLYHEDRAL_GRAVITY_LIBRARY = ${BUILD_POLYHEDRAL_GRAVITY_LIBRARY}")
 # Option to build the python interface
-option(BUILD_POLYHEDRAL_PYTHON_INTERFACE "Set this to on if the python interface should be built (Default: ON)" ON)
-message(STATUS "BUILD_POLYHEDRAL_GRAVITY_PYTHON_INTERFACE = ${BUILD_POLYHEDRAL_PYTHON_INTERFACE}")
+option(BUILD_POLYHEDRAL_GRAVITY_PYTHON_INTERFACE "Set this to on if the python interface should be built (Default: ON)" ON)
 # Option to build tests or not
 option(BUILD_POLYHEDRAL_GRAVITY_TESTS "Set to on if the tests should be built (Default: ON)" ON)
-message(STATUS "BUILD_POLYHEDRAL_GRAVITY_TESTS = ${BUILD_POLYHEDRAL_GRAVITY_TESTS}")
 
-
-IF(_LIBCPP_DISABLE_AVAILABILITY)
+if (_LIBCPP_DISABLE_AVAILABILITY)
     message(STATUS "Disabling availability macros for libc++")
     add_definitions(-D_LIBCPP_DISABLE_AVAILABILITY)
 endif ()
 
+if (${CMAKE_CXX_COMPILER_ID} STREQUAL "AppleClang")
+    # Fixes undefined _VSTD when using Apple Clang 17
+    message(STATUS "Using Apple Clang compiler. Defining _VSTD=std.")
+    add_definitions(-D_VSTD=std)
+endif()
+
+
+# Resolves missing fmt symbols when working with spdlog (bundled via brew/ conda on Arm architecture)
+# Refer to https://github.com/gabime/spdlog/issues/660
+add_compile_definitions(FMT_HEADER_ONLY)
+
+include(git)
+include(version.cmake)
+
+message(STATUS "#################################################################")
+message(STATUS "Polyhedral Gravity Version          ${POLYHEDRAL_GRAVITY_VERSION}")
+message(STATUS "Polyhedral Gravity Commit Hash      ${POLYHEDRAL_GRAVITY_COMMIT_HASH}")
+message(STATUS "Polyhedral Parallelization Backend  ${POLYHEDRAL_GRAVITY_PARALLELIZATION}")
+message(STATUS "Polyhedral Gravity Logging Level    ${POLYHEDRAL_GRAVITY_LOGGING_LEVEL}")
+message(STATUS "#################################################################")
+message(STATUS "Polyhedral Gravity Documentation    ${BUILD_POLYHEDRAL_GRAVITY_DOCS}")
+message(STATUS "Polyhedral Gravity Library          ${BUILD_POLYHEDRAL_GRAVITY_LIBRARY}")
+message(STATUS "Polyhedral Gravity C++ Executable   ${BUILD_POLYHEDRAL_GRAVITY_EXECUTABLE}")
+message(STATUS "Polyhedral Gravity Python Interface ${BUILD_POLYHEDRAL_GRAVITY_PYTHON_INTERFACE}")
+message(STATUS "Polyhedral Gravity Tests            ${BUILD_POLYHEDRAL_GRAVITY_TESTS}")
+message(STATUS "#################################################################")
 #######################################################
 # Including dependencies needed across multiple targets
 #######################################################
-# Appends the the module path to contain additional CMake modules for this project
-# and include everything necessary
-list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
 
-# Include dependecies
 include(thrust)
 include(spdlog)
 include(tetgen)
 include(xsimd)
+include(clang_format)
+include(cmake_format)
 
 ###############################
 # Thrust Parallelization Set-Up
@@ -76,9 +91,12 @@ include(xsimd)
 # Get a version of tbb from the github repository, simplifies compilation for the user since tbb does not need to be
 # preinstalled but rather gets automatically set up via CMake
 # Nevertheless, there is still the option to enforce to use a local installation if one exists
-if (NOT USE_LOCAL_TBB AND ${POLYHEDRAL_GRAVITY_PARALLELIZATION} STREQUAL "TBB")
+if (${POLYHEDRAL_GRAVITY_PARALLELIZATION} STREQUAL "TBB")
     include(tbb)
-    thrust_set_TBB_target(tbb)
+    thrust_set_TBB_target(TBB::tbb)
+    add_compile_definitions(POLYHEDRAL_GRAVITY_TBB)
+elseif (${POLYHEDRAL_GRAVITY_PARALLELIZATION} STREQUAL "OMP")
+    add_compile_definitions(POLYHEDRAL_GRAVITY_OMP)
 endif ()
 
 # Thrust set-up i.e. the parallelization library, create targets according to the users specification

{polyhedral_gravity-3.2.1/polyhedral_gravity.egg-info → polyhedral_gravity-3.3}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: polyhedral_gravity
-Version: 3.2.1
+Version: 3.3
 Summary: Package to compute full gravity tensor of a given constant density polyhedron for arbitrary points according to the geodetic convention
 Author: Jonas Schuhmacher
 Author-email: jonas.schuhmacher@tum.de
@@ -19,9 +19,19 @@ Classifier: Operating System :: MacOS
 Classifier: Operating System :: POSIX :: Linux
 Classifier: Intended Audience :: Science/Research
 Classifier: Topic :: Scientific/Engineering :: Physics
-Requires-Python: >=3.6
+Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: license
+Dynamic: license-file
+Dynamic: project-url
+Dynamic: requires-python
+Dynamic: summary
 
 # polyhedral-gravity-model
 
@@ -95,20 +105,20 @@ The evaluation of the polyhedral gravity model requires the following parameters
 | Polyhedral Mesh (either as vertices & faces or as polyhedral source files) |
 | Constant Density $\rho$                                                    |
 
-The mesh and the constants density's unit must match.
-Have a look the documentation to view the [supported mesh files](https://esa.github.io/polyhedral-gravity-model/quickstart/supported_input.html).
+The mesh and the constant density's unit must match.
+Have a look at the documentation to view the [supported mesh files](https://esa.github.io/polyhedral-gravity-model/quickstart/supported_input.html).
 
 ### Output
 
 The calculation outputs the following parameters for every Computation Point *P*.
 The units of the respective output depend on the units of the input parameters (mesh and density)!
-Hence, if e.g. your mesh is in $km$, the density must match. Further, output units will be different accordingly.
+Hence, if e.g., your mesh is in $km$, the density must match. Further, output units will be different accordingly.
 
-|                            Name                            | Unit (if mesh in $[m]$ and $\rho$ in $[kg/m^3]$) |                              Comment                              |
-|:----------------------------------------------------------:|:------------------------------------------------:|:-----------------------------------------------------------------:|
-|                            $V$                             |       $\frac{m^2}{s^2}$ or $\frac{J}{kg}$        |           The potential or also called specific energy            |
-|                    $V_x$, $V_y$, $V_z$                     |                 $\frac{m}{s^2}$                  | The gravitational accerleration in the three cartesian directions |
-| $V_{xx}$, $V_{yy}$, $V_{zz}$, $V_{xy}$, $V_{xz}$, $V_{yz}$ |                 $\frac{1}{s^2}$                  |   The spatial rate of change of the gravitational accleration    |
+|                            Name                            | Unit (if mesh in $[m]$ and $\rho$ in $[kg/m^3]$) |                             Comment                              |
+|:----------------------------------------------------------:|:------------------------------------------------:|:----------------------------------------------------------------:|
+|                            $V$                             |       $\frac{m^2}{s^2}$ or $\frac{J}{kg}$        |           The potential or also called specific energy           |
+|                    $V_x$, $V_y$, $V_z$                     |                 $\frac{m}{s^2}$                  | The gravitational acceleration in the three cartesian directions |
+| $V_{xx}$, $V_{yy}$, $V_{zz}$, $V_{xy}$, $V_{xz}$, $V_{yz}$ |                 $\frac{1}{s^2}$                  |   The spatial rate of change of the gravitational acceleration   |
 
 
 >[!NOTE]
@@ -124,7 +134,7 @@ around a cube:
 
 ```python
 import numpy as np
-from polyhedral_gravity import Polyhedron, GravityEvaluable, evaluate, PolyhedronIntegrity, NormalOrientation
+from polyhedral_gravity import Polyhedron, GravityEvaluable, evaluate, PolyhedronIntegrity, NormalOrientation, MetricUnit
 
 # We define the cube as a polyhedron with 8 vertices and 12 triangular faces
 # The polyhedron's normals point outwards (see below for checking this)
@@ -167,7 +177,7 @@ potential, acceleration, tensor = evaluate(
 The more advanced way is to use the `GravityEvaluable` class. It caches the
 internal data structure and properties which can be reused for multiple
 evaluations. This is especially useful if you want to compute the gravity
-for multiple computation points, but don't know the "future points" in advance.
+for multiple computation points but don't know the "future points" in advance.
 
 ```python
 evaluable = GravityEvaluable(polyhedron=cube_polyhedron) # stores intermediate computation steps
@@ -188,21 +198,24 @@ This property is - by default - checked when constructing the `Polyhedron`! So,
 is impossible if not **explicitly** disabled to create an invalid `Polyhedron`.
 You can disable/ enable this setting via the optional `integrity_check` flag and can even
 automatically repair the ordering via `HEAL`.
-If you are confident that your mesh is defined correctly (e.g. checked once with the integrity check)
+If you are confident that your mesh is defined correctly (e.g., checked once with the integrity check)
 you can disable this check (via `DISABLE`) to avoid the additional runtime overhead of the check.
+Also, you can set the metric unit of the mesh and the density.
+This also influences the output unit. E.g., Density in $kg/m^3$, Mesh in $m$, then the potential is given in $m^2/s^2$.
 
 ```python
 cube_polyhedron = Polyhedron(
-  polyhedral_source=(cube_vertices, cube_faces),
-  density=cube_density,
+  polyhedral_source=(cube_vertices, cube_faces),# coordinates in m (default), km, or unitless
+  density=cube_density,                         # kg/m^3 (default) or kg/km^3 or unitless
   normal_orientation=NormalOrientation.INWARDS, # OUTWARDS (default) or INWARDS
   integrity_check=PolyhedronIntegrity.VERIFY,   # VERIFY (default), DISABLE or HEAL
+  metric_unit=MetricUnit.METER,                 # METER (default), KILOMETER, UNITLESS
 )
 ```
 
 > [!TIP]
 > More examples and plots are depicted in the
-[jupyter notebook](script/polyhedral-gravity.ipynb).
+[jupyter notebook](script/polyhedral-gravity.ipynb) and the [second jupyter notebook](script/Kleopatra.ipynb)
 
 
 ### Minimal C++ Example
@@ -267,8 +280,8 @@ As a second option, you can also install the python interface with pip from [PyP
 pip install polyhedral-gravity
 ```
 
-Binaries for the most common platforms are available on PyPI including
-Windows, Linux and macOS. For macOS and Linux, binaries for
+Binaries for the most common platforms are available on PyPI, including
+Windows, Linux, and macOS. For macOS and Linux, binaries for
 `x86_64` and `aarch64` are provided.
 In case `pip` uses the source distribution, please make sure that
 you have a C++17 capable compiler and CMake installed.
@@ -276,9 +289,9 @@ you have a C++17 capable compiler and CMake installed.
 ### From source
 
 The project uses the following dependencies,
-all of them are **automatically** set-up via CMake:
+all of them are **automatically** set up via CMake:
 
-- GoogleTest (1.13.0 or compatible), only required for testing
+- GoogleTest (1.15.2 or compatible), only required for testing
 - spdlog (1.13.0 or compatible), required for logging
 - tetgen (1.6 or compatible), required for I/O
 - yaml-cpp (0.8.0 or compatible), required for I/O
@@ -286,7 +299,7 @@ all of them are **automatically** set-up via CMake:
 - xsimd (11.1.0 or compatible), required for vectorization of the `atan(..)`
 - pybind11 (2.12.0 or compatible), required for the Python interface, but not the C++ standalone
 
-The module will be build using a C++17 capable compiler,
+The module will be built using a C++17 capable compiler,
 CMake. Just execute the following command in
 the repository root folder:
 
@@ -304,7 +317,7 @@ export POLYHEDRAL_GRAVITY_PARALLELIZATION="TBB"
 pip install .
 ```
 
-(Optional: For a faster build you can install all dependencies available
+(Optional: For a faster build, you can install all dependencies available
 for your system in your local python environment. That way, they
 won't be fetched from GitHub.)
 
@@ -312,7 +325,7 @@ won't be fetched from GitHub.)
 
 ### Building the C++ Library & Executable
 
-The program is build by using CMake. So first make sure that you installed
+The program is built by using CMake. So first make sure that you installed
 CMake and then follow these steps:
 
 ```bash
@@ -324,17 +337,16 @@ cmake --build .
 
 The following options are available:
 
-|                             Name (Default) | Options                                                                                     |
-|-------------------------------------------:|:--------------------------------------------------------------------------------------------|
-| POLYHEDRAL_GRAVITY_PARALLELIZATION (`CPP`) | `CPP` = Serial Execution / `OMP` or `TBB` = Parallel Execution with OpenMP or Intel\'s TBB  |
-|                     LOGGING_LEVEL (`INFO`) | `TRACE`, `DEBUG`, `INFO`, `WARN`, `ERROR`, `CRITICAL`, `OFF`                                |
-|                      USE_LOCAL_TBB (`OFF`) | Use a local installation of `TBB` instead of setting it up via `CMake`                      |
-|      BUILD_POLYHEDRAL_GRAVITY_DOCS (`OFF`) | Build this documentation                                                                    |
-|      BUILD_POLYHEDRAL_GRAVITY_TESTS (`ON`) | Build the Tests                                                                             |
-|   BUILD_POLYHEDRAL_PYTHON_INTERFACE (`ON`) | Build the Python interface                                                                  |
+|                                               Name (Default) | Options                                                                                     |
+|-------------------------------------------------------------:|:--------------------------------------------------------------------------------------------|
+|                   POLYHEDRAL_GRAVITY_PARALLELIZATION (`CPP`) | `CPP` = Serial Execution / `OMP` or `TBB` = Parallel Execution with OpenMP or Intel\'s TBB  |
+|                    POLYHEDRAL_GRAVITY_LOGGING_LEVEL (`INFO`) | `TRACE`, `DEBUG`, `INFO`, `WARN`, `ERROR`, `CRITICAL`, `OFF`                                |
+|                        BUILD_POLYHEDRAL_GRAVITY_DOCS (`OFF`) | Build this documentation                                                                    |
+|                        BUILD_POLYHEDRAL_GRAVITY_TESTS (`ON`) | Build the Tests                                                                             |
+|             BUILD_POLYHEDRAL_GRAVITY_PYTHON_INTERFACE (`ON`) | Build the Python interface                                                                  |
 
 During testing POLYHEDRAL_GRAVITY_PARALLELIZATION=`TBB` has been the most performant.
-It is further not recommend to change the LOGGING_LEVEL to something else than `INFO=2`.
+It is further not recommended to change the POLYHEDRAL_GRAVITY_LOGGING_LEVEL to something else than `INFO=2`.
 
 The recommended CMake settings using the `TBB` backend would look like this:
 
@@ -361,23 +373,24 @@ It is required to specify the source-files of the polyhedron's mesh (more info
 about the supported file in the [documentation](https://esa.github.io/polyhedral-gravity-model/quickstart/supported_input.html)), the density
 of the polyhedron, and the wished computation points where the
 gravity tensor shall be computed.
-Further one must specify the name of the .csv output file.
+Further, one must specify the name of the .csv output file.
 
 ````yaml
 ---
 gravityModel:
   input:
-    polyhedron: #polyhedron source-file(s)
+    polyhedron:                                 # polyhedron source-file(s)
       - "../example-config/data/tsoulis.node"   # .node contains the vertices
       - "../example-config/data/tsoulis.face"   # .face contains the triangular faces
-    density: 2670.0                             # constant density, units must match with the mesh (see section below)
-    points: # Location of the computation point(s) P
+    density: 2670.0                             # constant density, units must match with the mesh (see a section below)
+                                                # Depends on metric_unit: 'km' -> kg/km^3, 'm' -> kg/m^3, 'unitless' -> 'unitless'
+    points:                                     # Location of the computation point(s) P
       - [ 0, 0, 0 ]                             # Here it is situated at the origin
-    check_mesh: true                            # Fully optional, enables mesh autodetect+repair of 
+    check_mesh: true                            # Fully optional, enables mesh autodetect+repair of
                                                 # the polyhedron's vertex ordering (not given: true)
+    metric_unit: m                              # Unit of mesh: One of 'm', 'km' or 'unitless' (not given: 'm')
   output:
-    filename: "gravity_result.csv"              # The name of the output file 
-
+    filename: "gravity_result.csv"              # The name of the output file
 ````
 
 #### Output
@@ -388,8 +401,8 @@ computation point *P*.
 
 ## Testing
 
-The project uses GoogleTest for testing. In oder to execute those
-tests just execute the following command in the build directory:
+The project uses GoogleTest for testing.
+In order to execute those tests, just execute the following command in the build directory:
 
 ```bash
 ctest
@@ -404,5 +417,5 @@ pytest
 ## Contributing
 
 We are happy to accept contributions to the project in the form of
-suggestions, bug reports and pull requests. Please have a look at
+suggestions, bug reports, and pull requests. Please have a look at
 the [contributing guidelines](CONTRIBUTING.md) for more information.

{polyhedral_gravity-3.2.1 → polyhedral_gravity-3.3}/README.md

@@ -76,20 +76,20 @@ The evaluation of the polyhedral gravity model requires the following parameters
 | Polyhedral Mesh (either as vertices & faces or as polyhedral source files) |
 | Constant Density $\rho$                                                    |
 
-The mesh and the constants density's unit must match.
-Have a look the documentation to view the [supported mesh files](https://esa.github.io/polyhedral-gravity-model/quickstart/supported_input.html).
+The mesh and the constant density's unit must match.
+Have a look at the documentation to view the [supported mesh files](https://esa.github.io/polyhedral-gravity-model/quickstart/supported_input.html).
 
 ### Output
 
 The calculation outputs the following parameters for every Computation Point *P*.
 The units of the respective output depend on the units of the input parameters (mesh and density)!
-Hence, if e.g. your mesh is in $km$, the density must match. Further, output units will be different accordingly.
+Hence, if e.g., your mesh is in $km$, the density must match. Further, output units will be different accordingly.
 
-|                            Name                            | Unit (if mesh in $[m]$ and $\rho$ in $[kg/m^3]$) |                              Comment                              |
-|:----------------------------------------------------------:|:------------------------------------------------:|:-----------------------------------------------------------------:|
-|                            $V$                             |       $\frac{m^2}{s^2}$ or $\frac{J}{kg}$        |           The potential or also called specific energy            |
-|                    $V_x$, $V_y$, $V_z$                     |                 $\frac{m}{s^2}$                  | The gravitational accerleration in the three cartesian directions |
-| $V_{xx}$, $V_{yy}$, $V_{zz}$, $V_{xy}$, $V_{xz}$, $V_{yz}$ |                 $\frac{1}{s^2}$                  |   The spatial rate of change of the gravitational accleration    |
+|                            Name                            | Unit (if mesh in $[m]$ and $\rho$ in $[kg/m^3]$) |                             Comment                              |
+|:----------------------------------------------------------:|:------------------------------------------------:|:----------------------------------------------------------------:|
+|                            $V$                             |       $\frac{m^2}{s^2}$ or $\frac{J}{kg}$        |           The potential or also called specific energy           |
+|                    $V_x$, $V_y$, $V_z$                     |                 $\frac{m}{s^2}$                  | The gravitational acceleration in the three cartesian directions |
+| $V_{xx}$, $V_{yy}$, $V_{zz}$, $V_{xy}$, $V_{xz}$, $V_{yz}$ |                 $\frac{1}{s^2}$                  |   The spatial rate of change of the gravitational acceleration   |
 
 
 >[!NOTE]
@@ -105,7 +105,7 @@ around a cube:
 
 ```python
 import numpy as np
-from polyhedral_gravity import Polyhedron, GravityEvaluable, evaluate, PolyhedronIntegrity, NormalOrientation
+from polyhedral_gravity import Polyhedron, GravityEvaluable, evaluate, PolyhedronIntegrity, NormalOrientation, MetricUnit
 
 # We define the cube as a polyhedron with 8 vertices and 12 triangular faces
 # The polyhedron's normals point outwards (see below for checking this)
@@ -148,7 +148,7 @@ potential, acceleration, tensor = evaluate(
 The more advanced way is to use the `GravityEvaluable` class. It caches the
 internal data structure and properties which can be reused for multiple
 evaluations. This is especially useful if you want to compute the gravity
-for multiple computation points, but don't know the "future points" in advance.
+for multiple computation points but don't know the "future points" in advance.
 
 ```python
 evaluable = GravityEvaluable(polyhedron=cube_polyhedron) # stores intermediate computation steps
@@ -169,21 +169,24 @@ This property is - by default - checked when constructing the `Polyhedron`! So,
 is impossible if not **explicitly** disabled to create an invalid `Polyhedron`.
 You can disable/ enable this setting via the optional `integrity_check` flag and can even
 automatically repair the ordering via `HEAL`.
-If you are confident that your mesh is defined correctly (e.g. checked once with the integrity check)
+If you are confident that your mesh is defined correctly (e.g., checked once with the integrity check)
 you can disable this check (via `DISABLE`) to avoid the additional runtime overhead of the check.
+Also, you can set the metric unit of the mesh and the density.
+This also influences the output unit. E.g., Density in $kg/m^3$, Mesh in $m$, then the potential is given in $m^2/s^2$.
 
 ```python
 cube_polyhedron = Polyhedron(
-  polyhedral_source=(cube_vertices, cube_faces),
-  density=cube_density,
+  polyhedral_source=(cube_vertices, cube_faces),# coordinates in m (default), km, or unitless
+  density=cube_density,                         # kg/m^3 (default) or kg/km^3 or unitless
   normal_orientation=NormalOrientation.INWARDS, # OUTWARDS (default) or INWARDS
   integrity_check=PolyhedronIntegrity.VERIFY,   # VERIFY (default), DISABLE or HEAL
+  metric_unit=MetricUnit.METER,                 # METER (default), KILOMETER, UNITLESS
 )
 ```
 
 > [!TIP]
 > More examples and plots are depicted in the
-[jupyter notebook](script/polyhedral-gravity.ipynb).
+[jupyter notebook](script/polyhedral-gravity.ipynb) and the [second jupyter notebook](script/Kleopatra.ipynb)
 
 
 ### Minimal C++ Example
@@ -248,8 +251,8 @@ As a second option, you can also install the python interface with pip from [PyP
 pip install polyhedral-gravity
 ```
 
-Binaries for the most common platforms are available on PyPI including
-Windows, Linux and macOS. For macOS and Linux, binaries for
+Binaries for the most common platforms are available on PyPI, including
+Windows, Linux, and macOS. For macOS and Linux, binaries for
 `x86_64` and `aarch64` are provided.
 In case `pip` uses the source distribution, please make sure that
 you have a C++17 capable compiler and CMake installed.
@@ -257,9 +260,9 @@ you have a C++17 capable compiler and CMake installed.
 ### From source
 
 The project uses the following dependencies,
-all of them are **automatically** set-up via CMake:
+all of them are **automatically** set up via CMake:
 
-- GoogleTest (1.13.0 or compatible), only required for testing
+- GoogleTest (1.15.2 or compatible), only required for testing
 - spdlog (1.13.0 or compatible), required for logging
 - tetgen (1.6 or compatible), required for I/O
 - yaml-cpp (0.8.0 or compatible), required for I/O
@@ -267,7 +270,7 @@ all of them are **automatically** set-up via CMake:
 - xsimd (11.1.0 or compatible), required for vectorization of the `atan(..)`
 - pybind11 (2.12.0 or compatible), required for the Python interface, but not the C++ standalone
 
-The module will be build using a C++17 capable compiler,
+The module will be built using a C++17 capable compiler,
 CMake. Just execute the following command in
 the repository root folder:
 
@@ -285,7 +288,7 @@ export POLYHEDRAL_GRAVITY_PARALLELIZATION="TBB"
 pip install .
 ```
 
-(Optional: For a faster build you can install all dependencies available
+(Optional: For a faster build, you can install all dependencies available
 for your system in your local python environment. That way, they
 won't be fetched from GitHub.)
 
@@ -293,7 +296,7 @@ won't be fetched from GitHub.)
 
 ### Building the C++ Library & Executable
 
-The program is build by using CMake. So first make sure that you installed
+The program is built by using CMake. So first make sure that you installed
 CMake and then follow these steps:
 
 ```bash
@@ -305,17 +308,16 @@ cmake --build .
 
 The following options are available:
 
-|                             Name (Default) | Options                                                                                     |
-|-------------------------------------------:|:--------------------------------------------------------------------------------------------|
-| POLYHEDRAL_GRAVITY_PARALLELIZATION (`CPP`) | `CPP` = Serial Execution / `OMP` or `TBB` = Parallel Execution with OpenMP or Intel\'s TBB  |
-|                     LOGGING_LEVEL (`INFO`) | `TRACE`, `DEBUG`, `INFO`, `WARN`, `ERROR`, `CRITICAL`, `OFF`                                |
-|                      USE_LOCAL_TBB (`OFF`) | Use a local installation of `TBB` instead of setting it up via `CMake`                      |
-|      BUILD_POLYHEDRAL_GRAVITY_DOCS (`OFF`) | Build this documentation                                                                    |
-|      BUILD_POLYHEDRAL_GRAVITY_TESTS (`ON`) | Build the Tests                                                                             |
-|   BUILD_POLYHEDRAL_PYTHON_INTERFACE (`ON`) | Build the Python interface                                                                  |
+|                                               Name (Default) | Options                                                                                     |
+|-------------------------------------------------------------:|:--------------------------------------------------------------------------------------------|
+|                   POLYHEDRAL_GRAVITY_PARALLELIZATION (`CPP`) | `CPP` = Serial Execution / `OMP` or `TBB` = Parallel Execution with OpenMP or Intel\'s TBB  |
+|                    POLYHEDRAL_GRAVITY_LOGGING_LEVEL (`INFO`) | `TRACE`, `DEBUG`, `INFO`, `WARN`, `ERROR`, `CRITICAL`, `OFF`                                |
+|                        BUILD_POLYHEDRAL_GRAVITY_DOCS (`OFF`) | Build this documentation                                                                    |
+|                        BUILD_POLYHEDRAL_GRAVITY_TESTS (`ON`) | Build the Tests                                                                             |
+|             BUILD_POLYHEDRAL_GRAVITY_PYTHON_INTERFACE (`ON`) | Build the Python interface                                                                  |
 
 During testing POLYHEDRAL_GRAVITY_PARALLELIZATION=`TBB` has been the most performant.
-It is further not recommend to change the LOGGING_LEVEL to something else than `INFO=2`.
+It is further not recommended to change the POLYHEDRAL_GRAVITY_LOGGING_LEVEL to something else than `INFO=2`.
 
 The recommended CMake settings using the `TBB` backend would look like this:
 
@@ -342,23 +344,24 @@ It is required to specify the source-files of the polyhedron's mesh (more info
 about the supported file in the [documentation](https://esa.github.io/polyhedral-gravity-model/quickstart/supported_input.html)), the density
 of the polyhedron, and the wished computation points where the
 gravity tensor shall be computed.
-Further one must specify the name of the .csv output file.
+Further, one must specify the name of the .csv output file.
 
 ````yaml
 ---
 gravityModel:
   input:
-    polyhedron: #polyhedron source-file(s)
+    polyhedron:                                 # polyhedron source-file(s)
       - "../example-config/data/tsoulis.node"   # .node contains the vertices
       - "../example-config/data/tsoulis.face"   # .face contains the triangular faces
-    density: 2670.0                             # constant density, units must match with the mesh (see section below)
-    points: # Location of the computation point(s) P
+    density: 2670.0                             # constant density, units must match with the mesh (see a section below)
+                                                # Depends on metric_unit: 'km' -> kg/km^3, 'm' -> kg/m^3, 'unitless' -> 'unitless'
+    points:                                     # Location of the computation point(s) P
       - [ 0, 0, 0 ]                             # Here it is situated at the origin
-    check_mesh: true                            # Fully optional, enables mesh autodetect+repair of 
+    check_mesh: true                            # Fully optional, enables mesh autodetect+repair of
                                                 # the polyhedron's vertex ordering (not given: true)
+    metric_unit: m                              # Unit of mesh: One of 'm', 'km' or 'unitless' (not given: 'm')
   output:
-    filename: "gravity_result.csv"              # The name of the output file 
-
+    filename: "gravity_result.csv"              # The name of the output file
 ````
 
 #### Output
@@ -369,8 +372,8 @@ computation point *P*.
 
 ## Testing
 
-The project uses GoogleTest for testing. In oder to execute those
-tests just execute the following command in the build directory:
+The project uses GoogleTest for testing.
+In order to execute those tests, just execute the following command in the build directory:
 
 ```bash
 ctest
@@ -385,5 +388,5 @@ pytest
 ## Contributing
 
 We are happy to accept contributions to the project in the form of
-suggestions, bug reports and pull requests. Please have a look at
+suggestions, bug reports, and pull requests. Please have a look at
 the [contributing guidelines](CONTRIBUTING.md) for more information.

polyhedral_gravity-3.3/cmake/clang_format.cmake

@@ -0,0 +1,26 @@
+# Find clang format
+find_program(CLANG_FORMAT clang-format)
+
+# Ensure clang-format was found
+if(NOT CLANG_FORMAT)
+    message(STATUS "clang-format not found. Please install it to use clang-format via CMake")
+else()
+    message(STATUS "clang-format found. You can format all source files via `cmake --build . --target format`")
+    file(GLOB_RECURSE CLANG_FORMAT_SRC
+            "${PROJECT_SOURCE_DIR}/src/*.cpp"
+            "${PROJECT_SOURCE_DIR}/src/*.h"
+            "${PROJECT_SOURCE_DIR}/test/*.cpp"
+            "${PROJECT_SOURCE_DIR}/test/*.h"
+    )
+    add_custom_command(
+            OUTPUT format_all_files
+            COMMAND ${CLANG_FORMAT} -i ${CLANG_FORMAT_SRC}
+            WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+            COMMENT "Formatting all source and test files with clang-format"
+            VERBATIM
+    )
+
+    add_custom_target(format
+            DEPENDS format_all_files
+    )
+endif()

polyhedral_gravity-3.3/cmake/cmake_format.cmake

@@ -0,0 +1,25 @@
+find_program(CMAKE_FORMAT_EXECUTABLE NAMES cmake-format)
+
+if (NOT CMAKE_FORMAT_EXECUTABLE)
+    message(STATUS "cmake-format not found. Please install it to use cmake-format via CMake")
+else ()
+    message(STATUS "cmake-format found. You can format all source files via `cmake --build . --target format_cmake`")
+
+    # Create a list of all .cmake files in the project
+    file(GLOB_RECURSE CMAKE_FORMAT_FILES
+            "${PROJECT_SOURCE_DIR}/*.cmake"
+            "${PROJECT_SOURCE_DIR}/CMakeLists.txt"
+    )
+
+    # Add a custom target to format all .cmake files
+    add_custom_command(
+            OUTPUT format_cmake_files
+            COMMAND ${CMAKE_FORMAT_EXECUTABLE} --in-place ${CMAKE_FORMAT_FILES}
+            WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+            COMMENT "Formatting all cmake files in the project with cmake-format"
+            VERBATIM
+    )
+    add_custom_target(format_cmake
+            DEPENDS format_cmake_files
+    )
+endif ()