From de10300ead96ea1d541836541d2997fb8b39d915 Mon Sep 17 00:00:00 2001
From: Christoph Rettinger <christoph.rettinger@fau.de>
Date: Thu, 18 May 2017 16:44:30 +0200
Subject: [PATCH] Added omega convenience functions to collision models
---
src/lbm/lattice_model/CollisionModel.h | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/src/lbm/lattice_model/CollisionModel.h b/src/lbm/lattice_model/CollisionModel.h
index e475a5e52..df97cc3c5 100644
--- a/src/lbm/lattice_model/CollisionModel.h
+++ b/src/lbm/lattice_model/CollisionModel.h
@@ -270,6 +270,9 @@ public:
real_t viscosity( const cell_idx_t /*x*/, const cell_idx_t /*y*/, const cell_idx_t /*z*/ ) const { return viscosity_; }
real_t omega() const { return lambda_e_; }
+ real_t omega( const cell_idx_t /*x*/, const cell_idx_t /*y*/, const cell_idx_t /*z*/,
+ const Vector3<real_t> & /*velocity*/ = Vector3<real_t>(), const real_t /*rho*/ = real_t(1) ) const { return omega(); }
+
inline real_t omega_bulk() const { return omega(); }
static real_t lambda_e( const real_t _omega ) { return _omega; }
@@ -477,6 +480,9 @@ public:
real_t s_m() const { return s_[16]; }
real_t omega() const { return s_[9]; }
+ real_t omega( const cell_idx_t /*x*/, const cell_idx_t /*y*/, const cell_idx_t /*z*/,
+ const Vector3<real_t> & /*velocity*/ = Vector3<real_t>(), const real_t /*rho*/ = real_t(1) ) const { return omega(); }
+
real_t omega_bulk() const { return s_[1]; }
real_t viscosity() const { return viscosity_; }
@@ -637,6 +643,9 @@ public:
real_t omega10() const { return omega_[9]; }
real_t omega() const { return omega_[0]; }
+ real_t omega( const cell_idx_t /*x*/, const cell_idx_t /*y*/, const cell_idx_t /*z*/,
+ const Vector3<real_t> & /*velocity*/ = Vector3<real_t>(), const real_t /*rho*/ = real_t(1) ) const { return omega(); }
+
real_t omega( uint_t idx ) const { return omega_[idx]; }
inline real_t viscosity() const { return viscosity_; }
--
GitLab