From 5ec8ed8689530f5b4974f649de67e8f3c6b755cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=BChle=2C=20Laura=20Christine=20=28lakue103=29?=
<laura.kuehle@uni-duesseldorf.de>
Date: Fri, 24 Feb 2023 16:24:20 +0100
Subject: [PATCH] Renamed boundary matrix to flux matrix.
---
Snakefile | 2 +-
scripts/tcd/Equation.py | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Snakefile b/Snakefile
index 6e79185..1cc26ea 100644
--- a/Snakefile
+++ b/Snakefile
@@ -24,7 +24,7 @@ TODO: Discuss how wavelet details should be plotted
Urgent:
TODO: Rename stiffness matrix to volume integral matrix -> Done
-TODO: Rename boundary matrix to flux matrix
+TODO: Rename boundary matrix to flux matrix -> Done
TODO: Change num_ghost_cells to be 1 for calc and 0 for other
TODO: Move boundary condition to Mesh class
TODO: Ensure exact solution is calculated in Equation class
diff --git a/scripts/tcd/Equation.py b/scripts/tcd/Equation.py
index afe266b..a4513ed 100644
--- a/scripts/tcd/Equation.py
+++ b/scripts/tcd/Equation.py
@@ -181,8 +181,8 @@ class LinearAdvection(Equation):
----------
volume_integral_matrix : ndarray
Volume integral matrix.
- boundary_matrix : ndarray
- Boundary matrix.
+ flux_matrix : ndarray
+ Flux matrix.
Methods
-------
@@ -216,11 +216,11 @@ class LinearAdvection(Equation):
lambda i, j: (j > i) & ((i+j) % 2 == 1), matrix_shape)] = -1.0
self._volume_integral_matrix = matrix * degree_matrix
- # Set boundary matrix
+ # Set flux matrix
matrix = np.fromfunction(lambda i, j: (-1.0)**i, matrix_shape) \
if self._wave_speed > 0 \
else np.fromfunction(lambda i, j: (-1.0)**j, matrix_shape)
- self._boundary_matrix = matrix * degree_matrix
+ self._flux_matrix = matrix * degree_matrix
def _initialize_projection(self) -> ndarray:
"""Initialize projection."""
@@ -323,7 +323,7 @@ class LinearAdvection(Equation):
if self._wave_speed > 0:
right_hand_side[:, self._mesh.num_ghost_cells:
-self._mesh.num_ghost_cells] = \
- 2 * (self._boundary_matrix @
+ 2 * (self._flux_matrix @
projection[:, self._mesh.num_ghost_cells-1:
-self._mesh.num_ghost_cells-1] +
self._volume_integral_matrix @
@@ -332,7 +332,7 @@ class LinearAdvection(Equation):
else:
right_hand_side[:, self._mesh.num_ghost_cells:
-self._mesh.num_ghost_cells] = \
- 2 * (self._boundary_matrix @
+ 2 * (self._flux_matrix @
projection[:, self._mesh.num_ghost_cells+1:] +
self._volume_integral_matrix @
projection[:, self._mesh.num_ghost_cells:
--
GitLab