Skip to content
Snippets Groups Projects
Commit a6fc90fa authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

fix compile

parent 27f78045
No related branches found
No related tags found
No related merge requests found
...@@ -60,9 +60,9 @@ class polynomialBasis ...@@ -60,9 +60,9 @@ class polynomialBasis
grads[i][1] = 0; grads[i][1] = 0;
grads[i][2] = 0; grads[i][2] = 0;
for(int j = 0; j < coefficients.size2(); j++){ for(int j = 0; j < coefficients.size2(); j++){
if ((monomials)(j, 0) > 0) if (monomials(j, 0) > 0)
grads[i][0] += (coefficients)(i, j) * grads[i][0] += coefficients(i, j) *
pow(u, (monomials)(j, 0) - 1) * (monomials)(j, 0); pow(u, monomials(j, 0) - 1) * monomials(j, 0);
} }
} }
break; break;
...@@ -72,14 +72,14 @@ class polynomialBasis ...@@ -72,14 +72,14 @@ class polynomialBasis
grads[i][1] = 0; grads[i][1] = 0;
grads[i][2] = 0; grads[i][2] = 0;
for(int j = 0; j < coefficients.size2(); j++){ for(int j = 0; j < coefficients.size2(); j++){
if ((monomials)(j, 0) > 0) if (monomials(j, 0) > 0)
grads[i][0] += (coefficients)(i, j) * grads[i][0] += coefficients(i, j) *
pow(u, (monomials)(j, 0) - 1) * (monomials)(j, 0) * pow(u, monomials(j, 0) - 1) * monomials(j, 0) *
pow(v, (monomials)(j, 1)); pow(v, monomials(j, 1));
if ((monomials)(j, 1) > 0) if (monomials(j, 1) > 0)
grads[i][1] += (coefficients)(i, j) * grads[i][1] += coefficients(i, j) *
pow(u, (monomials)(j, 0)) * pow(u, monomials(j, 0)) *
pow(v, (monomials)(j, 1) - 1) * (monomials)(j, 1); pow(v, monomials(j, 1) - 1) * monomials(j, 1);
} }
} }
break; break;
...@@ -89,21 +89,21 @@ class polynomialBasis ...@@ -89,21 +89,21 @@ class polynomialBasis
grads[i][1] = 0; grads[i][1] = 0;
grads[i][2] = 0; grads[i][2] = 0;
for(int j = 0; j < coefficients.size2(); j++){ for(int j = 0; j < coefficients.size2(); j++){
if ((monomials)(j, 0) > 0) if (monomials(j, 0) > 0)
grads[i][0] += (coefficients)(i, j) * grads[i][0] += coefficients(i, j) *
pow(u, (monomials)(j, 0) - 1) * (monomials)(j, 0) * pow(u, monomials(j, 0) - 1) * monomials(j, 0) *
pow(v, (monomials)(j, 1)) * pow(v, monomials(j, 1)) *
pow(w, (monomials)(j, 2)); pow(w, monomials(j, 2));
if ((monomials)(j, 1) > 0) if (monomials(j, 1) > 0)
grads[i][1] += (coefficients)(i, j) * grads[i][1] += coefficients(i, j) *
pow(u, (monomials)(j, 0)) * pow(u, monomials(j, 0)) *
pow(v, (monomials)(j, 1) - 1) * (monomials)(j, 1) * pow(v, monomials(j, 1) - 1) * monomials(j, 1) *
pow(w, (monomials)(j, 2)); pow(w, monomials(j, 2));
if ((monomials)(j, 2) > 0) if (monomials(j, 2) > 0)
grads[i][2] += (coefficients)(i, j) * grads[i][2] += coefficients(i, j) *
pow(u, (monomials)(j, 0)) * pow(u, monomials(j, 0)) *
pow(v, (monomials)(j, 1)) * pow(v, monomials(j, 1)) *
pow(w, (monomials)(j, 2) - 1) * (monomials)(j, 2); pow(w, monomials(j, 2) - 1) * monomials(j, 2);
} }
} }
break; break;
...@@ -119,8 +119,9 @@ class polynomialBasis ...@@ -119,8 +119,9 @@ class polynomialBasis
hess[i][2][0] = hess[i][2][1] = hess[i][2][2] = 0; hess[i][2][0] = hess[i][2][1] = hess[i][2][2] = 0;
for(int j = 0; j < coefficients.size2(); j++){ for(int j = 0; j < coefficients.size2(); j++){
if ((monomials)(j, 0) > 1) // second derivative !=0 if (monomials(j, 0) > 1) // second derivative !=0
hess[i][0][0] += (coefficients)(i, j) * pow(u, (monomials)(j, 0) - 2) * (monomials)(j, 0) * ((monomials)(j, 0)-1); hess[i][0][0] += coefficients(i, j) * pow(u, monomials(j, 0) - 2) *
monomials(j, 0) * (monomials(j, 0) - 1);
} }
} }
break; break;
...@@ -130,18 +131,17 @@ class polynomialBasis ...@@ -130,18 +131,17 @@ class polynomialBasis
hess[i][1][0] = hess[i][1][1] = hess[i][1][2] = 0; hess[i][1][0] = hess[i][1][1] = hess[i][1][2] = 0;
hess[i][2][0] = hess[i][2][1] = hess[i][2][2] = 0; hess[i][2][0] = hess[i][2][1] = hess[i][2][2] = 0;
for(int j = 0; j < coefficients.size2(); j++){ for(int j = 0; j < coefficients.size2(); j++){
if ((monomials)(j, 0) > 1) // second derivative !=0 if (monomials(j, 0) > 1) // second derivative !=0
hess[i][0][0] += (coefficients)(i, j) * hess[i][0][0] += coefficients(i, j) * pow(u, monomials(j, 0) - 2) *
pow(u, (monomials)(j, 0) - 2) * (monomials)(j, 0) * ((monomials)(j, 0)-1) * monomials(j, 0) * (monomials(j, 0) - 1) * pow(v, monomials(j, 1));
pow(v, (monomials)(j, 1)); if ((monomials(j, 1) > 0) && (monomials(j, 0) > 0))
if (((monomials)(j,1)>0) and ((monomials)(j,0)>0)) hess[i][0][1] += coefficients(i, j) *
hess[i][0][1]+=(coefficients)(i, j) * pow(u, monomials(j, 0) - 1) * monomials(j, 0) *
pow(u, (monomials)(j, 0) - 1) * (monomials)(j, 0) * pow(v, monomials(j, 1) - 1) * monomials(j, 1);
pow(v, (monomials)(j, 1)-1) * (monomials)(j, 1); if (monomials(j, 1) > 1)
if ((monomials)(j, 1) > 1) hess[i][1][1] += coefficients(i, j) *
hess[i][1][1] += (coefficients)(i, j) * pow(u, monomials(j, 0)) *
pow(u, (monomials)(j, 0)) * pow(v, monomials(j, 1) - 2) * monomials(j, 1) * (monomials(j, 1) - 1);
pow(v, (monomials)(j, 1) - 2) * (monomials)(j, 1) * ((monomials)(j, 1)-1);
} }
hess[i][1][0] = hess[i][0][1]; hess[i][1][0] = hess[i][0][1];
} }
...@@ -152,37 +152,37 @@ class polynomialBasis ...@@ -152,37 +152,37 @@ class polynomialBasis
hess[i][1][0] = hess[i][1][1] = hess[i][1][2] = 0; hess[i][1][0] = hess[i][1][1] = hess[i][1][2] = 0;
hess[i][2][0] = hess[i][2][1] = hess[i][2][2] = 0; hess[i][2][0] = hess[i][2][1] = hess[i][2][2] = 0;
for(int j = 0; j < coefficients.size2(); j++){ for(int j = 0; j < coefficients.size2(); j++){
if ((monomials)(j, 0) > 1) if (monomials(j, 0) > 1)
hess[i][0][0] += (coefficients)(i, j) * hess[i][0][0] += coefficients(i, j) *
pow(u, (monomials)(j, 0) - 2) * (monomials)(j, 0) * ((monomials)(j, 0)-1) * pow(u, monomials(j, 0) - 2) * monomials(j, 0) * (monomials(j, 0)-1) *
pow(v, (monomials)(j, 1)) * pow(v, monomials(j, 1)) *
pow(w, (monomials)(j, 2)); pow(w, monomials(j, 2));
if (((monomials)(j,0)>0) and ((monomials)(j,1)>0)) if ((monomials(j, 0) > 0) && (monomials(j, 1) > 0))
hess[i][0][1] += (coefficients)(i, j) * hess[i][0][1] += coefficients(i, j) *
pow(u, (monomials)(j, 0) - 1) * (monomials)(j, 0) * pow(u, monomials(j, 0) - 1) * monomials(j, 0) *
pow(v, (monomials)(j, 1) - 1) * (monomials)(j, 1) * pow(v, monomials(j, 1) - 1) * monomials(j, 1) *
pow(w, (monomials)(j, 2)); pow(w, monomials(j, 2));
if (((monomials)(j,0)>0) and ((monomials)(j,2)>0)) if ((monomials(j, 0) > 0) && (monomials(j, 2) > 0))
hess[i][0][2] += (coefficients)(i, j) * hess[i][0][2] += coefficients(i, j) *
pow(u, (monomials)(j, 0) - 1) * (monomials)(j, 0) * pow(u, monomials(j, 0) - 1) * monomials(j, 0) *
pow(v, (monomials)(j, 1)) * pow(v, monomials(j, 1)) *
pow(w, (monomials)(j, 2) - 1) * (monomials)(j, 2); pow(w, monomials(j, 2) - 1) * monomials(j, 2);
if ((monomials)(j, 1) > 1) if (monomials(j, 1) > 1)
hess[i][1][1] += (coefficients)(i, j) * hess[i][1][1] += coefficients(i, j) *
pow(u, (monomials)(j, 0)) * pow(u, monomials(j, 0)) *
pow(v, (monomials)(j, 1) - 2) * (monomials)(j, 1) * ((monomials)(j, 1)-1) * pow(v, monomials(j, 1) - 2) * monomials(j, 1) * (monomials(j, 1)-1) *
pow(w, (monomials)(j, 2)); pow(w, monomials(j, 2));
if (((monomials)(j,1)>0) and ((monomials)(j,2)>0)) if ((monomials(j, 1) > 0) && (monomials(j, 2) > 0))
hess[i][1][2] += (coefficients)(i, j) * hess[i][1][2] += coefficients(i, j) *
pow(u, (monomials)(j, 0)) * pow(u, monomials(j, 0)) *
pow(v, (monomials)(j, 1) - 1) * (monomials)(j, 1) * pow(v, monomials(j, 1) - 1) * monomials(j, 1) *
pow(w, (monomials)(j, 2) - 1) * (monomials)(j, 2); pow(w, monomials(j, 2) - 1) * monomials(j, 2);
if ((monomials)(j, 2) > 1) if (monomials(j, 2) > 1)
hess[i][2][2] += (coefficients)(i, j) * hess[i][2][2] += coefficients(i, j) *
pow(u, (monomials)(j, 0)) * pow(u, monomials(j, 0)) *
pow(v, (monomials)(j, 1)) * pow(v, monomials(j, 1)) *
pow(w, (monomials)(j, 2) - 2) * (monomials)(j, 2) * ((monomials)(j, 2)-1); pow(w, monomials(j, 2) - 2) * monomials(j, 2) * (monomials(j, 2) - 1);
} }
hess[i][1][0] = hess[i][0][1]; hess[i][1][0] = hess[i][0][1];
hess[i][2][0] = hess[i][0][2]; hess[i][2][0] = hess[i][0][2];
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment