Commit 74d8c1d5 authored by Dave Moxey's avatar Dave Moxey
Browse files

Fixed compiler warnings in MultiRegions and SolverUtils.

parent f3f18e1f
......@@ -84,9 +84,9 @@ namespace Nektar
m_numGlobalDirBndCoeffs(0),
m_solnType(eNoSolnType),
m_bndSystemBandWidth(0),
m_successiveRHS(0),
m_gsh(0),
m_bndGsh(0),
m_successiveRHS(0)
m_bndGsh(0)
{
}
......@@ -101,9 +101,9 @@ namespace Nektar
m_numLocalDirBndCoeffs(0),
m_numGlobalDirBndCoeffs(0),
m_bndSystemBandWidth(0),
m_successiveRHS(0),
m_gsh(0),
m_bndGsh(0),
m_successiveRHS(0)
m_bndGsh(0)
{
// Default value from Solver Info
m_solnType = pSession->GetSolverInfoAsEnum<GlobalSysSolnType>(
......@@ -172,9 +172,9 @@ namespace Nektar
m_solnType(oldLevelMap->m_solnType),
m_preconType(oldLevelMap->m_preconType),
m_iterativeTolerance(oldLevelMap->m_iterativeTolerance),
m_successiveRHS(oldLevelMap->m_successiveRHS),
m_gsh(oldLevelMap->m_gsh),
m_bndGsh(oldLevelMap->m_bndGsh),
m_successiveRHS(oldLevelMap->m_successiveRHS),
m_lowestStaticCondLevel(oldLevelMap->m_lowestStaticCondLevel)
{
int i;
......
......@@ -68,7 +68,6 @@ namespace Nektar
protected:
private:
int m_contNcoeffs;
Array<OneD, NekDouble> m_contCoeffs;
// virtual functions
......
......@@ -808,9 +808,6 @@ namespace Nektar
// Number of solution points of each element
int nLocalSolutionPts;
// Number of coeffients points of each element
int nLocalCoeffPts;
// Initial index of each element
int phys_offset;
......
......@@ -641,7 +641,7 @@ namespace Nektar
}
//Extract the data in fielddata into the m_coeff list
void ExpListHomogeneous2D::v_ExtractDataToCoeffs(LibUtilities::FieldDefinitionsSharedPtr &fielddef, std::vector<NekDouble> &fielddata, std::string &field)
void ExpListHomogeneous2D::v_ExtractDataToCoeffs(LibUtilities::FieldDefinitionsSharedPtr &fielddef, std::vector<NekDouble> &fielddata, std::string &field, Array<OneD, NekDouble> &coeffs)
{
int i,k;
int offset = 0;
......@@ -677,7 +677,7 @@ namespace Nektar
for(k = 0; k < (NumMod_y*NumMod_z); ++k)
{
Vmath::Vcopy(datalen,&fielddata[offset],1,&m_coeffs[m_coeff_offset[eid] + k*ncoeffs_per_line],1);
Vmath::Vcopy(datalen,&fielddata[offset],1,&coeffs[m_coeff_offset[eid] + k*ncoeffs_per_line],1);
offset += datalen;
}
}
......
......@@ -195,7 +195,7 @@ namespace Nektar
virtual void v_AppendFieldData(LibUtilities::FieldDefinitionsSharedPtr &fielddef, std::vector<NekDouble> &fielddata, Array<OneD, NekDouble> &coeffs);
virtual void v_ExtractDataToCoeffs(LibUtilities::FieldDefinitionsSharedPtr &fielddef, std::vector<NekDouble> &fielddata, std::string &field);
virtual void v_ExtractDataToCoeffs(LibUtilities::FieldDefinitionsSharedPtr &fielddef, std::vector<NekDouble> &fielddata, std::string &field, Array<OneD, NekDouble> &coeffs);
virtual void v_WriteTecplotHeader(std::ofstream &outfile,std::string var = "v");
......
......@@ -73,7 +73,6 @@ namespace Nektar
const MatrixStorage& matStorage):
m_smvbsrmatrix(),
m_rows(rows),
m_cols(columns),
m_mulCallsCounter(0)
{
MatrixStorageType storageType = pSession->
......@@ -170,6 +169,8 @@ namespace Nektar
Vmath::Vcopy(m_rows, &m_tmpout[0], 1, &out[0], 1);
}
m_mulCallsCounter++;
}
const unsigned long GlobalMatrix::GetMulCallsCounter() const
......
......@@ -74,7 +74,6 @@ namespace Nektar
DNekSmvBsrMatSharedPtr m_smvbsrmatrix;
unsigned int m_rows;
unsigned int m_cols;
Array<OneD, NekDouble> m_tmpin;
Array<OneD, NekDouble> m_tmpout;
......
......@@ -134,7 +134,7 @@ namespace Nektar
*/
inline bool GlobalOptParam::DoGlobalMatOp(const StdRegions::MatrixType i) const
{
OptimizationOperationType type;
OptimizationOperationType type = eBwdTrans;
switch(i)
{
case StdRegions::eBwdTrans:
......@@ -185,7 +185,7 @@ namespace Nektar
*/
inline const Array<OneD, const bool> &GlobalOptParam::DoBlockMatOp(const StdRegions::MatrixType i) const
{
OptimizationOperationType type;
OptimizationOperationType type = eBwdTrans;
switch(i)
{
case StdRegions::eBwdTrans:
......
......@@ -664,7 +664,7 @@ namespace Nektar
int BottomUpSubStructuredGraph::GetNpatchesWithInterior(
const int whichlevel) const
{
int returnval;
int returnval = -1;
static int level = 0;
level++;
......@@ -721,7 +721,7 @@ namespace Nektar
int BottomUpSubStructuredGraph::GetInteriorOffset(
const int whichlevel, const int patch) const
{
int retval;
int retval = -1;
static int level = 0;
level++;
......@@ -772,7 +772,7 @@ namespace Nektar
int BottomUpSubStructuredGraph::GetNumGlobalDofs(
const int whichlevel) const
{
int returnval;
int returnval = -1;
static int level = 0;
level++;
......
......@@ -996,7 +996,7 @@ namespace Nektar
const Array<OneD, const NekDouble> &numericalFlux,
Array<OneD, NekDouble> &divCFlux)
{
int i, n;
int n;
int nLocalSolutionPts, phys_offset;
LibUtilities::BasisSharedPtr Basis;
......@@ -1264,8 +1264,6 @@ namespace Nektar
int n, e, i, j, cnt;
int nElements = fields[0]->GetExpSize();
int nTracePts = fields[0]->GetTrace()->GetTotPoints();
int nLocalSolutionPts;
int nEdgePts;
int trace_offset;
......
......@@ -1448,7 +1448,7 @@ namespace Nektar
const Array<OneD, const NekDouble> &iFlux,
Array<OneD, NekDouble> &derCFlux)
{
int i, n;
int n;
int nLocalSolutionPts, phys_offset;
Array<OneD, NekDouble> auxArray1, auxArray2;
......@@ -1942,8 +1942,6 @@ namespace Nektar
int n, e, i, j, cnt;
int nElements = fields[0]->GetExpSize();
int nTracePts = fields[0]->GetTrace()->GetTotPoints();
int nLocalSolutionPts;
int nEdgePts;
int trace_offset;
......@@ -1951,8 +1949,6 @@ namespace Nektar
int nquad0;
int nquad1;
NekDouble fac;
Array<OneD, NekDouble> auxArray1, auxArray2;
Array<OneD, LibUtilities::BasisSharedPtr> base;
......
......@@ -1606,7 +1606,7 @@ namespace Nektar
const Array<OneD, const NekDouble> &iFlux,
Array<OneD, NekDouble> &derCFlux)
{
int i, n;
int n;
int nLocalSolutionPts, phys_offset;
Array<OneD, NekDouble> auxArray1, auxArray2;
......@@ -1698,9 +1698,6 @@ namespace Nektar
Array<OneD, const NekDouble> jac;
int nElements = fields[0]->GetExpSize();
int nDim = fields[0]->GetCoordim(0);
int nTracePts = fields[0]->GetTrace()->GetTotPoints();
int trace_offset, phys_offset;
int nLocalSolutionPts;
int nquad0, nquad1;
......@@ -1916,9 +1913,6 @@ namespace Nektar
int n, e, i, j, cnt;
int nElements = fields[0]->GetExpSize();
int nDim = fields[0]->GetCoordim(0);
int nTracePts = fields[0]->GetTrace()->GetTotPoints();
int nLocalSolutionPts;
int nEdgePts;
int trace_offset;
......@@ -2112,8 +2106,6 @@ namespace Nektar
int n, e, i, j, cnt;
int nElements = fields[0]->GetExpSize();
int nTracePts = fields[0]->GetTrace()->GetTotPoints();
int nLocalSolutionPts;
int nEdgePts;
int trace_offset;
......@@ -2121,8 +2113,6 @@ namespace Nektar
int nquad0;
int nquad1;
NekDouble fac;
Array<OneD, NekDouble> auxArray1, auxArray2;
Array<OneD, LibUtilities::BasisSharedPtr> base;
......
......@@ -136,7 +136,7 @@ namespace Nektar
*/
NekDouble UnsteadySystem::MaxTimeStepEstimator()
{
NekDouble TimeStability;
NekDouble TimeStability = 0.0;
switch(m_timeIntMethod)
{
case LibUtilities::eForwardEuler:
......
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