From 1de184cbfa6a74ba3f534912a82f49435d2618f4 Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Thu, 7 Sep 2023 10:59:14 +0200 Subject: [PATCH] ASMs2D::evalPoint: use geometry basis --- src/ASM/ASMs2D.C | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/ASM/ASMs2D.C b/src/ASM/ASMs2D.C index e1734be7..e8898dc7 100644 --- a/src/ASM/ASMs2D.C +++ b/src/ASM/ASMs2D.C @@ -2546,11 +2546,12 @@ bool ASMs2D::integrate (Integrand& integrand, int lIndex, int ASMs2D::evalPoint (const double* xi, double* param, Vec3& X) const { - if (!surf) return -2; + const Go::SplineSurface* geo = this->getBasis(ASM::GEOMETRY_BASIS); + if (!geo) return -2; - param[0] = (1.0-xi[0])*surf->startparam_u() + xi[0]*surf->endparam_u(); - param[1] = (1.0-xi[1])*surf->startparam_v() + xi[1]*surf->endparam_v(); - SplineUtils::point(X,param[0],param[1],surf); + param[0] = (1.0-xi[0])*geo->startparam_u() + xi[0]*geo->endparam_u(); + param[1] = (1.0-xi[1])*geo->startparam_v() + xi[1]*geo->endparam_v(); + SplineUtils::point(X,param[0],param[1],geo); // Check if this point matches any of the control points (nodes) return this->searchCtrlPt(surf->coefs_begin(),surf->coefs_end(),