Commit 1455101e authored by Michael Turner's avatar Michael Turner

start of optimsiation of mappings and qualities

parent 7e01d701
......@@ -115,7 +115,7 @@ if(OCC_FOUND)
TKSTL
TKShHealing
TKXSBase
TKBin
TKBinL
TKBool
TKBO
TKBRep
......
......@@ -33,7 +33,7 @@ IF(NEKTAR_USE_MESHGEN)
TKSTL
TKShHealing
TKXSBase
TKBin
TKBinL
TKBool
TKBO
TKBRep
......
......@@ -26,6 +26,7 @@ SET(NekMeshHeaders
ProcessModules/ProcessVarOpti/ProcessVarOpti.h
ProcessModules/ProcessVarOpti/NodeOpti.h
ProcessModules/ProcessVarOpti/NodeOptiJob.h
ProcessModules/ProcessVarOpti/ElUtil.h
)
SET(NekMeshSources
......
This diff is collapsed.
////////////////////////////////////////////////////////////////////////////////
//
// File: ProcessJac.h
//
// For more information, please see: http://www.nektar.info/
//
// The MIT License
//
// Copyright (c) 2006 Division of Applied Mathematics, Brown University (USA),
// Department of Aeronautics, Imperial College London (UK), and Scientific
// Computing and Imaging Institute, University of Utah (USA).
//
// License for the specific language governing rights and limitations under
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
// the rights to use, copy, modify, merge, publish, distribute, sublicense,
// and/or sell copies of the Software, and to permit persons to whom the
// Software is furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included
// in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
//
// Description: Calculate jacobians of elements.
//
////////////////////////////////////////////////////////////////////////////////
#ifndef UTILITIES_NEKMESH_PROCESSVAROPTI_ELUTIL
#define UTILITIES_NEKMESH_PROCESSVAROPTI_ELUTIL
namespace Nektar
{
namespace Utilities
{
class ElUtil
{
public:
ElUtil(ElementSharedPtr e)
private:
ElementSharedPtr m_el;
std::vector<std::vector<NekDouble *> > m_nodes;
std::vector<Array<OneD, NekDouble> > m_maps;
int m_dim;
};
typedef boost::shared_ptr<ElUtil> ElUtilSharedPtr;
}
}
#endif
......@@ -39,6 +39,7 @@
#include "ProcessVarOpti.h"
#include "NodeOpti.h"
#include "NodeOptiJob.h"
#include "ElUtil.h"
#include <boost/thread/mutex.hpp>
......
......@@ -43,34 +43,6 @@ namespace Nektar
namespace Utilities
{
struct ElData
{
ElData(std::vector<NodeSharedPtr> innodes, int spaceDim)
{
nodes.resize(innodes.size());
for (int i = 0; i < innodes.size(); ++i)
{
nodes[i].resize(spaceDim);
nodes[i][0] = &innodes[i]->m_x;
if (spaceDim >= 2)
{
nodes[i][1] = &innodes[i]->m_y;
}
if (spaceDim >= 3)
{
nodes[i][2] = &innodes[i]->m_z;
}
}
}
ElementSharedPtr el;
std::vector<std::vector<NekDouble *> > nodes;
std::vector<Array<OneD, NekDouble> > maps;
};
typedef boost::shared_ptr<ElData> ElDataSharedPtr;
struct DerivUtil
{
NekMatrix<NekDouble> VdmD[3];
......@@ -120,7 +92,7 @@ public:
/// Write mesh to output file.
virtual void Process();
private:
typedef std::map<int, std::vector<ElDataSharedPtr> > NodeElMap;
typedef std::map<int, std::vector<ElUtilSharedPtr> > NodeElMap;
void FillQuadPoints();
void GetElementMap();
......@@ -130,7 +102,7 @@ private:
void EvaluateMesh();
NodeElMap nodeElMap;
std::vector<ElDataSharedPtr> dataSet;
std::vector<ElUtilSharedPtr> dataSet;
ResidualSharedPtr res;
DerivUtilSharedPtr derivUtil;
......
Markdown is supported
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