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

Fixed demos, some solvers

parent 74d8c1d5
......@@ -20,7 +20,7 @@ int main(int argc, char *argv[])
NekDouble x[2];
LibUtilities::PointsType Qtype;
LibUtilities::BasisType btype;
StdRegions::StdExpansion1D *E;
StdRegions::StdExpansion1D *E = NULL;
if(argc != 6)
{
......
......@@ -27,7 +27,7 @@ int main(int argc, char *argv[])
LibUtilities::BasisType btype2 = LibUtilities::eOrtho_B;
LibUtilities::PointsType NodalType = LibUtilities::eNodalTriElec;
LibUtilities::ShapeType regionshape;
StdRegions::StdExpansion2D *E;
StdRegions::StdExpansion2D *E = NULL;
Array<OneD, NekDouble> sol;
Array<OneD, NekDouble> coords(8);
StdRegions::Orientation edgeDir = StdRegions::eForwards;
......
......@@ -59,7 +59,7 @@ int main(int argc, char *argv[]){
BasisType btype1,btype2,btype3;
ShapeType regionshape;
StdExpansion* E;
StdExpansion* E = NULL;
Array<OneD, NekDouble> sol;
if(argc < 23)
......
......@@ -23,7 +23,7 @@ int main(int argc, char *argv[])
NekDouble x[2];
LibUtilities::PointsType Qtype;
LibUtilities::BasisType btype;
StdRegions::StdExpansion1D *E;
StdRegions::StdExpansion1D *E = NULL;
if(argc != 6)
{
......
......@@ -37,7 +37,7 @@ int main(int argc, char *argv[])
LibUtilities::BasisType btype2 = LibUtilities::eOrtho_B;
LibUtilities::PointsType NodalType = LibUtilities::eNodalTriElec;
LibUtilities::ShapeType regionshape;
StdRegions::StdExpansion2D *E;
StdRegions::StdExpansion2D *E = NULL;
Array<OneD, NekDouble> sol,x,y,dx,dy;
Array<OneD, NekDouble> coords(8);
StdRegions::Orientation edgeDir = StdRegions::eForwards;
......
......@@ -74,7 +74,7 @@ int main(int argc, char *argv[]){
LibUtilities::BasisType btype1,btype2,btype3;
LibUtilities::ShapeType regionshape;
StdRegions::StdExpansion *E;
StdRegions::StdExpansion *E = NULL;
Array<OneD, NekDouble> x, y, z, sol, dx, dy, dz;
if(argc < 23)
......
......@@ -34,7 +34,6 @@ int main(int argc, char *argv[])
StdRegions::ConstFactorMap factors;
StdRegions::VarCoeffMap varcoeffs;
FlagList flags;
NekDouble st;
if(argc < 2)
{
......
......@@ -48,7 +48,7 @@ using namespace Nektar;
#ifdef TIMING
#include <time.h>
#define Timing(s) \
fprintf(stdout,"%s Took %g seconds\n",s,(clock()-st)/cps); \
fprintf(stdout,"%s Took %g seconds\n",s,(clock()-st)/cps); \
st = clock();
#else
#define Timing(s) \
......@@ -68,8 +68,10 @@ int main(int argc, char *argv[])
Array<OneD,NekDouble> xc0,xc1,xc2;
StdRegions::ConstFactorMap factors;
FlagList flags;
NekDouble cps = (double)CLOCKS_PER_SEC;
NekDouble st;
#ifdef TIMING
NekDouble st;
NekDouble cps = (double)CLOCKS_PER_SEC;
#endif
if(argc < 2)
{
......
......@@ -119,7 +119,7 @@ int main(int argc, char *argv[]) {
//-----------------------------------------------
// Define a 3D expansion based on basis definition
StdRegions::StdExpansion *spe;
StdRegions::StdExpansion *spe = NULL;
if( regionShape == LibUtilities::ePrism )
{
......
......@@ -137,7 +137,7 @@ int main(int argc, char *argv[]) {
//-----------------------------------------------
// Define a 3D expansion based on basis definition
StdRegions::StdExpansion3D *spe;
StdRegions::StdExpansion3D *spe = NULL;
if( regionShape == LibUtilities::ePrism )
{
......
......@@ -27,7 +27,7 @@ int main(int argc, char *argv[]){
LibUtilities::BasisType btype2 = LibUtilities::eOrtho_B;
LibUtilities::PointsType NodalType = LibUtilities::eNodalTriElec;
LibUtilities::ShapeType regionshape;
StdRegions::StdExpansion *E;
StdRegions::StdExpansion *E = NULL;
Array<OneD, NekDouble> sol;
if(argc != 8)
......
......@@ -41,7 +41,7 @@ int main(int argc, char *argv[]){
LibUtilities::BasisType btype3 = LibUtilities::eOrtho_C;
LibUtilities::PointsType NodalType = LibUtilities::eNodalTriElec;
LibUtilities::ShapeType regionshape;
StdRegions::StdExpansion *E;
StdRegions::StdExpansion *E = NULL;
Array<OneD, NekDouble> sol;
if(argc != 11)
......
......@@ -14,7 +14,7 @@ int main(int argc, char *argv[])
int order, nq;
LibUtilities::PointsType Qtype;
LibUtilities::BasisType btype;
StdRegions::StdExpansion1D *E;
StdRegions::StdExpansion1D *E = NULL;
Array<OneD, NekDouble> sol;
if(argc != 4)
......
......@@ -34,7 +34,7 @@ int main(int argc, char *argv[])
LibUtilities::BasisType btype2 = LibUtilities::eOrtho_B;
LibUtilities::PointsType NodalType = LibUtilities::eNodalTriElec;
LibUtilities::ShapeType regionshape;
StdRegions::StdExpansion *E;
StdRegions::StdExpansion *E = NULL;
Array<OneD, NekDouble> sol,dx,dy,x,y;
if(argc != 8)
......
......@@ -61,7 +61,7 @@ int main(int argc, char *argv[]){
LibUtilities::BasisType btype2 = LibUtilities::eOrtho_B;
LibUtilities::BasisType btype3 = LibUtilities::eOrtho_C;
LibUtilities::ShapeType regionshape;
StdRegions::StdExpansion *E;
StdRegions::StdExpansion *E = NULL;
Array<OneD, NekDouble> x, y, z, sol, dx, dy, dz;
if(argc != 11)
......
......@@ -98,7 +98,7 @@ int main(int argc, char *argv[]) {
//-----------------------------------------------
// Define a 3D expansion based on basis definition
StdRegions::StdExpansion *sPyrE;
StdRegions::StdExpansion *sPyrE = NULL;
if(regionShape == LibUtilities::ePyramid )
{
......
......@@ -112,7 +112,7 @@ int main(int argc, char *argv[]) {
//-----------------------------------------------
// Define a 3D expansion based on basis definition
StdRegions::StdExpansion3D *sPyrE;
StdRegions::StdExpansion3D *sPyrE = NULL;
if( regionShape == LibUtilities::ePyramid )
{
......
......@@ -85,7 +85,7 @@ int main(int argc, char *argv[])
//-----------------------------------------------
// Define a 3D expansion based on basis definition
StdRegions::StdExpansion *ste;
StdRegions::StdExpansion *ste = NULL;
if( regionShape == LibUtilities::eTetrahedron )
{
......
......@@ -114,7 +114,7 @@ int main(int argc, char *argv[]) {
//-----------------------------------------------
// Define a 3D expansion based on basis definition
StdRegions::StdExpansion3D *ste;
StdRegions::StdExpansion3D *ste = NULL;
if( regionShape == LibUtilities::eTetrahedron )
{
......
......@@ -14,7 +14,7 @@ IF( NEKTAR_SOLVER_ADR )
./EquationSystems/UnsteadyDiffusion.cpp
./EquationSystems/UnsteadyAdvectionDiffusion.cpp
./EquationSystems/UnsteadyInviscidBurger.cpp
./EquationSystems/CFLtester.cpp
#./EquationSystems/CFLtester.cpp
./EquationSystems/EigenValuesAdvection.cpp)
ADD_SOLVER_EXECUTABLE(ADRSolver solvers
......
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