Skip to content

Commit 7f46a3f

Browse files
finetjulfinetjul
committed
Merge branch 'FFSApplication'
* FFSApplication: Copy simulator.config in Debug/Release/RelWithDebInfo bin subdirectory Tweak gui and default values Copy simulator.config to bin directory Add button to the GUI
2 parents 3151526 + 624ef05 commit 7f46a3f

5 files changed

Lines changed: 200 additions & 72 deletions

File tree

‎Applications/FFS/CMakeLists.txt‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,17 @@ target_link_libraries(msv${KIT}
9292
msvVTKParallel
9393
msvVTKWidgets
9494
msvQtWidgets
95-
msvIBTK
95+
msvIBTK
9696
msvIBAMR
9797
)
9898

99+
add_custom_command(TARGET msv${KIT} PRE_BUILD
100+
COMMAND ${CMAKE_COMMAND} -E copy
101+
"${CMAKE_CURRENT_SOURCE_DIR}/Resources/simulator.config"
102+
"$<TARGET_FILE_DIR:msv${KIT}>/Resources/simulator.config")
103+
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/Resources/simulator.config"
104+
DESTINATION "${MSVTK_INSTALL_BIN_DIR}/Resources/simulator.config")
105+
99106
install(TARGETS msv${KIT}
100107
RUNTIME DESTINATION ${MSVTK_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
101108
LIBRARY DESTINATION ${MSVTK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries

‎Applications/FFS/Resources/UI/msvQFFSMainWindow.ui‎

Lines changed: 121 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<x>0</x>
3434
<y>0</y>
3535
<width>698</width>
36-
<height>20</height>
36+
<height>25</height>
3737
</rect>
3838
</property>
3939
<widget class="QMenu" name="menuFile">
@@ -73,43 +73,137 @@
7373
<number>0</number>
7474
</property>
7575
<item>
76-
<widget class="QCheckBox" name="showCartesianGrid">
77-
<property name="text">
78-
<string>Show Cartesian Grid</string>
79-
</property>
80-
<property name="checked">
81-
<bool>true</bool>
82-
</property>
83-
</widget>
84-
</item>
85-
<item>
86-
<widget class="QCheckBox" name="showSurface">
87-
<property name="text">
88-
<string>Show Surface</string>
89-
</property>
90-
<property name="checked">
91-
<bool>true</bool>
76+
<widget class="QGroupBox" name="LoadingGroupBox">
77+
<property name="title">
78+
<string>Loading</string>
9279
</property>
80+
<layout class="QFormLayout" name="formLayout_2">
81+
<item row="0" column="0">
82+
<widget class="QLabel" name="maxLevelsLabel">
83+
<property name="text">
84+
<string>Max Levels:</string>
85+
</property>
86+
</widget>
87+
</item>
88+
<item row="0" column="1">
89+
<widget class="QSpinBox" name="maxLevelsSpinBox">
90+
<property name="minimum">
91+
<number>1</number>
92+
</property>
93+
<property name="value">
94+
<number>5</number>
95+
</property>
96+
</widget>
97+
</item>
98+
<item row="1" column="0">
99+
<widget class="QLabel" name="dataLevelsLabel">
100+
<property name="text">
101+
<string>Data Levels:</string>
102+
</property>
103+
</widget>
104+
</item>
105+
<item row="1" column="1">
106+
<widget class="QSpinBox" name="dataLevelsSpinBox">
107+
<property name="minimum">
108+
<number>1</number>
109+
</property>
110+
<property name="maximum">
111+
<number>4</number>
112+
</property>
113+
<property name="value">
114+
<number>2</number>
115+
</property>
116+
</widget>
117+
</item>
118+
</layout>
93119
</widget>
94120
</item>
95121
<item>
96-
<widget class="QCheckBox" name="showBoundaryEdges">
97-
<property name="text">
98-
<string>Show boundary edges</string>
122+
<widget class="QGroupBox" name="VisualisationGroupBox">
123+
<property name="enabled">
124+
<bool>false</bool>
99125
</property>
100-
<property name="checked">
101-
<bool>true</bool>
126+
<property name="title">
127+
<string>Visualisation</string>
102128
</property>
129+
<layout class="QVBoxLayout" name="verticalLayout_2">
130+
<item>
131+
<widget class="QCheckBox" name="showCartesianGrid">
132+
<property name="text">
133+
<string>Show Cartesian Grid</string>
134+
</property>
135+
<property name="checked">
136+
<bool>true</bool>
137+
</property>
138+
</widget>
139+
</item>
140+
<item>
141+
<widget class="QCheckBox" name="showSurface">
142+
<property name="text">
143+
<string>Show Surface</string>
144+
</property>
145+
<property name="checked">
146+
<bool>true</bool>
147+
</property>
148+
</widget>
149+
</item>
150+
<item>
151+
<widget class="QCheckBox" name="showBoundaryEdges">
152+
<property name="text">
153+
<string>Show boundary edges</string>
154+
</property>
155+
<property name="checked">
156+
<bool>true</bool>
157+
</property>
158+
</widget>
159+
</item>
160+
<item>
161+
<widget class="QCheckBox" name="showOutlineCorners">
162+
<property name="text">
163+
<string>Show outline corners</string>
164+
</property>
165+
<property name="checked">
166+
<bool>true</bool>
167+
</property>
168+
</widget>
169+
</item>
170+
</layout>
103171
</widget>
104172
</item>
105173
<item>
106-
<widget class="QCheckBox" name="showOutlineCorners">
107-
<property name="text">
108-
<string>Show outline corners</string>
174+
<widget class="QGroupBox" name="SimulationGroupBox">
175+
<property name="enabled">
176+
<bool>false</bool>
109177
</property>
110-
<property name="checked">
111-
<bool>true</bool>
178+
<property name="title">
179+
<string>Simulation</string>
112180
</property>
181+
<layout class="QFormLayout" name="formLayout">
182+
<item row="0" column="0">
183+
<widget class="QLabel" name="timeStepsLabel">
184+
<property name="text">
185+
<string>Time Steps:</string>
186+
</property>
187+
</widget>
188+
</item>
189+
<item row="0" column="1">
190+
<widget class="QSpinBox" name="numberOfTimeSteps">
191+
<property name="minimum">
192+
<number>1</number>
193+
</property>
194+
<property name="value">
195+
<number>1</number>
196+
</property>
197+
</widget>
198+
</item>
199+
<item row="1" column="0" colspan="2">
200+
<widget class="QPushButton" name="runTimeSteps">
201+
<property name="text">
202+
<string>Run</string>
203+
</property>
204+
</widget>
205+
</item>
206+
</layout>
113207
</widget>
114208
</item>
115209
</layout>

‎Applications/FFS/msvFluidSimulator.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -715,7 +715,7 @@ msvFluidSimulator::msvFluidSimulator()
715715
this->AMRDataset = vtkHierarchicalBoxDataSet::New();
716716
this->CoarsestGridSpacing = 8;
717717
this->MaxLevels = 5;
718-
this->RefinamentRatio = 2;
718+
this->RefinamentRatio = 4;
719719
this->FinestGridSpacing = this->CoarsestGridSpacing << (this->MaxLevels-1);
720720
this->DataLevel = this->MaxLevels-1;
721721
this->FluidDensity = 1.0;

0 commit comments

Comments
 (0)