Commit 237a9bf0 authored by Tomáš Oberhuber's avatar Tomáš Oberhuber
Browse files

Fixing the Navier Stokes example.

parent 2f765c12

examples/navier-stokes/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -10,8 +10,10 @@ CXX = g++ 
CUDA_CXX = nvcc

OMP_FLAGS = -DHAVE_OPENMP -fopenmp 

#CXX_FLAGS = -std=gnu++0x -I$(TNL_INCLUDE_DIR) -O0 -g -DDEBUG $(OMP_FLAGS)

CXX_FLAGS = -std=gnu++0x -I$(TNL_INCLUDE_DIR) -O3 $(OMP_FLAGS)

#CXX_FLAGS = -std=gnu++0x -I$(TNL_INCLUDE_DIR) -O3 $(OMP_FLAGS)

CXX_FLAGS = -std=gnu++0x -I$(TNL_INCLUDE_DIR) -O3 $(OMP_FLAGS) -pg

#CXX_FLAGS = -DHAVE_NOT_CXX11 -I$(TNL_INCLUDE_DIR) -O3 $(OMP_FLAGS)

 

LD_FLAGS = -L$(TNL_INSTALL_DIR) -ltnl-0.1 -lgomp



SOURCES = main.cpp

examples/navier-stokes/navierStokesSolver_impl.h

+1 −1
Original line number Diff line number Diff line
@@ -436,7 +436,7 @@ void navierStokesSolver< Mesh, EulerScheme > :: GetExplicitRHS( const RealType& 
                                         rho_u2_t[ c ] );

            

            //rho_u1_t[ c ] += ;

            rho_u2_t[ c ] -= startUpCoefficient * this -> gravity * this -> rho[ c ];

            //rho_u2_t[ c ] -= startUpCoefficient * this -> gravity * this -> rho[ c ];



            /***

             * Add the viscosity term

src/implementation/core/tnlObject.cpp

+1 −0
Original line number Diff line number Diff line
@@ -208,6 +208,7 @@ bool parseObjectType( const tnlString& objectType, 
         templateBrackets --;

      i ++;

   }

   return true;

}

tests/unit-tests/core/tnlArrayTest.cpp

+4 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 


int main( int argc, char* argv[] )

{

#ifdef HAVE_CPPUNIT

   if( ! tnlUnitTestStarter :: run< tnlArrayTester< char, tnlHost, int > >() ||

       ! tnlUnitTestStarter :: run< tnlArrayTester< int, tnlHost, int > >() ||

       ! tnlUnitTestStarter :: run< tnlArrayTester< long int, tnlHost, int > >() ||
@@ -34,4 +35,7 @@ int main( int argc, char* argv[] ) 
       ! tnlUnitTestStarter :: run< tnlArrayTester< long double, tnlHost, long int > >() )

      return EXIT_FAILURE;

   return EXIT_SUCCESS;

#else

   return EXIT_FAILURE;

#endif

}

tests/unit-tests/core/tnlArrayTester.h

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#ifndef TNLARRAYMANAGERTESTER_H_

#define TNLARRAYMANAGERTESTER_H_



#ifdef HAVE_CPPUNIT

#include <cppunit/TestSuite.h>

#include <cppunit/TestResult.h>

#include <cppunit/TestCaller.h>
@@ -208,5 +209,6 @@ class tnlArrayTester : public CppUnit :: TestCase 


};



#endif /* HAVE_CPPUNIT */



#endif /* TNLARRAYMANAGERTESTER_H_ */