Merge branch 'SmallFixes' into 'master'

Small fixes See merge request ogs/ogs!4786
ufz · Nov 3, 2023 · 70ee852 · 70ee852
2 parents d1118bf + ec732c4
commit 70ee852
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/ProcessLib/Assembly/MatrixOutput.cpp b/ProcessLib/Assembly/MatrixOutput.cpp
@@ -33,14 +33,14 @@ std::string getSeparatorAfterFilenamePrefix(std::string const& filenamePrefix)
 #ifndef USE_PETSC
 static void outputGlobalMatrix(GlobalMatrix const& mat, std::ostream& os)
 {
-    os << "(" << mat.getNumberOfRows() << " x " << mat.getNumberOfColumns()
-       << ")\n";
+    os << std::setprecision(16) << "(" << mat.getNumberOfRows() << " x "
+       << mat.getNumberOfColumns() << ")\n";
     mat.write(os);
 }
 
 static void outputGlobalVector(GlobalVector const& vec, std::ostream& os)
 {
-    os << "(" << vec.size() << ")\n";
+    os << std::setprecision(16) << "(" << vec.size() << ")\n";
     os << vec.getRawVector() << '\n';
 }
 

diff --git a/ProcessLib/SmallDeformation/SmallDeformationProcess.cpp b/ProcessLib/SmallDeformation/SmallDeformationProcess.cpp
@@ -133,7 +133,7 @@ void SmallDeformationProcess<DisplacementDim>::initializeConcreteProcess(
 
 template <int DisplacementDim>
 void SmallDeformationProcess<DisplacementDim>::assembleConcreteProcess(
-    const double t, double const dt, std::vector<GlobalVector*> const& x,
+    double const t, double const dt, std::vector<GlobalVector*> const& x,
     std::vector<GlobalVector*> const& x_prev, int const process_id,
     GlobalMatrix& M, GlobalMatrix& K, GlobalVector& b)
 {
@@ -155,7 +155,7 @@ void SmallDeformationProcess<DisplacementDim>::assembleConcreteProcess(
 template <int DisplacementDim>
 void SmallDeformationProcess<DisplacementDim>::
     assembleWithJacobianConcreteProcess(
-        const double t, double const dt, std::vector<GlobalVector*> const& x,
+        double const t, double const dt, std::vector<GlobalVector*> const& x,
         std::vector<GlobalVector*> const& x_prev, int const process_id,
         GlobalMatrix& M, GlobalMatrix& K, GlobalVector& b, GlobalMatrix& Jac)
 {
@@ -180,7 +180,7 @@ void SmallDeformationProcess<DisplacementDim>::
 template <int DisplacementDim>
 void SmallDeformationProcess<DisplacementDim>::postTimestepConcreteProcess(
     std::vector<GlobalVector*> const& x,
-    std::vector<GlobalVector*> const& x_prev, const double t, const double dt,
+    std::vector<GlobalVector*> const& x_prev, double const t, double const dt,
     int const process_id)
 {
     DBUG("PostTimestep SmallDeformationProcess.");
@@ -206,7 +206,7 @@ void SmallDeformationProcess<DisplacementDim>::postTimestepConcreteProcess(
 template <int DisplacementDim>
 void SmallDeformationProcess<DisplacementDim>::computeSecondaryVariableConcrete(
     double const t, double const dt, std::vector<GlobalVector*> const& x,
-    GlobalVector const& x_prev, const int process_id)
+    GlobalVector const& x_prev, int const process_id)
 {
     DBUG("Compute the secondary variables for SmallDeformationProcess.");
     std::vector<NumLib::LocalToGlobalIndexMap const*> dof_tables;

diff --git a/ProcessLib/SmallDeformation/SmallDeformationProcess.h b/ProcessLib/SmallDeformation/SmallDeformationProcess.h
@@ -49,7 +49,7 @@ class SmallDeformationProcess final : public Process
         MeshLib::Mesh const& mesh,
         unsigned const integration_order) override;
 
-    void assembleConcreteProcess(const double t, double const dt,
+    void assembleConcreteProcess(double const t, double const dt,
                                  std::vector<GlobalVector*> const& x,
                                  std::vector<GlobalVector*> const& x_prev,
                                  int const process_id, GlobalMatrix& M,
@@ -63,13 +63,13 @@ class SmallDeformationProcess final : public Process
 
     void postTimestepConcreteProcess(std::vector<GlobalVector*> const& x,
                                      std::vector<GlobalVector*> const& x_prev,
-                                     const double t, const double dt,
+                                     double const t, double const dt,
                                      int const process_id) override;
 
     void computeSecondaryVariableConcrete(double const t, double const dt,
                                           std::vector<GlobalVector*> const& x,
                                           GlobalVector const& x_prev,
-                                          const int process_id) override;
+                                          int const process_id) override;
 
 private:
     SmallDeformationProcessData<DisplacementDim> _process_data;

diff --git a/Tests/Data/ThermoRichardsMechanics/MFront/A2/A2.xml b/Tests/Data/ThermoRichardsMechanics/MFront/A2/A2.xml
@@ -109,6 +109,6 @@
 
     <!-- Relax the tolerance a bit -->
     <replace sel="/*/test_definition/vtkdiff[field=&quot;NodalForces&quot;]/absolute_tolerance/text()">
-        7e-10
+        1e-9
     </replace>
 </OpenGeoSysProjectDiff>