Commit a6cd9f5b authored by Dave Moxey's avatar Dave Moxey
Browse files

Fix a bunch of compiler warnings for OS X, as well as install error problems.

parent 74ce6ecd
......@@ -52,6 +52,10 @@ SET(NEKTAR_LIBRARY_TYPE "SHARED")
SET(CMAKE_SKIP_BUILD_RPATH FALSE)
SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
SET(CMAKE_INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${LIB_DIR}")
IF (APPLE)
SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_DIR}")
ENDIF()
LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
"${CMAKE_INSTALL_PREFIX}/${LIB_DIR}" isSystemDir)
IF("${isSystemDir}" STREQUAL "-1")
......
const int size = 10;
int main(int argc, char *argv[])
{
return 0;
......
......@@ -28,7 +28,7 @@ int main(int argc, char *argv[])
LibUtilities::CommSharedPtr vComm = vSession->GetComm();
MultiRegions::DisContField3DSharedPtr Exp,Fce;
int i,j,k, nq, coordim;
int i, nq, coordim;
Array<OneD,NekDouble> fce;
Array<OneD,NekDouble> xc0,xc1,xc2;
StdRegions::ConstFactorMap factors;
......
......@@ -261,9 +261,9 @@
m_globalBndMat (In.m_globalBndMat),
m_trace (In.m_trace),
m_traceMap (In.m_traceMap),
m_periodicVerts (In.m_periodicVerts),
m_periodicFaces (In.m_periodicFaces),
m_periodicEdges (In.m_periodicEdges),
m_periodicFaces (In.m_periodicFaces)
m_periodicVerts (In.m_periodicVerts)
{
}
......
......@@ -112,20 +112,20 @@ namespace Nektar
switch(solveType)
{
case eLinearPreconXxt:
{
linSolveType = eXxtFullMatrix;
break;
}
case eLinearPreconPETSc:
{
#ifdef NEKTAR_USING_PETSC
linSolveType = ePETScFullMatrix;
#else
#ifndef NEKTAR_USING_PETSC
ASSERTL0(false, "Nektar++ has not been compiled with "
"PETSc support.");
#endif
}
case eLinearPreconXxt:
default:
{
linSolveType = eXxtFullMatrix;
break;
}
}
m_vertLocToGloMap = m_locToGloMap->LinearSpaceMap(*expList, linSolveType);
......
......@@ -1223,8 +1223,6 @@ namespace Nektar
StdRegions::StdExpansionSharedPtr locExpansion;
locExpansion = expList->GetExp(offset);
unsigned int nbnd=locExpansion->NumBndryCoeffs();
unsigned int ncoeffs=locExpansion->GetNcoeffs();
unsigned int nint=ncoeffs-nbnd;
//This is the SC elemental matrix in the orginal basis (S1)
DNekScalMatSharedPtr pS1=loc_mat;
......
......@@ -70,6 +70,8 @@ namespace SolverUtils
class Forcing
{
public:
SOLVER_UTILS_EXPORT virtual ~Forcing() {}
/// Initialise the forcing object
SOLVER_UTILS_EXPORT void InitObject(
const Array<OneD, MultiRegions::ExpListSharedPtr>& pFields,
......
......@@ -250,6 +250,7 @@ namespace Nektar
else
{
Array<OneD, const NekDouble> w0 = base[0]->GetW();
len = 0.0;
for(int i = 0; i < jac.num_elements(); ++i)
{
......
......@@ -41,20 +41,6 @@ namespace Nektar
{
namespace StdRegions
{
/** define list of number of vertices corresponding to each ShapeType */
const int g_shapenverts[LibUtilities::SIZE_ShapeType] = {0,2,3,4,4,5,6,8};
/** define list of number of edges corresponding to each ShapeType */
const int g_shapenedges[LibUtilities::SIZE_ShapeType] = {0,1,3,4,6,8,9,12};
/** define list of number of faces corresponding to each ShapeType */
const int g_shapenfaces[LibUtilities::SIZE_ShapeType] = {0,0,0,0,4,5,5,6};
//std::map<StdMatrixKey, DNekMatSharedPtr> StdExpansion::m_stdMatrixManager;
//std::map<StdMatrixKey, DNekBlkMatSharedPtr> StdExpansion::m_stdStaticCondMatrixManager;
//std::map<IndexMapKey, IndexMapValuesSharedPtr> StdExpansion::m_IndexMapManager;
StdExpansion::StdExpansion(void):
m_elmt_id(0),
m_ncoeffs(0)
......
......@@ -1446,9 +1446,6 @@ namespace Nektar
// project onto modal space.
OrthoExp.FwdTrans(array,orthocoeffs);
//To avoid the exponential from blowing up
NekDouble epsilon = 1;
//counters for scanning through orthocoeffs array
int j, k, cnt = 0;
int nmodes = min(nmodes_a,nmodes_b);
......
......@@ -1348,7 +1348,6 @@ namespace Nektar
int nmodes0 = m_base[0]->GetNumModes();
int nmodes1 = m_base[1]->GetNumModes();
int numMax = nmodes0;
int numMin2 = nmodes0;
int i;
......
......@@ -2313,10 +2313,6 @@ namespace Nektar
const int nvariables = m_fields.num_elements();
const int nElements = m_fields[0]->GetExpSize();
NekDouble hxmin = 0.0;
NekDouble hymin = 0.0;
NekDouble hmin = 0.0;
Array<OneD, NekDouble> Sensor(nPts, 0.0);
Array<OneD, NekDouble> SensorKappa(nPts, 0.0);
Array <OneD, NekDouble > Lambda(nPts, 0.0);
......@@ -2475,15 +2471,10 @@ namespace Nektar
// Determine the maximum wavespeed
Vmath::Vadd(nPts, absVelocity, 1, soundspeed, 1, Lambda, 1);
NekDouble LambdaMax = Vmath::Vmax(nPts, Lambda, 1);
// Determine hbar = hx_i/h
const int nElements = m_fields[0]->GetExpSize();
Array<OneD,int> pOrderElmt = GetNumExpModesPerExp();
NekDouble order = Vmath::Vmax(pOrderElmt.num_elements(), pOrderElmt, 1);
NekDouble ThetaH = m_FacH;
NekDouble ThetaL = m_FacL;
......
......@@ -33,7 +33,7 @@
//
///////////////////////////////////////////////////////////////////////////////
#ifndef NEKTAR_SOLVERS_SUPSTEPPINGEXTRAPOLATE_H
#ifndef NEKTAR_SOLVERS_SUBSTEPPINGEXTRAPOLATE_H
#define NEKTAR_SOLVERS_SUBSTEPPINGEXTRAPOLATE_H
#include <LibUtilities/BasicUtils/NekFactory.hpp>
......
///////////////////////////////////////////////////////////////////////////////
//
// File MoveMeshToCriticalLayer.cpp
......@@ -457,7 +458,7 @@ int main(int argc, char *argv[])
Computestreakpositions(nvertl, streak, xold_up, yold_up,
xold_low, yold_low, xold_c, yold_c, x_c, y_c,cr,true);
// if the curve is low the old layer point, it has to shift down
NekDouble shift;
NekDouble shift=0;
for(int q=0; q<nvertl; q++)
{
if(y_c[q] < yold_c[q])
......
......@@ -115,6 +115,8 @@ void OutputTecplot::Process(po::variables_map &vm)
<< " J=" << m_f->m_fieldPts->m_npts[1]
<< " F=POINT" << endl;
break;
default:
ASSERTL0(false, "Points type not supported yet.");
}
for(int i = 0; i < m_f->m_fieldPts->m_pts[0].num_elements(); ++i)
......
......@@ -33,7 +33,7 @@
//
////////////////////////////////////////////////////////////////////////////////
#ifndef UTILITIES_PREPROCESSING_MESHCONVERT_INPUTVTK
#ifndef UTILITIES_PREPROCESSING_MESHCONVERT_INPUTTEC
#define UTILITIES_PREPROCESSING_MESHCONVERT_INPUTTEC
#include "Module.h"
......
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