Internal node numbering consistent with input

Author: sebproell

src/ale/4C_ale_resulttest.cpp

@@ -32,7 +32,6 @@ void ALE::AleResultTest::test_node(
   if (dis != aledis_->name()) return;
 
   int node = container.get<int>("NODE");
-  node -= 1;
 
   int havenode(aledis_->have_global_node(node));
   int isnodeofanybody(0);

src/art_net/4C_art_net_artery_resulttest.cpp

@@ -46,7 +46,6 @@ void Arteries::ArteryResultTest::test_node(
   if (dis != dis_->name()) return;
 
   int node = container.get<int>("NODE");
-  node -= 1;
 
   int havenode(dis_->have_global_node(node));
   int isnodeofanybody(0);

src/core/fem/src/general/element/4C_fem_general_element.cpp

@@ -198,11 +198,10 @@ void Core::Elements::Element::set_node_ids(const int nnode, const int* nodes)
 
 /*----------------------------------------------------------------------*/
 /*----------------------------------------------------------------------*/
-void Core::Elements::Element::set_node_ids_one_based_index(
+void Core::Elements::Element::set_node_ids(
     const std::string& distype, const Core::IO::InputParameterContainer& container)
 {
   nodeid_ = container.get<std::vector<int>>(distype);
-  for (int& i : nodeid_) i -= 1;
   node_.resize(0);
 }
 

src/core/fem/src/general/element/4C_fem_general_element.hpp

@@ -725,7 +725,7 @@ might become invalid after a redistribution of the discretization.
      * Set the list of node ids this element is connected to. Here, the index
      * starts at 1, not 0. This is used for the legacy element input.
      */
-    void set_node_ids_one_based_index(
+    void set_node_ids(
         const std::string& distype, const Core::IO::InputParameterContainer& container);
 
     /*!

src/core/io/src/4C_io_input_file_utils.cpp

@@ -150,7 +150,7 @@ void Core::IO::read_design(InputFile& input, const std::string& name,
                                (name == "DVOL" && dname == "DVOLUME"),
           "Wrong design node name: {}. Expected {}.", dname, name);
 
-      topology[dobj - 1].insert(nodeid - 1);
+      topology[dobj - 1].insert(nodeid);
     }
     else  // fancy specification of the design nodes by specifying min or max of the domain
     {     // works best on rectangular domains ;)

src/core/io/src/4C_io_meshreader.cpp

@@ -298,7 +298,7 @@ namespace
         Core::IO::InputParameterContainer data;
         linedef.fully_parse(element_parser, data);
 
-        ele->set_node_ids_one_based_index(distype, data);
+        ele->set_node_ids(distype, data);
         ele->read_element(eletype, distype, data);
 
         // add element to discretization
@@ -690,7 +690,7 @@ namespace
 
       if (type == "NODE")
       {
-        int nodeid = parser.read<int>() - 1;
+        const int nodeid = parser.read<int>();
         parser.consume("COORD");
         auto coords = parser.read<std::vector<double>>(3);
 
@@ -709,13 +709,13 @@ namespace
       // this node is a Nurbs control point
       else if (type == "CP")
       {
-        int cpid = parser.read<int>() - 1;
+        const int cpid = parser.read<int>();
         parser.consume("COORD");
         auto coords = parser.read<std::vector<double>>(3);
         double weight = parser.read<double>();
 
         max_node_id = std::max(max_node_id, cpid) + 1;
-        if (cpid != line_count)
+        if (cpid != line_count + 1)
           FOUR_C_THROW(
               "Reading of control points {} failed: They must be numbered consecutive!!", cpid);
         std::vector<std::shared_ptr<Core::FE::Discretization>> diss =
@@ -745,7 +745,7 @@ namespace
         std::vector<std::array<double, 3>> fibers;
         std::map<Core::Nodes::AngleType, double> angles;
 
-        int nodeid = parser.read<int>() - 1;
+        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;

src/fluid/4C_fluid_result_test.cpp

@@ -45,7 +45,6 @@ void FLD::FluidResultTest::test_node(
   if (dis != fluiddis_->name()) return;
 
   int node = container.get<int>("NODE");
-  node -= 1;
 
   int havenode(fluiddis_->have_global_node(node));
   int isnodeofanybody(0);

src/fsi/src/utils/4C_fsi_resulttest.cpp

@@ -205,7 +205,6 @@ void FSI::FSIResultTest::test_node(
     const Core::IO::InputParameterContainer& container, int& nerr, int& test_count)
 {
   int node = container.get<int>("NODE");
-  node -= 1;
 
   int havenode(slavedisc_->have_global_node(node));
   int isnodeofanybody(0);

src/lubrication/src/4C_lubrication_resulttest.cpp

@@ -39,7 +39,6 @@ void Lubrication::ResultTest::test_node(
   if (dis != dis_->name()) return;
 
   int node = container.get<int>("NODE");
-  node -= 1;
 
   int havenode(dis_->have_global_node(node));
   int isnodeofanybody(0);

src/particle_wall/4C_particle_wall_result_test.cpp

@@ -48,7 +48,6 @@ void PARTICLEWALL::WallResultTest::test_node(
 
   // extract node id
   int node = container.get<int>("NODE");
-  node -= 1;
 
   int havenode(walldiscretization_->have_global_node(node));
   int havenodeonanyproc(0);