Skip to content
Merged
Show file tree
Hide file tree
Changes from 57 commits
Commits
Show all changes
79 commits
Select commit Hold shift + click to select a range
72d3374
interpolator base class, tests [breaking]
Fuad-HH Jan 18, 2025
a1a4196
working single mesh interpolation class
Fuad-HH Jan 22, 2025
3ea79c2
interpolator test compares each entry with expected
Fuad-HH Jan 22, 2025
c8a268e
interpolator test passes for mesh to mesh
Fuad-HH Jan 23, 2025
ab1e73e
adding c api
Fuad-HH Feb 20, 2025
c392bf4
add omega_h mesh handle struct
Fuad-HH Feb 21, 2025
8b78bf1
fortran api for interpolator
Fuad-HH Feb 21, 2025
69ad666
fortran and c api to read Omega_h mesh from file
Fuad-HH Feb 21, 2025
c87ffef
added test_interpolator_fortran
Fuad-HH Feb 21, 2025
7eeeaee
interpolator frotran api test correction
Fuad-HH Feb 21, 2025
2831e82
added pcms_interpolate function
Fuad-HH Feb 21, 2025
afd2480
test pcms interpolator api
Fuad-HH Feb 21, 2025
fdf58ed
point cloud based search working
Fuad-HH May 6, 2025
28e2406
point cloud search
Fuad-HH May 14, 2025
d4eb4b5
merge c and fortran api with develop
Fuad-HH May 19, 2025
c9557b9
mesh based and mixed interpolator for degas2 xgc coupling
Fuad-HH Sep 16, 2025
ed67fcc
minor parameter changes for better interpolation
Fuad-HH Sep 16, 2025
d8a8413
Merge branch 'mergecfortapi' of github.com:Fuad-HH/pcms into mergecfo…
Fuad-HH Sep 17, 2025
b91712c
get number of mesh elements from interpolation creating call
Fuad-HH Sep 17, 2025
bd842e2
add xgc node to degas2 centroid interpolation
Fuad-HH Sep 21, 2025
bb2dbd5
merge pcms interpolator and its c/fortran API with develop
Fuad-HH Sep 29, 2025
04a178b
fix merging error with interpolator normalization
Fuad-HH Sep 30, 2025
d9bd71f
fix interpolation class test partially (the values)
Fuad-HH Oct 9, 2025
53e53b1
divided point cloud support strcuture search
Fuad-HH Oct 10, 2025
cf8ff02
adj searches use helper functions to adapt radius
Fuad-HH Oct 10, 2025
3269492
clang-format on the changed source files
Fuad-HH Oct 10, 2025
679b493
replace prints with pcms::printInfo or Error
Fuad-HH Oct 14, 2025
5fd2ed2
interpolation parameters exposed to fortran api
Fuad-HH Oct 14, 2025
da24d7a
separate mpi comm for all mesh readers
Fuad-HH Oct 15, 2025
37d7b7f
remove assertion skip
Fuad-HH Nov 3, 2025
ebaa642
add printDebugInfo and fix typo
Fuad-HH Nov 3, 2025
fccd134
check pointers not pointing same array when copying
Fuad-HH Nov 3, 2025
7f9d9e3
add test case to test a real example of interpolation
Fuad-HH Nov 13, 2025
3cbfdf6
better parameters
Fuad-HH Nov 13, 2025
c981b25
add virtual destructor
Fuad-HH Nov 13, 2025
4039ee5
rename MLSMeshInterpolation
Fuad-HH Nov 13, 2025
2fdf849
Unify interpolator handles in C/Fortran API
Fuad-HH Nov 14, 2025
225fdf7
refactor ltx interpolation test, improved verification
Fuad-HH Nov 14, 2025
4013be7
merge develop
Fuad-HH Nov 14, 2025
5120c21
remove MPI_Comm_dup for omega_h reads
Fuad-HH Nov 20, 2025
ceb6334
minor refactorings
Fuad-HH Nov 20, 2025
ce86584
fix node file read
Fuad-HH Nov 20, 2025
0f09569
make decay_factor and lambda parameters
Fuad-HH Nov 21, 2025
833b2c4
remove degas2xgc c/fortran API
Fuad-HH Nov 21, 2025
acfd98d
replace mesh in interpolation test
Fuad-HH Nov 21, 2025
15a42ab
temporary fix for ltx interpolation test
Fuad-HH Nov 21, 2025
ce23d76
add PCMS_PRINT_ENABLED for printDebugInfo
Fuad-HH Nov 21, 2025
a2ab568
add doc to interpolation_base.h
Fuad-HH Nov 21, 2025
cbed4e1
add doc to interpolator.h
Fuad-HH Nov 21, 2025
35d20d4
temporary fix to print fail log
Fuad-HH Nov 21, 2025
b10cfb1
always print log
Fuad-HH Nov 21, 2025
e2f2287
Revert "always print log"
Fuad-HH Nov 21, 2025
38644f0
Revert "temporary fix to print fail log"
Fuad-HH Nov 21, 2025
ccdca5e
rename omega_h mesh handle api
Fuad-HH Dec 5, 2025
d2d3268
divide up mesh and library handle
Fuad-HH Dec 5, 2025
682cf37
separate header for mesh
Fuad-HH Dec 5, 2025
bc94d32
rename mesh and library handle
Fuad-HH Dec 7, 2025
a5d0f17
uint->unsigned
jacobmerson Dec 7, 2025
f7678fe
formatting with clang-format
jacobmerson Dec 7, 2025
fff5adc
add specific versions to workflow for redev and meshfields
jacobmerson Dec 7, 2025
1300e3f
Merge branch 'develop' into mergecfortapi
jacobmerson Dec 7, 2025
7bb09ba
Merge branch 'develop' into mergecfortapi
jacobmerson Dec 9, 2025
45cc9d5
add additional debugging output in ltx testcase
jacobmerson Dec 9, 2025
b59c425
make sure test log is always output
jacobmerson Dec 9, 2025
9e16b03
use git has for omega-h version in workflow until
jacobmerson Dec 9, 2025
fab3d06
change export name
Fuad-HH Dec 9, 2025
e357250
add kokkoskernel hint
Fuad-HH Dec 9, 2025
ea9549b
make cmake verbose
Fuad-HH Dec 9, 2025
ae4b8f4
debug-output
Fuad-HH Dec 9, 2025
e592902
make kokkoskernels private link
jacobmerson Dec 10, 2025
8f8d161
fix build so mls_interpolation.hpp does not need the impl included.
jacobmerson Dec 11, 2025
86715bb
add kokkos kernels link to unit test
jacobmerson Dec 11, 2025
3c8d25f
add interpolator target to pcms::pcms
jacobmerson Dec 11, 2025
4c3f7f6
rework capi targets
jacobmerson Dec 11, 2025
86ce66f
add debugging output to the installation test case
jacobmerson Dec 11, 2025
4189201
rework fortranapi targets
jacobmerson Dec 11, 2025
68774c6
update interpolator targets name
jacobmerson Dec 11, 2025
76b88bd
use pcms::pcms in example build directory
jacobmerson Dec 11, 2025
b7eee41
reorder config file to move interpolator target before c/fortran apis
jacobmerson Dec 12, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions src/pcms/capi/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,24 @@ set(CAPI_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/client.h
${CMAKE_CURRENT_SOURCE_DIR}/kokkos.h)
set_target_properties(
pcms_capi PROPERTIES PUBLIC_HEADER "${CAPI_HEADERS}" OUTPUT_NAME pcmscapi
EXPORT_NAME capi)
EXPORT_NAME capi)

add_library(pcms_interpolator_capi mesh.cpp interpolator.cpp kokkos.cpp)
add_library(pcms::interpolator::capi ALIAS pcms_interpolator_capi)
target_link_libraries(pcms_interpolator_capi PUBLIC MPI::MPI_C PRIVATE pcms::interpolator)
target_include_directories(pcms_interpolator_capi
PUBLIC
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../..>" # this makes the module path cpms/capi
"$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/pcms/capi>")
set(INT_CAPI_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/interpolator.h
${CMAKE_CURRENT_SOURCE_DIR}/mesh.h)
set_target_properties(pcms_interpolator_capi
PROPERTIES PUBLIC_HEADERS "${INT_CAPI_HEADERS}"
OUTPUT_NAME pcmsinterpolatorcapi
EXPORT_NAME interpolatorcapi)

install(
TARGETS pcms_capi
TARGETS pcms_capi pcms_interpolator_capi
EXPORT pcms_capi-targets
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
Expand Down
134 changes: 134 additions & 0 deletions src/pcms/capi/interpolator.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,134 @@
//
// Created by hasanm4 on 2/17/25.
//
#include <pcms/capi/kokkos.h>
#include <pcms/capi/interpolator.h>
#include <pcms/interpolator/interpolation_base.h>
#include <Omega_h_file.hpp>
#include <Omega_h_library.hpp>
#include <Omega_h_mesh.hpp>
#include <pcms/print.h>

//[[nodiscard]]
PcmsInterpolatorHandle pcms_create_interpolator(PcmsOmegaHMeshHandle oh_mesh,
double radius)
{
auto* source_mesh = reinterpret_cast<Omega_h::Mesh*>(oh_mesh.mesh_handle);
auto* interpolator = new MLSMeshInterpolation(*source_mesh, radius);
return {reinterpret_cast<void*>(interpolator)};
}

PcmsInterpolatorHandle pcms_create_point_based_interpolator(
void* source_points, int source_points_size, void* target_points,
int target_points_size, double radius, int degree, int min_req_supports,
double lambda, double decay_factor)
{

auto source_points_view = pcms::Rank1View<double, pcms::HostMemorySpace>(
reinterpret_cast<double*>(source_points), source_points_size);
auto target_points_view = pcms::Rank1View<double, pcms::HostMemorySpace>(
reinterpret_cast<double*>(target_points), target_points_size);
auto* interpolator = new MLSPointCloudInterpolation(
source_points_view, target_points_view, 2, radius, min_req_supports, degree,
true, lambda, decay_factor);
return {reinterpret_cast<void*>(interpolator)};
}

Omega_h::HostRead<Omega_h::Real> read_mesh_centroids(const char* mesh_filename,
int& num_elements)
{
auto fname = std::string(mesh_filename);
fname = fname.erase(fname.find_last_not_of(" \n\r\t") + 1);
pcms::printInfo("The interpolator got dg2 mesh file: %s\n", fname.c_str());
auto mesh_lib = Omega_h::Library(nullptr, nullptr, MPI_COMM_SELF);
auto mesh = Omega_h::binary::read(fname, mesh_lib.world());
auto elem_centroids = getCentroids(mesh);
num_elements = mesh.nelems();
OMEGA_H_CHECK_PRINTF(num_elements * 2 == elem_centroids.size(),
"Mesh element centroids size does not match the number "
"of elements %d != %d\n",
num_elements * 2, elem_centroids.size());

pcms::printInfo("Number of element centroids: %d\n",
elem_centroids.size() / 2);
OMEGA_H_CHECK_PRINTF(mesh.dim() == 2, "Mesh dimension is not 2D %d\n",
mesh.dim());

return {elem_centroids};
}

void write_void_int_pointer(void* pointer, int value)
{
if (pointer) {
int* dg2_elem_count_int = reinterpret_cast<int*>(pointer);
*dg2_elem_count_int = value;
} else {
pcms::printError("Error: NULL pointer provided to write integer value\n");
}
}

PcmsInterpolatorHandle pcms_create_degas2xgcnode_interpolator(
void* target_points, int target_points_size, const char* dg2_mesh_filename,
double radius, void* dg2_elem_count, int degree, int min_req_supports,
double lambda, double decay_factor)
{
// same as above pcms_create_degas2xgc_interpolator but the target points are
// provided by the user this is useful when the corresponding xgc mesh is not
// available

int dg2_num_elems = 0;
Omega_h::HostRead<Omega_h::Real> dg2_elem_centroids_host =
read_mesh_centroids(dg2_mesh_filename, dg2_num_elems);
write_void_int_pointer(dg2_elem_count, dg2_num_elems);

return pcms_create_point_based_interpolator(
(void*)dg2_elem_centroids_host.data(), dg2_elem_centroids_host.size(),
target_points, target_points_size, radius, degree, min_req_supports, lambda,
decay_factor);
}

PcmsInterpolatorHandle pcms_create_xgcnodedegas2_interpolator(
const char* dg2_mesh_filename, void* source_points, int source_points_size,
double radius, void* dg2_elem_count, int degree, int min_req_supports,
double lambda, double decay_factor)
{
int dg2_num_elems = 0;
Omega_h::HostRead<Omega_h::Real> dg2_elem_centroids_host =
read_mesh_centroids(dg2_mesh_filename, dg2_num_elems);
write_void_int_pointer(dg2_elem_count, dg2_num_elems);

return pcms_create_point_based_interpolator(
source_points, source_points_size, (void*)dg2_elem_centroids_host.data(),
dg2_elem_centroids_host.size(), radius, degree, min_req_supports, lambda,
decay_factor);
}

void pcms_destroy_interpolator(PcmsInterpolatorHandle interpolator)
{
if (interpolator.pointer != nullptr) {
delete reinterpret_cast<InterpolationBase*>(interpolator.pointer);
}
}

void pcms_interpolate(PcmsInterpolatorHandle interpolator, void* input,
int input_size, void* output, int output_size)
{
auto* mls_interpolator =
reinterpret_cast<InterpolationBase*>(interpolator.pointer);

OMEGA_H_CHECK_PRINTF(
input_size == mls_interpolator->getSourceSize(),
"Input array size does not match the source size %d != %zu\n", input_size,
mls_interpolator->getSourceSize());
OMEGA_H_CHECK_PRINTF(
output_size == mls_interpolator->getTargetSize(),
"Output array size does not match the target size %d != %zu\n", output_size,
mls_interpolator->getTargetSize());

pcms::Rank1View<double, pcms::HostMemorySpace> input_array(
reinterpret_cast<double*>(input), input_size);
pcms::Rank1View<double, pcms::HostMemorySpace> output_array(
reinterpret_cast<double*>(output), output_size);

mls_interpolator->eval(input_array, output_array);
}
182 changes: 182 additions & 0 deletions src/pcms/capi/interpolator.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,182 @@
/**
* @file interpolator.h
* @brief PCMS Interpolator C API Header
*
* This header defines the C API for the PCMS Interpolator library, which
* provides functionality for creating and using interpolators based on Moving
* Least Squares (MLS) methods. For now, it only supports 2D interpolation and
* hard-coded for RBF, Gaussian weight function.
*/

#ifndef PCMS_INTERPOLATOR_CAPI_H
#define PCMS_INTERPOLATOR_CAPI_H

#include <stdint.h>
#include "mesh.h"

#ifdef __cplusplus
extern "C" {
#endif

/**
* @brief Holds a void pointer of InterpolationBase object
* @see InterpolationBase, MLSMeshInterpolation, MLSPointCloudInterpolation
*/
struct PcmsInterpolatorHandle
{
void* pointer;
};

/**
* @brief Typedef for PcmsInterpolatorHandle struct
* @copydetails PcmsInterpolatorHandle
* @see PcmsInterpolatorHandle, InterpolationBase, MLSMeshInterpolation,
* MLSPointCloudInterpolation
*/
typedef struct PcmsInterpolatorHandle PcmsInterpolatorHandle;

/**
* @brief Create centroid to node interpolator
* @param oh_mesh Omega_h mesh handle
* @param radius Starting radius for support search
* @return PcmsInterpolatorHandle Handle to the created interpolator
*
* @details Creates an interpolator that maps values from element centroids to
* mesh nodes It uses MLS interpolation and uses the radius to start adaptive
* support search.
*
* @note Uses default parameters of MLSMeshInterpolation.
* @see MLSMeshInterpolation
*/
PcmsInterpolatorHandle pcms_create_interpolator(PcmsOmegaHMeshHandle oh_mesh,
double radius);

/**
* @brief Create 2D point-based MLS interpolator for RBF interpolation
* @param source_points Void pointer to the first source point of double of size
* source_points_size
* @param source_points_size Size of source points array \f$
* Number\ of\ source\ points \times 2 \f$
* @param target_points Void pointer to the first target point of double of size
* target_points_size
* @param target_points_size Size of target points array \f$
* Number\ of\ target\ points \times 2 \f$
* @param radius Starting radius for support search (always adaptive)
* @param degree Degree of the MLS basis functions
* @param min_req_supports Minimum required supports for each target point
* (maximum allowed supports is three times this value)
* @param lambda Regularization parameter
* @param decay_factor Decay factor for weight function
* @return PcmsInterpolatorHandle Handle to the created interpolator
*
* @details To better select the interpolation parameters, look at their
* explanation in mls_interpolation function documentation. Call
* pcms_interpolate function with this interpolator to perform interpolation
* from source points to target points. Remember to delete the created
* interpolator using pcms_destroy_interpolator function after use to avoid
* memory leaks. The user is responsible for ensuring that the source and target
* points are sustained in memory during the call of this constructor. They are
* no longer needed after the interpolator is created as they are copied
* internally.
*
* @see mls_interpolation, InterpolationBase, MLSPointCloudInterpolation
*/
PcmsInterpolatorHandle pcms_create_point_based_interpolator(
void* source_points, int source_points_size, void* target_points,
int target_points_size, double radius, int degree, int min_req_supports,
double lambda, double decay_factor);

/**
* @brief Create 2D point-based interpolator to map from Degas2 mesh element
* centroids (source) to XGC nodes (target)
* @param target_points Void pointer to the first target point of double of size
* target_points_size
* @param target_points_size Size of target points array \f$
* Number\ of\ target\ points \times 2 \f$
* @param dg2_mesh_filename C-string of Degas2 mesh filename (Omega_h (.osh)
* format)
* @param radius Starting radius for support search (always adaptive)
* @param dg2_elem_count Void pointer to integer to write the number of Degas2
* elements
* @param degree Degree of the MLS basis functions
* @param min_req_supports Minimum required supports for each target point
* (maximum allowed supports is three times this value)
* @param lambda Regularization parameter of MLS
* @param decay_factor Decay factor for weight function of MLS
* @return PcmsInterpolatorHandle Handle to the created interpolator
*
* @note This is used to interpolate after the Degas2 step in a coupled
* Degas2-XGC simulation.
* @copydetails pcms_create_point_based_interpolator
* @see mls_interpolation
*/
PcmsInterpolatorHandle pcms_create_degas2xgcnode_interpolator(
void* target_points, int target_points_size, const char* dg2_mesh_filename,
double radius, void* dg2_elem_count, int degree, int min_req_supports,
double lambda, double decay_factor);

/**
* @brief Create 2D point-based interpolator to map from XGC nodes (source) to
* Degas2 mesh element centroids (target)
* @param dg2_mesh_filename C-string of Degas2 mesh filename (Omega_h (.osh)
* format)
* @param source_points Void pointer to the first source point of double of size
* source_points_size
* @param source_points_size Size of source points array \f$
* Number\ of\ source\ points \times 2 \f$
* @param radius Starting radius for support search (always adaptive)
* @param dg2_elem_count Void pointer to integer to write the number of Degas2
* elements
* @param degree Degree of the MLS basis functions
* @param min_req_supports Minimum required supports for each target point
* (maximum allowed supports is three times this value)
* @param lambda Regularization parameter of MLS
* @param decay_factor Decay factor for weight function of MLS
* @return PcmsInterpolatorHandle Handle to the created interpolator
*
* @note This is used to interpolate before the Degas2 step in a coupled
* Degas2-XGC simulation.
* @copydetails pcms_create_point_based_interpolator
* @see mls_interpolation
*/
PcmsInterpolatorHandle pcms_create_xgcnodedegas2_interpolator(
const char* dg2_mesh_filename, void* source_points, int source_points_size,
double radius, void* dg2_elem_count, int degree, int min_req_supports,
double lambda, double decay_factor);

/**
* @brief Destroy interpolator
* @param interpolator Handle to the created interpolator
*
* @details Call this function to delete the created interpolator using
* pcms_create_interpolator or pcms_create_point_based_interpolator functions
* after use to avoid memory leaks.
*/
void pcms_destroy_interpolator(PcmsInterpolatorHandle interpolator);

/**
* @brief Perform interpolation
* @param interpolator Handle to the created interpolator
* @param input Void pointer to the first element of the input data array of
* type double and size of input_size
* @param input_size Size of the input data array which is the same as the
* number of source points/elements
* @param output Void pointer to the first element of the output data array of
* type double and size of output_size
* @param output_size Size of the output data array which is the same as the
* number of target points/elements
*
* @details Uses the given interpolator to perform interpolation using the input
* data and writes the results to the output data array.
*
* @see pcms_create_interpolator, pcms_create_point_based_interpolator,
* mls_interpolation, InterpolationBase
*/
void pcms_interpolate(PcmsInterpolatorHandle interpolator, void* input,
int input_size, void* output, int output_size);

#ifdef __cplusplus
}
#endif

#endif // PCMS_INTERPOLATOR_CAPI_H
45 changes: 45 additions & 0 deletions src/pcms/capi/mesh.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
#include "mesh.h"

#include <Omega_h_file.hpp>
#include <Omega_h_library.hpp>
#include <Omega_h_mesh.hpp>

PcmsOmegaHLibraryHandle pcms_create_omega_h_library()
{
#ifdef Omega_H_USE_MPI
Omega_h::Library* oh_lib =
new Omega_h::Library(nullptr, nullptr, MPI_COMM_SELF);
#else
Omega_h::Library* oh_lib = new Omega_h::Library(nullptr, nullptr);
#endif

return {reinterpret_cast<void*>(oh_lib)};
}

PcmsOmegaHMeshHandle pcms_create_omega_h_mesh(
const char* filename, const PcmsOmegaHLibraryHandle oh_lib_handle)
{
auto fname = std::string(filename);
// trim the filename since it is coming from c or fortran api which may have
// extra spaces at the end
fname.erase(fname.find_last_not_of(" \n\r\t") + 1);
Omega_h::Library* oh_lib =
reinterpret_cast<Omega_h::Library*>(oh_lib_handle.lib_handle);
auto* mesh = new Omega_h::Mesh(Omega_h::binary::read(fname, oh_lib->world()));

return {reinterpret_cast<void*>(mesh)};
}

void pcms_destroy_omega_h_mesh(PcmsOmegaHMeshHandle oh_mesh)
{
if (oh_mesh.mesh_handle != nullptr) {
delete reinterpret_cast<Omega_h::Mesh*>(oh_mesh.mesh_handle);
}
}

void pcms_destroy_omega_h_library(PcmsOmegaHLibraryHandle oh_lib_handle)
{
if (oh_lib_handle.lib_handle != nullptr) {
delete reinterpret_cast<Omega_h::Library*>(oh_lib_handle.lib_handle);
}
}
Loading
Loading