Commit b7fa2505 authored by Tomas Sobotik's avatar Tomas Sobotik
Browse files

Merging with MASTER. Fast Sweep 2D in progress, fixed test functions

parent f917518c

examples/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -3,4 +3,4 @@ add_subdirectory( navier-stokes ) 
#add_subdirectory( mean-curvature-flow )

#add_subdirectory( hamilton-jacobi )

#add_subdirectory( hamilton-jacobi-parallel )

#add_subdirectory( fast-sweeping )
 
add_subdirectory( fast-sweeping )

examples/CMakeLists.txt~

+2 −2
Original line number Diff line number Diff line
@@ -2,5 +2,5 @@ add_subdirectory( heat-equation ) 
add_subdirectory( navier-stokes )

#add_subdirectory( mean-curvature-flow )

#add_subdirectory( hamilton-jacobi )

add_subdirectory( hamilton-jacobi-parallel )

add_subdirectory( fast-sweeping )
 
#add_subdirectory( hamilton-jacobi-parallel )

#add_subdirectory( fast-sweeping )

examples/fast-sweeping/MainBuildConfig.h

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#ifndef MAINBUILDCONFIG_H_

#define MAINBUILDCONFIG_H_



#include <solvers/tnlConfigTags.h>

#include <solvers/tnlBuildConfigTags.h>



class MainBuildConfig

{

examples/fast-sweeping/main.h

+4 −4
Original line number Diff line number Diff line
@@ -17,11 +17,11 @@ 


#include "MainBuildConfig.h"

	//for HOST versions:

//#include "tnlFastSweeping.h"

#include "tnlFastSweeping.h"

	//for DEVICE versions:

#include "tnlFastSweeping_CUDA.h"

//#include "tnlFastSweeping_CUDA.h"

#include "fastSweepingConfig.h"

#include <solvers/tnlConfigTags.h>

#include <solvers/tnlBuildConfigTags.h>



#include <mesh/tnlGrid.h>

#include <core/tnlDevice.h>
@@ -43,7 +43,7 @@ int main( int argc, char* argv[] ) 
   if( ! parseCommandLine( argc, argv, configDescription, parameters ) )

      return false;



    tnlFastSweeping<tnlGrid<3,double,tnlHost, int>, double, int> solver;

    tnlFastSweeping<tnlGrid<2,double,tnlHost, int>, double, int> solver;

    if(!solver.init(parameters))

   {

    	cerr << "Solver failed to initialize." << endl;

examples/fast-sweeping/tnlFastSweeping.h

+9 −2
Original line number Diff line number Diff line
@@ -19,8 +19,10 @@ 
#include <config/tnlParameterContainer.h>

#include <core/vectors/tnlVector.h>

#include <core/vectors/tnlStaticVector.h>

#include <functions/tnlMeshFunction.h>

#include <core/tnlHost.h>

#include <mesh/tnlGrid.h>

#include <mesh/grids/tnlGridEntity.h>

#include <limits.h>

#include <core/tnlDevice.h>

#include <ctime>
@@ -57,6 +59,7 @@ public: 
	typedef typename MeshType::CoordinatesType CoordinatesType;





	tnlFastSweeping();



	static tnlString getType();

	bool init( const tnlParameterContainer& parameters );
@@ -96,10 +99,14 @@ protected: 


	bool exactInput;



	DofVectorType dofVector, dofVector2;

	tnlMeshFunction<MeshType> dofVector, dofVector2;

	DofVectorType data;



	RealType h;



	tnlGridEntity< MeshType, 0, tnlGridEntityNoStencilStorage > Entity;





#ifdef HAVE_OPENMP

//	omp_lock_t* gridLock;

#endif
@@ -188,6 +195,6 @@ protected: 
	//for parallel version use this one instead:

// #include "tnlFastSweeping2D_openMP_impl.h"



#include "tnlFastSweeping3D_impl.h"

//															#include "tnlFastSweeping3D_impl.h"



#endif /* TNLFASTSWEEPING_H_ */