Skip to content
Snippets Groups Projects
Commit 70f14967 authored by Amaury Johnen's avatar Amaury Johnen
Browse files

fix barycenter and lagPointFast in 2D (not tested)

parent 917d9a53
No related branches found
No related tags found
No related merge requests found
...@@ -98,7 +98,6 @@ int ElementType::ParentTypeFromTag(int tag) ...@@ -98,7 +98,6 @@ int ElementType::ParentTypeFromTag(int tag)
int ElementType::OrderFromTag(int tag) int ElementType::OrderFromTag(int tag)
{ {
switch (tag) { switch (tag) {
case MSH_PNT : return 0; case MSH_PNT : return 0;
case MSH_LIN_1 : return 0; case MSH_LIN_1 : return 0;
...@@ -228,7 +227,6 @@ int ElementType::OrderFromTag(int tag) ...@@ -228,7 +227,6 @@ int ElementType::OrderFromTag(int tag)
Msg::Error("Unknown element tag %d, assuming order 1.",tag); Msg::Error("Unknown element tag %d, assuming order 1.",tag);
return 1; return 1;
} }
} }
int ElementType::DimensionFromTag(int tag) int ElementType::DimensionFromTag(int tag)
......
...@@ -101,7 +101,7 @@ JacobianBasis::JacobianBasis(int tag) ...@@ -101,7 +101,7 @@ JacobianBasis::JacobianBasis(int tag)
double xBar = 0., yBar = 0., zBar = 0.; double xBar = 0., yBar = 0., zBar = 0.;
double barycenter[3] = {0., 0., 0.}; double barycenter[3] = {0., 0., 0.};
for (int i = 0; i < numPrimMapNodes; i++) { for (int i = 0; i < numPrimMapNodes; i++) {
for (int j = 0; i < primMapBasis->points.size2(); ++i) { for (int j = 0; j < primMapBasis->points.size2(); ++j) {
barycenter[j] += primMapBasis->points(i, j); barycenter[j] += primMapBasis->points(i, j);
} }
} }
...@@ -126,7 +126,8 @@ JacobianBasis::JacobianBasis(int tag) ...@@ -126,7 +126,8 @@ JacobianBasis::JacobianBasis(int tag)
// Compute "fast" Jacobian evaluation matrices (at 1st order nodes + barycenter) // Compute "fast" Jacobian evaluation matrices (at 1st order nodes + barycenter)
numJacNodesFast = numPrimMapNodes+1; numJacNodesFast = numPrimMapNodes+1;
fullMatrix<double> lagPointsFast(numJacNodesFast,3); // Sampling points fullMatrix<double> lagPointsFast(numJacNodesFast,3); // Sampling points
lagPointsFast.copy(primMapBasis->points,0,numPrimMapNodes,0,3,0,0); // 1st order nodes lagPointsFast.copy(primMapBasis->points,0,numPrimMapNodes,
0,primMapBasis->points.size2(),0,0); // 1st order nodes
lagPointsFast(numPrimMapNodes,0) = barycenter[0]; // Last point = barycenter lagPointsFast(numPrimMapNodes,0) = barycenter[0]; // Last point = barycenter
lagPointsFast(numPrimMapNodes,1) = barycenter[1]; lagPointsFast(numPrimMapNodes,1) = barycenter[1];
lagPointsFast(numPrimMapNodes,2) = barycenter[2]; lagPointsFast(numPrimMapNodes,2) = barycenter[2];
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment