diff options
| -rw-r--r-- | default.nix | 5 | ||||
| -rw-r--r-- | examples/settling_cubes_2d_ibm_gpu/.nix/derivation.nix (renamed from examples/settling_cubes_2d_ibm/.nix/derivation.nix) | 0 | ||||
| -rw-r--r-- | examples/settling_cubes_2d_ibm_gpu/SConscript (renamed from examples/settling_cubes_2d_ibm/SConscript) | 0 | ||||
| -rw-r--r-- | examples/settling_cubes_2d_ibm_gpu/SConstruct (renamed from examples/settling_cubes_2d_ibm/SConstruct) | 0 | ||||
| -rw-r--r-- | examples/settling_cubes_2d_ibm_gpu/sim.cpp (renamed from examples/settling_cubes_2d_ibm/sim.cpp) | 6 | ||||
| -rw-r--r-- | lib/core/c++/environment.hpp | 4 |
6 files changed, 10 insertions, 5 deletions
diff --git a/default.nix b/default.nix index 2232e47..05ca001 100644 --- a/default.nix +++ b/default.nix @@ -171,6 +171,11 @@ in rec { inherit pname version stdenv forstio adaptive-cpp; inherit kel; }; + + settling_cubes_2d_ibm_gpu = pkgs.callPackage ./examples/settling_cubes_2d_ibm_gpu/.nix/derivation.nix { + inherit pname version stdenv forstio adaptive-cpp; + inherit kel; + }; heterogeneous_computing = pkgs.callPackage ./examples/heterogeneous_computing/.nix/derivation.nix { inherit pname version stdenv forstio adaptive-cpp; diff --git a/examples/settling_cubes_2d_ibm/.nix/derivation.nix b/examples/settling_cubes_2d_ibm_gpu/.nix/derivation.nix index d7f138b..d7f138b 100644 --- a/examples/settling_cubes_2d_ibm/.nix/derivation.nix +++ b/examples/settling_cubes_2d_ibm_gpu/.nix/derivation.nix diff --git a/examples/settling_cubes_2d_ibm/SConscript b/examples/settling_cubes_2d_ibm_gpu/SConscript index ae08056..ae08056 100644 --- a/examples/settling_cubes_2d_ibm/SConscript +++ b/examples/settling_cubes_2d_ibm_gpu/SConscript diff --git a/examples/settling_cubes_2d_ibm/SConstruct b/examples/settling_cubes_2d_ibm_gpu/SConstruct index 0611b67..0611b67 100644 --- a/examples/settling_cubes_2d_ibm/SConstruct +++ b/examples/settling_cubes_2d_ibm_gpu/SConstruct diff --git a/examples/settling_cubes_2d_ibm/sim.cpp b/examples/settling_cubes_2d_ibm_gpu/sim.cpp index 411efa7..16b44c3 100644 --- a/examples/settling_cubes_2d_ibm/sim.cpp +++ b/examples/settling_cubes_2d_ibm_gpu/sim.cpp @@ -180,7 +180,7 @@ saw::error_or<void> step( // auto coll_ev = q.submit([&](acpp::sycl::handler& h){ // Need nicer things to handle the flow. I see improvement here - component<T,Desc,cmpt::BGK, encode::Sycl<saw::encode::Native>> collision{0.65}; + component<T,Desc,cmpt::BGKGuo, encode::Sycl<saw::encode::Native>> collision{0.65}; component<T,Desc,cmpt::BounceBack,encode::Sycl<saw::encode::Native>> bb; component<T,Desc,cmpt::AntiBounceBack<0u>,encode::Sycl<saw::encode::Native>> abb; @@ -255,13 +255,13 @@ saw::error_or<void> lbm_main(int argc, char** argv){ using dfi = df_info<T,Desc>; - auto eo_lbm_dir = output_directory(); + auto eo_lbm_dir = lbm_directory(); if(eo_lbm_dir.is_error()){ return std::move(eo_lbm_dir.get_error()); } auto& lbm_dir = eo_lbm_dir.get_value(); - auto out_dir = lbm_dir / "poiseulle_particles_2d_bgk_gpu"; + auto out_dir = lbm_dir / "settling_cubes_2d_ibm_gpu"; { std::error_code ec; diff --git a/lib/core/c++/environment.hpp b/lib/core/c++/environment.hpp index f9bac48..27d8f3a 100644 --- a/lib/core/c++/environment.hpp +++ b/lib/core/c++/environment.hpp @@ -26,8 +26,8 @@ saw::error_or<environment> lbm_directory(){ { env.data_dir = env.lbm_dir / "data"; - // LBM - auto lbm_dir_config = lbm_dir / "data_dir_location.txt"; + // LBM Data Location + auto lbm_dir_config = env.lbm_dir / "data_dir_location.txt"; if( fs::exists(lbm_dir_config) && fs::is_regular_file(lbm_dir_config) ){ std::ifstream file{lbm_dir_config}; |