Commit b2641d63 authored by Chris Cantwell's avatar Chris Cantwell
Browse files

Merge branch 'feature/fld2dto2d5' of /opt/gitlab/repositories/nektar

parents 3fbb52ec ee276141
......@@ -14,6 +14,7 @@ ADD_UTILITIES_EXECUTABLE(ProbeFld util-extra ProbeFld.cpp)
ADD_UTILITIES_EXECUTABLE(XmlToTecplot util XmlToTecplot.cpp)
ADD_UTILITIES_EXECUTABLE(XmlToTecplotWireFrame util XmlToTecplotWireFrame.cpp)
ADD_UTILITIES_EXECUTABLE(XmlToVtk util XmlToVtk.cpp)
ADD_UTILITIES_EXECUTABLE(Fld2DTo2D5 util Fld2DTo2D5.cpp)
# Generate list of available solvers
FILE(GLOB dir_list "*")
......
#include <cstdio>
#include <cstdlib>
#include <iomanip>
#include <vector>
#include <MultiRegions/ExpList.h>
#include <MultiRegions/ExpList1D.h>
#include <MultiRegions/ExpList2D.h>
#include <MultiRegions/ExpList2DHomogeneous1D.h>
#include <MultiRegions/ExpList3DHomogeneous1D.h>
#include <MultiRegions/ExpList3DHomogeneous2D.h>
using namespace Nektar;
int main(int argc, char *argv[])
{
int i,j,k;
if(argc != 6)
{
fprintf(stderr,
"Usage: Fld2DTo2D5 2dmeshfile 2dfieldfile 3dmeshfile 3dfieldfile outfield\n");
exit(1);
}
string datasave(argv[5]);
string mesh2d(argv[1]);
string mesh3d(argv[3]);
//create 2d session
LibUtilities::SessionReaderSharedPtr vSession2d
= LibUtilities::SessionReader::CreateInstance(2, argv);
std::vector<std::string> filenames;
filenames.push_back(mesh3d);
//create 3D session
LibUtilities::SessionReaderSharedPtr vSession3d
= LibUtilities::SessionReader::CreateInstance(2, argv, filenames, vSession2d->GetComm());
SpatialDomains::MeshGraphSharedPtr graphShPt2d = SpatialDomains::MeshGraph::Read(vSession2d);
SpatialDomains::MeshGraphSharedPtr graphShPt3d = SpatialDomains::MeshGraph::Read(vSession3d);
//2D
string field2dfile(argv[2]);
vector<LibUtilities::FieldDefinitionsSharedPtr> field2ddef;
vector<vector<NekDouble> > field2ddata;
LibUtilities::Import(field2dfile,field2ddef,field2ddata);
//3D
string field3dfile(argv[4]);
vector<LibUtilities::FieldDefinitionsSharedPtr> field3ddef;
vector<vector<NekDouble> > field3ddata;
LibUtilities::Import(field3dfile,field3ddef,field3ddata);
vector<vector<NekDouble> > field3ddatanew(field3ddef.size());
// Set up Expansion information
vector< vector<LibUtilities::PointsType> > pointstype2d;
vector< vector<LibUtilities::PointsType> > pointstype3d;
for(i = 0; i < field2ddef.size(); ++i)
{
vector<LibUtilities::PointsType> ptype2d;
for(j = 0; j < 2; ++j)
{
ptype2d.push_back(LibUtilities::ePolyEvenlySpaced);
}
pointstype2d.push_back(ptype2d);
}
graphShPt2d->SetExpansions(field2ddef,pointstype2d);
for(i = 0; i < field3ddef.size(); ++i)
{
vector<LibUtilities::PointsType> ptype3d;
for(j = 0; j < 2; ++j)
{
ptype3d.push_back(LibUtilities::ePolyEvenlySpaced);
}
pointstype3d.push_back(ptype3d);
}
graphShPt3d->SetExpansions(field3ddef,pointstype3d);
bool useFFT = false;
bool dealiasing = false;
// Define Expansion
//int expdim2d = graphShPt2d->GetMeshDimension();
int nfields2d = field2ddef[0]->m_fields.size();
//int expdim3d = graphShPt3d->GetMeshDimension();
int nfields3d = field3ddef[0]->m_fields.size();
//Gen 2d
Array<OneD, MultiRegions::ExpListSharedPtr> Exp2d(nfields2d);
MultiRegions::ExpList2DSharedPtr Exp2D;
Exp2D = MemoryManager<MultiRegions::ExpList2D>::AllocateSharedPtr(vSession2d,graphShPt2d);
Exp2d[0] = Exp2D;
for(i = 1; i < nfields2d; ++i)
{
Exp2d[i] = MemoryManager<MultiRegions::ExpList2D>::AllocateSharedPtr(*Exp2D);
}
//Gen 3d
Array<OneD, MultiRegions::ExpListSharedPtr> Exp3d(nfields3d);
MultiRegions::ExpList3DHomogeneous1DSharedPtr Exp3DH1;
// Define Homogeneous expansion
int nplanes;
//vSession3d->LoadParameter("HomModesZ",nplanes,field3ddef[0]->m_numModes[2]);
nplanes = field3ddef[0]->m_numModes[2];
cout<< nplanes << endl;
// nplanes + 1 points
const LibUtilities::PointsKey Pkey(nplanes,LibUtilities::ePolyEvenlySpaced);
const LibUtilities::BasisKey Bkey(field3ddef[0]->m_basis[2],nplanes,Pkey);
NekDouble lz = field3ddef[0]->m_homogeneousLengths[0];
Exp3DH1 = MemoryManager<MultiRegions::ExpList3DHomogeneous1D>::AllocateSharedPtr(vSession3d,Bkey,lz,useFFT,dealiasing,graphShPt3d);
Exp3d[0] = Exp3DH1;
for(j = 1; j < nfields3d; ++j)
{
Exp3d[j] = MemoryManager<MultiRegions::ExpList3DHomogeneous1D>::AllocateSharedPtr(*Exp3DH1);
}
k=0;
for(j = 0; j < nfields2d; ++j)
{
if (j< nfields2d-1)
{
for(int i = 0; i < field2ddata.size(); ++i)
{
Exp2d[j]->ExtractDataToCoeffs(
field2ddef[i],
field2ddata[i],
field2ddef[i]->m_fields[j],
Exp3d[j]->GetPlane(k)->UpdateCoeffs());
}
}
if (j==nfields2d-1)
{
for(int i = 0; i < field2ddata.size(); ++i)
{
Exp2d[j]->ExtractDataToCoeffs(
field2ddef[i],
field2ddata[i],
field2ddef[i]->m_fields[j],
Exp3d[j+1]->GetPlane(k)->UpdateCoeffs());
}
}
}
Array<OneD, Array<OneD, NekDouble> > fieldcoeffs(vSession3d->GetVariables().size());
for(j = 0; j < fieldcoeffs.num_elements(); ++j)
{
fieldcoeffs[j] = Exp3d[j]->UpdateCoeffs();
for(int i = 0; i < field3ddef.size(); ++i)
{
Exp3d[0]->AppendFieldData(field3ddef[i], field3ddatanew[i],fieldcoeffs[j]);
}
}
LibUtilities::Write(datasave,field3ddef,field3ddatanew);
return 0;
}
// Only for 2d to 2d5 Hui Xu 23 Aug 2013
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