Skip to content
Snippets Groups Projects
Commit acfa70a5 authored by Elias Pipping's avatar Elias Pipping
Browse files

[Cleanup] Add toBool() convenience method

parent dffa270a
Branches
No related tags found
No related merge requests found
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
#endif #endif
#include "boundary_writer.hh" #include "boundary_writer.hh"
#include "tobool.hh"
template <class ScalarVector, class Vector> template <class ScalarVector, class Vector>
BoundaryWriter<ScalarVector, Vector>::BoundaryWriter( BoundaryWriter<ScalarVector, Vector>::BoundaryWriter(
...@@ -16,7 +17,7 @@ BoundaryWriter<ScalarVector, Vector>::BoundaryWriter( ...@@ -16,7 +17,7 @@ BoundaryWriter<ScalarVector, Vector>::BoundaryWriter(
std::fstream vertexCoordinateWriter(prefix + "Coordinates", std::fstream vertexCoordinateWriter(prefix + "Coordinates",
std::fstream::out); std::fstream::out);
for (size_t i = 0; i < boundaryNodes.size(); ++i) for (size_t i = 0; i < boundaryNodes.size(); ++i)
if (boundaryNodes[i][0]) if (toBool(boundaryNodes[i]))
vertexCoordinateWriter << vertexCoordinates[i] << std::endl; vertexCoordinateWriter << vertexCoordinates[i] << std::endl;
vertexCoordinateWriter.close(); vertexCoordinateWriter.close();
} }
...@@ -31,7 +32,7 @@ template <class ScalarVector, class Vector> ...@@ -31,7 +32,7 @@ template <class ScalarVector, class Vector>
void BoundaryWriter<ScalarVector, Vector>::writeKinetics(Vector const &u, void BoundaryWriter<ScalarVector, Vector>::writeKinetics(Vector const &u,
Vector const &v) { Vector const &v) {
for (size_t i = 0; i < boundaryNodes.size(); ++i) { for (size_t i = 0; i < boundaryNodes.size(); ++i) {
if (!boundaryNodes[i][0]) if (!toBool(boundaryNodes[i]))
continue; continue;
displacementWriter << projector_(u[i]) << " "; displacementWriter << projector_(u[i]) << " ";
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
#endif #endif
#include "friction_writer.hh" #include "friction_writer.hh"
#include "tobool.hh"
template <class ScalarVector, class Vector> template <class ScalarVector, class Vector>
FrictionWriter<ScalarVector, Vector>::FrictionWriter( FrictionWriter<ScalarVector, Vector>::FrictionWriter(
...@@ -23,7 +24,7 @@ template <class ScalarVector, class Vector> ...@@ -23,7 +24,7 @@ template <class ScalarVector, class Vector>
void FrictionWriter<ScalarVector, Vector>::writeOther( void FrictionWriter<ScalarVector, Vector>::writeOther(
ScalarVector const &coefficient, ScalarVector const &alpha) { ScalarVector const &coefficient, ScalarVector const &alpha) {
for (size_t i = 0; i < boundaryNodes.size(); ++i) { for (size_t i = 0; i < boundaryNodes.size(); ++i) {
if (!boundaryNodes[i][0]) if (!toBool(boundaryNodes[i]))
continue; continue;
coefficientWriter << coefficient[i] << " "; coefficientWriter << coefficient[i] << " ";
......
...@@ -68,6 +68,7 @@ ...@@ -68,6 +68,7 @@
#include <dune/tectonic/globalnonlinearity.hh> #include <dune/tectonic/globalnonlinearity.hh>
#include "assemblers.hh" #include "assemblers.hh"
#include "tobool.hh"
#include "enum_parser.cc" #include "enum_parser.cc"
#include "enum_scheme.cc" #include "enum_scheme.cc"
#include "enum_state_model.cc" #include "enum_state_model.cc"
......
#ifndef DIETERICH_STATE_UPDATER_HH #ifndef DIETERICH_STATE_UPDATER_HH
#define DIETERICH_STATE_UPDATER_HH #define DIETERICH_STATE_UPDATER_HH
#include "tobool.hh"
#include "stateupdater.hh" #include "stateupdater.hh"
template <class ScalarVector, class Vector> template <class ScalarVector, class Vector>
...@@ -56,7 +57,7 @@ template <class ScalarVector, class Vector> ...@@ -56,7 +57,7 @@ template <class ScalarVector, class Vector>
void DieterichStateUpdater<ScalarVector, Vector>::solve( void DieterichStateUpdater<ScalarVector, Vector>::solve(
Vector const &velocity_field) { Vector const &velocity_field) {
for (size_t i = 0; i < nodes.size(); ++i) { for (size_t i = 0; i < nodes.size(); ++i) {
if (not nodes[i][0]) if (not toBool(nodes[i]))
continue; continue;
double const VoL = velocity_field[i].two_norm() / L; double const VoL = velocity_field[i].two_norm() / L;
......
#ifndef RUINA_STATE_UPDATER_HH #ifndef RUINA_STATE_UPDATER_HH
#define RUINA_STATE_UPDATER_HH #define RUINA_STATE_UPDATER_HH
#include "tobool.hh"
#include "stateupdater.hh" #include "stateupdater.hh"
template <class ScalarVector, class Vector> template <class ScalarVector, class Vector>
...@@ -42,7 +43,7 @@ template <class ScalarVector, class Vector> ...@@ -42,7 +43,7 @@ template <class ScalarVector, class Vector>
void RuinaStateUpdater<ScalarVector, Vector>::solve( void RuinaStateUpdater<ScalarVector, Vector>::solve(
Vector const &velocity_field) { Vector const &velocity_field) {
for (size_t i = 0; i < nodes.size(); ++i) { for (size_t i = 0; i < nodes.size(); ++i) {
if (not nodes[i][0]) if (not toBool(nodes[i]))
continue; continue;
double const VoL = velocity_field[i].two_norm() / L; double const VoL = velocity_field[i].two_norm() / L;
......
#ifndef TO_BOOL_HH
#define TO_BOOL_HH
template <class Alloc>
bool toBool(Dune::BitSetVectorConstReference<1, Alloc> x) {
return x[0];
}
#endif
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment