[asl] 128/177: Rename locomotive_in_tunnel
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Thu Aug 27 09:22:47 UTC 2015
This is an automated email from the git hooks/post-receive script.
ghisvail-guest pushed a commit to branch master
in repository asl.
commit 1353906827c6b7a67a17a19adb85d9b4899002a0
Author: Avtech Scientific <AvtechScientific at users.noreply.github.com>
Date: Thu Jul 30 17:37:12 2015 +0300
Rename locomotive_in_tunnel
---
NEWS.md | 2 ++
README.md | 19 +++++++++----------
examples/flow/CMakeLists.txt | 6 +++---
.../flow/{locomotive_in_tunnel.cc => locomotive.cc} | 14 +++++++-------
.../{locomotive_in_tunnel.pvsm => locomotive.pvsm} | 0
5 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/NEWS.md b/NEWS.md
index 4a8ebf3..d5c6ee3 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -2,5 +2,7 @@
## 0.1.5
+- supplying cl.hpp, since not provided by OpenCL 2.0
- bug fixes
- improved tests
+- improved application parameters management
\ No newline at end of file
diff --git a/README.md b/README.md
index 60799e4..9701e4d 100644
--- a/README.md
+++ b/README.md
@@ -22,8 +22,7 @@ Professional consulting, training and integration services are provided by [Avte
### Installation
1. Install [cmake](http://cmake.org) (>=3.0.2, BSD License) and the required libraries:
- - [OpenCL](https://www.khronos.org/opencl) (=1.2 (2.0 supplies no C++ bindings), OpenCL Specification License)
- - [C++ bindings for OpenCL](https://www.khronos.org/registry/cl/api/1.2/cl.hpp) (=1.2 (2.0 supplies no C++ bindings), OpenCL Specification License)
+ - [OpenCL](https://www.khronos.org/opencl) (>=1.2, OpenCL Specification License)
- [boost](http://www.boost.org) (>=1.55, Boost Software License)
- [VTK](http://vtk.org) (>=6.1, BSD License)
- [optional](https://github.com/AvtechScientific/ASL/blob/master/cmake/ASLBuildOptions.cmake#L3): Matlab support with [matio](https://sourceforge.net/projects/matio) (>=1.5.2, BSD License)
@@ -35,16 +34,16 @@ Professional consulting, training and integration services are provided by [Avte
### Running an example
-1. Go to examples: `cd examples/flow/locomotive_in_tunnel`
+1. Go to examples: `cd examples/flow/locomotive`
2. Copy the .stl input file: `cp ../../../../ASL/examples/input_data/locomotive.stl .`
-3. Run: `./locomotive_in_tunnel`. Optionally: change some parameters - `./locomotive_in_tunnel --dx 0.1 --dt 2` or write all of them into a file for later editing/reuse - `./locomotive_in_tunnel -g bigGrid.ini`. List all available options - `locomotive_in_tunnel -h`.
-4. Post-processing: see [step by step example](https://github.com/AvtechScientific/ASL/wiki/User-Guide#post-processing) and the ParaView state file `examples/input_data/locomotive_in_tunnel.pvsm`.
+3. Run: `./locomotive`. Optionally: change some parameters - `./locomotive --dx 0.1 --dt 2` or write all of them into a file for later editing/reuse - `./locomotive -g bigGrid.ini`. List all available options - `locomotive -h`.
+4. Post-processing: see [step by step example](https://github.com/AvtechScientific/ASL/wiki/User-Guide#post-processing) and the ParaView state file `examples/input_data/locomotive.pvsm`.
### Writing your own code using ASL
-1. Take a look on [examples](http://asl.org.il/doc/Developer-Guide/examples.html) and the [API documentation](http://asl.org.il/doc/Developer-Guide/), start with [examples/flow/locomotive_in_tunnel.cc](http://asl.org.il/doc/Developer-Guide/locomotive_in_tunnel_8cc-example.html)
+1. Take a look on [examples](http://asl.org.il/doc/Developer-Guide/examples.html) and the [API documentation](http://asl.org.il/doc/Developer-Guide/), start with [examples/flow/locomotive.cc](http://asl.org.il/doc/Developer-Guide/locomotive_8cc-example.html)
2. ASL installation supplies `ASL.pc` and `ASLConfig.cmake` files. To build your program using:
- - `pkg-config`: launch ``c++ `pkg-config --cflags --libs ASL` -o locomotive_in_tunnel locomotive_in_tunnel.cc``
+ - `pkg-config`: launch ``c++ `pkg-config --cflags --libs ASL` -o locomotive locomotive.cc``
- `cmake`: write a basic `CMakeLists.txt` file:
```cmake
@@ -52,6 +51,6 @@ project(locomotive)
cmake_minimum_required(VERSION 3.0.2 FATAL_ERROR)
find_package(ASL 0.1.4 CONFIG REQUIRED)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-add_executable(locomotive_in_tunnel locomotive_in_tunnel.cc)
-target_link_libraries(locomotive_in_tunnel PRIVATE ASL::aslnum ASL::aslvtk ASL::asl)
-```
+add_executable(locomotive locomotive.cc)
+target_link_libraries(locomotive PRIVATE ASL::aslnum ASL::aslvtk ASL::asl)
+```
\ No newline at end of file
diff --git a/examples/flow/CMakeLists.txt b/examples/flow/CMakeLists.txt
index 16e59b6..6005abb 100644
--- a/examples/flow/CMakeLists.txt
+++ b/examples/flow/CMakeLists.txt
@@ -29,9 +29,9 @@ add_executable(compressor compressor.cc)
target_link_libraries(compressor aslnum aslvtk asl)
set_property(TARGET compressor PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/compressor)
-add_executable(locomotive_in_tunnel locomotive_in_tunnel.cc)
-target_link_libraries(locomotive_in_tunnel aslnum aslvtk asl)
-set_property(TARGET locomotive_in_tunnel PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/locomotive_in_tunnel)
+add_executable(locomotive locomotive.cc)
+target_link_libraries(locomotive aslnum aslvtk asl)
+set_property(TARGET locomotive PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/locomotive)
add_executable(locomotive_stability locomotive_stability.cc)
target_link_libraries(locomotive_stability aslnum aslvtk asl)
diff --git a/examples/flow/locomotive_in_tunnel.cc b/examples/flow/locomotive.cc
similarity index 95%
rename from examples/flow/locomotive_in_tunnel.cc
rename to examples/flow/locomotive.cc
index b0d687e..49300b6 100644
--- a/examples/flow/locomotive_in_tunnel.cc
+++ b/examples/flow/locomotive.cc
@@ -22,7 +22,7 @@
/**
- \example locomotive_in_tunnel.cc
+ \example locomotive.cc
*/
#include <utilities/aslParametersManager.h>
@@ -80,8 +80,8 @@ int main(int argc, char* argv[])
/* Convenience facility to manage simulation parameters (and also
hardware parameters defining platform and device for computations)
through command line and/or parameters file.
- See `locomotive_in_tunnel --help` for more information */
- asl::ApplicationParametersManager appParamsManager("locomotive_in_tunnel",
+ See `locomotive --help` for more information */
+ asl::ApplicationParametersManager appParamsManager("locomotive",
"1.0");
/* Important: declare Parameters only after declaring
@@ -90,10 +90,10 @@ int main(int argc, char* argv[])
0.08 - default value; will be used if nothing else is provided during
runtime through command line or parameters file.
"dx" - option key; is used to specify this parameter through command line
- and/or parameters file, like `locomotive_in_tunnel --dx 0.05`
+ and/or parameters file, like `locomotive --dx 0.05`
"space step" - option description; is used in the help output:
- `locomotive_in_tunnel -h` and as comment on parameters file generation:
- `locomotive_in_tunnel -g ./defaultParameters.ini`
+ `locomotive -h` and as comment on parameters file generation:
+ `locomotive -g ./defaultParameters.ini`
"m" - parameter units; is used to complement the option description mentioned
above. Might be used for automatic unit conversion in future (to this end
it is recommended to use the notation of the Boost::Units library). */
@@ -187,7 +187,7 @@ int main(int argc, char* argv[])
// Initialization of the output system
// Write the output to the directory containing the input parameters file (default "./")
- asl::WriterVTKXML writer(appParamsManager.getDir() + "locomotive_in_tunnel");
+ asl::WriterVTKXML writer(appParamsManager.getDir() + "locomotive");
writer.addScalars("map", *locomotive);
writer.addScalars("tunnel", *tunnelMap);
writer.addScalars("rho", *lbgk->getRho());
diff --git a/examples/input_data/locomotive_in_tunnel.pvsm b/examples/input_data/locomotive.pvsm
similarity index 100%
rename from examples/input_data/locomotive_in_tunnel.pvsm
rename to examples/input_data/locomotive.pvsm
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/asl.git
More information about the debian-science-commits
mailing list