Commit 2184c1e8 authored by Chris Cantwell's avatar Chris Cantwell
Browse files

Tidy up code.

parent 80ab2d10
......@@ -136,8 +136,8 @@ namespace Nektar
MultiplyByStdQuadratureMetric(m_metrics[MetricQuadrature],
m_metrics[MetricQuadrature]);
}
}
DNekMatSharedPtr Expansion::v_BuildTransformationMatrix(
const DNekScalMatSharedPtr &r_bnd,
const StdRegions::MatrixType matrixType)
......
......@@ -1868,27 +1868,13 @@ namespace Nektar
DNekMatSharedPtr lap = MemoryManager<DNekMat>
::AllocateSharedPtr(rows,cols);
(*lap) = gmat[0][0]*lap00 + gmat[4][0]*lap11 + gmat[8][0]*lap22
(*lap) = gmat[0][0]*lap00
+ gmat[4][0]*lap11
+ gmat[8][0]*lap22
+ gmat[3][0]*(lap01 + Transpose(lap01))
+ gmat[6][0]*(lap02 + Transpose(lap02))
+ gmat[7][0]*(lap12 + Transpose(lap12));
/*
(*lap) = (gmat[0][0]*gmat[0][0] + gmat[3][0]*gmat[3][0]
+ gmat[6][0]*gmat[6][0])*lap00
+ (gmat[1][0]*gmat[1][0] + gmat[4][0]*gmat[4][0]
+ gmat[7][0]*gmat[7][0])*lap11
+ (gmat[2][0]*gmat[2][0] + gmat[5][0]*gmat[5][0]
+ gmat[8][0]*gmat[8][0])*lap22
+ (gmat[0][0]*gmat[1][0] + gmat[3][0]*gmat[4][0]
+ gmat[6][0]*gmat[7][0])
*(lap01 + Transpose(lap01))
+ (gmat[0][0]*gmat[2][0] + gmat[3][0]*gmat[5][0]
+ gmat[6][0]*gmat[8][0])
*(lap02 + Transpose(lap02))
+ (gmat[1][0]*gmat[2][0] + gmat[4][0]*gmat[5][0]
+ gmat[7][0]*gmat[8][0])
*(lap12 + Transpose(lap12));
*/
returnval = MemoryManager<DNekScalMat>
::AllocateSharedPtr(jac,lap);
}
......
......@@ -1528,27 +1528,13 @@ namespace Nektar
DNekMatSharedPtr lap = MemoryManager<DNekMat>
::AllocateSharedPtr(rows,cols);
(*lap) = gmat[0][0]*lap00 + gmat[4][0]*lap11 + gmat[8][0]*lap22
(*lap) = gmat[0][0]*lap00
+ gmat[4][0]*lap11
+ gmat[8][0]*lap22
+ gmat[3][0]*(lap01 + Transpose(lap01))
+ gmat[6][0]*(lap02 + Transpose(lap02))
+ gmat[7][0]*(lap12 + Transpose(lap12));
/*
(*lap) = (gmat[0][0]*gmat[0][0] + gmat[3][0]*gmat[3][0]
+ gmat[6][0]*gmat[6][0])*lap00
+ (gmat[1][0]*gmat[1][0] + gmat[4][0]*gmat[4][0]
+ gmat[7][0]*gmat[7][0])*lap11
+ (gmat[2][0]*gmat[2][0] + gmat[5][0]*gmat[5][0]
+ gmat[8][0]*gmat[8][0])*lap22
+ (gmat[0][0]*gmat[1][0] + gmat[3][0]*gmat[4][0]
+ gmat[6][0]*gmat[7][0])
*(lap01 + Transpose(lap01))
+ (gmat[0][0]*gmat[2][0] + gmat[3][0]*gmat[5][0]
+ gmat[6][0]*gmat[8][0])
*(lap02 + Transpose(lap02))
+ (gmat[1][0]*gmat[2][0] + gmat[4][0]*gmat[5][0]
+ gmat[7][0]*gmat[8][0])
*(lap12 + Transpose(lap12));
*/
returnval = MemoryManager<DNekScalMat>
::AllocateSharedPtr(jac,lap);
}
......
......@@ -1336,7 +1336,9 @@ namespace Nektar
DNekMatSharedPtr lap = MemoryManager<DNekMat>
::AllocateSharedPtr(rows,cols);
(*lap) = gmat[0][0]*lap00 + gmat[4][0]*lap11 + gmat[8][0]*lap22
(*lap) = gmat[0][0]*lap00
+ gmat[4][0]*lap11
+ gmat[8][0]*lap22
+ gmat[3][0]*(lap01 + Transpose(lap01))
+ gmat[6][0]*(lap02 + Transpose(lap02))
+ gmat[7][0]*(lap12 + Transpose(lap12));
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment