re-integrated the input_output module. Added more robust documentatio…

…n for the Domain, Geometry, Boundary, and Input_Output module.

src/input_output/gmsh_parser.rs

@@ -1,4 +1,4 @@
-use crate::domain::{Mesh, MeshEntity, Sieve};
+use crate::domain::{mesh::Mesh, MeshEntity, Sieve};
 use std::fs::File;
 use std::io::{self, BufRead, BufReader};
 

src/input_output/mesh_generation.rs

@@ -1,4 +1,4 @@
-use crate::domain::{Mesh, MeshEntity};
+use crate::domain::{mesh::Mesh, MeshEntity};
 
 pub struct MeshGenerator;
 
@@ -195,7 +195,7 @@ impl MeshGenerator {
                     let _n8 = n7 + 1;
 
                     // Define the faces and add them as MeshEntities
-                    let front_face = MeshEntity::Face(mesh.entities.len());
+                    let front_face = MeshEntity::Face(mesh.entities.read().expect("Failed to acquire read lock").len());
                     mesh.add_entity(front_face.clone());
                     mesh.add_relationship(front_face.clone(), MeshEntity::Vertex(n1));
                     mesh.add_relationship(front_face.clone(), MeshEntity::Vertex(n2));

src/input_output/tests.rs

@@ -187,6 +187,7 @@ mod tests {
         let expected_num_vertices = (nx + 1) * (ny + 1);
         let num_vertices = mesh
             .entities
+            .read().expect("Failed to acquire read lock")
             .iter()
             .filter(|e| matches!(e, MeshEntity::Vertex(_)))
             .count();
@@ -196,6 +197,7 @@ mod tests {
         let expected_num_cells = nx * ny;
         let num_cells = mesh
             .entities
+            .read().expect("Failed to acquire read lock")
             .iter()
             .filter(|e| matches!(e, MeshEntity::Cell(_)))
             .count();
@@ -217,6 +219,7 @@ mod tests {
         let expected_num_vertices = (nx + 1) * (ny + 1) * (nz + 1);
         let num_vertices = mesh
             .entities
+            .read().expect("Failed to acquire read lock")
             .iter()
             .filter(|e| matches!(e, MeshEntity::Vertex(_)))
             .count();
@@ -226,6 +229,7 @@ mod tests {
         let expected_num_cells = nx * ny * nz;
         let num_cells = mesh
             .entities
+            .read().expect("Failed to acquire read lock")
             .iter()
             .filter(|e| matches!(e, MeshEntity::Cell(_)))
             .count();
@@ -243,6 +247,7 @@ mod tests {
         let expected_num_vertices = num_divisions + 1;
         let num_vertices = mesh
             .entities
+            .read().expect("Failed to acquire read lock")
             .iter()
             .filter(|e| matches!(e, MeshEntity::Vertex(_)))
             .count();
@@ -252,6 +257,7 @@ mod tests {
         let expected_num_cells = num_divisions;
         let num_cells = mesh
             .entities
+            .read().expect("Failed to acquire read lock")
             .iter()
             .filter(|e| matches!(e, MeshEntity::Cell(_)))
             .count();

src/lib.rs

@@ -10,7 +10,7 @@ pub mod boundary;
 pub mod solver;
 pub mod time_stepping;
 pub mod linalg;
-//pub mod input_output;
+pub mod input_output;
 pub mod tests;
 
 pub use geometry::{Geometry, CellShape, FaceShape};

target/.rustc_info.json

@@ -1 +1 @@
-{"rustc_fingerprint":18432001303766494279,"outputs":{"4614504638168534921":{"success":true,"status":"","code":0,"stdout":"rustc 1.80.1 (3f5fd8dd4 2024-08-06)\nbinary: rustc\ncommit-hash: 3f5fd8dd41153bc5fdca9427e9e05be2c767ba23\ncommit-date: 2024-08-06\nhost: x86_64-pc-windows-msvc\nrelease: 1.80.1\nLLVM version: 18.1.7\n","stderr":""},"15729799797837862367":{"success":true,"status":"","code":0,"stdout":"___.exe\nlib___.rlib\n___.dll\n___.dll\n___.lib\n___.dll\nC:\\Users\\Tea\\.rustup\\toolchains\\stable-x86_64-pc-windows-msvc\npacked\n___\ndebug_assertions\npanic=\"unwind\"\nproc_macro\ntarget_abi=\"\"\ntarget_arch=\"x86_64\"\ntarget_endian=\"little\"\ntarget_env=\"msvc\"\ntarget_family=\"windows\"\ntarget_feature=\"cmpxchg16b\"\ntarget_feature=\"fxsr\"\ntarget_feature=\"sse\"\ntarget_feature=\"sse2\"\ntarget_feature=\"sse3\"\ntarget_has_atomic=\"128\"\ntarget_has_atomic=\"16\"\ntarget_has_atomic=\"32\"\ntarget_has_atomic=\"64\"\ntarget_has_atomic=\"8\"\ntarget_has_atomic=\"ptr\"\ntarget_os=\"windows\"\ntarget_pointer_width=\"64\"\ntarget_vendor=\"pc\"\nwindows\n","stderr":""},"16495917692426387086":{"success":true,"status":"","code":0,"stdout":"___.exe\nlib___.rlib\n___.dll\n___.dll\n___.lib\n___.dll\n","stderr":""}},"successes":{}}
+{"rustc_fingerprint":18432001303766494279,"outputs":{"4614504638168534921":{"success":true,"status":"","code":0,"stdout":"rustc 1.80.1 (3f5fd8dd4 2024-08-06)\nbinary: rustc\ncommit-hash: 3f5fd8dd41153bc5fdca9427e9e05be2c767ba23\ncommit-date: 2024-08-06\nhost: x86_64-pc-windows-msvc\nrelease: 1.80.1\nLLVM version: 18.1.7\n","stderr":""},"16495917692426387086":{"success":true,"status":"","code":0,"stdout":"___.exe\nlib___.rlib\n___.dll\n___.dll\n___.lib\n___.dll\n","stderr":""},"15729799797837862367":{"success":true,"status":"","code":0,"stdout":"___.exe\nlib___.rlib\n___.dll\n___.dll\n___.lib\n___.dll\nC:\\Users\\Tea\\.rustup\\toolchains\\stable-x86_64-pc-windows-msvc\npacked\n___\ndebug_assertions\npanic=\"unwind\"\nproc_macro\ntarget_abi=\"\"\ntarget_arch=\"x86_64\"\ntarget_endian=\"little\"\ntarget_env=\"msvc\"\ntarget_family=\"windows\"\ntarget_feature=\"cmpxchg16b\"\ntarget_feature=\"fxsr\"\ntarget_feature=\"sse\"\ntarget_feature=\"sse2\"\ntarget_feature=\"sse3\"\ntarget_has_atomic=\"128\"\ntarget_has_atomic=\"16\"\ntarget_has_atomic=\"32\"\ntarget_has_atomic=\"64\"\ntarget_has_atomic=\"8\"\ntarget_has_atomic=\"ptr\"\ntarget_os=\"windows\"\ntarget_pointer_width=\"64\"\ntarget_vendor=\"pc\"\nwindows\n","stderr":""}},"successes":{}}