Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix test fields #175

Merged
merged 23 commits into from
Feb 23, 2024
Merged

Fix test fields #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
2de6136
Improve test error handling
mrp089 Jan 25, 2024
a355c8f
Merge branch 'SimVascular:main' into fix_test_fields_173
mrp089 Jan 25, 2024
18d03eb
Fix typo
mrp089 Jan 25, 2024
dae2c58
Merge remote-tracking branch 'refs/remotes/origin/fix_test_fields_173…
mrp089 Jan 25, 2024
2c6cefa
Fix typo
mrp089 Jan 25, 2024
d733170
Merge branch 'SimVascular:main' into fix_test_fields_173
mrp089 Feb 21, 2024
0ee6292
Add missing test fields, recompute results. Will trigger errors on te…
mrp089 Feb 21, 2024
25d0ab0
Loosen some tolerances
mrp089 Feb 22, 2024
a67193f
Fix surface orientations in block compression
mrp089 Feb 22, 2024
4fcfff7
Throw macOS 14 into the mix
mrp089 Feb 22, 2024
f29bc5d
Change absolute zero tolerance to be rtol
mrp089 Feb 22, 2024
07bfdf6
Set HDF5 path in macOS 14
mrp089 Feb 22, 2024
2957bcd
Merge branch 'SimVascular:main' into fix_test_fields_173
mrp089 Feb 22, 2024
289cd47
Loosen tolerances
mrp089 Feb 22, 2024
d6ca075
Looser tolerance
mrp089 Feb 22, 2024
442f1ef
Remove macOS 14
mrp089 Feb 22, 2024
11ae808
Explicitly define all tolerances
mrp089 Feb 22, 2024
9f9e708
Remove DEFAULT_TOL
mrp089 Feb 22, 2024
9b5b302
Loosen tolerances
mrp089 Feb 22, 2024
7cec83e
Loosen tolerance
mrp089 Feb 22, 2024
1c03b11
Reduce max iter
mrp089 Feb 22, 2024
a948d07
Merge branch 'main' into fix_test_fields_173
mrp089 Feb 23, 2024
9071ad9
Remove remaining .inp files
mrp089 Feb 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions tests/cases/cmm/iliac_artery_variable_wall_props/2-inflate/result_003.vtu
View file
Open in desktop
Git LFS file not shown
7 changes: 4 additions & 3 deletions tests/cases/cmm/iliac_artery_variable_wall_props/2-inflate/svFSI.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
<Add_equation type="CMM" >
<Coupled> true </Coupled>
<Min_iterations> 3 </Min_iterations>
<Max_iterations> 10 </Max_iterations>
<Tolerance> 1e-7 </Tolerance>
<Max_iterations> 13 </Max_iterations>
<Tolerance> 1e-12 </Tolerance>

<Initialize> inflate </Initialize>
<Poisson_ratio> 0.5 </Poisson_ratio>
Expand All @@ -49,7 +49,8 @@

<LS type="CG" >
<Max_iterations> 500 </Max_iterations>
<Tolerance> 1e-7 </Tolerance>
<Tolerance> 1e-12 </Tolerance>
<Krylov_space_dimension> 50 </Krylov_space_dimension>
</LS>


Expand Down
4 changes: 2 additions & 2 deletions tests/cases/cmm/iliac_artery_variable_wall_props/3-inflate-cmm/result_003.vtu
View file
Open in desktop
Git LFS file not shown
6 changes: 3 additions & 3 deletions tests/cases/cmm/iliac_artery_variable_wall_props/3-inflate-cmm/svFSI.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@
<Add_equation type="CMM" >
<Coupled> true </Coupled>
<Min_iterations> 3 </Min_iterations>
<Max_iterations> 10 </Max_iterations>
<Tolerance> 1e-7 </Tolerance>
<Max_iterations> 7 </Max_iterations>
<Tolerance> 1e-12 </Tolerance>

<Fluid_density> 1.06 </Fluid_density>
<Viscosity model="Constant" >
Expand All @@ -81,7 +81,7 @@
<LS type="GMRES" >
<Preconditioner> FSILS </Preconditioner>
<Max_iterations> 100 </Max_iterations>
<Tolerance> 1e-4 </Tolerance>
<Tolerance> 1e-12 </Tolerance>
</LS>


Expand Down
4 changes: 2 additions & 2 deletions tests/cases/cmm/pipe_3d/2a-inflate/result_003.vtu
View file
Open in desktop
Git LFS file not shown
4 changes: 2 additions & 2 deletions tests/cases/cmm/pipe_3d/2a-inflate/svFSI.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<Coupled> true </Coupled>
<Min_iterations> 3 </Min_iterations>
<Max_iterations> 5 </Max_iterations>
<Tolerance> 1e-6 </Tolerance>
<Tolerance> 1e-12 </Tolerance>

<Initialize> inflate </Initialize>
<Poisson_ratio> 0.5 </Poisson_ratio>
Expand All @@ -46,7 +46,7 @@

<LS type="CG" >
<Max_iterations> 500 </Max_iterations>
<Tolerance> 1e-6 </Tolerance>
<Tolerance> 1e-12 </Tolerance>
</LS>

<Add_BF mesh="wall" >
Expand Down
4 changes: 2 additions & 2 deletions tests/cases/cmm/pipe_3d/2b-prestress/result_003.vtu
View file
Open in desktop
Git LFS file not shown
6 changes: 3 additions & 3 deletions tests/cases/cmm/pipe_3d/2b-prestress/svFSI.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
<Add_equation type="CMM" >
<Coupled> true </Coupled>
<Min_iterations> 3 </Min_iterations>
<Max_iterations> 5 </Max_iterations>
<Tolerance> 1e-6 </Tolerance>
<Max_iterations> 30 </Max_iterations>
<Tolerance> 1e-12 </Tolerance>
<Prestress> true </Prestress>
<Initialize> prestress </Initialize>

Expand All @@ -49,7 +49,7 @@

<LS type="GMRES" >
<Max_iterations> 500 </Max_iterations>
<Tolerance> 1e-6 </Tolerance>
<Tolerance> 1e-12 </Tolerance>
</LS>

<Add_BF mesh="wall" >
Expand Down
4 changes: 2 additions & 2 deletions tests/cases/cmm/pipe_3d/3a-inflate-cmm/result_005.vtu
View file
Open in desktop
Git LFS file not shown
10 changes: 6 additions & 4 deletions tests/cases/cmm/pipe_3d/3a-inflate-cmm/svFSI.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@
<Add_equation type="CMM" >
<Coupled> true </Coupled>
<Min_iterations> 3 </Min_iterations>
<Max_iterations> 10 </Max_iterations>
<Tolerance> 1e-4 </Tolerance>
<Max_iterations> 20 </Max_iterations>
<Tolerance> 1e-12 </Tolerance>

<Fluid_density> 1.06 </Fluid_density>
<Viscosity model="Constant" >
Expand All @@ -65,13 +65,15 @@
<Displacement> true </Displacement>
<Velocity> true </Velocity>
<Pressure> true</Pressure>
<Traction> true </Traction>
<WSS> true </WSS>
</Output>

<LS type="GMRES" >
<Preconditioner> FSILS </Preconditioner>
<Max_iterations> 100 </Max_iterations>
<Tolerance> 1e-4 </Tolerance>
<Max_iterations> 10 </Max_iterations>
<Tolerance> 1e-12 </Tolerance>
<Krylov_space_dimension> 50 </Krylov_space_dimension>
</LS>


Expand Down
4 changes: 2 additions & 2 deletions tests/cases/cmm/pipe_3d/3b-prestress-cmm/result_005.vtu
View file
Open in desktop
Git LFS file not shown
7 changes: 4 additions & 3 deletions tests/cases/cmm/pipe_3d/3b-prestress-cmm/svFSI.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@
<Add_equation type="CMM" >
<Coupled> true </Coupled>
<Min_iterations> 3 </Min_iterations>
<Max_iterations> 10 </Max_iterations>
<Tolerance> 1e-4 </Tolerance>
<Max_iterations> 30 </Max_iterations>
<Tolerance> 1e-12 </Tolerance>
<!--Prestress> true </Prestress-->

<Fluid_density> 1.06 </Fluid_density>
Expand All @@ -67,12 +67,13 @@
<Velocity> true </Velocity>
<Pressure> true</Pressure>
<WSS> true </WSS>
<Traction> true</Traction>
</Output>

<LS type="GMRES" >
<Preconditioner> FSILS </Preconditioner>
<Max_iterations> 100 </Max_iterations>
<Tolerance> 1e-4 </Tolerance>
<Tolerance> 1e-12 </Tolerance>
</LS>


Expand Down
4 changes: 2 additions & 2 deletions tests/cases/fluid/carreau_yasuda/result_001.vtu
View file
Open in desktop
Git LFS file not shown
27 changes: 12 additions & 15 deletions tests/cases/fluid/carreau_yasuda/svFSI.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@

<Coupled> true </Coupled>
<Min_iterations> 1 </Min_iterations>
<Max_iterations> 10 </Max_iterations>
<Tolerance> 1e-7 </Tolerance>
<Max_iterations> 4 </Max_iterations>
<Tolerance> 1e-12 </Tolerance>
<Backflow_stabilization_coefficient> 0.2 </Backflow_stabilization_coefficient>

<Density> 1.06 </Density>
Expand All @@ -60,21 +60,18 @@
</Viscosity>

<Output type="Spatial" >
<Velocity> true </Velocity>
<Pressure> true </Pressure>
<Traction> true </Traction>
<WSS> true </WSS>
<Velocity> true </Velocity>
<Pressure> true </Pressure>
<Traction> true </Traction>
<Vorticity> true</Vorticity>
<Divergence> true</Divergence>
<WSS> true </WSS>
</Output>

<LS type="NS" >
<Max_iterations> 10 </Max_iterations>
<NS_GM_max_iterations> 10 </NS_GM_max_iterations>
<NS_CG_max_iterations> 500 </NS_CG_max_iterations>
<Tolerance> 1e-5 </Tolerance>
<NS_GM_tolerance> 1e-5 </NS_GM_tolerance>
<NS_CG_tolerance> 1e-5 </NS_CG_tolerance>
<Absolute_tolerance> 1e-14 </Absolute_tolerance>
<Krylov_space_dimension> 50 </Krylov_space_dimension>
<LS type="GMRES" >
<Preconditioner> FSILS </Preconditioner>
<Max_iterations> 100 </Max_iterations>
<Tolerance> 1e-12 </Tolerance>
</LS>

<Add_BC name="lumen_inlet" >
Expand Down
4 changes: 2 additions & 2 deletions tests/cases/fluid/casson/result_001.vtu
View file
Open in desktop
Git LFS file not shown
27 changes: 12 additions & 15 deletions tests/cases/fluid/casson/svFSI.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@

<Coupled> true </Coupled>
<Min_iterations> 1 </Min_iterations>
<Max_iterations> 10 </Max_iterations>
<Tolerance> 1e-7 </Tolerance>
<Max_iterations> 5 </Max_iterations>
<Tolerance> 1e-12 </Tolerance>
<Backflow_stabilization_coefficient> 0.2 </Backflow_stabilization_coefficient>

<Density> 1.06 </Density>
Expand All @@ -58,21 +58,18 @@
</Viscosity>

<Output type="Spatial" >
<Velocity> true </Velocity>
<Pressure> true </Pressure>
<Traction> true </Traction>
<WSS> true </WSS>
<Velocity> true </Velocity>
<Pressure> true </Pressure>
<Traction> true </Traction>
<Vorticity> true</Vorticity>
<Divergence> true</Divergence>
<WSS> true </WSS>
</Output>

<LS type="NS" >
<Max_iterations> 10 </Max_iterations>
<NS_GM_max_iterations> 10 </NS_GM_max_iterations>
<NS_CG_max_iterations> 50 </NS_CG_max_iterations>
<Tolerance> 1e-5 </Tolerance>
<NS_GM_tolerance> 1e-5 </NS_GM_tolerance>
<NS_CG_tolerance> 1e-5 </NS_CG_tolerance>
<Absolute_tolerance> 1e-14 </Absolute_tolerance>
<Krylov_space_dimension> 50 </Krylov_space_dimension>
<LS type="GMRES" >
<Preconditioner> FSILS </Preconditioner>
<Max_iterations> 100 </Max_iterations>
<Tolerance> 1e-12 </Tolerance>
</LS>

<Add_BC name="lumen_inlet" >
Expand Down
4 changes: 2 additions & 2 deletions tests/cases/fluid/driven_cavity_2d/result_002.vtu
View file
Open in desktop
Git LFS file not shown
20 changes: 11 additions & 9 deletions tests/cases/fluid/driven_cavity_2d/svFSI.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@
<Add_equation type="fluid" >
<Coupled> true </Coupled>
<Min_iterations> 1 </Min_iterations>
<Max_iterations> 10</Max_iterations>
<Tolerance> 1e-6 </Tolerance>
<Max_iterations> 7</Max_iterations>
<Tolerance> 1e-12 </Tolerance>
<Backflow_stabilization_coefficient> 0.0 </Backflow_stabilization_coefficient>

<Density> 100 </Density>
Expand All @@ -58,20 +58,22 @@
</Viscosity>

<Output type="Spatial" >
<Velocity> true </Velocity>
<Pressure> true </Pressure>
<Vorticity> true </Vorticity>
<Divergence> true </Divergence>
<Velocity> true </Velocity>
<Pressure> true </Pressure>
<Traction> true </Traction>
<Vorticity> true</Vorticity>
<Divergence> true</Divergence>
<WSS> true </WSS>
</Output>

<Output type="Volume_integral" >
<Divergence> true </Divergence>
</Output>

<LS type="GMRES" >
<Max_iterations> 100 </Max_iterations>
<Tolerance> 1e-6 </Tolerance>
<Krylov_space_dimension> 50 </Krylov_space_dimension>
<Preconditioner> FSILS </Preconditioner>
<Max_iterations> 1000 </Max_iterations>
<Tolerance> 1e-12 </Tolerance>
</LS>

<Add_BC name="left" >
Expand Down
4 changes: 2 additions & 2 deletions tests/cases/fluid/dye_AD/result_001.vtu
View file
Open in desktop
Git LFS file not shown
Loading
Loading