Fix more issues

sebproell · sebproell · commit 8400895265d9 · 2025-05-02T17:20:22.000+02:00
diff --git a/src/ale/4C_ale_resulttest.cpp b/src/ale/4C_ale_resulttest.cpp
@@ -39,7 +39,7 @@ void ALE::AleResultTest::test_node(
 
   if (isnodeofanybody == 0)
   {
-    FOUR_C_THROW("Node {} does not belong to discretization {}", node + 1, aledis_->name());
+    FOUR_C_THROW("Node {} does not belong to discretization {}", node, aledis_->name());
   }
   else
   {
diff --git a/src/art_net/4C_art_net_artery_resulttest.cpp b/src/art_net/4C_art_net_artery_resulttest.cpp
@@ -53,7 +53,7 @@ void Arteries::ArteryResultTest::test_node(
 
   if (isnodeofanybody == 0)
   {
-    FOUR_C_THROW("Node {} does not belong to discretization {}", node + 1, dis_->name());
+    FOUR_C_THROW("Node {} does not belong to discretization {}", node, dis_->name());
   }
   else
   {
diff --git a/src/core/io/src/4C_io_meshreader.cpp b/src/core/io/src/4C_io_meshreader.cpp
@@ -694,7 +694,7 @@ namespace
         parser.consume("COORD");
         auto coords = parser.read<std::vector<double>>(3);
 
-        max_node_id = std::max(max_node_id, nodeid) + 1;
+        max_node_id = std::max(max_node_id, nodeid);
         std::vector<std::shared_ptr<Core::FE::Discretization>> dis =
             find_dis_node(element_readers, nodeid);
 
@@ -714,7 +714,7 @@ namespace
         auto coords = parser.read<std::vector<double>>(3);
         double weight = parser.read<double>();
 
-        max_node_id = std::max(max_node_id, cpid) + 1;
+        max_node_id = std::max(max_node_id, cpid);
         if (cpid != line_count + 1)
           FOUR_C_THROW(
               "Reading of control points {} failed: They must be numbered consecutive!!", cpid);
@@ -748,7 +748,7 @@ namespace
         const int nodeid = parser.read<int>();
         parser.consume("COORD");
         auto coords = parser.read<std::vector<double>>(3);
-        max_node_id = std::max(max_node_id, nodeid) + 1;
+        max_node_id = std::max(max_node_id, nodeid);
 
         while (!parser.at_end())
         {
diff --git a/src/fluid/4C_fluid_result_test.cpp b/src/fluid/4C_fluid_result_test.cpp
@@ -52,7 +52,7 @@ void FLD::FluidResultTest::test_node(
 
   if (isnodeofanybody == 0)
   {
-    FOUR_C_THROW("Node {} does not belong to discretization {}", node + 1, fluiddis_->name());
+    FOUR_C_THROW("Node {} does not belong to discretization {}", node, fluiddis_->name());
   }
   else
   {
diff --git a/src/fluid_xfluid/4C_fluid_xfluid_resulttest.cpp b/src/fluid_xfluid/4C_fluid_xfluid_resulttest.cpp
@@ -19,10 +19,7 @@ FOUR_C_NAMESPACE_OPEN
 
 
 FLD::XFluidResultTest::XFluidResultTest(const FLD::XFluid& xfluid)
-    : Core::Utils::ResultTest("XFLUID"),
-      discret_(xfluid.discret_),
-      velnp_(xfluid.state_->velnp_),
-      node_from_zero_(true)
+    : Core::Utils::ResultTest("XFLUID"), discret_(xfluid.discret_), velnp_(xfluid.state_->velnp_)
 {
 }
 
@@ -31,11 +28,8 @@ FLD::XFluidResultTest::XFluidResultTest(const FLD::XFluidFluid& xfluid)
       discret_(xfluid.discret_),
       velnp_(xfluid.state_->velnp_),
       coupl_discret_(xfluid.embedded_fluid_->discretization()),
-      coupl_velnp_(xfluid.embedded_fluid_->velnp()),
-      node_from_zero_(false)
+      coupl_velnp_(xfluid.embedded_fluid_->velnp())
 {
-  // Todo: remove the "node_from_zero" flag for fluidfluid:
-  // adapt the test cases!
 }
 
 void FLD::XFluidResultTest::test_node(
@@ -46,9 +40,6 @@ void FLD::XFluidResultTest::test_node(
 
   int node = container.get<int>("NODE");
 
-  // Todo: remove!
-  if (node_from_zero_) node -= 1;
-
   if (dis == discret_->name())
   {
     test_node(container, nerr, test_count, node, *discret_, *velnp_);
@@ -71,7 +62,7 @@ void FLD::XFluidResultTest::test_node(const Core::IO::InputParameterContainer& c
 
   if (isnodeofanybody == 0)
   {
-    FOUR_C_THROW("Node {} does not belong to discretization {}", node + 1, discret.name());
+    FOUR_C_THROW("Node {} does not belong to discretization {}", node, discret.name());
   }
   else
   {
diff --git a/src/fluid_xfluid/4C_fluid_xfluid_resulttest.hpp b/src/fluid_xfluid/4C_fluid_xfluid_resulttest.hpp
@@ -65,9 +65,6 @@ namespace FLD
 
     /// solution vector for additional coupling discretization
     std::shared_ptr<const Core::LinAlg::Vector<double>> coupl_velnp_;
-
-    /// take care of node numbering off-by-one (will be removed soon)
-    const bool node_from_zero_;
   };
 
 }  // namespace FLD
diff --git a/src/fsi/src/utils/4C_fsi_resulttest.cpp b/src/fsi/src/utils/4C_fsi_resulttest.cpp
@@ -212,7 +212,7 @@ void FSI::FSIResultTest::test_node(
 
   if (isnodeofanybody == 0)
   {
-    FOUR_C_THROW("Node {} does not belong to discretization {}", node + 1, slavedisc_->name());
+    FOUR_C_THROW("Node {} does not belong to discretization {}", node, slavedisc_->name());
   }
   else
   {
diff --git a/src/lubrication/src/4C_lubrication_resulttest.cpp b/src/lubrication/src/4C_lubrication_resulttest.cpp
@@ -46,7 +46,7 @@ void Lubrication::ResultTest::test_node(
 
   if (isnodeofanybody == 0)
   {
-    FOUR_C_THROW("Node {} does not belong to discretization {}", node + 1, dis_->name());
+    FOUR_C_THROW("Node {} does not belong to discretization {}", node, dis_->name());
   }
   else
   {
diff --git a/src/porofluid_pressure_based/4C_porofluid_pressure_based_resulttest.cpp b/src/porofluid_pressure_based/4C_porofluid_pressure_based_resulttest.cpp
@@ -47,8 +47,8 @@ void PoroPressureBased::ResultTest::test_node(
 
   if (isnodeofanybody == 0)
   {
-    FOUR_C_THROW("Node {} does not belong to discretization {}", node + 1,
-        porotimint_.discretization()->name());
+    FOUR_C_THROW(
+        "Node {} does not belong to discretization {}", node, porotimint_.discretization()->name());
   }
   else
   {
diff --git a/src/scatra/4C_scatra_resulttest.cpp b/src/scatra/4C_scatra_resulttest.cpp
@@ -42,7 +42,7 @@ void ScaTra::ScaTraResultTest::test_node(
 
   if (isnodeofanybody == 0)
   {
-    FOUR_C_THROW("Node {} does not belong to discretization {}", node + 1,
+    FOUR_C_THROW("Node {} does not belong to discretization {}", node,
         scatratimint_->discretization()->name());
   }
   else
diff --git a/src/structure/4C_structure_resulttest.cpp b/src/structure/4C_structure_resulttest.cpp
@@ -50,7 +50,7 @@ void StruResultTest::test_node(
 
   if (isnodeofanybody == 0)
   {
-    FOUR_C_THROW("Node {} does not belong to discretization {}", node + 1, strudisc_->name());
+    FOUR_C_THROW("Node {} does not belong to discretization {}", node, strudisc_->name());
   }
   else
   {
diff --git a/src/structure_new/src/utils/4C_structure_new_resulttest.cpp b/src/structure_new/src/utils/4C_structure_new_resulttest.cpp
@@ -193,7 +193,7 @@ void Solid::ResultTest::test_node(
 
   if (isnodeofanybody == 0)
   {
-    FOUR_C_THROW("Node {} does not belong to discretization {}", node + 1, strudisc_->name());
+    FOUR_C_THROW("Node {} does not belong to discretization {}", node, strudisc_->name());
   }
 
   std::string position = container.get<std::string>("QUANTITY");
diff --git a/src/thermo/src/utils/4C_thermo_resulttest.cpp b/src/thermo/src/utils/4C_thermo_resulttest.cpp
@@ -43,7 +43,7 @@ void Thermo::ResultTest::test_node(
 
   if (isnodeofanybody == 0)
   {
-    FOUR_C_THROW("Node {} does not belong to discretization {}", node + 1, thrdisc_->name());
+    FOUR_C_THROW("Node {} does not belong to discretization {}", node, thrdisc_->name());
   }
   else
   {
diff --git a/tests/input_files/xfsi_3D_boxes.dat b/tests/input_files/xfsi_3D_boxes.dat
@@ -123,11 +123,11 @@ ROTATION 0 0 0
 ELEMENTS    FLUID HEX8 MAT 1 NA Euler
 PARTITION   structured
 ----------------------------------------------------------RESULT DESCRIPTION
-STRUCTURE DIS structure NODE 19 QUANTITY dispx VALUE 8.89037247841968647e-05 TOLERANCE 1e-11
-STRUCTURE DIS structure NODE 19 QUANTITY dispy VALUE 2.00196712058491467e-05 TOLERANCE 1e-11
-STRUCTURE DIS structure NODE 19 QUANTITY dispz VALUE 0 TOLERANCE 1e-11
-XFLUID DIS fluid NODE 28 QUANTITY velx VALUE 2.83327859793370662e-01 TOLERANCE 1e-08
-XFLUID DIS fluid NODE 28 QUANTITY vely VALUE -1.12290496662579953e-01 TOLERANCE 1e-08
-XFLUID DIS fluid NODE 28 QUANTITY velz VALUE -1.60516000180241342e-01 TOLERANCE 1e-08
-XFLUID DIS fluid NODE 28 QUANTITY pressure VALUE 3.04164771555694435e-01 TOLERANCE 1e-08
+STRUCTURE DIS structure NODE 18 QUANTITY dispx VALUE 8.89037247841968647e-05 TOLERANCE 1e-11
+STRUCTURE DIS structure NODE 18 QUANTITY dispy VALUE 2.00196712058491467e-05 TOLERANCE 1e-11
+STRUCTURE DIS structure NODE 18 QUANTITY dispz VALUE 0 TOLERANCE 1e-11
+XFLUID DIS fluid NODE 27 QUANTITY velx VALUE 2.83327859793370662e-01 TOLERANCE 1e-08
+XFLUID DIS fluid NODE 27 QUANTITY vely VALUE -1.12290496662579953e-01 TOLERANCE 1e-08
+XFLUID DIS fluid NODE 27 QUANTITY velz VALUE -1.60516000180241342e-01 TOLERANCE 1e-08
+XFLUID DIS fluid NODE 27 QUANTITY pressure VALUE 3.04164771555694435e-01 TOLERANCE 1e-08
 //                              END

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ void ALE::AleResultTest::test_node(`
`39`	`39`
`40`	`40`	`if (isnodeofanybody == 0)`
`41`	`41`	`{`
`42`		`- FOUR_C_THROW("Node {} does not belong to discretization {}", node + 1, aledis_->name());`
	`42`	`+ FOUR_C_THROW("Node {} does not belong to discretization {}", node, aledis_->name());`
`43`	`43`	`}`
`44`	`44`	`else`
`45`	`45`	`{`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ void Arteries::ArteryResultTest::test_node(`
`53`	`53`
`54`	`54`	`if (isnodeofanybody == 0)`
`55`	`55`	`{`
`56`		`- FOUR_C_THROW("Node {} does not belong to discretization {}", node + 1, dis_->name());`
	`56`	`+ FOUR_C_THROW("Node {} does not belong to discretization {}", node, dis_->name());`
`57`	`57`	`}`
`58`	`58`	`else`
`59`	`59`	`{`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ void FLD::FluidResultTest::test_node(`
`52`	`52`
`53`	`53`	`if (isnodeofanybody == 0)`
`54`	`54`	`{`
`55`		`- FOUR_C_THROW("Node {} does not belong to discretization {}", node + 1, fluiddis_->name());`
	`55`	`+ FOUR_C_THROW("Node {} does not belong to discretization {}", node, fluiddis_->name());`
`56`	`56`	`}`
`57`	`57`	`else`
`58`	`58`	`{`
Original file line number	Diff line number	Diff line change
`@@ -19,10 +19,7 @@ FOUR_C_NAMESPACE_OPEN`
`19`	`19`
`20`	`20`
`21`	`21`	`FLD::XFluidResultTest::XFluidResultTest(const FLD::XFluid& xfluid)`
`22`		`- : Core::Utils::ResultTest("XFLUID"),`
`23`		`- discret_(xfluid.discret_),`
`24`		`- velnp_(xfluid.state_->velnp_),`
`25`		`- node_from_zero_(true)`
	`22`	`+ : Core::Utils::ResultTest("XFLUID"), discret_(xfluid.discret_), velnp_(xfluid.state_->velnp_)`
`26`	`23`	`{`
`27`	`24`	`}`
`28`	`25`
`@@ -31,11 +28,8 @@ FLD::XFluidResultTest::XFluidResultTest(const FLD::XFluidFluid& xfluid)`
`31`	`28`	`discret_(xfluid.discret_),`
`32`	`29`	`velnp_(xfluid.state_->velnp_),`
`33`	`30`	`coupl_discret_(xfluid.embedded_fluid_->discretization()),`
`34`		`- coupl_velnp_(xfluid.embedded_fluid_->velnp()),`
`35`		`- node_from_zero_(false)`
	`31`	`+ coupl_velnp_(xfluid.embedded_fluid_->velnp())`
`36`	`32`	`{`
`37`		`- // Todo: remove the "node_from_zero" flag for fluidfluid:`
`38`		`- // adapt the test cases!`
`39`	`33`	`}`
`40`	`34`
`41`	`35`	`void FLD::XFluidResultTest::test_node(`
`@@ -46,9 +40,6 @@ void FLD::XFluidResultTest::test_node(`
`46`	`40`
`47`	`41`	`int node = container.get<int>("NODE");`
`48`	`42`
`49`		`- // Todo: remove!`
`50`		`- if (node_from_zero_) node -= 1;`
`51`		`-`
`52`	`43`	`if (dis == discret_->name())`
`53`	`44`	`{`
`54`	`45`	`test_node(container, nerr, test_count, node, discret_, velnp_);`
`@@ -71,7 +62,7 @@ void FLD::XFluidResultTest::test_node(const Core::IO::InputParameterContainer& c`
`71`	`62`
`72`	`63`	`if (isnodeofanybody == 0)`
`73`	`64`	`{`
`74`		`- FOUR_C_THROW("Node {} does not belong to discretization {}", node + 1, discret.name());`
	`65`	`+ FOUR_C_THROW("Node {} does not belong to discretization {}", node, discret.name());`
`75`	`66`	`}`
`76`	`67`	`else`
`77`	`68`	`{`
Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,7 @@ void FSI::FSIResultTest::test_node(`
`212`	`212`
`213`	`213`	`if (isnodeofanybody == 0)`
`214`	`214`	`{`
`215`		`- FOUR_C_THROW("Node {} does not belong to discretization {}", node + 1, slavedisc_->name());`
	`215`	`+ FOUR_C_THROW("Node {} does not belong to discretization {}", node, slavedisc_->name());`
`216`	`216`	`}`
`217`	`217`	`else`
`218`	`218`	`{`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ void Lubrication::ResultTest::test_node(`
`46`	`46`
`47`	`47`	`if (isnodeofanybody == 0)`
`48`	`48`	`{`
`49`		`- FOUR_C_THROW("Node {} does not belong to discretization {}", node + 1, dis_->name());`
	`49`	`+ FOUR_C_THROW("Node {} does not belong to discretization {}", node, dis_->name());`
`50`	`50`	`}`
`51`	`51`	`else`
`52`	`52`	`{`
Original file line number	Diff line number	Diff line change
`@@ -47,8 +47,8 @@ void PoroPressureBased::ResultTest::test_node(`
`47`	`47`
`48`	`48`	`if (isnodeofanybody == 0)`
`49`	`49`	`{`
`50`		`- FOUR_C_THROW("Node {} does not belong to discretization {}", node + 1,`
`51`		`- porotimint_.discretization()->name());`
	`50`	`+ FOUR_C_THROW(`
	`51`	`+ "Node {} does not belong to discretization {}", node, porotimint_.discretization()->name());`
`52`	`52`	`}`
`53`	`53`	`else`
`54`	`54`	`{`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ void ScaTra::ScaTraResultTest::test_node(`
`42`	`42`
`43`	`43`	`if (isnodeofanybody == 0)`
`44`	`44`	`{`
`45`		`- FOUR_C_THROW("Node {} does not belong to discretization {}", node + 1,`
	`45`	`+ FOUR_C_THROW("Node {} does not belong to discretization {}", node,`
`46`	`46`	`scatratimint_->discretization()->name());`
`47`	`47`	`}`
`48`	`48`	`else`