|
18 | 18 | from rich.console import Console
|
19 | 19 | from rich.live import Live
|
20 | 20 | from rich.panel import Panel
|
21 |
| -from rich.progress import Progress, TaskID |
22 | 21 | from rich.table import Table
|
23 | 22 | from scipy.sparse import coo_matrix, csc_matrix
|
24 | 23 | from scipy.sparse.linalg import LinearOperator, spilu
|
|
37 | 36 | from collections.abc import Callable
|
38 | 37 |
|
39 | 38 | import matplotlib.axes
|
| 39 | + from rich.progress import Progress, TaskID |
40 | 40 |
|
41 | 41 |
|
42 | 42 | class Section:
|
@@ -456,7 +456,7 @@ def warping_analysis(progress: Progress | None = None) -> None:
|
456 | 456 | msg = f"[green]:white_check_mark: {self.num_nodes}x{self.num_nodes} "
|
457 | 457 | msg += "stiffness matrix assembled"
|
458 | 458 | progress.update(task_id=task, description=msg)
|
459 |
| - progress.update(cast(TaskID, 0), advance=1) |
| 459 | + progress.update(cast("TaskID", 0), advance=1) |
460 | 460 | else:
|
461 | 461 | k_lg, f_torsion = warping_section.assemble_torsion()
|
462 | 462 |
|
@@ -516,7 +516,7 @@ def solve_warping() -> npt.NDArray[np.float64]:
|
516 | 516 | msg = "[green]:white_check_mark: Warping function solved "
|
517 | 517 | msg += f"({solver_type})"
|
518 | 518 | progress.update(task, description=msg)
|
519 |
| - progress.update(cast(TaskID, 0), advance=1) |
| 519 | + progress.update(cast("TaskID", 0), advance=1) |
520 | 520 | else:
|
521 | 521 | omega = solve_warping()
|
522 | 522 |
|
@@ -565,7 +565,7 @@ def assemble_shear_load(
|
565 | 565 |
|
566 | 566 | msg = "[green]:white_check_mark: Shear function vectors assembled"
|
567 | 567 | progress.update(task, description=msg)
|
568 |
| - progress.update(cast(TaskID, 0), advance=1) |
| 568 | + progress.update(cast("TaskID", 0), advance=1) |
569 | 569 | else:
|
570 | 570 | f_psi, f_phi = assemble_shear_load()
|
571 | 571 |
|
@@ -613,7 +613,7 @@ def solve_shear_functions(
|
613 | 613 | msg = "[green]:white_check_mark: Shear functions solved "
|
614 | 614 | msg += f"({solver_type})"
|
615 | 615 | progress.update(task, description=msg)
|
616 |
| - progress.update(cast(TaskID, 0), advance=1) |
| 616 | + progress.update(cast("TaskID", 0), advance=1) |
617 | 617 | else:
|
618 | 618 | psi_shear, phi_shear = solve_shear_functions()
|
619 | 619 |
|
@@ -676,7 +676,7 @@ def assemble_sc_warping_integrals(
|
676 | 676 |
|
677 | 677 | msg = "[green]:white_check_mark: Shear and warping integrals assembled"
|
678 | 678 | progress.update(task, description=msg)
|
679 |
| - progress.update(cast(TaskID, 0), advance=1) |
| 679 | + progress.update(cast("TaskID", 0), advance=1) |
680 | 680 | else:
|
681 | 681 | (
|
682 | 682 | sc_xint,
|
@@ -754,7 +754,7 @@ def assemble_shear_deformation(
|
754 | 754 | msg = "[green]:white_check_mark: Shear deformation coefficients "
|
755 | 755 | msg += "assembled"
|
756 | 756 | progress.update(task_id=task, description=msg)
|
757 |
| - progress.update(cast(TaskID, 0), advance=1) |
| 757 | + progress.update(cast("TaskID", 0), advance=1) |
758 | 758 | else:
|
759 | 759 | kappa_x, kappa_y, kappa_xy = assemble_shear_deformation()
|
760 | 760 |
|
@@ -825,7 +825,7 @@ def calculate_monosymmetry_integrals(
|
825 | 825 |
|
826 | 826 | msg = "[green]:white_check_mark: Monosymmetry integrals assembled"
|
827 | 827 | progress.update(task_id=task, description=msg)
|
828 |
| - progress.update(cast(TaskID, 0), advance=1) |
| 828 | + progress.update(cast("TaskID", 0), advance=1) |
829 | 829 | else:
|
830 | 830 | int_x, int_y, int_11, int_22 = calculate_monosymmetry_integrals()
|
831 | 831 |
|
@@ -1037,7 +1037,7 @@ def warping_analysis(progress: Progress | None = None) -> None:
|
1037 | 1037 | msg = f"[green]:white_check_mark: {self.num_nodes}x{self.num_nodes} "
|
1038 | 1038 | msg += "stiffness matrix assembled"
|
1039 | 1039 | progress.update(task_id=task, description=msg)
|
1040 |
| - progress.update(cast(TaskID, 0), advance=1) |
| 1040 | + progress.update(cast("TaskID", 0), advance=1) |
1041 | 1041 | else:
|
1042 | 1042 | k_lg, f_torsion = warping_section.assemble_torsion()
|
1043 | 1043 |
|
@@ -1097,7 +1097,7 @@ def solve_warping() -> npt.NDArray[np.float64]:
|
1097 | 1097 | msg = "[green]:white_check_mark: Warping function solved "
|
1098 | 1098 | msg += f"({solver_type})"
|
1099 | 1099 | progress.update(task, description=msg)
|
1100 |
| - progress.update(cast(TaskID, 0), advance=1) |
| 1100 | + progress.update(cast("TaskID", 0), advance=1) |
1101 | 1101 | else:
|
1102 | 1102 | omega = solve_warping()
|
1103 | 1103 |
|
|
0 commit comments