From af082563b17defae5452a3af434473f2d2f97744 Mon Sep 17 00:00:00 2001
From: Rupert Nash <r.nash@epcc.ed.ac.uk>
Date: Wed, 20 Dec 2023 16:37:34 +0000
Subject: [PATCH] Rename XML element for rbc templates from "cells" to
 "templates"

---
 Code/configuration/SimConfigReader.cc          | 2 +-
 Code/tests/redblood/CellIOTests.cc             | 6 +++---
 Code/tests/redblood/LoadDeformedCellTests.cc   | 2 +-
 Code/tests/redblood/MulticellBenchmarkTests.cc | 2 +-
 Code/tests/redblood/SadCellIntegrationTests.cc | 4 ++--
 Code/tests/resources/cyl_l100_r5.xml           | 4 ++--
 Code/tests/resources/fedosov1c.xml             | 4 ++--
 Code/tests/resources/large_cylinder_rbc.xml    | 4 ++--
 8 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Code/configuration/SimConfigReader.cc b/Code/configuration/SimConfigReader.cc
index 6219e0d92..40645ea9c 100644
--- a/Code/configuration/SimConfigReader.cc
+++ b/Code/configuration/SimConfigReader.cc
@@ -920,7 +920,7 @@ namespace hemelb::configuration {
         auto controllerNode = rbcEl.PopChildOrThrow("controller");
         ans.boxSize = PopDimensionalValue<LatticeDistance>(*controllerNode->PopChildOrThrow("boxsize"), "lattice");
 
-        if (auto cellsEl = rbcEl.PopChildOrNull("cells"))
+        if (auto cellsEl = rbcEl.PopChildOrNull("templates"))
             ans.meshes = readTemplateCells(*cellsEl);
 
         // Now we can check that the cell inserters only refer to templates that exist
diff --git a/Code/tests/redblood/CellIOTests.cc b/Code/tests/redblood/CellIOTests.cc
index e39eb9127..63b0fac37 100644
--- a/Code/tests/redblood/CellIOTests.cc
+++ b/Code/tests/redblood/CellIOTests.cc
@@ -146,7 +146,7 @@ namespace hemelb::tests
                                    "    </outlet>"
                                    "  </outlets>"
                                    "  <redbloodcells>"
-                                   "    <cells>"
+                                   "    <templates>"
                                    "      <cell>"
                                    "        <shape mesh_path=\"red_blood_cell.txt\" mesh_format=\"Krueger\" />"
                                    "        <scale units=\"m\" value=\"0.6\"/>"
@@ -155,13 +155,13 @@ namespace hemelb::tests
                                    "       <shape mesh_path=\"red_blood_cell.txt\" mesh_format=\"Krueger\" />"
                                    "       <scale units=\"m\" value=\"0.5\"/>"
                                    "     </cell>"
-                                   "   </cells>"
+                                   "   </templates>"
                                    "  </redbloodcells>"
                                    "</parent>";
             io::xml::Document document;
             document.LoadString(xml_text);
             auto root = document.GetRoot();
-            auto cellsEl = root.GetChildOrThrow("redbloodcells").GetChildOrThrow("cells");
+            auto cellsEl = root.GetChildOrThrow("redbloodcells").GetChildOrThrow("templates");
             auto tc_conf = reader.readTemplateCells(cellsEl);
             configuration::GlobalSimInfo sim_info;
             auto in_conf = reader.DoIOForInOutlets(sim_info, root.GetChildOrThrow("inlets"));
diff --git a/Code/tests/redblood/LoadDeformedCellTests.cc b/Code/tests/redblood/LoadDeformedCellTests.cc
index 3db5a5a61..68a8bf63e 100644
--- a/Code/tests/redblood/LoadDeformedCellTests.cc
+++ b/Code/tests/redblood/LoadDeformedCellTests.cc
@@ -47,7 +47,7 @@ namespace hemelb::tests
       DeleteXMLInput("large_cylinder_rbc.xml", { "inlets", "inlet", "insertcell" });
       DeleteXMLInput("large_cylinder_rbc.xml", { "inlets", "inlet", "flowextension" });
       DeleteXMLInput("large_cylinder_rbc.xml", { "outlets", "outlet", "flowextension" });
-      DeleteXMLInput("large_cylinder_rbc.xml", { "redbloodcells", "cells" });
+      DeleteXMLInput("large_cylinder_rbc.xml", { "redbloodcells", "templates" });
 
       int constexpr argc = 3;
       char const * argv[argc] = {
diff --git a/Code/tests/redblood/MulticellBenchmarkTests.cc b/Code/tests/redblood/MulticellBenchmarkTests.cc
index 5d038b4d5..5698c8d22 100644
--- a/Code/tests/redblood/MulticellBenchmarkTests.cc
+++ b/Code/tests/redblood/MulticellBenchmarkTests.cc
@@ -45,7 +45,7 @@ namespace hemelb::tests
                            { "redbloodcells", "controller", "stencil" },
                            "two");
             ModifyXMLInput("large_cylinder_rbc.xml", { "redbloodcells",
-                                                       "cells",
+                                                       "templates",
                                                        "cell",
                                                        "shape",
                                                        "mesh_path" },
diff --git a/Code/tests/redblood/SadCellIntegrationTests.cc b/Code/tests/redblood/SadCellIntegrationTests.cc
index b46615c75..19c0c1e90 100644
--- a/Code/tests/redblood/SadCellIntegrationTests.cc
+++ b/Code/tests/redblood/SadCellIntegrationTests.cc
@@ -35,7 +35,7 @@ namespace hemelb::tests
 
       ModifyXMLInput("large_cylinder_rbc.xml", { "simulation", "steps", "value" }, 10000);
       ModifyXMLInput("large_cylinder_rbc.xml", { "redbloodcells",
-	    "cells",
+	    "templates",
 	    "cell",
 	    "shape",
 	    "mesh_path" },
@@ -46,7 +46,7 @@ namespace hemelb::tests
 	    "mean",
 	    "value" },
 	0);
-      DeleteXMLInput("large_cylinder_rbc.xml", { "redbloodcells", "cells" });
+      DeleteXMLInput("large_cylinder_rbc.xml", { "redbloodcells", "templates" });
       DeleteXMLInput("large_cylinder_rbc.xml", { "inlets", "inlet", "flowextension" });
       DeleteXMLInput("large_cylinder_rbc.xml", { "outlets", "outlet", "flowextension" });
 
diff --git a/Code/tests/resources/cyl_l100_r5.xml b/Code/tests/resources/cyl_l100_r5.xml
index 4789e20fa..8dd750216 100644
--- a/Code/tests/resources/cyl_l100_r5.xml
+++ b/Code/tests/resources/cyl_l100_r5.xml
@@ -74,7 +74,7 @@
       <cutoffdistance units="lattice" value="1.0" />
       <exponent value="2"/>
     </cell2Wall>
-    <cells>
+    <templates>
       <cell name="default">
         <moduli>
           <bending units="lattice" value="0.002087" />
@@ -86,7 +86,7 @@
         <shape mesh_path="rbc_ico_2880.msh" mesh_format="Krueger" />
         <scale units="m" value="4e-06" />
       </cell>
-    </cells>
+    </templates>
     <output>
       <vtk>
         <period units="lattice" value="500" />
diff --git a/Code/tests/resources/fedosov1c.xml b/Code/tests/resources/fedosov1c.xml
index 022985ff9..bad98a446 100644
--- a/Code/tests/resources/fedosov1c.xml
+++ b/Code/tests/resources/fedosov1c.xml
@@ -84,7 +84,7 @@
       <cutoffdistance units="lattice" value="1.0" />
       <exponent value="2"/>
     </cell2Wall>
-    <cells>
+    <templates>
       <cell name="default">
         <moduli>
           <surface units="lattice" value="1" />
@@ -96,7 +96,7 @@
         <shape mesh_path="rbc_ico_1280.msh" mesh_format="Krueger" />
         <scale units="m" value="4.1e-06" />
       </cell>
-    </cells>
+    </templates>
     <output>
       <vtk>
         <period units="lattice" value="1000" />
diff --git a/Code/tests/resources/large_cylinder_rbc.xml b/Code/tests/resources/large_cylinder_rbc.xml
index dbb6aea95..341f65803 100644
--- a/Code/tests/resources/large_cylinder_rbc.xml
+++ b/Code/tests/resources/large_cylinder_rbc.xml
@@ -76,7 +76,7 @@
       <cutoffdistance units="lattice" value="1.0" />
       <exponent value="2"/>
     </cell2Wall>
-    <cells>
+    <templates>
       <cell name="default">
         <moduli>
           <bending units="Nm" value="2e-19" />
@@ -99,7 +99,7 @@
         <shape mesh_path="red_blood_cell.txt" mesh_format="Krueger" />
         <scale units="m" value="8e-06" />
       </cell>
-    </cells>
+    </templates>
     <output>
       <vtk>
         <period units="lattice" value="100" />