From da74359cabb4bae9e7e273c03b1e0bad6226b344 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matou=C5=A1=20Fencl?= <fenclmat@fjfi.cvut.cz>
Date: Fri, 30 Nov 2018 09:06:24 +0100
Subject: [PATCH] Changed int to IndexType
---
.../tnlDirectEikonalMethodsBase_impl.h | 6 +++---
.../tnlFastSweepingMethod2D_impl.h | 20 +++++++++----------
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/TNL/Experimental/Hamilton-Jacobi/Solvers/hamilton-jacobi/tnlDirectEikonalMethodsBase_impl.h b/src/TNL/Experimental/Hamilton-Jacobi/Solvers/hamilton-jacobi/tnlDirectEikonalMethodsBase_impl.h
index 786c6a4886..e142152ef7 100644
--- a/src/TNL/Experimental/Hamilton-Jacobi/Solvers/hamilton-jacobi/tnlDirectEikonalMethodsBase_impl.h
+++ b/src/TNL/Experimental/Hamilton-Jacobi/Solvers/hamilton-jacobi/tnlDirectEikonalMethodsBase_impl.h
@@ -99,7 +99,7 @@ tnlDirectEikonalMethodsBase< Meshes::Grid< 2, Real, Device, Index > >::
updateBlocks( InterfaceMapType interfaceMap,
MeshFunctionType aux,
MeshFunctionType helpFunc,
- ArrayContainer BlockIterHost, int numThreadsPerBlock/*, Real **sArray*/ )
+ ArrayContainer BlockIterHost, IndexType numThreadsPerBlock/*, Real **sArray*/ )
{
#pragma omp parallel for schedule( dynamic )
for( IndexType i = 0; i < BlockIterHost.getSize(); i++ )
@@ -267,13 +267,13 @@ updateBlocks( InterfaceMapType interfaceMap,
template< typename Real,
typename Device,
typename Index >
-template< int sizeSArray >
+template< IndexType sizeSArray >
void
tnlDirectEikonalMethodsBase< Meshes::Grid< 3, Real, Device, Index > >::
updateBlocks( const InterfaceMapType interfaceMap,
const MeshFunctionType aux,
MeshFunctionType& helpFunc,
- ArrayContainer BlockIterHost, int numThreadsPerBlock/*, Real **sArray*/ )
+ ArrayContainer BlockIterHost, IndexType numThreadsPerBlock/*, Real **sArray*/ )
{
//#pragma omp parallel for schedule( dynamic )
for( IndexType i = 0; i < BlockIterHost.getSize(); i++ )
diff --git a/src/TNL/Experimental/Hamilton-Jacobi/Solvers/hamilton-jacobi/tnlFastSweepingMethod2D_impl.h b/src/TNL/Experimental/Hamilton-Jacobi/Solvers/hamilton-jacobi/tnlFastSweepingMethod2D_impl.h
index 001f4c69a4..27d2663416 100644
--- a/src/TNL/Experimental/Hamilton-Jacobi/Solvers/hamilton-jacobi/tnlFastSweepingMethod2D_impl.h
+++ b/src/TNL/Experimental/Hamilton-Jacobi/Solvers/hamilton-jacobi/tnlFastSweepingMethod2D_impl.h
@@ -85,25 +85,25 @@ solve( const MeshPointer& mesh,
#ifdef HAVE_MPI
int i = Communicators::MpiCommunicator::GetRank( Communicators::MpiCommunicator::AllGroup );
- //printf( "Hello world from rank: %d ", i );
+ printf( "Hello world from rank: %d ", i );
//Communicators::MpiCommunicator::Request r = Communicators::MpiCommunicator::ISend( auxPtr, 0, 0, Communicators::MpiCommunicator::AllGroup );
- if( i == 1 )
- /*for( int k = 0; k < 16*16; k++ )
- aux[ k ] = 10;*/
+ /*if( i == 1 )
+ for( int k = 0; k < 16*16; k++ )
+ aux[ k ] = 10;
printf( "1: mesh x: %d\n", mesh->getDimensions().x() );
printf( "1: mesh y: %d\n", mesh->getDimensions().y() );
- //aux.save("aux_proc1.tnl");
+ aux.save("aux_proc1.tnl");*/
if( i == 0 )
printf( "0: mesh x: %d\n", mesh->getDimensions().x() );
printf( "0: mesh y: %d\n", mesh->getDimensions().y() );
- //aux.save("aux_proc0.tnl");
- /*for( int k = 0; k < mesh->getDimensions().x()*mesh->getDimensions().y(); k++ )
+ aux.save("aux_proc0.tnl");
+ for( int k = 0; k < 16*16; k++ )
aux[ k ] = 10;
- for( int k = 0; k < mesh->getDimensions().x(); k++ ){
- for( int l = 0; l < mesh->getDimensions().y(); l++ )
+ for( int k = 0; k < 16; k++ ){
+ for( int l = 0; l < 16; l++ )
printf("%f.2\t",aux[ k * 16 + l ] );
printf("\n");
- }*/
+ }
/*bool a = Communicators::MpiCommunicator::IsInitialized();
if( a )
--
GitLab