[asl] 31/33: Update to the new aslTimer API

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch master
in repository asl.

commit e2d3d246d95d49ecd3f69573d63d7c5f129f6171
Author: Avtech Scientific <AvtechScientific at users.noreply.github.com>
Date:   Wed Mar 2 10:39:54 2016 +0200

    Update to the new aslTimer API
---
 CMakeLists.txt                 | 3 ++-
 NEWS.md                        | 2 +-
 test/testACL/testPrivateVar.cc | 6 +++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index da6b6cb..42f1837 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -52,6 +52,7 @@ include(ASLBuildFunctions)
 find_package(OpenCL 1.1 REQUIRED)
 # ToDo: check - system component might be not needed any longer on new versions of Boost
 find_package(Boost 1.55 REQUIRED COMPONENTS program_options filesystem system)
+# ToDo: remove support for VTK 6.1 at some point in future
 find_package(VTK 6.1 QUIET COMPONENTS vtkRenderingCore vtkImagingCore vtkFiltersCore vtkIOCore vtkIOLegacy vtkIOXML vtkIOMINC vtkCommonCore vtkViewsCore vtkftgl vtksys vtkDICOMParser vtkexpat vtkzlib NO_MODULE)
 if(NOT VTK_FOUND)
 	find_package(VTK 7.0 REQUIRED COMPONENTS vtkRenderingCore vtkImagingCore vtkFiltersCore vtkIOCore vtkIOLegacy vtkIOXML vtkIOMINC vtkCommonCore vtkViewsCore vtksys vtkDICOMParser vtkexpat vtkzlib NO_MODULE)
@@ -92,7 +93,7 @@ set(CPACK_PACKAGE_VERSION_PATCH ${ASL_VERSION_PATCH})
 set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE")
 set(CPACK_RESOURCE_FILE_README "${PROJECT_SOURCE_DIR}/README.md")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Advanced Simulation Library is a free and open source hardware accelerated multiphysics simulation software.")
-set(CPACK_PACKAGE_DESCRIPTION "Advanced Simulation Library (ASL) is a free and open source hardware accelerated multiphysics simulation software. Its computational engine is based, among others, on the Lattice Boltzmann Methods and is written in OpenCL which enable extraordinarily efficient deployment on a variety of massively parallel architectures, ranging from inexpensive FPGAs, DSPs and GPUs up to heterogeneous clusters and supercomputers. The engine is hidden entirely behind C++ cla [...]
+set(CPACK_PACKAGE_DESCRIPTION "Advanced Simulation Library (ASL) is a free and open source hardware accelerated multiphysics simulation software. Its computational engine is written in OpenCL which enables extraordinarily efficient deployment on a variety of massively parallel architectures, ranging from inexpensive FPGAs, DSPs and GPUs up to heterogeneous clusters and supercomputers. The engine is hidden entirely behind simple C++ classes, so that no OpenCL knowledge is required from ap [...]
 set(CPACK_PACKAGE_VENDOR "Avtech Scientific")
 set(CPACK_PACKAGE_CONTACT "http://avtechscientific.com/contact")
 
diff --git a/NEWS.md b/NEWS.md
index c9ed7a5..97a3335 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -6,7 +6,7 @@
 - bug fixes
 - fixing portability issues
 
-Contributors: Bartłomiej Piotrowski
+Contributors: Bartłomiej Piotrowski, Evgeniy Alekseev.
 
 
 ## 0.1.6
diff --git a/test/testACL/testPrivateVar.cc b/test/testACL/testPrivateVar.cc
index fb65140..a9835e4 100644
--- a/test/testACL/testPrivateVar.cc
+++ b/test/testACL/testPrivateVar.cc
@@ -62,7 +62,7 @@ bool testKernelUnoptimized()
 	for(unsigned int i(0); i<nCycles; ++i)
 		k.compute();
 	timer.stop();
-	std::cout<<"Unoptimized: "<<timer.getTime()<<endl;
+	std::cout<<"Unoptimized: "<<timer.realTime()<<endl;
 
 	return true;		
 }
@@ -93,7 +93,7 @@ bool testKernelUnoptimizedPlus()
 	for(unsigned int i(0); i<nCycles; ++i)
 		k.compute();
 	timer.stop();
-	std::cout<<"UnoptimizedPlus: "<<timer.getTime()<<endl;
+	std::cout<<"UnoptimizedPlus: "<<timer.realTime()<<endl;
 
 	return true;		
 }
@@ -123,7 +123,7 @@ bool testKernelOptimized()
 	for(unsigned int i(0); i<nCycles; ++i)
 		k.compute();
 	timer.stop();
-	std::cout<<"Optimized: "<<timer.getTime()<<endl;
+	std::cout<<"Optimized: "<<timer.realTime()<<endl;
 
 	return true;		
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/asl.git