Merge branch 'master' into feature/FieldIO

Conflicts:
	library/StdRegions/StdExpansion.cpp
	solvers/ADRSolver/EquationSystems/UnsteadyDiffusion.cpp
	solvers/ADRSolver/EquationSystems/UnsteadyDiffusion.h
	solvers/IncNavierStokesSolver/EquationSystems/VelocityCorrectionScheme.cpp

library/StdRegions/StdExpansion.cpp

@@ -363,14 +363,8 @@ namespace Nektar
                 {
                     StdMatrixKey masskey(eMass,mkey.GetShapeType(),*this,NullConstFactorMap,NullVarCoeffMap,mkey.GetNodalPointsType());
                     DNekMatSharedPtr mmat = GetStdMatrix(masskey);
-
-#if 1
-                    returnval = MemoryManager<DNekMat>::AllocateSharedPtr(m_ncoeffs,m_ncoeffs); //Populate standard mass matrix.
-
-                    Vmath::Vcopy(m_ncoeffs*m_ncoeffs,mmat->GetRawPtr(),1,returnval->GetRawPtr(),1);
-#else
+                    
                     returnval = MemoryManager<DNekMat>::AllocateSharedPtr(*mmat); //Populate standard mass matrix.
-#endif
                     returnval->Invert();
                 }
                 break;
@@ -1168,7 +1162,6 @@ namespace Nektar
             NEKERROR(ErrorUtil::efatal, "This function is not defined for this shape");
         }
 
-
         void StdExpansion::v_AddEdgeNormBoundaryInt(const int edge,
                                                     boost::shared_ptr<StdExpansion>    &EdgeExp,
                                                     const Array<OneD, const NekDouble> &Fn,
@@ -1176,7 +1169,7 @@ namespace Nektar
         {
             NEKERROR(ErrorUtil::efatal, "This function is not defined for this shape");
         }
-        
+
         void StdExpansion::v_AddFaceNormBoundaryInt(const int face,
                                                     boost::shared_ptr<StdExpansion>    &FaceExp,
                                                     const Array<OneD, const NekDouble> &Fn,

library/StdRegions/StdRegions.hpp

@@ -178,7 +178,7 @@ namespace Nektar
             "HybridDGLamToQ2",
             "HybridDGLamToU",
             "FwdTrans",
-            "Preconditinoer",
+            "Preconditioner",
         };
 
         enum VarCoeffType

solvers/ADRSolver/EquationSystems/UnsteadyDiffusion.cpp

@@ -57,6 +57,13 @@ namespace Nektar
         m_session->LoadParameter("wavefreq",   m_waveFreq, 0.0);
         m_session->LoadParameter("epsilon",    m_epsilon,  0.0);
 
+        m_session->MatchSolverInfo("SpectralVanishingViscosity","True",m_useSpecVanVisc,false);
+        if(m_useSpecVanVisc)
+        {
+            m_session->LoadParameter("SVVCutoffRatio",m_sVVCutoffRatio,0.75);
+            m_session->LoadParameter("SVVDiffCoeff",m_sVVDiffCoeff,0.1);
+        }
+
         int npoints = m_fields[0]->GetNpoints();
 
         if(m_session->DefinesParameter("d00"))
@@ -163,7 +170,7 @@ namespace Nektar
             {
                 // Just copy over array
                 int npoints = GetNpoints();
-
+                
                 for(i = 0; i < nvariables; ++i)
                 {
                     Vmath::Vcopy(npoints, inarray[i], 1, outarray[i], 1);
@@ -205,7 +212,7 @@ namespace Nektar
         int npoints    = m_fields[0]->GetNpoints();
         factors[StdRegions::eFactorLambda] = 1.0 / lambda / m_epsilon;
         factors[StdRegions::eFactorTau]    = 1.0;
-        
+
         // We solve ( \nabla^2 - HHlambda ) Y[i] = rhs [i]
         // inarray = input: \hat{rhs} -> output: \hat{Y}
         // outarray = output: nabla^2 \hat{Y}

solvers/ADRSolver/EquationSystems/UnsteadyDiffusion.h

@@ -62,6 +62,9 @@ namespace Nektar
         virtual ~UnsteadyDiffusion();
 
     protected:
+        bool m_useSpecVanVisc;
+        NekDouble m_sVVCutoffRatio;   // cutt off ratio from which to start decayhing modes
+        NekDouble m_sVVDiffCoeff;     // Diffusion coefficient of SVV modes
         SolverUtils::DiffusionSharedPtr         m_diffusion;        
         SolverUtils::RiemannSolverSharedPtr     m_riemannSolver;
 

solvers/IncNavierStokesSolver/EquationSystems/VelocityCorrectionScheme.cpp

@@ -104,7 +104,7 @@ namespace Nektar
             {
                 m_session->MatchSolverInfo("SpectralVanishingViscosity","True",m_useHomo1DSpecVanVisc,false);
             }
-            
+
             if(m_useHomo1DSpecVanVisc)
             {