update solution to accept ints and floats, update scitech25

ACea15 · Dec 1, 2024 · e3ec6c0 · e3ec6c0
1 parent 2356990
commit e3ec6c0
Show file tree

Hide file tree

Showing 11 changed files with 227 additions and 112 deletions.
diff --git a/docs/reports/scitech25/figs_ext/DiscreteL0.png b/docs/reports/scitech25/figs_ext/DiscreteL0.png
diff --git a/docs/reports/scitech25/figs_ext/DiscreteL2.png b/docs/reports/scitech25/figs_ext/DiscreteL2.png
diff --git a/docs/reports/scitech25/figs_ext/DiscreteL4.pdf b/docs/reports/scitech25/figs_ext/DiscreteL4.pdf
diff --git a/docs/reports/scitech25/figs_ext/MC1.png b/docs/reports/scitech25/figs_ext/MC1.png
diff --git a/docs/reports/scitech25/figs_ext/bug_gust3d.pdf b/docs/reports/scitech25/figs_ext/bug_gust3d.pdf
diff --git a/docs/reports/scitech25/figs_ext/bug_model3.pdf b/docs/reports/scitech25/figs_ext/bug_model3.pdf
diff --git a/docs/reports/scitech25/figs_ext/bug_model7.pdf b/docs/reports/scitech25/figs_ext/bug_model7.pdf
diff --git a/docs/reports/scitech25/figs_ext/monoeuvre3D.pdf b/docs/reports/scitech25/figs_ext/monoeuvre3D.pdf
diff --git a/docs/reports/scitech25/main.org b/docs/reports/scitech25/main.org
diff --git a/docs/schemas/draft2.org b/docs/schemas/draft2.org
@@ -279,10 +279,15 @@ Systems with labels:
 [[file:UML_software1.png]]
 
 * Algorithms
-Extensive  work carried out into a software architecture that complies with good design principles.
 
 
-#+NAME: alg:componentss
+$N_N$ Number of discretisation condensed nodes in the model
+$N_m$ Number of modal shapes in the solution
+$N_t$ Number of time-steps in the integration scheme.
+$N_c$ Number of cases to be run in parallel
+
+
+#+NAME: alg:process
 \begin{algorithm}[h!]
 \DontPrintSemicolon
 \SetKwInOut{Input}{input}

diff --git a/feniax/preprocessor/solution.py b/feniax/preprocessor/solution.py
@@ -79,6 +79,8 @@ def save_container(path, container):
         attr_path = path / attr_name
         if isinstance(attr, jnp.ndarray):
             jnp.save(attr_path, attr)
+        elif isinstance(attr, int) or isinstance(attr, float):
+            jnp.save(attr_path, jnp.array(attr))
         elif isinstance(attr, np.ndarray):
             jnp.save(attr_path, attr)
         elif isinstance(attr, (list, dict, tuple)):
@@ -102,7 +104,12 @@ def load_container(path: pathlib.Path, Container):
             if Container.__annotations__[attr_name].__name__ == "Array":
                 kwargs[attr_name] = jnp.load(attr_path.with_suffix(".npy"))
             elif Container.__annotations__[attr_name].__name__ == "ndarray":
-                kwargs[attr_name] = np.load(attr_path.with_suffix(".npy"))
+                kwargs[attr_name] = jnp.load(attr_path.with_suffix(".npy"))
+            elif (Container.__annotations__[attr_name].__name__ == "int"):
+                  kwargs[attr_name] = int(jnp.load(attr_path.with_suffix(".npy")))
+            elif (Container.__annotations__[attr_name].__name__ == "float"):
+                  kwargs[attr_name] = float(jnp.load(attr_path.with_suffix(".npy")))
+
             elif (
                 (Container.__annotations__[attr_name].__name__ == "dict")
                 or (Container.__annotations__[attr_name].__name__ == "list")