OilfieldToolsNet/IFEM
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changed: get rid of confusing use of dimension variable

Browse Source 
introduce a perknot variable instead. this is the true meaning
of the entity and we avoid the confusing increase/decrease cycle

git-svn-id: http://svn.sintef.no/trondheim/IFEM/trunk@1540 e10b68d5-8a6e-419e-a041-bce267b0401d
This commit is contained in:
akva 2012-03-22 10:41:05 +00:00 committed by Knut Morten Okstad
parent 2f0bd93bff
commit 75e6b3f4ee
2 changed files with 75 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
src/ASM/ASMs2DInterpolate.C
View File

@ -26,6 +26,7 @@ Go::SplineSurface*
ASSERT((int)wpar_u.size() == (int)par_u.size()); ASSERT((int)wpar_u.size() == (int)par_u.size());
ASSERT((int)wpar_v.size() == (int)par_v.size()); ASSERT((int)wpar_v.size() == (int)par_v.size());
std::vector<double> points2; std::vector<double> points2;
int perknot=dimension;
if (rational) if (rational)
{ {
// Include weight information // Include weight information
@ -44,7 +45,7 @@ Go::SplineSurface*
points2.push_back(points[kr*dimension+kh]*wgtval[kr]); points2.push_back(points[kr*dimension+kh]*wgtval[kr]);
points2.push_back(wgtval[kr]); points2.push_back(wgtval[kr]);
} }
dimension++; perknot++;
} }
else else
points2 = points; points2 = points;
@ -59,8 +60,8 @@ Go::SplineSurface*
// Interpolate // Interpolate
std::vector<double> coefs; std::vector<double> coefs;
std::vector<double> pnts; std::vector<double> pnts;
pnts.insert(pnts.end(), points2.begin()+ki*dimension*par_u.size(), pnts.insert(pnts.end(), points2.begin()+ki*perknot*par_u.size(),
points2.begin()+(ki+1)*dimension*par_u.size()); points2.begin()+(ki+1)*perknot*par_u.size());
SplineInterpolator::leastsquare_approximation(par_u, wpar_u, pnts, SplineInterpolator::leastsquare_approximation(par_u, wpar_u, pnts,
tg_pnt, basis_u, coefs); tg_pnt, basis_u, coefs);
cv_coefs.insert(cv_coefs.end(), coefs.begin(), coefs.end()); cv_coefs.insert(cv_coefs.end(), coefs.begin(), coefs.end());
@ -71,11 +72,6 @@ Go::SplineSurface*
SplineInterpolator::leastsquare_approximation(par_v, wpar_v, cv_coefs, SplineInterpolator::leastsquare_approximation(par_v, wpar_v, cv_coefs,
tg_pnt, basis_v, sf_coefs); tg_pnt, basis_v, sf_coefs);
if (rational)
{
dimension--;
}
// Make surface // Make surface
Go::SplineSurface* surf = new Go::SplineSurface(basis_u, basis_v, Go::SplineSurface* surf = new Go::SplineSurface(basis_u, basis_v,
sf_coefs.begin(), dimension, sf_coefs.begin(), dimension,
@ -117,6 +113,7 @@ Go::SplineSurface*
ASSERT( (par_v.size()+1)*0.5 - (2*(basis_v.order()-1)-1) >= 0); ASSERT( (par_v.size()+1)*0.5 - (2*(basis_v.order()-1)-1) >= 0);
std::vector<double> points2; std::vector<double> points2;
int perknot=dimension;
if (rational) if (rational)
{ {
// Include weight information // Include weight information
@ -135,7 +132,7 @@ Go::SplineSurface*
points2.push_back(points[kr*dimension+kh]*wgtval[kr]); points2.push_back(points[kr*dimension+kh]*wgtval[kr]);
points2.push_back(wgtval[kr]); points2.push_back(wgtval[kr]);
} }
dimension++; perknot++;
} }
else else
points2 = points; points2 = points;
@ -177,8 +174,8 @@ Go::SplineSurface*
{ {
// Interpolate over local patch of size 2*degree_p-1 (moving window priciple) // Interpolate over local patch of size 2*degree_p-1 (moving window priciple)
std::vector<double> pnts; std::vector<double> pnts;
pnts.insert(pnts.end(), points2.begin()+ki*dimension*par_u.size(), pnts.insert(pnts.end(), points2.begin()+ki*perknot*par_u.size(),
points2.begin()+(ki+1)*dimension*par_u.size()); points2.begin()+(ki+1)*perknot*par_u.size());
int ui_end = par_u.size() + 2*count_multipl_knots_u - basis_u.numCoefs()+1; int ui_end = par_u.size() + 2*count_multipl_knots_u - basis_u.numCoefs()+1;
// case evaluation depending on multiplicity of knots in u-direction // case evaluation depending on multiplicity of knots in u-direction
@ -189,7 +186,7 @@ Go::SplineSurface*
std::vector<double> pnts_parts; std::vector<double> pnts_parts;
std::vector<double> par_u_parts; std::vector<double> par_u_parts;
par_u_parts.insert(par_u_parts.end(),par_u.begin()+ui*2,par_u.begin()+ui*2+(2*p-1)); par_u_parts.insert(par_u_parts.end(),par_u.begin()+ui*2,par_u.begin()+ui*2+(2*p-1));
pnts_parts.insert(pnts_parts.end(), pnts.begin()+ui*2*dimension, pnts.begin()+(ui*2+(2*p-1))*dimension); pnts_parts.insert(pnts_parts.end(), pnts.begin()+ui*2*perknot, pnts.begin()+(ui*2+(2*p-1))*perknot);
std::vector<double> coefs; std::vector<double> coefs;
SplineInterpolator::quasiinterpolate(par_u_parts, pnts_parts, tg_pnt, SplineInterpolator::quasiinterpolate(par_u_parts, pnts_parts, tg_pnt,
basis_u, ui, coefs); basis_u, ui, coefs);
@ -224,7 +221,7 @@ Go::SplineSurface*
std::vector<double> pnts_parts; std::vector<double> pnts_parts;
std::vector<double> par_u_parts; std::vector<double> par_u_parts;
par_u_parts.insert(par_u_parts.end(),par_u.begin()+(j+count)*2,par_u.begin()+(j+count)*2+(2*p-1));//dp(j+count,:) par_u_parts.insert(par_u_parts.end(),par_u.begin()+(j+count)*2,par_u.begin()+(j+count)*2+(2*p-1));//dp(j+count,:)
pnts_parts.insert(pnts_parts.end(), pnts.begin()+(j+count)*2*dimension, pnts.begin()+((j+count)*2+(2*p-1))*dimension); pnts_parts.insert(pnts_parts.end(), pnts.begin()+(j+count)*2*perknot, pnts.begin()+((j+count)*2+(2*p-1))*perknot);
std::vector<double> coefs; std::vector<double> coefs;
SplineInterpolator::quasiinterpolate(par_u_parts, pnts_parts, tg_pnt, SplineInterpolator::quasiinterpolate(par_u_parts, pnts_parts, tg_pnt,
basis_u, j+count+countj, coefs); basis_u, j+count+countj, coefs);
@ -236,7 +233,7 @@ Go::SplineSurface*
std::vector<double> pnts_parts; std::vector<double> pnts_parts;
std::vector<double> par_u_parts; std::vector<double> par_u_parts;
par_u_parts.insert(par_u_parts.end(),par_u.begin()+p-m+1+j+2*count,par_u.begin()+3*p-m-1+j+2*count+1);//dist_vec(p-m+1+j+2*count:3*p-m-1+j+2*count) par_u_parts.insert(par_u_parts.end(),par_u.begin()+p-m+1+j+2*count,par_u.begin()+3*p-m-1+j+2*count+1);//dist_vec(p-m+1+j+2*count:3*p-m-1+j+2*count)
pnts_parts.insert(pnts_parts.end(), pnts.begin()+(p-m+1+j+2*count)*dimension, pnts.begin()+(3*p-m-1+j+2*count+1)*dimension); pnts_parts.insert(pnts_parts.end(), pnts.begin()+(p-m+1+j+2*count)*perknot, pnts.begin()+(3*p-m-1+j+2*count+1)*perknot);
std::vector<double> coefs; std::vector<double> coefs;
SplineInterpolator::quasiinterpolate(par_u_parts, pnts_parts, tg_pnt, SplineInterpolator::quasiinterpolate(par_u_parts, pnts_parts, tg_pnt,
basis_u, j+countj, coefs); basis_u, j+countj, coefs);
@ -248,7 +245,7 @@ Go::SplineSurface*
std::vector<double> pnts_parts; std::vector<double> pnts_parts;
std::vector<double> par_u_parts; std::vector<double> par_u_parts;
par_u_parts.insert(par_u_parts.end(),par_u.begin()+(j+count+((p-m+2)*0.5)+m-2)*2,par_u.begin()+(j+count+((p-m+2)*0.5)+m-2)*2+(2*p-1));//dp(j+count+((p-m+2)*0.5)+m-2,:) par_u_parts.insert(par_u_parts.end(),par_u.begin()+(j+count+((p-m+2)*0.5)+m-2)*2,par_u.begin()+(j+count+((p-m+2)*0.5)+m-2)*2+(2*p-1));//dp(j+count+((p-m+2)*0.5)+m-2,:)
pnts_parts.insert(pnts_parts.end(), pnts.begin()+(j+count+((p-m+2)*0.5)+m-2)*2*dimension, pnts.begin()+((j+count+((p-m+2)*0.5)+m-2)*2+(2*p-1))*dimension); pnts_parts.insert(pnts_parts.end(), pnts.begin()+(j+count+((p-m+2)*0.5)+m-2)*2*perknot, pnts.begin()+((j+count+((p-m+2)*0.5)+m-2)*2+(2*p-1))*perknot);
std::vector<double> coefs; std::vector<double> coefs;
SplineInterpolator::quasiinterpolate(par_u_parts, pnts_parts, tg_pnt, SplineInterpolator::quasiinterpolate(par_u_parts, pnts_parts, tg_pnt,
basis_u, j+countj, coefs); basis_u, j+countj, coefs);
@ -264,7 +261,7 @@ Go::SplineSurface*
std::vector<double> pnts_parts; std::vector<double> pnts_parts;
std::vector<double> par_u_parts; std::vector<double> par_u_parts;
par_u_parts.insert(par_u_parts.end(),par_u.begin()+(j+count)*2,par_u.begin()+(j+count)*2+(2*p-1));//dp(j+count,:) par_u_parts.insert(par_u_parts.end(),par_u.begin()+(j+count)*2,par_u.begin()+(j+count)*2+(2*p-1));//dp(j+count,:)
pnts_parts.insert(pnts_parts.end(), pnts.begin()+(j+count)*2*dimension, pnts.begin()+((j+count)*2+(2*p-1))*dimension); pnts_parts.insert(pnts_parts.end(), pnts.begin()+(j+count)*2*perknot, pnts.begin()+((j+count)*2+(2*p-1))*perknot);
std::vector<double> coefs; std::vector<double> coefs;
SplineInterpolator::quasiinterpolate(par_u_parts, pnts_parts, tg_pnt, SplineInterpolator::quasiinterpolate(par_u_parts, pnts_parts, tg_pnt,
basis_u, j+count+countj, coefs); basis_u, j+count+countj, coefs);
@ -276,7 +273,7 @@ Go::SplineSurface*
std::vector<double> pnts_parts; std::vector<double> pnts_parts;
std::vector<double> par_u_parts; std::vector<double> par_u_parts;
par_u_parts.insert(par_u_parts.end(),par_u.begin()+p-m+j+2*count,par_u.begin()+3*p-m-2+2*count+j+1);//dist_vec(p-m+j+2*count:3*p-m-2+2*count+j) par_u_parts.insert(par_u_parts.end(),par_u.begin()+p-m+j+2*count,par_u.begin()+3*p-m-2+2*count+j+1);//dist_vec(p-m+j+2*count:3*p-m-2+2*count+j)
pnts_parts.insert(pnts_parts.end(), pnts.begin()+(p-m+j+2*count)*dimension, pnts.begin()+(3*p-m-2+2*count+j+1)*dimension); pnts_parts.insert(pnts_parts.end(), pnts.begin()+(p-m+j+2*count)*perknot, pnts.begin()+(3*p-m-2+2*count+j+1)*perknot);
std::vector<double> coefs; std::vector<double> coefs;
SplineInterpolator::quasiinterpolate(par_u_parts, pnts_parts, tg_pnt, SplineInterpolator::quasiinterpolate(par_u_parts, pnts_parts, tg_pnt,
basis_u, j+countj, coefs); basis_u, j+countj, coefs);
@ -288,7 +285,7 @@ Go::SplineSurface*
std::vector<double> pnts_parts; std::vector<double> pnts_parts;
std::vector<double> par_u_parts; std::vector<double> par_u_parts;
par_u_parts.insert(par_u_parts.end(),par_u.begin()+p+j+2*count,par_u.begin()+3*p-2+j+2*count+1);//dist_vec(p+j+2*count:3*p-2+j+2*count) par_u_parts.insert(par_u_parts.end(),par_u.begin()+p+j+2*count,par_u.begin()+3*p-2+j+2*count+1);//dist_vec(p+j+2*count:3*p-2+j+2*count)
pnts_parts.insert(pnts_parts.end(), pnts.begin()+(p+j+2*count)*dimension, pnts.begin()+(3*p-2+j+2*count+1)*dimension); pnts_parts.insert(pnts_parts.end(), pnts.begin()+(p+j+2*count)*perknot, pnts.begin()+(3*p-2+j+2*count+1)*perknot);
std::vector<double> coefs; std::vector<double> coefs;
SplineInterpolator::quasiinterpolate(par_u_parts, pnts_parts, tg_pnt, SplineInterpolator::quasiinterpolate(par_u_parts, pnts_parts, tg_pnt,
basis_u, j+countj, coefs); basis_u, j+countj, coefs);
@ -300,7 +297,7 @@ Go::SplineSurface*
std::vector<double> pnts_parts; std::vector<double> pnts_parts;
std::vector<double> par_u_parts; std::vector<double> par_u_parts;
par_u_parts.insert(par_u_parts.end(),par_u.begin()+(j+count+((p-m+1)*0.5)+m-1)*2,par_u.begin()+(j+count+((p-m+1)*0.5)+m-1)*2+(2*p-1));//dp(j+count+((p-m+1)*0.5)+m-1,:) par_u_parts.insert(par_u_parts.end(),par_u.begin()+(j+count+((p-m+1)*0.5)+m-1)*2,par_u.begin()+(j+count+((p-m+1)*0.5)+m-1)*2+(2*p-1));//dp(j+count+((p-m+1)*0.5)+m-1,:)
pnts_parts.insert(pnts_parts.end(), pnts.begin()+(j+count+((p-m+1)*0.5)+m-1)*2*dimension, pnts.begin()+((j+count+((p-m+1)*0.5)+m-1)*2+(2*p-1))*dimension); pnts_parts.insert(pnts_parts.end(), pnts.begin()+(j+count+((p-m+1)*0.5)+m-1)*2*perknot, pnts.begin()+((j+count+((p-m+1)*0.5)+m-1)*2+(2*p-1))*perknot);
std::vector<double> coefs; std::vector<double> coefs;
SplineInterpolator::quasiinterpolate(par_u_parts, pnts_parts, tg_pnt, SplineInterpolator::quasiinterpolate(par_u_parts, pnts_parts, tg_pnt,
basis_u, j+countj, coefs); basis_u, j+countj, coefs);
@ -317,7 +314,7 @@ Go::SplineSurface*
std::vector<double> pnts_parts; std::vector<double> pnts_parts;
std::vector<double> par_u_parts; std::vector<double> par_u_parts;
par_u_parts.insert(par_u_parts.end(),par_u.begin()+(dcount+ti-(m-1))*2,par_u.begin()+(dcount+ti-(m-1))*2+(2*p-1)); par_u_parts.insert(par_u_parts.end(),par_u.begin()+(dcount+ti-(m-1))*2,par_u.begin()+(dcount+ti-(m-1))*2+(2*p-1));
pnts_parts.insert(pnts_parts.end(), pnts.begin()+(dcount+ti-(m-1))*2*dimension, pnts.begin()+((dcount+ti-(m-1))*2+(2*p-1))*dimension); pnts_parts.insert(pnts_parts.end(), pnts.begin()+(dcount+ti-(m-1))*2*perknot, pnts.begin()+((dcount+ti-(m-1))*2+(2*p-1))*perknot);
std::vector<double> coefs; std::vector<double> coefs;
SplineInterpolator::quasiinterpolate(par_u_parts, pnts_parts, tg_pnt, SplineInterpolator::quasiinterpolate(par_u_parts, pnts_parts, tg_pnt,
@ -329,7 +326,7 @@ Go::SplineSurface*
std::vector<double> pnts_parts; std::vector<double> pnts_parts;
std::vector<double> par_u_parts; std::vector<double> par_u_parts;
par_u_parts.insert(par_u_parts.end(),par_u.begin()+(ti+dcount)*2,par_u.begin()+(ti+dcount)*2+(2*p-1)); par_u_parts.insert(par_u_parts.end(),par_u.begin()+(ti+dcount)*2,par_u.begin()+(ti+dcount)*2+(2*p-1));
pnts_parts.insert(pnts_parts.end(), pnts.begin()+(ti+dcount)*2*dimension, pnts.begin()+((ti+dcount)*2+(2*p-1))*dimension); pnts_parts.insert(pnts_parts.end(), pnts.begin()+(ti+dcount)*2*perknot, pnts.begin()+((ti+dcount)*2+(2*p-1))*perknot);
std::vector<double> coefs; std::vector<double> coefs;
SplineInterpolator::quasiinterpolate(par_u_parts, pnts_parts, tg_pnt, SplineInterpolator::quasiinterpolate(par_u_parts, pnts_parts, tg_pnt,
basis_u, ti, coefs); basis_u, ti, coefs);
@ -373,7 +370,7 @@ Go::SplineSurface*
//---------------------------------------------------- //----------------------------------------------------
std::vector<double> sf_coefs; std::vector<double> sf_coefs;
int ucount = (par_u.size() + 2*count_multipl_knots_u - basis_u.numCoefs()+1)*(2*p-1)*dimension; int ucount = (par_u.size() + 2*count_multipl_knots_u - basis_u.numCoefs()+1)*(2*p-1)*perknot;
int vi_end = par_v.size() + 2*count_multipl_knots_v - basis_v.numCoefs()+1 ; int vi_end = par_v.size() + 2*count_multipl_knots_v - basis_v.numCoefs()+1 ;
if (count_multipl_knots_v == 0) if (count_multipl_knots_v == 0)
@ -553,7 +550,7 @@ Go::SplineSurface*
std::vector<double> tmp; std::vector<double> tmp;
for(int i = 0; i < gmyl ; i++) for(int i = 0; i < gmyl ; i++)
{ {
for(int j=0 ; j < gmxl*dimension ;j++) for(int j=0 ; j < gmxl*perknot ;j++)
{ {
tmp.push_back( 0.0 ); tmp.push_back( 0.0 );
} }
@ -561,7 +558,7 @@ Go::SplineSurface*
} }
std::vector<double> sf_coefs_solution; std::vector<double> sf_coefs_solution;
for(int i = 0; i < n*m*dimension ; i++) for(int i = 0; i < n*m*perknot ; i++)
sf_coefs_solution.push_back( 0.0 ); sf_coefs_solution.push_back( 0.0 );
int starti, startj; int starti, startj;
@ -580,61 +577,61 @@ Go::SplineSurface*
{if (invyl == 1) {if (invyl == 1)
{if (a == 0) {if (a == 0)
for (int i = starti;i<(starti+2*q-1);i++) for (int i = starti;i<(starti+2*q-1);i++)
for (int j = startj;j<(startj+p)*dimension;j++) for (int j = startj;j<(startj+p)*perknot;j++)
gm[i][j] = 1; gm[i][j] = 1;
else if (a == invxl-1) else if (a == invxl-1)
for (int i = starti;i<(starti+2*q-1);i++) for (int i = starti;i<(starti+2*q-1);i++)
for (int j = (startj+p-1)*dimension; j< (startj+2*p-1)*dimension;j++) for (int j = (startj+p-1)*perknot; j< (startj+2*p-1)*perknot;j++)
gm[i][j] = 1; gm[i][j] = 1;
for (int i = starti;i<(starti+2*q-1);i++) for (int i = starti;i<(starti+2*q-1);i++)
for (int j = (startj+p-1)*dimension;j<(startj+p)*dimension;j++) for (int j = (startj+p-1)*perknot;j<(startj+p)*perknot;j++)
gm[i][j] = 1;} gm[i][j] = 1;}
else if (invxl == 1) // else if (invxl == 1) //
{if (b == 0) {if (b == 0)
for (int i = starti; i< (starti+q);i++) for (int i = starti; i< (starti+q);i++)
for (int j = startj;j<(startj+2*p-1)*dimension;j++) for (int j = startj;j<(startj+2*p-1)*perknot;j++)
gm[i][j] = 1; gm[i][j] = 1;
else if (b == invyl-1) else if (b == invyl-1)
for (int i = (starti+q-1);i<(starti+2*q-1);i++) for (int i = (starti+q-1);i<(starti+2*q-1);i++)
for (int j = startj;j<(startj+2*p-1)*dimension;j++) for (int j = startj;j<(startj+2*p-1)*perknot;j++)
gm[i][j] = 1; gm[i][j] = 1;
for (int i = (starti+q-1);i<(starti+q);i++) for (int i = (starti+q-1);i<(starti+q);i++)
for (int j = startj;j<(startj+2*p-1)*dimension;j++) for (int j = startj;j<(startj+2*p-1)*perknot;j++)
gm[i][j] = 1;} gm[i][j] = 1;}
else if (b==0 && a == 0) //top left corner else if (b==0 && a == 0) //top left corner
for (int i = starti;i<(starti+q);i++) for (int i = starti;i<(starti+q);i++)
for (int j = startj;j<(startj+p)*dimension;j++) for (int j = startj;j<(startj+p)*perknot;j++)
gm[i][j]= 1; gm[i][j]= 1;
else if (b == 0 && a == invxl-1) //top right corner else if (b == 0 && a == invxl-1) //top right corner
for (int i = starti;i<(starti+q);i++) for (int i = starti;i<(starti+q);i++)
for (int j = (startj+p-1)*dimension;j<(startj+2*p-1)*dimension;j++) for (int j = (startj+p-1)*perknot;j<(startj+2*p-1)*perknot;j++)
gm[i][j]= 1; gm[i][j]= 1;
else if (b == invyl-1 && a == 0) //bottom left corner else if (b == invyl-1 && a == 0) //bottom left corner
for (int i = (starti+q-1);i<(starti+2*q-1);i++) for (int i = (starti+q-1);i<(starti+2*q-1);i++)
for (int j = startj;j<(startj+p)*dimension;j++) for (int j = startj;j<(startj+p)*perknot;j++)
gm[i][j]= 1; gm[i][j]= 1;
else if (b == invyl-1 && a == invxl-1) //bottom right corner else if (b == invyl-1 && a == invxl-1) //bottom right corner
for (int i = (starti+q-1);i<(starti+2*q-1);i++) for (int i = (starti+q-1);i<(starti+2*q-1);i++)
for (int j = (startj+p-1)*dimension;j<(startj+2*p-1)*dimension;j++) for (int j = (startj+p-1)*perknot;j<(startj+2*p-1)*perknot;j++)
gm[i][j]= 1; gm[i][j]= 1;
else if (b==0) // top edge else if (b==0) // top edge
for (int i = starti;i<(starti+q);i++) for (int i = starti;i<(starti+q);i++)
for (int j = (startj+p-1)*dimension;j<(startj+p)*dimension;j++) for (int j = (startj+p-1)*perknot;j<(startj+p)*perknot;j++)
gm[i][j]= 1; gm[i][j]= 1;
else if (a == invxl-1) // right edge else if (a == invxl-1) // right edge
for (int i = (starti+q-1);i<(starti+q);i++) for (int i = (starti+q-1);i<(starti+q);i++)
for (int j = (startj+p-1)*dimension;j<(startj+2*p-1)*dimension;j++) for (int j = (startj+p-1)*perknot;j<(startj+2*p-1)*perknot;j++)
gm[i][j]= 1; gm[i][j]= 1;
else if (a == 0) // left edge else if (a == 0) // left edge
for (int i = (starti+q-1);i<(starti+q);i++) for (int i = (starti+q-1);i<(starti+q);i++)
for (int j = startj;j<(startj+p)*dimension;j++) for (int j = startj;j<(startj+p)*perknot;j++)
gm[i][j]= 1; gm[i][j]= 1;
else if (b == invyl-1) // bottom edge else if (b == invyl-1) // bottom edge
for (int i = (starti+q-1);i<(starti+2*q-1);i++) for (int i = (starti+q-1);i<(starti+2*q-1);i++)
for (int j = (startj+p-1)*dimension;j<(startj+p)*dimension;j++) for (int j = (startj+p-1)*perknot;j<(startj+p)*perknot;j++)
gm[i][j]= 1;}// interior elements gm[i][j]= 1;}// interior elements
for (int i = (starti+q-1);i<(starti+q);i++) for (int i = (starti+q-1);i<(starti+q);i++)
for (int j = (startj+p-1)*dimension;j<(startj+p)*dimension;j++) for (int j = (startj+p-1)*perknot;j<(startj+p)*perknot;j++)
gm[i][j]= 1; gm[i][j]= 1;
} }
@ -643,10 +640,10 @@ Go::SplineSurface*
int count = -1; int count = -1;
for (int i = 0;i<gmyl;i++) for (int i = 0;i<gmyl;i++)
for (int j = 0;j<gmxl*dimension;j++) for (int j = 0;j<gmxl*perknot;j++)
if (gm[i][j] == 1) if (gm[i][j] == 1)
{count = count+1; {count = count+1;
sf_coefs_solution[count] = sf_coefs[i*(gmxl*dimension)+j];} sf_coefs_solution[count] = sf_coefs[i*(gmxl*perknot)+j];}
} }
@ -654,11 +651,6 @@ Go::SplineSurface*
/////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////
if (rational)
{
dimension--;
}
// Make surface // Make surface
Go::SplineSurface* surf = new Go::SplineSurface(basis_u, basis_v, Go::SplineSurface* surf = new Go::SplineSurface(basis_u, basis_v,
sf_coefs_solution.begin(), sf_coefs_solution.begin(),
@ -687,16 +679,10 @@ Go::SplineSurface*
if (rational) if (rational)
{ {
sizepoints = par_u.size()*par_v.size(); sizepoints = par_u.size()*par_v.size();
dimension++;
} }
else else
sizepoints = points.size(); sizepoints = points.size();
if (rational)
{
dimension--;
}
std::vector<double> local_coefs; std::vector<double> local_coefs;
size_t countpoints=0; size_t countpoints=0;
if (rational) if (rational)

82
src/ASM/ASMs3DInterpolate.C
View File

@ -29,6 +29,7 @@ Go::SplineVolume*
ASSERT((int)wpar_w.size() == (int)par_w.size()); ASSERT((int)wpar_w.size() == (int)par_w.size());
std::vector<double> points2; std::vector<double> points2;
int perknot=dimension;
if (rational) if (rational)
{ {
shared_ptr<Go::SplineVolume> denom = shared_ptr<Go::SplineVolume> denom =
@ -46,7 +47,7 @@ Go::SplineVolume*
points2.push_back(points[kr*dimension+kh]*wgtval[kr]); points2.push_back(points[kr*dimension+kh]*wgtval[kr]);
points2.push_back(wgtval[kr]); points2.push_back(wgtval[kr]);
} }
dimension++; perknot++;
} }
else else
points2 = points; points2 = points;
@ -65,8 +66,8 @@ Go::SplineVolume*
std::vector<double> coefs; std::vector<double> coefs;
std::vector<double> pnts; std::vector<double> pnts;
pnts.insert(pnts.end(), pnts.insert(pnts.end(),
points2.begin()+(kj*par_v.size()+ki)*dimension*par_u.size(), points2.begin()+(kj*par_v.size()+ki)*perknot*par_u.size(),
points2.begin()+(kj*par_v.size()+ki+1)*dimension*par_u.size()); points2.begin()+(kj*par_v.size()+ki+1)*perknot*par_u.size());
SplineInterpolator::leastsquare_approximation(par_u, wpar_u, pnts, tg_pnt, SplineInterpolator::leastsquare_approximation(par_u, wpar_u, pnts, tg_pnt,
basis_u, coefs); basis_u, coefs);
@ -87,11 +88,6 @@ Go::SplineVolume*
SplineInterpolator::leastsquare_approximation(par_w, wpar_w, sf_coefs, tg_pnt, SplineInterpolator::leastsquare_approximation(par_w, wpar_w, sf_coefs, tg_pnt,
basis_w, vol_coefs); basis_w, vol_coefs);
if (rational)
{
dimension--;
}
// Make surface // Make surface
Go::SplineVolume* vol = new Go::SplineVolume(basis_u, basis_v, basis_w, Go::SplineVolume* vol = new Go::SplineVolume(basis_u, basis_v, basis_w,
vol_coefs.begin(), dimension, vol_coefs.begin(), dimension,
@ -137,6 +133,7 @@ Go::SplineVolume*
ASSERT( (par_v.size()+1)*0.5 - (2*(basis_v.order()-1)-1) >= 0); ASSERT( (par_v.size()+1)*0.5 - (2*(basis_v.order()-1)-1) >= 0);
std::vector<double> points2; std::vector<double> points2;
int perknot=dimension;
if (rational) if (rational)
{ {
shared_ptr<Go::SplineVolume> denom = shared_ptr<Go::SplineVolume> denom =
@ -153,7 +150,7 @@ Go::SplineVolume*
points2.push_back(points[kr*dimension+kh]*wgtval[kr]); points2.push_back(points[kr*dimension+kh]*wgtval[kr]);
points2.push_back(wgtval[kr]); points2.push_back(wgtval[kr]);
} }
dimension++; perknot++;
} }
else else
points2 = points; points2 = points;
@ -197,7 +194,7 @@ Go::SplineVolume*
// Interpolate // Interpolate
std::vector<double> pnts; std::vector<double> pnts;
pnts.insert(pnts.end(), points2.begin()+(kj*par_v.size()+ki)*dimension*par_u.size(),points2.begin()+(kj*par_v.size()+ki+1)*dimension*par_u.size()); pnts.insert(pnts.end(), points2.begin()+(kj*par_v.size()+ki)*perknot*par_u.size(),points2.begin()+(kj*par_v.size()+ki+1)*perknot*par_u.size());
int ui_end = par_u.size()+2*count_multipl_knots_u-basis_u.numCoefs()+1; int ui_end = par_u.size()+2*count_multipl_knots_u-basis_u.numCoefs()+1;
if (count_multipl_knots_u == 0) { if (count_multipl_knots_u == 0) {
@ -205,7 +202,7 @@ Go::SplineVolume*
std::vector<double> pnts_parts; std::vector<double> pnts_parts;
std::vector<double> par_u_parts; std::vector<double> par_u_parts;
par_u_parts.insert(par_u_parts.end(),par_u.begin()+ui*2,par_u.begin()+ui*2+(2*p-1)); par_u_parts.insert(par_u_parts.end(),par_u.begin()+ui*2,par_u.begin()+ui*2+(2*p-1));
pnts_parts.insert(pnts_parts.end(), pnts.begin()+ui*2*dimension, pnts.begin()+(ui*2+(2*p-1))*dimension); pnts_parts.insert(pnts_parts.end(), pnts.begin()+ui*2*perknot, pnts.begin()+(ui*2+(2*p-1))*perknot);
std::vector<double> coefs; std::vector<double> coefs;
SplineInterpolator::quasiinterpolate(par_u_parts, pnts_parts, tg_pnt, SplineInterpolator::quasiinterpolate(par_u_parts, pnts_parts, tg_pnt,
@ -239,7 +236,7 @@ Go::SplineVolume*
std::vector<double> pnts_parts; std::vector<double> pnts_parts;
std::vector<double> par_u_parts; std::vector<double> par_u_parts;
par_u_parts.insert(par_u_parts.end(),par_u.begin()+(j+count)*2,par_u.begin()+(j+count)*2+(2*p-1));//dp(j+count,:) par_u_parts.insert(par_u_parts.end(),par_u.begin()+(j+count)*2,par_u.begin()+(j+count)*2+(2*p-1));//dp(j+count,:)
pnts_parts.insert(pnts_parts.end(), pnts.begin()+(j+count)*2*dimension, pnts.begin()+((j+count)*2+(2*p-1))*dimension); pnts_parts.insert(pnts_parts.end(), pnts.begin()+(j+count)*2*perknot, pnts.begin()+((j+count)*2+(2*p-1))*perknot);
std::vector<double> coefs; std::vector<double> coefs;
SplineInterpolator::quasiinterpolate(par_u_parts, pnts_parts, SplineInterpolator::quasiinterpolate(par_u_parts, pnts_parts,
tg_pnt, basis_u, tg_pnt, basis_u,
@ -252,7 +249,7 @@ Go::SplineVolume*
std::vector<double> pnts_parts; std::vector<double> pnts_parts;
std::vector<double> par_u_parts; std::vector<double> par_u_parts;
par_u_parts.insert(par_u_parts.end(),par_u.begin()+p-m+1+j+2*count,par_u.begin()+3*p-m-1+j+2*count+1);//dist_vec(p-m+1+j+2*count:3*p-m-1+j+2*count) par_u_parts.insert(par_u_parts.end(),par_u.begin()+p-m+1+j+2*count,par_u.begin()+3*p-m-1+j+2*count+1);//dist_vec(p-m+1+j+2*count:3*p-m-1+j+2*count)
pnts_parts.insert(pnts_parts.end(), pnts.begin()+(p-m+1+j+2*count)*dimension, pnts.begin()+(3*p-m-1+j+2*count+1)*dimension); pnts_parts.insert(pnts_parts.end(), pnts.begin()+(p-m+1+j+2*count)*perknot, pnts.begin()+(3*p-m-1+j+2*count+1)*perknot);
std::vector<double> coefs; std::vector<double> coefs;
SplineInterpolator::quasiinterpolate(par_u_parts, pnts_parts, tg_pnt, SplineInterpolator::quasiinterpolate(par_u_parts, pnts_parts, tg_pnt,
@ -265,7 +262,7 @@ Go::SplineVolume*
std::vector<double> pnts_parts; std::vector<double> pnts_parts;
std::vector<double> par_u_parts; std::vector<double> par_u_parts;
par_u_parts.insert(par_u_parts.end(),par_u.begin()+(j+count+((p-m+2)*0.5)+m-2)*2,par_u.begin()+(j+count+((p-m+2)*0.5)+m-2)*2+(2*p-1));//dp(j+count+((p-m+2)*0.5)+m-2,:) par_u_parts.insert(par_u_parts.end(),par_u.begin()+(j+count+((p-m+2)*0.5)+m-2)*2,par_u.begin()+(j+count+((p-m+2)*0.5)+m-2)*2+(2*p-1));//dp(j+count+((p-m+2)*0.5)+m-2,:)
pnts_parts.insert(pnts_parts.end(), pnts.begin()+(j+count+((p-m+2)*0.5)+m-2)*2*dimension, pnts.begin()+((j+count+((p-m+2)*0.5)+m-2)*2+(2*p-1))*dimension); pnts_parts.insert(pnts_parts.end(), pnts.begin()+(j+count+((p-m+2)*0.5)+m-2)*2*perknot, pnts.begin()+((j+count+((p-m+2)*0.5)+m-2)*2+(2*p-1))*perknot);
std::vector<double> coefs; std::vector<double> coefs;
SplineInterpolator::quasiinterpolate(par_u_parts, pnts_parts, tg_pnt, SplineInterpolator::quasiinterpolate(par_u_parts, pnts_parts, tg_pnt,
@ -281,7 +278,7 @@ Go::SplineVolume*
std::vector<double> pnts_parts; std::vector<double> pnts_parts;
std::vector<double> par_u_parts; std::vector<double> par_u_parts;
par_u_parts.insert(par_u_parts.end(),par_u.begin()+(j+count)*2,par_u.begin()+(j+count)*2+(2*p-1));//dp(j+count,:) par_u_parts.insert(par_u_parts.end(),par_u.begin()+(j+count)*2,par_u.begin()+(j+count)*2+(2*p-1));//dp(j+count,:)
pnts_parts.insert(pnts_parts.end(), pnts.begin()+(j+count)*2*dimension, pnts.begin()+((j+count)*2+(2*p-1))*dimension); pnts_parts.insert(pnts_parts.end(), pnts.begin()+(j+count)*2*perknot, pnts.begin()+((j+count)*2+(2*p-1))*perknot);
std::vector<double> coefs; std::vector<double> coefs;
SplineInterpolator::quasiinterpolate(par_u_parts, pnts_parts, SplineInterpolator::quasiinterpolate(par_u_parts, pnts_parts,
@ -295,7 +292,7 @@ Go::SplineVolume*
std::vector<double> pnts_parts; std::vector<double> pnts_parts;
std::vector<double> par_u_parts; std::vector<double> par_u_parts;
par_u_parts.insert(par_u_parts.end(),par_u.begin()+p-m+j+2*count,par_u.begin()+3*p-m-2+2*count+j+1);//dist_vec(p-m+j+2*count:3*p-m-2+2*count+j) par_u_parts.insert(par_u_parts.end(),par_u.begin()+p-m+j+2*count,par_u.begin()+3*p-m-2+2*count+j+1);//dist_vec(p-m+j+2*count:3*p-m-2+2*count+j)
pnts_parts.insert(pnts_parts.end(), pnts.begin()+(p-m+j+2*count)*dimension, pnts.begin()+(3*p-m-2+2*count+j+1)*dimension); pnts_parts.insert(pnts_parts.end(), pnts.begin()+(p-m+j+2*count)*perknot, pnts.begin()+(3*p-m-2+2*count+j+1)*perknot);
std::vector<double> coefs; std::vector<double> coefs;
SplineInterpolator::quasiinterpolate(par_u_parts, pnts_parts, SplineInterpolator::quasiinterpolate(par_u_parts, pnts_parts,
@ -309,7 +306,7 @@ Go::SplineVolume*
std::vector<double> pnts_parts; std::vector<double> pnts_parts;
std::vector<double> par_u_parts; std::vector<double> par_u_parts;
par_u_parts.insert(par_u_parts.end(),par_u.begin()+p+j+2*count,par_u.begin()+3*p-2+j+2*count+1);//dist_vec(p+j+2*count:3*p-2+j+2*count) par_u_parts.insert(par_u_parts.end(),par_u.begin()+p+j+2*count,par_u.begin()+3*p-2+j+2*count+1);//dist_vec(p+j+2*count:3*p-2+j+2*count)
pnts_parts.insert(pnts_parts.end(), pnts.begin()+(p+j+2*count)*dimension, pnts.begin()+(3*p-2+j+2*count+1)*dimension); pnts_parts.insert(pnts_parts.end(), pnts.begin()+(p+j+2*count)*perknot, pnts.begin()+(3*p-2+j+2*count+1)*perknot);
std::vector<double> coefs; std::vector<double> coefs;
SplineInterpolator::quasiinterpolate(par_u_parts, pnts_parts, SplineInterpolator::quasiinterpolate(par_u_parts, pnts_parts,
@ -323,7 +320,7 @@ Go::SplineVolume*
std::vector<double> pnts_parts; std::vector<double> pnts_parts;
std::vector<double> par_u_parts; std::vector<double> par_u_parts;
par_u_parts.insert(par_u_parts.end(),par_u.begin()+(j+count+((p-m+1)*0.5)+m-1)*2,par_u.begin()+(j+count+((p-m+1)*0.5)+m-1)*2+(2*p-1));//dp(j+count+((p-m+1)*0.5)+m-1,:) par_u_parts.insert(par_u_parts.end(),par_u.begin()+(j+count+((p-m+1)*0.5)+m-1)*2,par_u.begin()+(j+count+((p-m+1)*0.5)+m-1)*2+(2*p-1));//dp(j+count+((p-m+1)*0.5)+m-1,:)
pnts_parts.insert(pnts_parts.end(), pnts.begin()+(j+count+((p-m+1)*0.5)+m-1)*2*dimension, pnts.begin()+((j+count+((p-m+1)*0.5)+m-1)*2+(2*p-1))*dimension); pnts_parts.insert(pnts_parts.end(), pnts.begin()+(j+count+((p-m+1)*0.5)+m-1)*2*perknot, pnts.begin()+((j+count+((p-m+1)*0.5)+m-1)*2+(2*p-1))*perknot);
std::vector<double> coefs; std::vector<double> coefs;
SplineInterpolator::quasiinterpolate(par_u_parts, pnts_parts, SplineInterpolator::quasiinterpolate(par_u_parts, pnts_parts,
@ -341,7 +338,7 @@ Go::SplineVolume*
std::vector<double> pnts_parts; std::vector<double> pnts_parts;
std::vector<double> par_u_parts; std::vector<double> par_u_parts;
par_u_parts.insert(par_u_parts.end(),par_u.begin()+(dcount+ti-(m-1))*2,par_u.begin()+(dcount+ti-(m-1))*2+(2*p-1)); par_u_parts.insert(par_u_parts.end(),par_u.begin()+(dcount+ti-(m-1))*2,par_u.begin()+(dcount+ti-(m-1))*2+(2*p-1));
pnts_parts.insert(pnts_parts.end(), pnts.begin()+(dcount+ti-(m-1))*2*dimension, pnts.begin()+((dcount+ti-(m-1))*2+(2*p-1))*dimension); pnts_parts.insert(pnts_parts.end(), pnts.begin()+(dcount+ti-(m-1))*2*perknot, pnts.begin()+((dcount+ti-(m-1))*2+(2*p-1))*perknot);
std::vector<double> coefs; std::vector<double> coefs;
@ -355,7 +352,7 @@ Go::SplineVolume*
std::vector<double> pnts_parts; std::vector<double> pnts_parts;
std::vector<double> par_u_parts; std::vector<double> par_u_parts;
par_u_parts.insert(par_u_parts.end(),par_u.begin()+(ti+dcount)*2,par_u.begin()+(ti+dcount)*2+(2*p-1)); par_u_parts.insert(par_u_parts.end(),par_u.begin()+(ti+dcount)*2,par_u.begin()+(ti+dcount)*2+(2*p-1));
pnts_parts.insert(pnts_parts.end(), pnts.begin()+(ti+dcount)*2*dimension, pnts.begin()+((ti+dcount)*2+(2*p-1))*dimension); pnts_parts.insert(pnts_parts.end(), pnts.begin()+(ti+dcount)*2*perknot, pnts.begin()+((ti+dcount)*2+(2*p-1))*perknot);
std::vector<double> coefs; std::vector<double> coefs;
SplineInterpolator::quasiinterpolate(par_u_parts, pnts_parts, SplineInterpolator::quasiinterpolate(par_u_parts, pnts_parts,
@ -396,7 +393,7 @@ Go::SplineVolume*
} }
std::vector<double> sf_coefs; std::vector<double> sf_coefs;
int ucount = (par_u.size() + 2*count_multipl_knots_u - basis_u.numCoefs()+1)*(2*p-1)*dimension; int ucount = (par_u.size() + 2*count_multipl_knots_u - basis_u.numCoefs()+1)*(2*p-1)*perknot;
int vi_end = par_v.size() + 2*count_multipl_knots_v - basis_v.numCoefs()+1 ; int vi_end = par_v.size() + 2*count_multipl_knots_v - basis_v.numCoefs()+1 ;
if (count_multipl_knots_v == 0) if (count_multipl_knots_v == 0)
@ -602,7 +599,7 @@ Go::SplineVolume*
std::vector<double> tmp; std::vector<double> tmp;
for(int i = 0; i < gmyl ; i++) for(int i = 0; i < gmyl ; i++)
{ {
for(int j=0 ; j < gmxl*dimension ;j++) for(int j=0 ; j < gmxl*perknot ;j++)
{ {
tmp.push_back( 0.0 ); tmp.push_back( 0.0 );
} }
@ -610,7 +607,7 @@ Go::SplineVolume*
} }
std::vector<double> sf_coefs_solution; std::vector<double> sf_coefs_solution;
for(int i = 0; i < n*m*dimension ; i++) for(int i = 0; i < n*m*perknot ; i++)
sf_coefs_solution.push_back( 0.0 ); sf_coefs_solution.push_back( 0.0 );
int starti, startj; int starti, startj;
@ -629,61 +626,61 @@ Go::SplineVolume*
{if (invyl == 1) {if (invyl == 1)
{if (a == 0) {if (a == 0)
for (int i = starti;i<(starti+2*q-1);i++) for (int i = starti;i<(starti+2*q-1);i++)
for (int j = startj;j<(startj+p)*dimension;j++) for (int j = startj;j<(startj+p)*perknot;j++)
gm[i][j] = 1; gm[i][j] = 1;
else if (a == invxl-1) else if (a == invxl-1)
for (int i = starti;i<(starti+2*q-1);i++) for (int i = starti;i<(starti+2*q-1);i++)
for (int j = (startj+p-1)*dimension; j< (startj+2*p-1)*dimension;j++) for (int j = (startj+p-1)*perknot; j< (startj+2*p-1)*perknot;j++)
gm[i][j] = 1; gm[i][j] = 1;
for (int i = starti;i<(starti+2*q-1);i++) for (int i = starti;i<(starti+2*q-1);i++)
for (int j = (startj+p-1)*dimension;j<(startj+p)*dimension;j++) for (int j = (startj+p-1)*perknot;j<(startj+p)*perknot;j++)
gm[i][j] = 1;} gm[i][j] = 1;}
else if (invxl == 1) // else if (invxl == 1) //
{if (b == 0) {if (b == 0)
for (int i = starti; i< (starti+q);i++) for (int i = starti; i< (starti+q);i++)
for (int j = startj;j<(startj+2*p-1)*dimension;j++) for (int j = startj;j<(startj+2*p-1)*perknot;j++)
gm[i][j] = 1; gm[i][j] = 1;
else if (b == invyl-1) else if (b == invyl-1)
for (int i = (starti+q-1);i<(starti+2*q-1);i++) for (int i = (starti+q-1);i<(starti+2*q-1);i++)
for (int j = startj;j<(startj+2*p-1)*dimension;j++) for (int j = startj;j<(startj+2*p-1)*perknot;j++)
gm[i][j] = 1; gm[i][j] = 1;
for (int i = (starti+q-1);i<(starti+q);i++) for (int i = (starti+q-1);i<(starti+q);i++)
for (int j = startj;j<(startj+2*p-1)*dimension;j++) for (int j = startj;j<(startj+2*p-1)*perknot;j++)
gm[i][j] = 1;} gm[i][j] = 1;}
else if (b==0 && a == 0) //top left corner else if (b==0 && a == 0) //top left corner
for (int i = starti;i<(starti+q);i++) for (int i = starti;i<(starti+q);i++)
for (int j = startj;j<(startj+p)*dimension;j++) for (int j = startj;j<(startj+p)*perknot;j++)
gm[i][j]= 1; gm[i][j]= 1;
else if (b == 0 && a == invxl-1) //top right corner else if (b == 0 && a == invxl-1) //top right corner
for (int i = starti;i<(starti+q);i++) for (int i = starti;i<(starti+q);i++)
for (int j = (startj+p-1)*dimension;j<(startj+2*p-1)*dimension;j++) for (int j = (startj+p-1)*perknot;j<(startj+2*p-1)*perknot;j++)
gm[i][j]= 1; gm[i][j]= 1;
else if (b == invyl-1 && a == 0) //bottom left corner else if (b == invyl-1 && a == 0) //bottom left corner
for (int i = (starti+q-1);i<(starti+2*q-1);i++) for (int i = (starti+q-1);i<(starti+2*q-1);i++)
for (int j = startj;j<(startj+p)*dimension;j++) for (int j = startj;j<(startj+p)*perknot;j++)
gm[i][j]= 1; gm[i][j]= 1;
else if (b == invyl-1 && a == invxl-1) //bottom right corner else if (b == invyl-1 && a == invxl-1) //bottom right corner
for (int i = (starti+q-1);i<(starti+2*q-1);i++) for (int i = (starti+q-1);i<(starti+2*q-1);i++)
for (int j = (startj+p-1)*dimension;j<(startj+2*p-1)*dimension;j++) for (int j = (startj+p-1)*perknot;j<(startj+2*p-1)*perknot;j++)
gm[i][j]= 1; gm[i][j]= 1;
else if (b==0) // top edge else if (b==0) // top edge
for (int i = starti;i<(starti+q);i++) for (int i = starti;i<(starti+q);i++)
for (int j = (startj+p-1)*dimension;j<(startj+p)*dimension;j++) for (int j = (startj+p-1)*perknot;j<(startj+p)*perknot;j++)
gm[i][j]= 1; gm[i][j]= 1;
else if (a == invxl-1) // right edge else if (a == invxl-1) // right edge
for (int i = (starti+q-1);i<(starti+q);i++) for (int i = (starti+q-1);i<(starti+q);i++)
for (int j = (startj+p-1)*dimension;j<(startj+2*p-1)*dimension;j++) for (int j = (startj+p-1)*perknot;j<(startj+2*p-1)*perknot;j++)
gm[i][j]= 1; gm[i][j]= 1;
else if (a == 0) // left edge else if (a == 0) // left edge
for (int i = (starti+q-1);i<(starti+q);i++) for (int i = (starti+q-1);i<(starti+q);i++)
for (int j = startj;j<(startj+p)*dimension;j++) for (int j = startj;j<(startj+p)*perknot;j++)
gm[i][j]= 1; gm[i][j]= 1;
else if (b == invyl-1) // bottom edge else if (b == invyl-1) // bottom edge
for (int i = (starti+q-1);i<(starti+2*q-1);i++) for (int i = (starti+q-1);i<(starti+2*q-1);i++)
for (int j = (startj+p-1)*dimension;j<(startj+p)*dimension;j++) for (int j = (startj+p-1)*perknot;j<(startj+p)*perknot;j++)
gm[i][j]= 1;}// interior elements gm[i][j]= 1;}// interior elements
for (int i = (starti+q-1);i<(starti+q);i++) for (int i = (starti+q-1);i<(starti+q);i++)
for (int j = (startj+p-1)*dimension;j<(startj+p)*dimension;j++) for (int j = (startj+p-1)*perknot;j<(startj+p)*perknot;j++)
gm[i][j]= 1; gm[i][j]= 1;
} }
@ -691,10 +688,10 @@ Go::SplineVolume*
int count = -1; int count = -1;
for (int i = 0;i<gmyl;i++) for (int i = 0;i<gmyl;i++)
for (int j = 0;j<gmxl*dimension;j++) for (int j = 0;j<gmxl*perknot;j++)
if (gm[i][j] == 1) if (gm[i][j] == 1)
{count = count+1; {count = count+1;
sf_coefs_solution[count] = sf_coefs[i*(gmxl*dimension)+j];} sf_coefs_solution[count] = sf_coefs[i*(gmxl*perknot)+j];}
} }
@ -706,11 +703,6 @@ Go::SplineVolume*
std::vector<double> vol_coefs; std::vector<double> vol_coefs;
SplineInterpolator::interpolate(par_w, volinput_coefs, tg_pnt, basis_w, vol_coefs); SplineInterpolator::interpolate(par_w, volinput_coefs, tg_pnt, basis_w, vol_coefs);
if (rational)
{
dimension--;
}
// Make surface // Make surface
Go::SplineVolume* vol = new Go::SplineVolume(basis_u, basis_v, basis_w, Go::SplineVolume* vol = new Go::SplineVolume(basis_u, basis_v, basis_w,
vol_coefs.begin(), dimension, vol_coefs.begin(), dimension,