Commit aaf1335
committed
Migrate to yaml input + pyvista instead of vtk
This commit provides the migration from the old
.dat input files requiring complex dedicated reading and writing
routines to the new yaml input format. Moreover we switch from vtk to
pyvista visualization. Specifically, the following work was performed:
- New reading and writing routines were implemented which make use of
fourcipp's FourCInput class. Thus, they also validate the input files
before visualization and before exporting them. We now only support the
in/out formats: .yaml, .yml. What was also added: read-in and write (export) error messages
(in the GUI and in the terminal), in case that either the file validation or the lnmmeshio
conversion to vtu fails.
- Replaced the vtk visualization of the input file with pyvista which provides
more comfortable handling of geometry data. Also, it provides a nice utilities bar
containing tools such as the coordinate system, the edge visibility, certain views ...
The plot was also significantly enhanced optically (more color-blind friendly colors, legend, design conditions now also visualized using spheres
allowing for reasonable scaling based on the current problem size,...).
- A new TrameApp class named FourCWebserver was implemented which improves the organization
of all server- and client-relevant data. It holds server-only variables, and state variables
shared between server and client (as well as controller methods and change events).
Similarly to the previous approach, there are specific sections, such as e.g. Materials, Design Conditions,
Result Description,... which are handled in a section-specific
manner as opposed to the more general settings sections, such as e.g. STRUCTURE DYNAMIC. The server-only
section variables basically hold the fourc yaml content in the same data structures as the input file, while
the state variables organize the date in a more client-friendly manner. For each of
the section types we have an initialization routine (for both server-only and state variables), and a
sync-back routine converting the current state to the server-only variables used subsequently for the export.
The data organization within each section is now also significantly improved in comparison with the previous main, by saving state
variables in nested dicts which are more easily accessible than the large multi-dimensional arrays used previously.
- Improvement of the GUI: rework of the specific section panels Materials, Design Conditions, Result Description and Functions to
more closely match the current yaml content structure and require less processing to obtain dedicated state variables. An important point
is that input files with all types of functions can now be entered into the Webviewer (as opposed to previously) - although the plot visualization
of specific function types remains to be done (only SYMBOLIC_FUNCTION_OF_SPACE_TIME currently supported).1 parent f1a7026 commit aaf1335
File tree
18 files changed
+3395
-2465
lines changed- src
- fourc_webviewer_default_files
- fourc_webviewer
- input_file_utils
18 files changed
+3395
-2465
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
10 | | - | |
| 10 | + | |
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
2 | 1 | | |
3 | 2 | | |
4 | 3 | | |
5 | 4 | | |
6 | 5 | | |
7 | 6 | | |
8 | 7 | | |
| 8 | + | |
9 | 9 | | |
10 | | - | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | | - | |
| 2 | + | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
| 5 | + | |
6 | 6 | | |
7 | | - | |
8 | | - | |
9 | | - | |
10 | | - | |
11 | | - | |
| 7 | + | |
12 | 8 | | |
13 | | - | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
14 | 12 | | |
15 | | - | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
16 | 20 | | |
17 | 21 | | |
18 | 22 | | |
19 | | - | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
20 | 28 | | |
21 | | - | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
22 | 32 | | |
23 | 33 | | |
24 | 34 | | |
25 | | - | |
| 35 | + | |
26 | 36 | | |
27 | | - | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
28 | 46 | | |
29 | | - | |
| 47 | + | |
30 | 48 | | |
| 49 | + | |
| 50 | + | |
31 | 51 | | |
32 | 52 | | |
33 | | - | |
| 53 | + | |
34 | 54 | | |
35 | 55 | | |
36 | 56 | | |
37 | 57 | | |
38 | 58 | | |
39 | | - | |
| 59 | + | |
40 | 60 | | |
41 | | - | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
42 | 64 | | |
43 | 65 | | |
44 | 66 | | |
45 | | - | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
46 | 70 | | |
47 | 71 | | |
48 | 72 | | |
| 73 | + | |
49 | 74 | | |
50 | 75 | | |
51 | 76 | | |
52 | 77 | | |
53 | | - | |
| 78 | + | |
54 | 79 | | |
| 80 | + | |
| 81 | + | |
55 | 82 | | |
56 | 83 | | |
57 | | - | |
| 84 | + | |
58 | 85 | | |
59 | | - | |
| 86 | + | |
60 | 87 | | |
61 | | - | |
62 | | - | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
63 | 92 | | |
64 | 93 | | |
65 | | - | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
66 | 99 | | |
67 | | - | |
| 100 | + | |
68 | 101 | | |
69 | 102 | | |
70 | 103 | | |
71 | 104 | | |
72 | 105 | | |
73 | | - | |
| 106 | + | |
74 | 107 | | |
75 | | - | |
| 108 | + | |
76 | 109 | | |
77 | | - | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
78 | 120 | | |
79 | | - | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
80 | 133 | | |
81 | | - | |
82 | | - | |
83 | | - | |
| 134 | + | |
84 | 135 | | |
85 | | - | |
| 136 | + | |
86 | 137 | | |
87 | 138 | | |
88 | 139 | | |
89 | 140 | | |
90 | 141 | | |
91 | 142 | | |
92 | | - | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
93 | 148 | | |
94 | | - | |
| 149 | + | |
95 | 150 | | |
96 | | - | |
| 151 | + | |
97 | 152 | | |
98 | | - | |
| 153 | + | |
99 | 154 | | |
100 | | - | |
| 155 | + | |
101 | 156 | | |
102 | | - | |
103 | | - | |
104 | | - | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
105 | 163 | | |
106 | | - | |
| 164 | + | |
107 | 165 | | |
108 | | - | |
109 | | - | |
110 | | - | |
| 166 | + | |
| 167 | + | |
| 168 | + | |
| 169 | + | |
| 170 | + | |
111 | 171 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
21 | | - | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
22 | 24 | | |
23 | 25 | | |
24 | 26 | | |
| |||
0 commit comments