From 30768a9f1579dc2f67486bb494cf9a785e95c9ac Mon Sep 17 00:00:00 2001
From: chantrait <teddy.chantrait@cea.fr>
Date: Thu, 29 Jun 2023 09:36:18 +0200
Subject: [PATCH] fix merge

---
 src/language/utils/OFStream.cpp             | 2 +-
 src/mesh/MeshFlatNodeBoundary.cpp           | 2 +-
 src/scheme/IBoundaryConditionDescriptor.hpp | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/language/utils/OFStream.cpp b/src/language/utils/OFStream.cpp
index 7fbae5890..237305c0a 100644
--- a/src/language/utils/OFStream.cpp
+++ b/src/language/utils/OFStream.cpp
@@ -8,7 +8,7 @@ OFStream::OFStream(const std::string& filename)
     m_fstream.open(filename);
     if (m_fstream.is_open()) {
       m_ostream = &m_fstream;
-      m_ostream->precision(15);
+//      m_ostream->precision(15);
     } else {
       std::stringstream error_msg;
       error_msg << "cannot create file " << rang::fgB::yellow << filename << rang::style::reset;
diff --git a/src/mesh/MeshFlatNodeBoundary.cpp b/src/mesh/MeshFlatNodeBoundary.cpp
index 77777a698..b7de42715 100644
--- a/src/mesh/MeshFlatNodeBoundary.cpp
+++ b/src/mesh/MeshFlatNodeBoundary.cpp
@@ -14,7 +14,7 @@ MeshFlatNodeBoundary<Dimension>::_checkBoundaryIsFlat(const TinyVector<Dimension
   const NodeValue<const Rd>& xr = mesh.xr();
 
   bool is_bad = false;
-  
+
   auto node_list = this->m_ref_node_list.list();
   parallel_for(node_list.size(), [=, &is_bad](int r) {
     const Rd& x = xr[node_list[r]];
diff --git a/src/scheme/IBoundaryConditionDescriptor.hpp b/src/scheme/IBoundaryConditionDescriptor.hpp
index b95ad7088..9f859875f 100644
--- a/src/scheme/IBoundaryConditionDescriptor.hpp
+++ b/src/scheme/IBoundaryConditionDescriptor.hpp
@@ -18,7 +18,6 @@ class IBoundaryConditionDescriptor
     free,
     inflow,
     neumann,
-    symmetry,
     coupling,
     outflow,
     symmetry
-- 
GitLab