Skip to content
Snippets Groups Projects
Commit 67997f67 authored by Matouš Fencl's avatar Matouš Fencl
Browse files

trying git problem

parent 9c196197
No related branches found
No related tags found
1 merge request!1Hamilton jacobi
Hide whitespace changes
Inline Side-by-side
src/TNL/Experimental/Hamilton-Jacobi/Solvers/hamilton-jacobi/tnlDirectEikonalMethodsBase_impl.h
+ 169
− 165
View file @ 67997f67
...@@ -632,170 +632,6 @@ __cuda_callable__ void sortMinims( T1 pom[] ) ...@@ -632,170 +632,6 @@ __cuda_callable__ void sortMinims( T1 pom[] )
} }
} }
template < typename Real, typename Device, typename Index >
__global__ void CudaInitCaller( const Functions::MeshFunction< Meshes::Grid< 2, Real, Device, Index > >& input,
Functions::MeshFunction< Meshes::Grid< 2, Real, Device, Index > >& output,
Functions::MeshFunction< Meshes::Grid< 2, Real, Device, Index >, 2, bool >& interfaceMap )
{
int i = threadIdx.x + blockDim.x*blockIdx.x;
int j = blockDim.y*blockIdx.y + threadIdx.y;
const Meshes::Grid< 2, Real, Device, Index >& mesh = input.template getMesh< Devices::Cuda >();
if( i < mesh.getDimensions().x() && j < mesh.getDimensions().y() )
{
typedef typename Meshes::Grid< 2, Real, Device, Index >::Cell Cell;
Cell cell( mesh );
cell.getCoordinates().x() = i; cell.getCoordinates().y() = j;
cell.refresh();
const Index cind = cell.getIndex();
output[ cind ] =
input( cell ) >= 0 ? TypeInfo< Real >::getMaxValue() :
- TypeInfo< Real >::getMaxValue();
interfaceMap[ cind ] = false;
const Real& hx = mesh.getSpaceSteps().x();
const Real& hy = mesh.getSpaceSteps().y();
cell.refresh();
const Real& c = input( cell );
if( ! cell.isBoundaryEntity() )
{
auto neighbors = cell.getNeighborEntities();
Real pom = 0;
const Index e = neighbors.template getEntityIndex< 1, 0 >();
const Index w = neighbors.template getEntityIndex< -1, 0 >();
const Index n = neighbors.template getEntityIndex< 0, 1 >();
const Index s = neighbors.template getEntityIndex< 0, -1 >();
if( c * input[ n ] <= 0 )
{
pom = TNL::sign( c )*( hy * c )/( c - input[ n ]);
if( TNL::abs( output[ cind ] ) > TNL::abs( pom ) )
output[ cind ] = pom;
interfaceMap[ cell.getIndex() ] = true;
}
if( c * input[ e ] <= 0 )
{
pom = TNL::sign( c )*( hx * c )/( c - input[ e ]);
if( TNL::abs( output[ cind ] ) > TNL::abs( pom ) )
output[ cind ] = pom;
interfaceMap[ cind ] = true;
}
if( c * input[ w ] <= 0 )
{
pom = TNL::sign( c )*( hx * c )/( c - input[ w ]);
if( TNL::abs( output[ cind ] ) > TNL::abs( pom ) )
output[ cind ] = pom;
interfaceMap[ cind ] = true;
}
if( c * input[ s ] <= 0 )
{
pom = TNL::sign( c )*( hy * c )/( c - input[ s ]);
if( TNL::abs( output[ cind ] ) > TNL::abs( pom ) )
output[ cind ] = pom;
interfaceMap[ cind ] = true;
}
}
}
}
template < typename Real, typename Device, typename Index >
__global__ void CudaInitCaller3d( const Functions::MeshFunction< Meshes::Grid< 3, Real, Device, Index > >& input,
Functions::MeshFunction< Meshes::Grid< 3, Real, Device, Index > >& output,
Functions::MeshFunction< Meshes::Grid< 3, Real, Device, Index >, 3, bool >& interfaceMap )
{
int i = threadIdx.x + blockDim.x*blockIdx.x;
int j = blockDim.y*blockIdx.y + threadIdx.y;
int k = blockDim.z*blockIdx.z + threadIdx.z;
const Meshes::Grid< 3, Real, Device, Index >& mesh = input.template getMesh< Devices::Cuda >();
if( i < mesh.getDimensions().x() && j < mesh.getDimensions().y() && k < mesh.getDimensions().z() )
{
typedef typename Meshes::Grid< 3, Real, Device, Index >::Cell Cell;
Cell cell( mesh );
cell.getCoordinates().x() = i; cell.getCoordinates().y() = j; cell.getCoordinates().z() = k;
cell.refresh();
const Index cind = cell.getIndex();
output[ cind ] =
input( cell ) >= 0 ? TypeInfo< Real >::getMaxValue() :
- TypeInfo< Real >::getMaxValue();
interfaceMap[ cind ] = false;
cell.refresh();
const Real& hx = mesh.getSpaceSteps().x();
const Real& hy = mesh.getSpaceSteps().y();
const Real& hz = mesh.getSpaceSteps().z();
const Real& c = input( cell );
if( ! cell.isBoundaryEntity() )
{
auto neighbors = cell.getNeighborEntities();
Real pom = 0;
const Index e = neighbors.template getEntityIndex< 1, 0, 0 >();
const Index w = neighbors.template getEntityIndex< -1, 0, 0 >();
const Index n = neighbors.template getEntityIndex< 0, 1, 0 >();
const Index s = neighbors.template getEntityIndex< 0, -1, 0 >();
const Index t = neighbors.template getEntityIndex< 0, 0, 1 >();
const Index b = neighbors.template getEntityIndex< 0, 0, -1 >();
if( c * input[ n ] <= 0 )
{
pom = TNL::sign( c )*( hy * c )/( c - input[ n ]);
if( TNL::abs( output[ cind ] ) > TNL::abs( pom ) )
output[ cind ] = pom;
interfaceMap[ cind ] = true;
}
if( c * input[ e ] <= 0 )
{
pom = TNL::sign( c )*( hx * c )/( c - input[ e ]);
if( TNL::abs( output[ cind ] ) > TNL::abs( pom ) )
output[ cind ] = pom;
interfaceMap[ cind ] = true;
}
if( c * input[ w ] <= 0 )
{
pom = TNL::sign( c )*( hx * c )/( c - input[ w ]);
if( TNL::abs( output[ cind ] ) > TNL::abs( pom ) )
output[ cind ] = pom;
interfaceMap[ cind ] = true;
}
if( c * input[ s ] <= 0 )
{
pom = TNL::sign( c )*( hy * c )/( c - input[ s ]);
if( TNL::abs( output[ cind ] ) > TNL::abs( pom ) )
output[ cind ] = pom;
interfaceMap[ cind ] = true;
}
if( c * input[ b ] <= 0 )
{
pom = TNL::sign( c )*( hz * c )/( c - input[ b ]);
if( TNL::abs( output[ cind ] ) > TNL::abs( pom ) )
output[ cind ] = pom;
interfaceMap[ cind ] = true;
}
if( c * input[ t ] <= 0 )
{
pom = TNL::sign( c )*( hz * c )/( c - input[ t ]);
if( TNL::abs( output[ cind ] ) > TNL::abs( pom ) )
output[ cind ] = pom;
interfaceMap[ cind ] = true;
}
}
}
}
template< typename Real, template< typename Real,
typename Device, typename Device,
typename Index > typename Index >
...@@ -967,6 +803,173 @@ getsArray( MeshFunctionType& aux, Real sArray[18][18], int dimX, int dimY, int b ...@@ -967,6 +803,173 @@ getsArray( MeshFunctionType& aux, Real sArray[18][18], int dimX, int dimY, int b
} }
}*/ }*/
#ifdef HAVE_CUDA
template < typename Real, typename Device, typename Index >
__global__ void CudaInitCaller( const Functions::MeshFunction< Meshes::Grid< 2, Real, Device, Index > >& input,
Functions::MeshFunction< Meshes::Grid< 2, Real, Device, Index > >& output,
Functions::MeshFunction< Meshes::Grid< 2, Real, Device, Index >, 2, bool >& interfaceMap )
{
int i = threadIdx.x + blockDim.x*blockIdx.x;
int j = blockDim.y*blockIdx.y + threadIdx.y;
const Meshes::Grid< 2, Real, Device, Index >& mesh = input.template getMesh< Devices::Cuda >();
if( i < mesh.getDimensions().x() && j < mesh.getDimensions().y() )
{
typedef typename Meshes::Grid< 2, Real, Device, Index >::Cell Cell;
Cell cell( mesh );
cell.getCoordinates().x() = i; cell.getCoordinates().y() = j;
cell.refresh();
const Index cind = cell.getIndex();
output[ cind ] =
input( cell ) >= 0 ? TypeInfo< Real >::getMaxValue() :
- TypeInfo< Real >::getMaxValue();
interfaceMap[ cind ] = false;
const Real& hx = mesh.getSpaceSteps().x();
const Real& hy = mesh.getSpaceSteps().y();
cell.refresh();
const Real& c = input( cell );
if( ! cell.isBoundaryEntity() )
{
auto neighbors = cell.getNeighborEntities();
Real pom = 0;
const Index e = neighbors.template getEntityIndex< 1, 0 >();
const Index w = neighbors.template getEntityIndex< -1, 0 >();
const Index n = neighbors.template getEntityIndex< 0, 1 >();
const Index s = neighbors.template getEntityIndex< 0, -1 >();
if( c * input[ n ] <= 0 )
{
pom = TNL::sign( c )*( hy * c )/( c - input[ n ]);
if( TNL::abs( output[ cind ] ) > TNL::abs( pom ) )
output[ cind ] = pom;
interfaceMap[ cell.getIndex() ] = true;
}
if( c * input[ e ] <= 0 )
{
pom = TNL::sign( c )*( hx * c )/( c - input[ e ]);
if( TNL::abs( output[ cind ] ) > TNL::abs( pom ) )
output[ cind ] = pom;
interfaceMap[ cind ] = true;
}
if( c * input[ w ] <= 0 )
{
pom = TNL::sign( c )*( hx * c )/( c - input[ w ]);
if( TNL::abs( output[ cind ] ) > TNL::abs( pom ) )
output[ cind ] = pom;
interfaceMap[ cind ] = true;
}
if( c * input[ s ] <= 0 )
{
pom = TNL::sign( c )*( hy * c )/( c - input[ s ]);
if( TNL::abs( output[ cind ] ) > TNL::abs( pom ) )
output[ cind ] = pom;
interfaceMap[ cind ] = true;
}
}
}
}
template < typename Real, typename Device, typename Index >
__global__ void CudaInitCaller3d( const Functions::MeshFunction< Meshes::Grid< 3, Real, Device, Index > >& input,
Functions::MeshFunction< Meshes::Grid< 3, Real, Device, Index > >& output,
Functions::MeshFunction< Meshes::Grid< 3, Real, Device, Index >, 3, bool >& interfaceMap )
{
int i = threadIdx.x + blockDim.x*blockIdx.x;
int j = blockDim.y*blockIdx.y + threadIdx.y;
int k = blockDim.z*blockIdx.z + threadIdx.z;
const Meshes::Grid< 3, Real, Device, Index >& mesh = input.template getMesh< Devices::Cuda >();
if( i < mesh.getDimensions().x() && j < mesh.getDimensions().y() && k < mesh.getDimensions().z() )
{
typedef typename Meshes::Grid< 3, Real, Device, Index >::Cell Cell;
Cell cell( mesh );
cell.getCoordinates().x() = i; cell.getCoordinates().y() = j; cell.getCoordinates().z() = k;
cell.refresh();
const Index cind = cell.getIndex();
output[ cind ] =
input( cell ) >= 0 ? TypeInfo< Real >::getMaxValue() :
- TypeInfo< Real >::getMaxValue();
interfaceMap[ cind ] = false;
cell.refresh();
const Real& hx = mesh.getSpaceSteps().x();
const Real& hy = mesh.getSpaceSteps().y();
const Real& hz = mesh.getSpaceSteps().z();
const Real& c = input( cell );
if( ! cell.isBoundaryEntity() )
{
auto neighbors = cell.getNeighborEntities();
Real pom = 0;
const Index e = neighbors.template getEntityIndex< 1, 0, 0 >();
const Index w = neighbors.template getEntityIndex< -1, 0, 0 >();
const Index n = neighbors.template getEntityIndex< 0, 1, 0 >();
const Index s = neighbors.template getEntityIndex< 0, -1, 0 >();
const Index t = neighbors.template getEntityIndex< 0, 0, 1 >();
const Index b = neighbors.template getEntityIndex< 0, 0, -1 >();
if( c * input[ n ] <= 0 )
{
pom = TNL::sign( c )*( hy * c )/( c - input[ n ]);
if( TNL::abs( output[ cind ] ) > TNL::abs( pom ) )
output[ cind ] = pom;
interfaceMap[ cind ] = true;
}
if( c * input[ e ] <= 0 )
{
pom = TNL::sign( c )*( hx * c )/( c - input[ e ]);
if( TNL::abs( output[ cind ] ) > TNL::abs( pom ) )
output[ cind ] = pom;
interfaceMap[ cind ] = true;
}
if( c * input[ w ] <= 0 )
{
pom = TNL::sign( c )*( hx * c )/( c - input[ w ]);
if( TNL::abs( output[ cind ] ) > TNL::abs( pom ) )
output[ cind ] = pom;
interfaceMap[ cind ] = true;
}
if( c * input[ s ] <= 0 )
{
pom = TNL::sign( c )*( hy * c )/( c - input[ s ]);
if( TNL::abs( output[ cind ] ) > TNL::abs( pom ) )
output[ cind ] = pom;
interfaceMap[ cind ] = true;
}
if( c * input[ b ] <= 0 )
{
pom = TNL::sign( c )*( hz * c )/( c - input[ b ]);
if( TNL::abs( output[ cind ] ) > TNL::abs( pom ) )
output[ cind ] = pom;
interfaceMap[ cind ] = true;
}
if( c * input[ t ] <= 0 )
{
pom = TNL::sign( c )*( hz * c )/( c - input[ t ]);
if( TNL::abs( output[ cind ] ) > TNL::abs( pom ) )
output[ cind ] = pom;
interfaceMap[ cind ] = true;
}
}
}
}
template< typename Real, template< typename Real,
typename Device, typename Device,
typename Index > typename Index >
...@@ -1022,4 +1025,5 @@ updateCell( Real sArray[18][18], int thri, int thrj, const Real hx, const Real h ...@@ -1022,4 +1025,5 @@ updateCell( Real sArray[18][18], int thri, int thrj, const Real hx, const Real h
//u[ cell.getIndex() ]= argAbsMin( value, tmp ); //u[ cell.getIndex() ]= argAbsMin( value, tmp );
sArray[ thrj ][ thri ] = argAbsMin( value, tmp ); sArray[ thrj ][ thri ] = argAbsMin( value, tmp );
} }
} }
\ No newline at end of file #endif
src/TNL/Experimental/Hamilton-Jacobi/Solvers/hamilton-jacobi/tnlFastSweepingMethod2D_impl.h
+ 4
− 2
View file @ 67997f67
...@@ -67,7 +67,9 @@ solve( const MeshPointer& mesh, ...@@ -67,7 +67,9 @@ solve( const MeshPointer& mesh,
interfaceMapPtr->setMesh( mesh ); interfaceMapPtr->setMesh( mesh );
std::cout << "Initiating the interface cells ..." << std::endl; std::cout << "Initiating the interface cells ..." << std::endl;
BaseType::initInterface( u, auxPtr, interfaceMapPtr ); BaseType::initInterface( u, auxPtr, interfaceMapPtr );
#ifdef HAVE_CUDA
cudaDeviceSynchronize(); cudaDeviceSynchronize();
#endif
auxPtr->save( "aux-ini.tnl" ); auxPtr->save( "aux-ini.tnl" );
...@@ -240,7 +242,7 @@ solve( const MeshPointer& mesh, ...@@ -240,7 +242,7 @@ solve( const MeshPointer& mesh,
aux.save("aux-final.tnl"); aux.save("aux-final.tnl");
} }
//#ifdef HAVE_CUDA #ifdef HAVE_CUDA
template < typename Real, typename Device, typename Index > template < typename Real, typename Device, typename Index >
__global__ void CudaUpdateCellCaller( tnlDirectEikonalMethodsBase< Meshes::Grid< 2, Real, Device, Index > > ptr, __global__ void CudaUpdateCellCaller( tnlDirectEikonalMethodsBase< Meshes::Grid< 2, Real, Device, Index > > ptr,
const Functions::MeshFunction< Meshes::Grid< 2, Real, Device, Index >, 2, bool >& interfaceMap, const Functions::MeshFunction< Meshes::Grid< 2, Real, Device, Index >, 2, bool >& interfaceMap,
...@@ -286,4 +288,4 @@ __global__ void CudaUpdateCellCaller( tnlDirectEikonalMethodsBase< Meshes::Grid< ...@@ -286,4 +288,4 @@ __global__ void CudaUpdateCellCaller( tnlDirectEikonalMethodsBase< Meshes::Grid<
} }
//ptr.getsArray( aux, sArray, mesh.getDimensions().x(), mesh.getDimensions().y(), blIdx, blIdy ); //ptr.getsArray( aux, sArray, mesh.getDimensions().x(), mesh.getDimensions().y(), blIdx, blIdy );
} }
//#endif #endif
\ No newline at end of file
src/TNL/Experimental/Hamilton-Jacobi/Solvers/hamilton-jacobi/tnlFastSweepingMethod3D_impl.h
+ 5
− 1
View file @ 67997f67
...@@ -64,7 +64,9 @@ solve( const MeshPointer& mesh, ...@@ -64,7 +64,9 @@ solve( const MeshPointer& mesh,
interfaceMapPtr->setMesh( mesh ); interfaceMapPtr->setMesh( mesh );
std::cout << "Initiating the interface cells ..." << std::endl; std::cout << "Initiating the interface cells ..." << std::endl;
BaseType::initInterface( u, auxPtr, interfaceMapPtr ); BaseType::initInterface( u, auxPtr, interfaceMapPtr );
#ifdef HAVE_CUDA
cudaDeviceSynchronize(); cudaDeviceSynchronize();
#endif
auxPtr->save( "aux-ini.tnl" ); auxPtr->save( "aux-ini.tnl" );
typename MeshType::Cell cell( *mesh ); typename MeshType::Cell cell( *mesh );
...@@ -274,6 +276,7 @@ solve( const MeshPointer& mesh, ...@@ -274,6 +276,7 @@ solve( const MeshPointer& mesh,
aux.save("aux-final.tnl"); aux.save("aux-final.tnl");
} }
#ifdef HAVE_CUDA
template < typename Real, typename Device, typename Index > template < typename Real, typename Device, typename Index >
__global__ void CudaUpdateCellCaller( tnlDirectEikonalMethodsBase< Meshes::Grid< 3, Real, Device, Index > > ptr, __global__ void CudaUpdateCellCaller( tnlDirectEikonalMethodsBase< Meshes::Grid< 3, Real, Device, Index > > ptr,
const Functions::MeshFunction< Meshes::Grid< 3, Real, Device, Index >, 3, bool >& interfaceMap, const Functions::MeshFunction< Meshes::Grid< 3, Real, Device, Index >, 3, bool >& interfaceMap,
...@@ -299,4 +302,5 @@ __global__ void CudaUpdateCellCaller( tnlDirectEikonalMethodsBase< Meshes::Grid< ...@@ -299,4 +302,5 @@ __global__ void CudaUpdateCellCaller( tnlDirectEikonalMethodsBase< Meshes::Grid<
} }
} }
} }
} }
\ No newline at end of file #endif
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