Merge pull request #758 from DHI/mesh_repr

FM reprs, nodes before elements
DHI · Nov 22, 2024 · daf0dc3 · daf0dc3
2 parents 8a7f514 + fb57792
commit daf0dc3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/mikeio/dfsu/_layered.py b/mikeio/dfsu/_layered.py
@@ -55,12 +55,13 @@ def __init__(self, filename: str | Path) -> None:
         self._items = self._read_items(self._filename)
 
     def __repr__(self) -> str:
-        out = [f"<mikeio.{self.__class__.__name__}>"]
-
-        out.append(f"number of elements: {self.geometry.n_elements}")
-        out.append(f"number of nodes: {self.geometry.n_nodes}")
-        out.append(f"projection: {self.geometry.projection_string}")
-        out.append(f"number of sigma layers: {self.geometry.n_sigma_layers}")
+        out = [
+            f"<mikeio.{self.__class__.__name__}>"
+            f"number of nodes: {self.geometry.n_nodes}",
+            f"number of elements: {self.geometry.n_elements}",
+            f"projection: {self.geometry.projection_string}",
+            f"number of sigma layers: {self.geometry.n_sigma_layers}",
+        ]
         if (
             self._type == DfsuFileType.DfsuVerticalProfileSigmaZ
             or self._type == DfsuFileType.Dfsu3DSigmaZ

diff --git a/mikeio/dfsu/_mesh.py b/mikeio/dfsu/_mesh.py
@@ -66,8 +66,8 @@ def _read_header(self, filename: str | Path) -> GeometryFM2D:
     def __repr__(self) -> str:
         out = [
             "<Mesh>",
-            f"number of elements: {self.n_elements}",
             f"number of nodes: {self.n_nodes}",
+            f"number of elements: {self.n_elements}",
             f"projection: {self.geometry.projection_string}",
         ]
         return str.join("\n", out)

diff --git a/mikeio/dfsu/_spectral.py b/mikeio/dfsu/_spectral.py
@@ -44,9 +44,9 @@ def __repr__(self) -> str:
         out = [f"<mikeio.{self.__class__.__name__}>"]
 
         if self._type is not DfsuFileType.DfsuSpectral0D:
+            out.append(f"number of nodes: {self.geometry.n_nodes}")
             if self._type is not DfsuFileType.DfsuSpectral1D:
                 out.append(f"number of elements: {self.geometry.n_elements}")
-            out.append(f"number of nodes: {self.geometry.n_nodes}")
         if self.geometry.is_spectral:
             if self.geometry.n_directions > 0:
                 out.append(f"number of directions: {self.geometry.n_directions}")