Reworking structure

34 files changed, 75 insertions, 0 deletions

diff --git a/lib/core/.nix/derivation.nix b/lib/core/.nix/derivation.nix
new file mode 100644
index 0000000..55a414f
--- /dev/null
+++ b/lib/core/.nix/derivation.nix
@@ -0,0 +1,36 @@
+{ lib
+, stdenv
+, scons
+, clang-tools
+, forstio
+, pname
+, version
+}:
+
+stdenv.mkDerivation {
+	inherit pname version;
+	src = ./..;
+
+  nativeBuildInputs = [
+    scons
+    clang-tools
+  ];
+
+  buildInputs = [
+    forstio.core
+    forstio.async
+    forstio.codec
+    forstio.codec-unit
+    forstio.codec-json
+  ];
+
+  doCheck = true;
+  checkPhase = ''
+    scons test
+    ./bin/tests
+	'';
+
+	preferLocalBuild = true;
+
+  outputs = [ "out" "dev" ];
+}
diff --git a/lib/SConstruct b/lib/core/SConstruct
index 8b3ab01..8b3ab01 100644
--- a/lib/SConstruct
+++ b/lib/core/SConstruct
diff --git a/lib/c++/SConscript b/lib/core/c++/SConscript
index 85a078f..85a078f 100644
--- a/lib/c++/SConscript
+++ b/lib/core/c++/SConscript
diff --git a/lib/c++/args.hpp b/lib/core/c++/args.hpp
index 99c6172..99c6172 100644
--- a/lib/c++/args.hpp
+++ b/lib/core/c++/args.hpp
diff --git a/lib/c++/boundary.hpp b/lib/core/c++/boundary.hpp
index c10784c..c10784c 100644
--- a/lib/c++/boundary.hpp
+++ b/lib/core/c++/boundary.hpp
diff --git a/lib/c++/collision.hpp b/lib/core/c++/collision.hpp
index 73e86ae..73e86ae 100644
--- a/lib/c++/collision.hpp
+++ b/lib/core/c++/collision.hpp
diff --git a/lib/c++/component.hpp b/lib/core/c++/component.hpp
index 1e5dbbf..1e5dbbf 100644
--- a/lib/c++/component.hpp
+++ b/lib/core/c++/component.hpp
diff --git a/lib/c++/config.hpp b/lib/core/c++/config.hpp
index 64f7a0f..64f7a0f 100644
--- a/lib/c++/config.hpp
+++ b/lib/core/c++/config.hpp
diff --git a/lib/c++/converter.hpp b/lib/core/c++/converter.hpp
index 5c19c68..5c19c68 100644
--- a/lib/c++/converter.hpp
+++ b/lib/core/c++/converter.hpp
diff --git a/lib/c++/descriptor.hpp b/lib/core/c++/descriptor.hpp
index c6938e3..c6938e3 100644
--- a/lib/c++/descriptor.hpp
+++ b/lib/core/c++/descriptor.hpp
diff --git a/lib/c++/environment.hpp b/lib/core/c++/environment.hpp
index 4915e3a..4915e3a 100644
--- a/lib/c++/environment.hpp
+++ b/lib/core/c++/environment.hpp
diff --git a/lib/c++/equilibrium.hpp b/lib/core/c++/equilibrium.hpp
index bb55d00..bb55d00 100644
--- a/lib/c++/equilibrium.hpp
+++ b/lib/core/c++/equilibrium.hpp
diff --git a/lib/c++/geometry.hpp b/lib/core/c++/geometry.hpp
index 9802feb..9802feb 100644
--- a/lib/c++/geometry.hpp
+++ b/lib/core/c++/geometry.hpp
diff --git a/lib/c++/hlbm.hpp b/lib/core/c++/hlbm.hpp
index 1c665ce..1c665ce 100644
--- a/lib/c++/hlbm.hpp
+++ b/lib/core/c++/hlbm.hpp
diff --git a/lib/c++/iterator.hpp b/lib/core/c++/iterator.hpp
index 866543a..866543a 100644
--- a/lib/c++/iterator.hpp
+++ b/lib/core/c++/iterator.hpp
diff --git a/lib/c++/lbm.hpp b/lib/core/c++/lbm.hpp
index 39c42af..39c42af 100644
--- a/lib/c++/lbm.hpp
+++ b/lib/core/c++/lbm.hpp
diff --git a/lib/c++/lbm_unit.hpp b/lib/core/c++/lbm_unit.hpp
index 2d90652..2d90652 100644
--- a/lib/c++/lbm_unit.hpp
+++ b/lib/core/c++/lbm_unit.hpp
diff --git a/lib/c++/macroscopic.hpp b/lib/core/c++/macroscopic.hpp
index 51368e9..51368e9 100644
--- a/lib/c++/macroscopic.hpp
+++ b/lib/core/c++/macroscopic.hpp
diff --git a/lib/c++/particle/geometry/circle.hpp b/lib/core/c++/particle/geometry/circle.hpp
index 331f06d..331f06d 100644
--- a/lib/c++/particle/geometry/circle.hpp
+++ b/lib/core/c++/particle/geometry/circle.hpp
diff --git a/lib/c++/particle/particle.hpp b/lib/core/c++/particle/particle.hpp
index 39aadfb..39aadfb 100644
--- a/lib/c++/particle/particle.hpp
+++ b/lib/core/c++/particle/particle.hpp
diff --git a/lib/c++/statistics.hpp b/lib/core/c++/statistics.hpp
index c07ccb7..c07ccb7 100644
--- a/lib/c++/statistics.hpp
+++ b/lib/core/c++/statistics.hpp
diff --git a/lib/c++/term_renderer.hpp b/lib/core/c++/term_renderer.hpp
index 5cbb551..5cbb551 100644
--- a/lib/c++/term_renderer.hpp
+++ b/lib/core/c++/term_renderer.hpp
diff --git a/lib/c++/util.hpp b/lib/core/c++/util.hpp
index 0bdebd1..0bdebd1 100644
--- a/lib/c++/util.hpp
+++ b/lib/core/c++/util.hpp
diff --git a/lib/c++/write_json.hpp b/lib/core/c++/write_json.hpp
index 19bbfa6..19bbfa6 100644
--- a/lib/c++/write_json.hpp
+++ b/lib/core/c++/write_json.hpp
diff --git a/lib/c++/write_vtk.hpp b/lib/core/c++/write_vtk.hpp
index 0647db5..0647db5 100644
--- a/lib/c++/write_vtk.hpp
+++ b/lib/core/c++/write_vtk.hpp
diff --git a/lib/tests/SConscript b/lib/core/tests/SConscript
index d1b381e..d1b381e 100644
--- a/lib/tests/SConscript
+++ b/lib/core/tests/SConscript
diff --git a/lib/tests/converter.cpp b/lib/core/tests/converter.cpp
index 4fc536f..4fc536f 100644
--- a/lib/tests/converter.cpp
+++ b/lib/core/tests/converter.cpp
diff --git a/lib/tests/descriptor.cpp b/lib/core/tests/descriptor.cpp
index 7f743ce..7f743ce 100644
--- a/lib/tests/descriptor.cpp
+++ b/lib/core/tests/descriptor.cpp
diff --git a/lib/tests/equilibrium.cpp b/lib/core/tests/equilibrium.cpp
index 9201e55..9201e55 100644
--- a/lib/tests/equilibrium.cpp
+++ b/lib/core/tests/equilibrium.cpp
diff --git a/lib/tests/iterator.cpp b/lib/core/tests/iterator.cpp
index 261765a..261765a 100644
--- a/lib/tests/iterator.cpp
+++ b/lib/core/tests/iterator.cpp
diff --git a/lib/tests/particle_flow_coupling.cpp b/lib/core/tests/particle_flow_coupling.cpp
index c3e3769..c3e3769 100644
--- a/lib/tests/particle_flow_coupling.cpp
+++ b/lib/core/tests/particle_flow_coupling.cpp
diff --git a/lib/tests/particles.cpp b/lib/core/tests/particles.cpp
index 277a8d0..277a8d0 100644
--- a/lib/tests/particles.cpp
+++ b/lib/core/tests/particles.cpp
diff --git a/lib/tests/vtk_write.cpp b/lib/core/tests/vtk_write.cpp
index 0df9998..0df9998 100644
--- a/lib/tests/vtk_write.cpp
+++ b/lib/core/tests/vtk_write.cpp
diff --git a/lib/sycl/.nix/derivation.nix b/lib/sycl/.nix/derivation.nix
new file mode 100644
index 0000000..bbe98a4
--- /dev/null
+++ b/lib/sycl/.nix/derivation.nix
@@ -0,0 +1,39 @@
+{ lib
+, stdenv
+, scons
+, clang-tools
+, forstio
+, pname
+, version
+}:
+
+stdenv.mkDerivation {
+	pname = "${pname}-sycl";
+	inherit version;
+	src = ./..;
+
+	nativeBuildInputs = [
+		scons
+		clang-tools
+	];
+
+	buildInputs = [
+		forstio.core
+		forstio.async
+		forstio.codec
+		forstio.codec-unit
+		forstio.codec-json
+		forstio.remote
+		forstio.remote-sycl
+	];
+
+	doCheck = true;
+	checkPhase = ''
+		scons test
+		./bin/tests
+	'';
+
+	preferLocalBuild = true;
+
+	outputs = [ "out" "dev" ];
+}