diff --git a/library/LibUtilities/Foundations/Basis.cpp b/library/LibUtilities/Foundations/Basis.cpp index d153fbd41faee4bf4df73f291b91cae4fa856f9d..9f68fd63fe624fde07178284b1fb39c7d5830354 100644 --- a/library/LibUtilities/Foundations/Basis.cpp +++ b/library/LibUtilities/Foundations/Basis.cpp @@ -598,20 +598,18 @@ namespace Nektar } } break; - - //Fourier Real Half Mode - case eFourierHalfModeRe: - - m_bdata[0] = cos(M_PI*z[0]); - m_dbdata[0] = -M_PI*sin(M_PI*z[0]); - break; - - //Fourier Imaginary Half Mode - case eFourierHalfModeIm: - - m_bdata[0] = -sin(M_PI*z[0]); - m_dbdata[0] =-M_PI*cos(M_PI*z[0]); - break; + + //Fourier Real Half Mode + case eFourierHalfModeRe: + m_bdata[0] = cos(M_PI*z[0]); + m_dbdata[0] = -M_PI*sin(M_PI*z[0]); + break; + + //Fourier Imaginary Half Mode + case eFourierHalfModeIm: + m_bdata[0] = -sin(M_PI*z[0]); + m_dbdata[0] = -M_PI*cos(M_PI*z[0]); + break; case eChebyshev: { diff --git a/library/SolverUtils/DriverArnoldi.cpp b/library/SolverUtils/DriverArnoldi.cpp index 8840cbd6377715d1a1761ec2c2817f8942b9bcbe..fe40d4ead51484e2457a062fbd2eb45d0234a669 100644 --- a/library/SolverUtils/DriverArnoldi.cpp +++ b/library/SolverUtils/DriverArnoldi.cpp @@ -97,7 +97,6 @@ namespace Nektar m_equ[0]->SetLambda(m_realShift); m_session->LoadParameter("imagShift", m_imagShift, 0.0); - cout << "Driver Arndoli end " << endl; } void DriverArnoldi::ArnoldiSummary(std::ostream &out) diff --git a/library/SolverUtils/DriverModifiedArnoldi.cpp b/library/SolverUtils/DriverModifiedArnoldi.cpp index 68df9316d075440e1e4862534e85fcc61eb152c1..492cb04ecaab71607431d7895bab3dda96ea4667 100644 --- a/library/SolverUtils/DriverModifiedArnoldi.cpp +++ b/library/SolverUtils/DriverModifiedArnoldi.cpp @@ -140,9 +140,10 @@ namespace Nektar out << "Iteration: " << 0 << endl; // Normalise first vector in sequence - alpha[0] = std::sqrt(Blas::Ddot(ntot, &Kseq[0][0], 1, &Kseq[0][0], 1)); - m_comm->AllReduce(alpha[0], Nektar::LibUtilities::ReduceSum); - + alpha[0] = std::sqrt(Blas::Ddot(ntot, &Kseq[0][0], 1, + &Kseq[0][0], 1)); + m_comm->AllReduce(alpha[0], Nektar::LibUtilities::ReduceSum); + //alpha[0] = std::sqrt(alpha[0]); Vmath::Smul(ntot, 1.0/alpha[0], Kseq[0], 1, Kseq[0], 1); @@ -154,8 +155,9 @@ namespace Nektar EV_update(Kseq[i-1], Kseq[i]); // Normalise - alpha[i] = std::sqrt(Blas::Ddot(ntot, &Kseq[i][0], 1, &Kseq[i][0], 1)); - m_comm->AllReduce(alpha[i], Nektar::LibUtilities::ReduceSum); + alpha[i] = std::sqrt(Blas::Ddot(ntot, &Kseq[i][0], 1, + &Kseq[i][0], 1)); + m_comm->AllReduce(alpha[i], Nektar::LibUtilities::ReduceSum); //alpha[i] = std::sqrt(alpha[i]); diff --git a/library/SolverUtils/EquationSystem.cpp b/library/SolverUtils/EquationSystem.cpp index 057d9d6c1ec3346028c7256fdfea088f1caea2a8..35087da0c4f8eabc925a6fe00411ea96db73ef48 100644 --- a/library/SolverUtils/EquationSystem.cpp +++ b/library/SolverUtils/EquationSystem.cpp @@ -363,8 +363,9 @@ namespace Nektar for (i = 0; i < m_fields.num_elements(); i++) { - if(m_session->GetVariable(i).compare("w") == 0) - { + if(m_session->GetVariable(i).compare("w") + == 0) + { m_fields[i] = MemoryManager<MultiRegions ::ContField3DHomogeneous1D> ::AllocateSharedPtr( @@ -1219,7 +1220,7 @@ namespace Nektar m_useFFT, m_homogen_dealiasing, m_graph, m_session->GetVariable(i)); - m_base[i]->SetWaveSpace(true); + m_base[i]->SetWaveSpace(true); } } else diff --git a/solvers/IncNavierStokesSolver/AdvectionTerms/AdjointAdvection.cpp b/solvers/IncNavierStokesSolver/AdvectionTerms/AdjointAdvection.cpp index 1f72acd146c8a391e35c22b7980a3db4d71a91b9..fdc2c3cf33ef9593cebb1aeb06cfcb1d8fee631f 100644 --- a/solvers/IncNavierStokesSolver/AdvectionTerms/AdjointAdvection.cpp +++ b/solvers/IncNavierStokesSolver/AdvectionTerms/AdjointAdvection.cpp @@ -462,13 +462,13 @@ namespace Nektar std::vector<LibUtilities::FieldDefinitionsSharedPtr> FieldDef; std::vector<std::vector<NekDouble> > FieldData; int nqtot = m_base[0]->GetTotPoints(); - - - //Get Homogeneous - LibUtilities::FieldIOSharedPtr fld = - MemoryManager<LibUtilities::FieldIO>::AllocateSharedPtr(m_session->GetComm()); - fld->Import(pInfile, FieldDef, FieldData); - + + //Get Homogeneous + LibUtilities::FieldIOSharedPtr fld = + MemoryManager<LibUtilities::FieldIO>::AllocateSharedPtr( + m_session->GetComm()); + fld->Import(pInfile, FieldDef, FieldData); + int nvar = m_session->GetVariables().size(); int s; diff --git a/solvers/IncNavierStokesSolver/AdvectionTerms/LinearisedAdvection.cpp b/solvers/IncNavierStokesSolver/AdvectionTerms/LinearisedAdvection.cpp index 99a977893cf40594fb6a894a67b5aa87dd4112f1..4f232994c127493c217cf8b53cb5ba83179acfe5 100644 --- a/solvers/IncNavierStokesSolver/AdvectionTerms/LinearisedAdvection.cpp +++ b/solvers/IncNavierStokesSolver/AdvectionTerms/LinearisedAdvection.cpp @@ -464,12 +464,13 @@ namespace Nektar std::vector<LibUtilities::FieldDefinitionsSharedPtr> FieldDef; std::vector<std::vector<NekDouble> > FieldData; int nqtot = m_base[0]->GetTotPoints(); - + //Get Homogeneous - LibUtilities::FieldIOSharedPtr fld = - MemoryManager<LibUtilities::FieldIO>::AllocateSharedPtr(m_session->GetComm()); - fld->Import(pInfile, FieldDef, FieldData); - + LibUtilities::FieldIOSharedPtr fld = + MemoryManager<LibUtilities::FieldIO>::AllocateSharedPtr( + m_session->GetComm()); + fld->Import(pInfile, FieldDef, FieldData); + //LibUtilities::Import(pInfile,FieldDef,FieldData); int nvar = m_session->GetVariables().size();