From 733c9c51a93add49ce22f424af2a699b845d6d34 Mon Sep 17 00:00:00 2001
From: Arne Morten Kvarving <arne.morten.kvarving@sintef.no>
Date: Thu, 19 May 2022 10:41:12 +0200
Subject: [PATCH] added: set parameters in SplineUtils::project

---
 src/Utility/SplineUtils.C | 12 ++++++++----
 src/Utility/SplineUtils.h |  3 ++-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/Utility/SplineUtils.C b/src/Utility/SplineUtils.C
index ed166b6d..085192f1 100644
--- a/src/Utility/SplineUtils.C
+++ b/src/Utility/SplineUtils.C
@@ -31,11 +31,13 @@ Vec3 SplineUtils::toVec3 (const Go::Point& X, int nsd)
 }
 
 
-Vec4 SplineUtils::toVec4 (const Go::Point& X, Real time)
+Vec4 SplineUtils::toVec4 (const Go::Point& X, Real time,
+                          const double* u)
 {
   Vec4 Y;
   for (int i = 0; i < X.size() && i < 3; i++) Y[i] = X[i];
   Y.t = time;
+  Y.u = u;
   return Y;
 }
 
@@ -195,7 +197,7 @@ Go::SplineCurve* SplineUtils::project (const Go::SplineCurve* curve,
   {
     gpar[i] = basis.grevilleParameter(i);
     curve->point(X,gpar[i]);
-    fOfX = f.getValue(toVec4(X,time));
+    fOfX = f.getValue(toVec4(X,time,&gpar[i]));
     fval.insert(fval.end(),fOfX.begin(),fOfX.begin()+nComp);
   }
 
@@ -238,7 +240,8 @@ Go::SplineSurface* SplineUtils::project (const Go::SplineSurface* surface,
     for (i = 0; i < nu; i++)
     {
       surface->point(X,upar[i],vpar[j]);
-      fOfX = f.getValue(toVec4(X,time));
+      double u[2] = {upar[i], vpar[j]};
+      fOfX = f.getValue(toVec4(X,time,u));
       fval.insert(fval.end(),fOfX.begin(),fOfX.begin()+nComp);
     }
 
@@ -288,7 +291,8 @@ Go::SplineVolume* SplineUtils::project (const Go::SplineVolume* volume,
       for (i = 0; i < nu; i++)
       {
         volume->point(X,upar[i],vpar[j],wpar[k]);
-        fOfX = f.getValue(toVec4(X,time));
+        double u[3] = {upar[i], vpar[j], wpar[k]};
+        fOfX = f.getValue(toVec4(X,time,u));
         fval.insert(fval.end(),fOfX.begin(),fOfX.begin()+nComp);
       }
 
diff --git a/src/Utility/SplineUtils.h b/src/Utility/SplineUtils.h
index 62ecf003..5728215b 100644
--- a/src/Utility/SplineUtils.h
+++ b/src/Utility/SplineUtils.h
@@ -38,7 +38,8 @@ namespace SplineUtils //! Various utility functions on spline objects.
   //! \brief Helper method for casting a \a Go::Point object to Vec3.
   Vec3 toVec3(const Go::Point& X, int nsd = 3);
   //! \brief Helper method for casting a \a Go::Point and time object to Vec4.
-  Vec4 toVec4(const Go::Point& X, Real time = Real(0));
+  Vec4 toVec4(const Go::Point& X, Real time = Real(0),
+              const double* u = nullptr);
 
   //! \brief Evaluates given spline curve at a parametric point.
   void point(Vec3& X, double u, Go::SplineCurve* curve);