From 97ee2879c839634934466489fc158f7093f6b411 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 | 12 ++++++------
.../hamilton-jacobi/tnlFastSweepingMethod2D_impl.h | 8 ++++----
2 files changed, 10 insertions(+), 10 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 26444bcfa5..47561768ee 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
@@ -96,10 +96,10 @@ template< typename Real,
template< int sizeSArray >
void
tnlDirectEikonalMethodsBase< Meshes::Grid< 2, Real, Device, Index > >::
-updateBlocks( const InterfaceMapType& interfaceMap,
- MeshFunctionType& aux,
- MeshFunctionType& helpFunc,
- ArrayContainer& BlockIterHost, int numThreadsPerBlock/*, Real **sArray*/ )
+updateBlocks( InterfaceMapType interfaceMap,
+ MeshFunctionType aux,
+ MeshFunctionType helpFunc,
+ 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( const 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 89cb608810..f7be7e7de2 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
@@ -97,11 +97,11 @@ solve( const MeshPointer& mesh,
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");
}*/
--
GitLab