Skip to content

[WIP] add lbm tests #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/conan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,15 +69,15 @@ jobs:
- name: Information about ccache
run: |
ccache -s -v
- name: Install dependencies
run: |
pip3 install pytest h5py
- name: Configure CMake
run: |
cmake . -B ./build -G "${{matrix.CMAKE_GENERATOR}}" -DCMAKE_BUILD_TYPE=Release -DENABLE_CONAN_OPTION=ON -DBUILD_TESTS=ON -DBUILD_DEMOS=ON -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
- name: Build
run: |
cmake --build ./build --config Release
- name: Install dependencies
run: |
pip3 install pytest h5py
- name: Unix test
if: runner.os != 'Windows'
run: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/vcpkg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,15 +69,15 @@ jobs:
- name: Information about ccache
run: |
ccache -s -v
- name: Install dependencies
run: |
pip3 install pytest h5py
- name: Configure CMake
run: |
cmake -B ./build -S . -G "${{matrix.CMAKE_GENERATOR}}" -DENABLE_VCPKG=ON -DBUILD_TESTS=ON -DBUILD_DEMOS=ON -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
- name: Build
run: |
cmake --build ./build --config Release
- name: Install dependencies
run: |
pip3 install pytest h5py
- name: Unix test
if: runner.os != 'Windows'
run: |
Expand Down
13 changes: 8 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
*build
*xml
*.vscode
*.h5
*.xdmf
build*
xml
.vscode
.VSCodeCounter
.h5
.xdmf
.DS_Store
__pycache__
2 changes: 1 addition & 1 deletion demos/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ find_package(CLI11)

# add_subdirectory(apple EXCLUDE_FROM_ALL)
add_subdirectory(FiniteVolume)
# add_subdirectory(LBM)
add_subdirectory(LBM)
add_subdirectory(p4est)
add_subdirectory(pablo)
add_subdirectory(tutorial)
Expand Down
3 changes: 1 addition & 2 deletions demos/LBM/prediction_map_1d.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ class prediction_map

prediction_map<index_t>& operator*=(const double d)
{
std::size_t index=0;
for(auto& c: coeff)
{
c.second *= d;
Expand All @@ -72,7 +71,7 @@ class prediction_map
{
for(auto &c: coeff)
{
std::cout << "( " << c.first << ", ): " << c.second << "\n";
out << "( " << c.first << ", ): " << c.second << "\n";
}
}
// private:
Expand Down
Loading