Commit 9437c8d7 authored by Tomas Sobotik's avatar Tomas Sobotik
Browse files

Merging with MASTER. Fast-Sweeping 3D CPU DONE (CANNOT TEST NOW)

parent 9c8d9d9d

examples/fast-sweeping/main.h

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ int main( int argc, char* argv[] ) 
   if( ! parseCommandLine( argc, argv, configDescription, parameters ) )

      return false;



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

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

    if(!solver.init(parameters))

   {

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

examples/fast-sweeping/tnlFastSweeping.h

+7 −21
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ public: 
	typedef tnlVector< RealType, DeviceType, IndexType> DofVectorType;

	typedef typename MeshType::CoordinatesType CoordinatesType;





	tnlFastSweeping();



	static tnlString getType();

	bool init( const tnlParameterContainer& parameters );
@@ -151,24 +151,6 @@ public: 
	//for parallel version use this one instead:

//	void updateValue(const Index i, const Index j, DofVectorType* grid);





	void setupSquare1000(Index i, Index j);

	void setupSquare1100(Index i, Index j);

	void setupSquare1010(Index i, Index j);

	void setupSquare1001(Index i, Index j);

	void setupSquare1110(Index i, Index j);

	void setupSquare1101(Index i, Index j);

	void setupSquare1011(Index i, Index j);

	void setupSquare1111(Index i, Index j);

	void setupSquare0000(Index i, Index j);

	void setupSquare0100(Index i, Index j);

	void setupSquare0010(Index i, Index j);

	void setupSquare0001(Index i, Index j);

	void setupSquare0110(Index i, Index j);

	void setupSquare0101(Index i, Index j);

	void setupSquare0011(Index i, Index j);

	void setupSquare0111(Index i, Index j);



	Real fabsMin(const Real x, const Real y);
@@ -178,10 +160,14 @@ protected: 


	bool exactInput;



	DofVectorType dofVector, dofVector2;



	tnlMeshFunction<MeshType> dofVector, dofVector2;

	DofVectorType data;



	RealType h;



	tnlGridEntity< MeshType, 3, tnlGridEntityNoStencilStorage > Entity;



#ifdef HAVE_OPENMP

//	omp_lock_t* gridLock;

#endif
@@ -195,6 +181,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_ */

examples/fast-sweeping/tnlFastSweeping2D_impl.h

+0 −4
Original line number Diff line number Diff line
@@ -396,11 +396,7 @@ void tnlFastSweeping< tnlGrid< 2,MeshReal, Device, MeshIndex >, Real, Index > :: 
{



	this->Entity.setCoordinates(CoordinatesType(i,j));



		//cout << Entity.getIndex()  << endl;



	this->Entity.refresh();

//	cout << "No. = " << dofVector2[i+j*Mesh.getDimensions().x()] << " i = " << i << ", " << Entity.getCoordinates().x() << " j = " << j << ", " << Entity.getCoordinates().y()<< " i+j*n = " <<i+j*Mesh.getDimensions().x()<< " index = "<<Entity.getIndex() << endl;

	tnlNeighbourGridEntityGetter<tnlGridEntity< MeshType, 2, tnlGridEntityNoStencilStorage >,2> neighbourEntities(Entity);



	Real value = dofVector2[Entity.getIndex()];

examples/fast-sweeping/tnlFastSweeping3D_impl.h

+31 −453

File changed.

Preview size limit exceeded, changes collapsed.