Merge branch 'dev'

4 files changed, 10 insertions, 8 deletions

diff --git a/examples/schaefer_turek_durst_krause_rannbacher/sim.cpp b/examples/schaefer_turek_durst_krause_rannbacher/sim.cpp
index b3422a5..b9b3778 100644
--- a/examples/schaefer_turek_durst_krause_rannbacher/sim.cpp
+++ b/examples/schaefer_turek_durst_krause_rannbacher/sim.cpp
@@ -20,7 +20,7 @@ using LbmArgs = Args<
 >;
 }
 
-template<typename T, typename Desc, typename Coll>
+template<typename T, typename Desc, typename Coll, uint64_t N>
 saw::error_or<void> lbm_main(const saw::data<args::LbmArgs>& args){
 	using namespace kel::lbm;
 
@@ -211,11 +211,11 @@ saw::error_or<void> k_main(int argc, char** argv){
 	auto& coupling = an.template get<"coupling">();
 
 	if(coupling.stl_view() == "hlbm"){
-		return lbm_main<FloatT,DescT,method::Hlbm>(args);
+		return lbm_main<FloatT,DescT,method::Hlbm,1u>(args);
 	} else if(coupling.stl_view() == "fplbm"){
-		return lbm_main<FloatT,DescT,method::FpLbm>(args);
+		return lbm_main<FloatT,DescT,method::FpLbm,1u>(args);
 	} else if(coupling.stl_view() == "psm"){
-		return lbm_main<FloatT,DescT,method::Psm>(args);
+		return lbm_main<FloatT,DescT,method::Psm,1u>(args);
 	}
 
 	return saw::make_error<saw::err::critical>("Invalid coupling");
diff --git a/modules/core/c++/abstract/alloc.hpp b/modules/core/c++/abstract/alloc.hpp
index b15e737..5872c10 100644
--- a/modules/core/c++/abstract/alloc.hpp
+++ b/modules/core/c++/abstract/alloc.hpp
@@ -2,7 +2,7 @@
 
 namespace kel {
 namespace lbm {
-namespace all {
+namespace rep {
 struct Native {};
 }
 }
diff --git a/modules/core/c++/abstract/common.hpp b/modules/core/c++/abstract/common.hpp
index 408946c..1b4e150 100644
--- a/modules/core/c++/abstract/common.hpp
+++ b/modules/core/c++/abstract/common.hpp
@@ -150,5 +150,4 @@ template <> struct void_unfix<void_t> { typedef void Type; };
 template <typename T> using unfix_void = typename void_unfix<T>::Type;
 
 template <typename... T> constexpr bool always_false = false;
-
 } // namespace saw
diff --git a/modules/core/c++/abstract/data.hpp b/modules/core/c++/abstract/data.hpp
index 327fb63..bef9a73 100644
--- a/modules/core/c++/abstract/data.hpp
+++ b/modules/core/c++/abstract/data.hpp
@@ -2,11 +2,14 @@
 
 #include "schema.hpp"
 #include "encode.hpp"
+#include "common.hpp"
 
 namespace kel {
 namespace lbm {
-template<typename Schema, typename Encode = enc::Native>
-class data final {};
+template<typename Schema, typename Encode = rep::Native>
+class data final {
+	static_assert(always_false<Schema,Encode>, "Invalid schema + encode in data specialization");
+};
 
 template<typename T, uint64_t N>
 class data<sch::Primitive<T,N>,Encode> final {