From 8ae96a982dc2073279b840c2c61d183b8218d07a Mon Sep 17 00:00:00 2001
From: Tomas Sobotik <sobotto4@fjfi.cvut.cz>
Date: Sun, 6 Mar 2016 00:39:30 +0100
Subject: [PATCH] Dimension for added for Fast-sweeping
---
examples/fast-sweeping/fastSweepingConfig.h | 1 +
examples/fast-sweeping/main.h | 36 ++++++++++++++++-----
2 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/examples/fast-sweeping/fastSweepingConfig.h b/examples/fast-sweeping/fastSweepingConfig.h
index ff14036301..02d639a14e 100644
--- a/examples/fast-sweeping/fastSweepingConfig.h
+++ b/examples/fast-sweeping/fastSweepingConfig.h
@@ -29,6 +29,7 @@ class fastSweepingConfig
config.addDelimiter( "Parallel Eikonal solver settings:" );
config.addEntry < tnlString > ( "problem-name", "This defines particular problem.", "fast-sweeping" );
config.addRequiredEntry < tnlString > ( "initial-condition", "Initial condition for solver");
+ config.addRequiredEntry < tnlString > ( "dim", "Dimension of problem.");
config.addEntry < tnlString > ( "mesh", "Name of mesh.", "mesh.tnl" );
config.addEntry < tnlString > ( "exact-input", "Are the function values near the curve equal to the SDF? (yes/no)", "no" );
}
diff --git a/examples/fast-sweeping/main.h b/examples/fast-sweeping/main.h
index 279eeb03c1..19dada3680 100644
--- a/examples/fast-sweeping/main.h
+++ b/examples/fast-sweeping/main.h
@@ -43,16 +43,36 @@ int main( int argc, char* argv[] )
if( ! parseCommandLine( argc, argv, configDescription, parameters ) )
return false;
- tnlFastSweeping<tnlGrid<3,double,tnlHost, int>, double, int> solver;
- if(!solver.init(parameters))
+ const tnlString& dim = parameters.getParameter< tnlString >( "dim" );
+
+ if(dim == "2")
+ {
+ tnlFastSweeping<tnlGrid<2,double,tnlHost, int>, double, int> solver;
+ if(!solver.init(parameters))
+ {
+ cerr << "Solver failed to initialize." << endl;
+ return EXIT_FAILURE;
+ }
+ checkCudaDevice;
+ cout << "-------------------------------------------------------------" << endl;
+ cout << "Starting solver..." << endl;
+ solver.run();
+ }
+ else if(dim == "3")
{
- cerr << "Solver failed to initialize." << endl;
- return EXIT_FAILURE;
+ tnlFastSweeping<tnlGrid<3,double,tnlHost, int>, double, int> solver;
+ if(!solver.init(parameters))
+ {
+ cerr << "Solver failed to initialize." << endl;
+ return EXIT_FAILURE;
+ }
+ checkCudaDevice;
+ cout << "-------------------------------------------------------------" << endl;
+ cout << "Starting solver..." << endl;
+ solver.run();
}
- checkCudaDevice;
- cout << "-------------------------------------------------------------" << endl;
- cout << "Starting solver..." << endl;
- solver.run();
+ else
+ cerr << "Unsopported no. of dimensions: " << dim << "!" << endl;
time(&stop);
--
GitLab