summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--examples/poiseulle_particles_2d_bgk_gpu/sim.cpp17
-rw-r--r--lib/core/c++/args.hpp15
-rw-r--r--lib/core/c++/lbm.hpp1
3 files changed, 26 insertions, 7 deletions
diff --git a/examples/poiseulle_particles_2d_bgk_gpu/sim.cpp b/examples/poiseulle_particles_2d_bgk_gpu/sim.cpp
index b8ac35e..9cc77ae 100644
--- a/examples/poiseulle_particles_2d_bgk_gpu/sim.cpp
+++ b/examples/poiseulle_particles_2d_bgk_gpu/sim.cpp
@@ -6,6 +6,7 @@
#include <forstio/remote/filesystem/easy.hpp>
#include <forstio/codec/json/json.hpp>
#include <forstio/codec/simple.hpp>
+#include <forstio/codec/args.hpp>
namespace kel {
namespace lbm {
@@ -242,6 +243,14 @@ template<typename T, typename Desc>
saw::error_or<void> lbm_main(int argc, char** argv){
using namespace kel::lbm;
+ /*
+ auto eo_lbm_args = setup_lbm_env<sch::Args<sch::Struct<>,sch::Tuple<>>>(argc,argv);
+ if(eo_lbm_args.is_error()){
+ return std::move(eo_lbm_args.get_error());
+ }
+ auto& lbm_args = eo_lbm_args.get_value();
+ */
+
using dfi = df_info<T,Desc>;
auto eo_lbm_dir = output_directory();
@@ -357,22 +366,20 @@ saw::error_or<void> lbm_main(int argc, char** argv){
}
}
*/
- /*
- {
+ if(i.get() % 32u == 0u){
{
- auto eov = dev.copy_to_host(lbm_sycl_data,*lbm_data_ptr);
+ auto eov = dev.copy_to_host(lbm_sycl_macro_data,*lbm_macro_data_ptr);
if(eov.is_error()){
return eov;
}
}
{
- auto eov = write_csv_file(out_dir,"lbm",i.get(), *lbm_data_ptr);
+ auto eov = write_csv_file(out_dir,"m",i.get(), *lbm_macro_data_ptr);
if(eov.is_error()){
return eov;
}
}
}
- */
// Stream
sycl_q.submit([&](acpp::sycl::handler& h){
component<T,Desc,cmpt::Stream,encode::Sycl<saw::encode::Native>> stream;
diff --git a/lib/core/c++/args.hpp b/lib/core/c++/args.hpp
index 01b4795..a0aa941 100644
--- a/lib/core/c++/args.hpp
+++ b/lib/core/c++/args.hpp
@@ -9,8 +9,19 @@ namespace sch {
using namespace saw::schema;
}
-saw::error_or<void> init_lbm_env(){
- return saw::make_void();
+template<typename ArgSchema>
+saw::error_or<saw::data<ArgSchema>> setup_lbm_env(int argc, char** argv){
+ saw::data<ArgSchema,saw::encode::Args> args_data{argc,argv};
+
+ saw::codec<ArgSchema,saw::encode::Args> args_codec;
+
+ saw::data<ArgSchema> args_decoded;
+ auto eov = args_codec.decode(args_data,args_decoded);
+ if(eov.is_error()){
+ return eov;
+ }
+
+ return args_decoded;
}
}
}
diff --git a/lib/core/c++/lbm.hpp b/lib/core/c++/lbm.hpp
index d6a0976..29de83e 100644
--- a/lib/core/c++/lbm.hpp
+++ b/lib/core/c++/lbm.hpp
@@ -1,5 +1,6 @@
#pragma once
+#include "args.hpp"
#include "schema.hpp"
#include "flatten.hpp"
#include "chunk.hpp"