Commit 48c991c0 authored by Chris Cantwell's avatar Chris Cantwell

Minor fixes, formatting and fixed IncNS FFTW tests.

parent 95577847
...@@ -346,7 +346,7 @@ namespace Nektar ...@@ -346,7 +346,7 @@ namespace Nektar
("npz", po::value<int>(), ("npz", po::value<int>(),
"number of procs in Z-dir") "number of procs in Z-dir")
("nsz", po::value<int>(), ("nsz", po::value<int>(),
"number of slics in Z-dir") "number of slices in Z-dir")
("part-only", po::value<int>(), ("part-only", po::value<int>(),
"only partition mesh into N partitions.") "only partition mesh into N partitions.")
("part-info", "Output partition information") ("part-info", "Output partition information")
......
...@@ -1228,10 +1228,19 @@ namespace Nektar ...@@ -1228,10 +1228,19 @@ namespace Nektar
int expansion); int expansion);
virtual void v_WriteTecplotConnectivity(std::ofstream &outfile, virtual void v_WriteTecplotConnectivity(std::ofstream &outfile,
int expansion); int expansion);
virtual void v_WriteVtkPieceHeader(std::ofstream &outfile, int expansion); virtual void v_WriteVtkPieceHeader(
virtual void v_WriteVtkPieceHeader(std::ofstream &outfile, int expansion, int istrip); std::ofstream &outfile,
virtual void v_WriteVtkPieceData(std::ofstream &outfile, int expansion, int expansion);
std::string var);
virtual void v_WriteVtkPieceHeader(
std::ofstream &outfile,
int expansion,
int istrip);
virtual void v_WriteVtkPieceData(
std::ofstream &outfile,
int expansion,
std::string var);
virtual NekDouble v_L2( virtual NekDouble v_L2(
const Array<OneD, const NekDouble> &phys, const Array<OneD, const NekDouble> &phys,
......
...@@ -394,14 +394,17 @@ namespace Nektar ...@@ -394,14 +394,17 @@ namespace Nektar
outfile << " <PointData>" << endl; outfile << " <PointData>" << endl;
} }
void ExpList3DHomogeneous1D::v_WriteVtkPieceHeader(std::ofstream &outfile, int expansion, int istrip) void ExpList3DHomogeneous1D::v_WriteVtkPieceHeader(
std::ofstream &outfile,
int expansion,
int istrip)
{ {
int i,j,k; int i,j,k;
int nquad0 = (*m_exp)[expansion]->GetNumPoints(0); int nq0 = (*m_exp)[expansion]->GetNumPoints(0);
int nquad1 = (*m_exp)[expansion]->GetNumPoints(1); int nq1 = (*m_exp)[expansion]->GetNumPoints(1);
int nquad2 = m_planes.num_elements(); int nq2 = m_planes.num_elements();
int ntot = nquad0*nquad1*nquad2; int ntot = nq0*nq1*nq2;
int ntotminus = (nquad0-1)*(nquad1-1)*(nquad2-1); int ntotminus = (nq0-1)*(nq1-1)*(nq2-1);
Array<OneD,NekDouble> coords[3]; Array<OneD,NekDouble> coords[3];
coords[0] = Array<OneD,NekDouble>(ntot); coords[0] = Array<OneD,NekDouble>(ntot);
...@@ -437,20 +440,20 @@ namespace Nektar ...@@ -437,20 +440,20 @@ namespace Nektar
outfile << " <Cells>" << endl; outfile << " <Cells>" << endl;
outfile << " <DataArray type=\"Int32\" " outfile << " <DataArray type=\"Int32\" "
<< "Name=\"connectivity\" format=\"ascii\">" << endl; << "Name=\"connectivity\" format=\"ascii\">" << endl;
for (i = 0; i < nquad0-1; ++i) for (i = 0; i < nq0-1; ++i)
{ {
for (j = 0; j < nquad1-1; ++j) for (j = 0; j < nq1-1; ++j)
{ {
for (k = 0; k < nquad2-1; ++k) for (k = 0; k < nq2-1; ++k)
{ {
outfile << k*nquad0*nquad1 + j*nquad0 + i << " " outfile << k*nq0*nq1 + j*nq0 + i << " "
<< k*nquad0*nquad1 + j*nquad0 + i + 1 << " " << k*nq0*nq1 + j*nq0 + i + 1 << " "
<< k*nquad0*nquad1 + (j+1)*nquad0 + i + 1 << " " << k*nq0*nq1 + (j+1)*nq0 + i + 1 << " "
<< k*nquad0*nquad1 + (j+1)*nquad0 + i << " " << k*nq0*nq1 + (j+1)*nq0 + i << " "
<< (k+1)*nquad0*nquad1 + j*nquad0 + i << " " << (k+1)*nq0*nq1 + j*nq0 + i << " "
<< (k+1)*nquad0*nquad1 + j*nquad0 + i + 1 << " " << (k+1)*nq0*nq1 + j*nq0 + i + 1 << " "
<< (k+1)*nquad0*nquad1 + (j+1)*nquad0 + i + 1 << " " << (k+1)*nq0*nq1 + (j+1)*nq0 + i + 1 << " "
<< (k+1)*nquad0*nquad1 + (j+1)*nquad0 + i << " " << endl; << (k+1)*nq0*nq1 + (j+1)*nq0 + i << endl;
} }
} }
} }
......
...@@ -76,7 +76,6 @@ IF( NEKTAR_SOLVER_INCNAVIERSTOKES ) ...@@ -76,7 +76,6 @@ IF( NEKTAR_SOLVER_INCNAVIERSTOKES )
ADD_NEKTAR_TEST(ChannelSpongeNSE) ADD_NEKTAR_TEST(ChannelSpongeNSE)
ADD_NEKTAR_TEST(ChannelSpongeLNSE) ADD_NEKTAR_TEST(ChannelSpongeLNSE)
ADD_NEKTAR_TEST(ChanFlow_Standard_BodyForce) ADD_NEKTAR_TEST(ChanFlow_Standard_BodyForce)
ADD_NEKTAR_TEST(CylFlow_MovBody)
#IF (NEKTAR_USING_ARPACK) #IF (NEKTAR_USING_ARPACK)
#ADD_NEKTAR_TEST(ChanStability_adj_Ar) ### #ADD_NEKTAR_TEST(ChanStability_adj_Ar) ###
...@@ -84,10 +83,11 @@ IF( NEKTAR_SOLVER_INCNAVIERSTOKES ) ...@@ -84,10 +83,11 @@ IF( NEKTAR_SOLVER_INCNAVIERSTOKES )
#ADD_NEKTAR_TEST(bfs_tg-AR) #ADD_NEKTAR_TEST(bfs_tg-AR)
#ENDIF (NEKTAR_USING_ARPACK) #ENDIF (NEKTAR_USING_ARPACK)
IF (NEKTAR_USING_FFTW) IF (NEKTAR_USE_FFTW)
ADD_NEKTAR_TEST(ChanFlow_3DH1D_FFT) ADD_NEKTAR_TEST(ChanFlow_3DH1D_FFT)
ADD_NEKTAR_TEST(ChanFlow_3DH2D_FFT) ADD_NEKTAR_TEST(ChanFlow_3DH2D_FFT)
ENDIF (NEKTAR_USING_FFTW) ADD_NEKTAR_TEST(CylFlow_MovBody)
ENDIF (NEKTAR_USE_FFTW)
IF (NEKTAR_USE_MPI) IF (NEKTAR_USE_MPI)
ADD_NEKTAR_TEST(ChanFlow_3DH1D_Parallel_mode1) ADD_NEKTAR_TEST(ChanFlow_3DH1D_Parallel_mode1)
......
...@@ -903,7 +903,7 @@ void FilterMovingBody::UpdateMotion( ...@@ -903,7 +903,7 @@ void FilterMovingBody::UpdateMotion(
for (int i = 1; i < nstrips; ++i) for (int i = 1; i < nstrips; ++i)
{ {
vComm->GetColumnComm()->Recv(i, CableMotions); vColComm->Recv(i, CableMotions);
m_outputStream[1].width(8); m_outputStream[1].width(8);
m_outputStream[1] << setprecision(6) << time; m_outputStream[1] << setprecision(6) << time;
......
...@@ -29,8 +29,8 @@ ...@@ -29,8 +29,8 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// //
// Description: Moving Body forcing (movement of a body in a domain is achieved via // Description: Moving Body forcing (movement of a body in a domain is achieved
// a forcing term which is the results of a coordinate system motion) // via a forcing term which is the results of a coordinate system motion)
// //
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
......
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