make decay_factor and lambda parameters

Author: Fuad-HH

src/pcms/interpolator/interpolation_base.cpp

@@ -31,13 +31,16 @@ Omega_h::Reals getCentroids(Omega_h::Mesh& mesh)
 
 MLSMeshInterpolation::MLSMeshInterpolation(Omega_h::Mesh& source_mesh,
                                            double radius, uint min_req_support,
-                                           uint degree, bool adapt_radius)
+                                           uint degree, bool adapt_radius,
+                                           double lambda, double decay_factor)
   : source_mesh_(source_mesh),
     target_mesh_(source_mesh),
     radius_(radius),
     min_req_supports_(min_req_support),
     degree_(degree),
-    adapt_radius_(adapt_radius)
+    adapt_radius_(adapt_radius),
+    lambda_(lambda),
+    decay_factor_(decay_factor)
 {
   single_mesh_ = true;
   target_coords_ = source_mesh_.coords();
@@ -60,13 +63,16 @@ MLSMeshInterpolation::MLSMeshInterpolation(Omega_h::Mesh& source_mesh,
                                            Omega_h::Mesh& target_mesh,
                                            const double radius,
                                            uint min_req_support, uint degree,
-                                           const bool adapt_radius)
+                                           const bool adapt_radius,
+                                           double lambda, double decay_factor)
   : source_mesh_(source_mesh),
     target_mesh_(target_mesh),
     radius_(radius),
     min_req_supports_(min_req_support),
     degree_(degree),
-    adapt_radius_(adapt_radius)
+    adapt_radius_(adapt_radius),
+    lambda_(lambda),
+    decay_factor_(decay_factor)
 {
   OMEGA_H_CHECK_PRINTF(source_mesh_.dim() == 2 && target_mesh_.dim() == 2,
                        "Only 2D meshes are supported but found %d, %d\n",
@@ -80,7 +86,7 @@ MLSMeshInterpolation::MLSMeshInterpolation(Omega_h::Mesh& source_mesh,
   target_field_ =
     Omega_h::HostWrite<Omega_h::Real>(target_mesh_.nverts(), "target field");
 
-  find_supports(min_req_supports_);
+  find_supports(min_req_supports_, 3 * min_req_supports_);
 }
 
 KOKKOS_INLINE_FUNCTION
@@ -391,8 +397,9 @@ void MLSMeshInterpolation::eval(
 
   // TODO: make the basis function a template or pass it as a parameter
   auto target_field_write = mls_interpolation(
-    Omega_h::Reals(source_field_), source_coords_, target_coords_, supports_, 2,
-    degree_, pcms::RadialBasisFunction::RBF_GAUSSIAN, 0, 1e-6, 5);
+    Omega_h::Reals(source_field_), source_coords_, target_coords_, supports_,
+    source_mesh_.dim(), degree_, pcms::RadialBasisFunction::RBF_GAUSSIAN,
+    lambda_, 1e-6, decay_factor_);
 
   target_field_ = Omega_h::HostWrite<Omega_h::Real>(target_field_write);
   copyHostWrite2ScalarArrayView(target_field_, target_field);

src/pcms/interpolator/interpolation_base.h

@@ -147,7 +147,8 @@ class MLSMeshInterpolation final : public InterpolationBase
    */
   MLSMeshInterpolation(Omega_h::Mesh& source_mesh, Omega_h::Mesh& target_mesh,
                        double radius, uint min_req_supports = 10,
-                       uint degree = 3, bool adapt_radius = true);
+                       uint degree = 3, bool adapt_radius = true,
+                       double lambda = 0.0, double decay_factor = 5.0);
 
   /**
    * @brief Centroids to Vertices interpolation for a single mesh
@@ -159,7 +160,8 @@ class MLSMeshInterpolation final : public InterpolationBase
    */
   MLSMeshInterpolation(Omega_h::Mesh& source_mesh, double radius,
                        uint min_req_supports = 10, uint degree = 3,
-                       bool adapt_radius = true);
+                       bool adapt_radius = true, double lambda = 0.0,
+                       double decay_factor = 5.0);
 
   size_t getSourceSize() const override;
   size_t getTargetSize() const override;
@@ -168,6 +170,8 @@ class MLSMeshInterpolation final : public InterpolationBase
 
 private:
   double radius_;
+  double lambda_;
+  double decay_factor_;
   bool adapt_radius_;
   bool single_mesh_ = false;
   uint degree_;

test/test_interpolation_class.cpp

@@ -131,7 +131,8 @@ TEST_CASE("Test MLSMeshInterpolation")
     pcms::printInfo("\n-------------------- Single Mesh Interpolation Test "
                     "Started --------------------\n");
     pcms::printInfo("Mesh based search...\n");
-    auto mls_single = MLSMeshInterpolation(source_mesh, 0.12, 15, 3, true);
+    auto mls_single =
+      MLSMeshInterpolation(source_mesh, 0.12, 15, 3, true, 0.0, 5.0);
 
     auto source_points_reals = getCentroids(source_mesh);
     auto source_points_host =
@@ -157,7 +158,7 @@ TEST_CASE("Test MLSMeshInterpolation")
     REQUIRE(source_mesh.dim() == 2);
     pcms::printInfo("Point cloud based search...\n");
     auto point_mls = MLSPointCloudInterpolation(
-      source_points_view, target_points_view, 2, 0.12, 15, 3, true);
+      source_points_view, target_points_view, 2, 0.12, 15, 3, true, 0.0, 5.0);
 
     Omega_h::Write<Omega_h::Real> sinxcosy_centroid(source_mesh.nfaces(),
                                                     "sinxcosy_centroid");
@@ -279,8 +280,8 @@ TEST_CASE("Test MLSMeshInterpolation")
     // translate_mesh(&target_mesh, Omega_h::Vector<2>{(1.0 - 0.999) / 2.0,
     //                                                (1.0 - 0.999) / 2.0});
 
-    auto mls_double =
-      MLSMeshInterpolation(source_mesh, target_mesh, 0.12, 15, 3, true);
+    auto mls_double = MLSMeshInterpolation(source_mesh, target_mesh, 0.12, 15,
+                                           3, true, 0.0, 5.0);
 
     Omega_h::HostWrite<double> source_data_host_write(source_sinxcosy_node);
     Omega_h::HostWrite<double> interpolated_data_hwrite(