diff --git a/tests/cases/cmm/iliac_artery_variable_wall_props/2-inflate/result_003.vtu b/tests/cases/cmm/iliac_artery_variable_wall_props/2-inflate/result_003.vtu index e1565646..65515d86 100755 --- a/tests/cases/cmm/iliac_artery_variable_wall_props/2-inflate/result_003.vtu +++ b/tests/cases/cmm/iliac_artery_variable_wall_props/2-inflate/result_003.vtu @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d2910d7416152b081b63e4b5b72b5e7acb50a5bf2e9937c64d574f7f0c9a1360 -size 382982 +oid sha256:081ed1e7dc2171e977588178c88deb1908b87f30809656f547868360598afee5 +size 382894 diff --git a/tests/cases/cmm/iliac_artery_variable_wall_props/2-inflate/svFSI.xml b/tests/cases/cmm/iliac_artery_variable_wall_props/2-inflate/svFSI.xml index d28e82ec..b6d9a9f6 100755 --- a/tests/cases/cmm/iliac_artery_variable_wall_props/2-inflate/svFSI.xml +++ b/tests/cases/cmm/iliac_artery_variable_wall_props/2-inflate/svFSI.xml @@ -33,8 +33,8 @@ true 3 - 10 - 1e-7 + 13 + 1e-12 inflate 0.5 @@ -49,7 +49,8 @@ 500 - 1e-7 + 1e-12 + 50 diff --git a/tests/cases/cmm/iliac_artery_variable_wall_props/3-inflate-cmm/result_003.vtu b/tests/cases/cmm/iliac_artery_variable_wall_props/3-inflate-cmm/result_003.vtu index 263cd6a8..abd2bc87 100755 --- a/tests/cases/cmm/iliac_artery_variable_wall_props/3-inflate-cmm/result_003.vtu +++ b/tests/cases/cmm/iliac_artery_variable_wall_props/3-inflate-cmm/result_003.vtu @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:14752c87d26e3027d1962223642cb5fc494fa0e1d2d61e4bfd5505bd61aa2f58 -size 3016902 +oid sha256:97096a05f666caa852db3b35a69157db84a2a5d8b3c9e54276d812bf68a84e5f +size 2977637 diff --git a/tests/cases/cmm/iliac_artery_variable_wall_props/3-inflate-cmm/svFSI.xml b/tests/cases/cmm/iliac_artery_variable_wall_props/3-inflate-cmm/svFSI.xml index fcd969d9..e94f1a01 100755 --- a/tests/cases/cmm/iliac_artery_variable_wall_props/3-inflate-cmm/svFSI.xml +++ b/tests/cases/cmm/iliac_artery_variable_wall_props/3-inflate-cmm/svFSI.xml @@ -53,8 +53,8 @@ true 3 - 10 - 1e-7 + 7 + 1e-12 1.06 @@ -81,7 +81,7 @@ FSILS 100 - 1e-4 + 1e-12 diff --git a/tests/cases/cmm/pipe_3d/2a-inflate/result_003.vtu b/tests/cases/cmm/pipe_3d/2a-inflate/result_003.vtu index e5496fa1..a5704b3a 100644 --- a/tests/cases/cmm/pipe_3d/2a-inflate/result_003.vtu +++ b/tests/cases/cmm/pipe_3d/2a-inflate/result_003.vtu @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:10a7b4357fc7c08768a905e7354e5e62331b6ac2d5fe8263d2eae5044d53cc0d -size 128258 +oid sha256:75e2c8014d99b5e25bb89dbae5e4db87cede06f65c7855051f6061709c45da0c +size 128242 diff --git a/tests/cases/cmm/pipe_3d/2a-inflate/svFSI.xml b/tests/cases/cmm/pipe_3d/2a-inflate/svFSI.xml index c073fcfc..45496fdf 100644 --- a/tests/cases/cmm/pipe_3d/2a-inflate/svFSI.xml +++ b/tests/cases/cmm/pipe_3d/2a-inflate/svFSI.xml @@ -33,7 +33,7 @@ true 3 5 - 1e-6 + 1e-12 inflate 0.5 @@ -46,7 +46,7 @@ 500 - 1e-6 + 1e-12 diff --git a/tests/cases/cmm/pipe_3d/2b-prestress/result_003.vtu b/tests/cases/cmm/pipe_3d/2b-prestress/result_003.vtu index 5f91b01b..240dda0e 100644 --- a/tests/cases/cmm/pipe_3d/2b-prestress/result_003.vtu +++ b/tests/cases/cmm/pipe_3d/2b-prestress/result_003.vtu @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d5e9a6a5356888fd0f8691e3af98a646f8a92ad6957d59edfc7e110065eab73e -size 189246 +oid sha256:a189ae3e15da6ac86cad226f2a6f7c82b71e6e28f83831eff7e945c9612de438 +size 252327 diff --git a/tests/cases/cmm/pipe_3d/2b-prestress/svFSI.xml b/tests/cases/cmm/pipe_3d/2b-prestress/svFSI.xml index 55926912..5f115416 100644 --- a/tests/cases/cmm/pipe_3d/2b-prestress/svFSI.xml +++ b/tests/cases/cmm/pipe_3d/2b-prestress/svFSI.xml @@ -33,8 +33,8 @@ true 3 - 5 - 1e-6 + 30 + 1e-12 true prestress @@ -49,7 +49,7 @@ 500 - 1e-6 + 1e-12 diff --git a/tests/cases/cmm/pipe_3d/3a-inflate-cmm/result_005.vtu b/tests/cases/cmm/pipe_3d/3a-inflate-cmm/result_005.vtu index a6c3116f..f054f85c 100644 --- a/tests/cases/cmm/pipe_3d/3a-inflate-cmm/result_005.vtu +++ b/tests/cases/cmm/pipe_3d/3a-inflate-cmm/result_005.vtu @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:224eaa94ec11bfab9d04fead8bd9b338818598388b0a1762e9b6abdaf3558f47 -size 546639 +oid sha256:b0dfa8b9b2a380e7724c769fc92c5dc7ea725fecb4b86a85fcf88eb4b39ae78e +size 626529 diff --git a/tests/cases/cmm/pipe_3d/3a-inflate-cmm/svFSI.xml b/tests/cases/cmm/pipe_3d/3a-inflate-cmm/svFSI.xml index 33f76a2d..5a54540f 100644 --- a/tests/cases/cmm/pipe_3d/3a-inflate-cmm/svFSI.xml +++ b/tests/cases/cmm/pipe_3d/3a-inflate-cmm/svFSI.xml @@ -49,8 +49,8 @@ true 3 - 10 - 1e-4 + 20 + 1e-12 1.06 @@ -65,13 +65,15 @@ true true true + true true FSILS - 100 - 1e-4 + 10 + 1e-12 + 50 diff --git a/tests/cases/cmm/pipe_3d/3b-prestress-cmm/result_005.vtu b/tests/cases/cmm/pipe_3d/3b-prestress-cmm/result_005.vtu index 7acc22a7..0cd8a507 100644 --- a/tests/cases/cmm/pipe_3d/3b-prestress-cmm/result_005.vtu +++ b/tests/cases/cmm/pipe_3d/3b-prestress-cmm/result_005.vtu @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9ed6882efeeb19ab408ca58d6924d025e6fddfe0c29d9fd46a04702b4132ef27 -size 410825 +oid sha256:d4e383142d16340e5353a9d7c5df8191d9ce93b597d9fdf86c51d157c6449a53 +size 627477 diff --git a/tests/cases/cmm/pipe_3d/3b-prestress-cmm/svFSI.xml b/tests/cases/cmm/pipe_3d/3b-prestress-cmm/svFSI.xml index 3a879c4d..8cc42e82 100644 --- a/tests/cases/cmm/pipe_3d/3b-prestress-cmm/svFSI.xml +++ b/tests/cases/cmm/pipe_3d/3b-prestress-cmm/svFSI.xml @@ -49,8 +49,8 @@ true 3 - 10 - 1e-4 + 30 + 1e-12 1.06 @@ -67,12 +67,13 @@ true true true + true FSILS 100 - 1e-4 + 1e-12 diff --git a/tests/cases/fluid/carreau_yasuda/result_001.vtu b/tests/cases/fluid/carreau_yasuda/result_001.vtu index 1c23164f..6fe0601e 100644 --- a/tests/cases/fluid/carreau_yasuda/result_001.vtu +++ b/tests/cases/fluid/carreau_yasuda/result_001.vtu @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b377e3b8147999b16cf71be5d37267947595eb94dc018572ed19e575cd570551 -size 62864 +oid sha256:5a5eb6524944b02918102592720d7bca7a2dd5363c3f6e4b923bb41bea8e6d58 +size 75601 diff --git a/tests/cases/fluid/carreau_yasuda/svFSI.xml b/tests/cases/fluid/carreau_yasuda/svFSI.xml index 7c5bffb2..9e9c313e 100644 --- a/tests/cases/fluid/carreau_yasuda/svFSI.xml +++ b/tests/cases/fluid/carreau_yasuda/svFSI.xml @@ -45,8 +45,8 @@ true 1 - 10 - 1e-7 + 4 + 1e-12 0.2 1.06 @@ -60,21 +60,18 @@ - true - true - true - true + true + true + true + true + true + true - - 10 - 10 - 500 - 1e-5 - 1e-5 - 1e-5 - 1e-14 - 50 + + FSILS + 100 + 1e-12 diff --git a/tests/cases/fluid/casson/result_001.vtu b/tests/cases/fluid/casson/result_001.vtu index 6c5071cc..b9999e9e 100644 --- a/tests/cases/fluid/casson/result_001.vtu +++ b/tests/cases/fluid/casson/result_001.vtu @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f9cda2d6aa0fb9d09ac6cbe90bcc20d3d7fbfff9f7be08b85d2b41d6df96685 -size 62852 +oid sha256:35e909ea7f8879bd1dc3d2c5d8ddb7a1727d354c5298985dcef89500565dd267 +size 75505 diff --git a/tests/cases/fluid/casson/svFSI.xml b/tests/cases/fluid/casson/svFSI.xml index 2c784366..d0bec925 100644 --- a/tests/cases/fluid/casson/svFSI.xml +++ b/tests/cases/fluid/casson/svFSI.xml @@ -45,8 +45,8 @@ true 1 - 10 - 1e-7 + 5 + 1e-12 0.2 1.06 @@ -58,21 +58,18 @@ - true - true - true - true + true + true + true + true + true + true - - 10 - 10 - 50 - 1e-5 - 1e-5 - 1e-5 - 1e-14 - 50 + + FSILS + 100 + 1e-12 diff --git a/tests/cases/fluid/driven_cavity_2d/result_002.vtu b/tests/cases/fluid/driven_cavity_2d/result_002.vtu index 5a58ae4e..a4fdd75d 100644 --- a/tests/cases/fluid/driven_cavity_2d/result_002.vtu +++ b/tests/cases/fluid/driven_cavity_2d/result_002.vtu @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c93cffb4c3afd0b8bb277ad16f1387ebfc8f738c66f5ef20abdd268c6e6ee873 -size 203873 +oid sha256:168b67c3f6252b61012b143e819aff2046b13c43b18d8c844a50df8ed1ded032 +size 290625 diff --git a/tests/cases/fluid/driven_cavity_2d/svFSI.xml b/tests/cases/fluid/driven_cavity_2d/svFSI.xml index 60ab0a4b..4cd68724 100755 --- a/tests/cases/fluid/driven_cavity_2d/svFSI.xml +++ b/tests/cases/fluid/driven_cavity_2d/svFSI.xml @@ -48,8 +48,8 @@ true 1 - 10 - 1e-6 + 7 + 1e-12 0.0 100 @@ -58,10 +58,12 @@ - true - true - true - true + true + true + true + true + true + true @@ -69,9 +71,9 @@ - 100 - 1e-6 - 50 + FSILS + 1000 + 1e-12 diff --git a/tests/cases/fluid/dye_AD/result_001.vtu b/tests/cases/fluid/dye_AD/result_001.vtu index c1ae2dac..ba96648e 100644 --- a/tests/cases/fluid/dye_AD/result_001.vtu +++ b/tests/cases/fluid/dye_AD/result_001.vtu @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1d646ef13eb959b8415b2a28b1cb893d7e1444c52ed62ce7bacfe7ca28aaaa83 -size 67621 +oid sha256:19e356507b8b992eff52a82bc5cc2cf00a383d3608728713e819438cbe6f61fa +size 80346 diff --git a/tests/cases/fluid/dye_AD/svFSI.inp b/tests/cases/fluid/dye_AD/svFSI.inp deleted file mode 100755 index 8b32ab42..00000000 --- a/tests/cases/fluid/dye_AD/svFSI.inp +++ /dev/null @@ -1,140 +0,0 @@ -#---------------------------------------------------------------- -# General simulation parameters - -Continue previous simulation: 0 -Number of spatial dimensions: 3 -Number of time steps: 400 -Time step size: 0.01 -Spectral radius of infinite time step: 0.50 -Searched file name to trigger stop: STOP_SIM - -Save results to VTK format: 1 -Name prefix of saved VTK files: result -Increment in saving VTK files: 5 -Start saving after time step: 1 - -Increment in saving restart files: 5 -Convert BIN to VTK format: 0 - -Verbose: 1 -Warning: 0 -Debug: 0 - -#---------------------------------------------------------------- -# Mesh data -Add mesh: msh { - Mesh file path: mesh-complete/mesh-complete.mesh.vtu - Add face: lumen_inlet { - Face file path: mesh-complete/mesh-surfaces/lumen_inlet.vtp - } - Add face: lumen_outlet { - Face file path: mesh-complete/mesh-surfaces/lumen_outlet.vtp - } - Add face: lumen_wall { - Face file path: mesh-complete/mesh-surfaces/lumen_wall.vtp - } -} - -#---------------------------------------------------------------- - -# Equations - -#---------------------------------------------------------------- -# Flow transport - Navier-Stokes equations - -Add equation: fluid { - Coupled: 1 - Min iterations: 3 - Max iterations: 10 - Tolerance: 1e-4 - Backflow stabilization coefficient: 0.2 - - Density: 1.06 - Viscosity: Constant {Value: 0.04} - - Output: Spatial { - Velocity: t - Pressure: t - Traction: t - WSS: t - } - - Output: Boundary_integral { - WSS: t - } - - LS type: NS - { - Max iterations: 10 - NS-GM max iterations: 3 - NS-CG max iterations: 500 - Tolerance: 1D-4 - NS-GM tolerance: 1D-4 - NS-CG tolerance: 1D-4 - Absolute tolerance: 1D-12 - Krylov space dimension: 50 - } - - Add BC: lumen_inlet { - Type: Dir - Time dependence: Unsteady - Temporal values file path: lumen_inlet.flow - Profile: Parabolic - Impose flux: t - } - - Add BC: lumen_outlet { - Type: Neu - Time dependence: RCR - RCR values: (121.0, 1.50D-5, 1212.0) - Distal pressure: 0.0 - } - - Add BC: lumen_wall { - Type: Dirichlet - Time dependence: Steady - Value: 0 - } -} - -#---------------------------------------------------------------- -# Scalar transport - advection-diffusion equations - -Add equation: scalarTransport { - Coupled: f - Min iterations: 2 - Max iterations: 5 - Tolerance: 1e-6 - - Conductivity: 1e-8 - Source term: 0.0 - -# Below lines could be used for computing residence time in a given -# region of interest, defined in `Domain 2' -# Domain: 2 { -# Conductivity: 1e-8 -# Source term: 1.0 -# } - - Output: Volume_integral { - Temperature: t - } - - Output: Alias { - Temperature: Concentration - } - - LS type: GMRES - { - Preconditioner: FSILS - Tolerance: 1D-6 - Max iterations: 100 - Krylov space dimension: 50 - } - - Add BC: lumen_inlet { - Type: Dir - Time dependence: Steady - Value: 1.0 - } -} diff --git a/tests/cases/fluid/dye_AD/svFSI.xml b/tests/cases/fluid/dye_AD/svFSI.xml index d34718fd..467dea3c 100644 --- a/tests/cases/fluid/dye_AD/svFSI.xml +++ b/tests/cases/fluid/dye_AD/svFSI.xml @@ -43,8 +43,8 @@ true 1 - 20 - 1e-7 + 5 + 1e-12 0.2 1.06 @@ -54,25 +54,22 @@ - true - true - true - true + true + true + true + true + true + true true - - 10 - 3 - 500 - 1e-4 - 1e-4 - 1e-4 - 1e-12 - 50 + + FSILS + 100 + 1e-12 diff --git a/tests/cases/fluid/iliac_artery/result_001.vtu b/tests/cases/fluid/iliac_artery/result_001.vtu index 818f9791..cb0a3e22 100644 --- a/tests/cases/fluid/iliac_artery/result_001.vtu +++ b/tests/cases/fluid/iliac_artery/result_001.vtu @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d7cf0e20a4cad5671c47bece4cf80aaf6769291c5bd8410786c133524185ad6a -size 2413599 +oid sha256:6cfc4f2fdd65b9edfa36458b4adf60254eaeed8118c470aa58013918651ee671 +size 2887313 diff --git a/tests/cases/fluid/iliac_artery/svFSI.xml b/tests/cases/fluid/iliac_artery/svFSI.xml index 80d3e0a4..94320b32 100644 --- a/tests/cases/fluid/iliac_artery/svFSI.xml +++ b/tests/cases/fluid/iliac_artery/svFSI.xml @@ -48,8 +48,8 @@ true 3 - 10 - 1e-12 + 12 + 1e-11 0.2 1.06 @@ -58,10 +58,12 @@ - true - true - true - true + true + true + true + true + true + true diff --git a/tests/cases/fluid/newtonian/result_001.vtu b/tests/cases/fluid/newtonian/result_001.vtu index b57a5d99..3c9bbe93 100644 --- a/tests/cases/fluid/newtonian/result_001.vtu +++ b/tests/cases/fluid/newtonian/result_001.vtu @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:44f237bd450a16a9211a05a090b3995ed86f4e3bf71f8208089f54880d1564b8 -size 62956 +oid sha256:bbdfe187d157f1310ff9ab250900407c0e3cd5d53598bdba13c4729dfb00e0ce +size 75669 diff --git a/tests/cases/fluid/newtonian/svFSI.xml b/tests/cases/fluid/newtonian/svFSI.xml index a39995f0..504b25f8 100644 --- a/tests/cases/fluid/newtonian/svFSI.xml +++ b/tests/cases/fluid/newtonian/svFSI.xml @@ -45,8 +45,8 @@ true 1 - 10 - 1e-7 + 4 + 1e-11 0.2 1.06 @@ -56,21 +56,18 @@ - true - true - true - true + true + true + true + true + true + true - - 10 - 10 - 50 - 1e-5 - 1e-5 - 1e-5 - 1e-14 - 50 + + FSILS + 100 + 1e-12 diff --git a/tests/cases/fluid/pipe_RCR_3d/result_002.vtu b/tests/cases/fluid/pipe_RCR_3d/result_002.vtu index 516c0001..d3084268 100644 --- a/tests/cases/fluid/pipe_RCR_3d/result_002.vtu +++ b/tests/cases/fluid/pipe_RCR_3d/result_002.vtu @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:578080643a071dbccf4fe2f4489a84c20f2f4de9cae34d55911eed06439d92d4 -size 337069 +oid sha256:f62a5a882595c10a9675583cc7f14d401bb3c11fecd4a6593c2ba0860f1cf70c +size 544865 diff --git a/tests/cases/fluid/pipe_RCR_3d/svFSI.xml b/tests/cases/fluid/pipe_RCR_3d/svFSI.xml index 0521ca14..871b4309 100755 --- a/tests/cases/fluid/pipe_RCR_3d/svFSI.xml +++ b/tests/cases/fluid/pipe_RCR_3d/svFSI.xml @@ -45,8 +45,8 @@ true 3 - 10 - 1e-3 + 5 + 1e-11 0.2 1.06 @@ -55,20 +55,18 @@ - true - true - true - true + true + true + true + true + true + true - - 10 - 3 - 500 - 1e-3 - 1e-3 - 1e-3 - 50 + + FSILS + 100 + 1e-12 diff --git a/tests/cases/fsi/pipe_3d/result_005.vtu b/tests/cases/fsi/pipe_3d/result_005.vtu index 7d86d48b..b3c68f1b 100644 --- a/tests/cases/fsi/pipe_3d/result_005.vtu +++ b/tests/cases/fsi/pipe_3d/result_005.vtu @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:811220a9228556d45c86f99e9031658ef64430a958582993fc47a3b545dce759 -size 212608 +oid sha256:2c5e0a10e6c3f30addeb8595c27f531146fdf22e7d00e132c2b5b6cd01adfd89 +size 208368 diff --git a/tests/cases/fsi/pipe_3d/svFSI.inp b/tests/cases/fsi/pipe_3d/svFSI.inp deleted file mode 100755 index e20bbac9..00000000 --- a/tests/cases/fsi/pipe_3d/svFSI.inp +++ /dev/null @@ -1,155 +0,0 @@ -#---------------------------------------------------------------- -# General simulation parameters - -Continue previous simulation: 0 -Number of spatial dimensions: 3 -Number of time steps: 80 -Time step size: 1e-4 -Spectral radius of infinite time step: 0.50 -Searched file name to trigger stop: STOP_SIM - -Save results to VTK format: 1 -Name prefix of saved VTK files: result -Increment in saving VTK files: 1 -Start saving after time step: 1 - -Increment in saving restart files: 1 -Convert BIN to VTK format: 0 - -Verbose: 1 -Warning: 0 -Debug: 0 - -#---------------------------------------------------------------- -# Mesh data -Add mesh: lumen { - Mesh file path: mesh/fluid/mesh-complete.mesh.vtu - Add face: lumen_inlet { - Face file path: mesh/fluid/mesh-surfaces/start.vtp - } - Add face: lumen_outlet { - Face file path: mesh/fluid/mesh-surfaces/end.vtp - } - Add face: lumen_wall { - Face file path: mesh/fluid/mesh-surfaces/interface.vtp - } - Domain: 0 -} - -Add mesh: wall { - Mesh file path: mesh/solid/mesh-complete.mesh.vtu - Add face: wall_inlet { - Face file path: mesh/solid/mesh-surfaces/start.vtp - } - Add face: wall_outlet { - Face file path: mesh/solid/mesh-surfaces/end.vtp - } - Add face: wall_inner { - Face file path: mesh/solid/mesh-surfaces/interface.vtp - } - Add face: wall_outer { - Face file path: mesh/solid/mesh-surfaces/outside.vtp - } - Domain: 1 -} - -#---------------------------------------------------------------- -# Projections -Add projection: wall_inner { - Project from face: lumen_wall -} - -#---------------------------------------------------------------- -# Equations -Add equation: FSI { - Coupled: 1 - Min iterations: 1 - Max iterations: 10 - Tolerance: 1e-6 - - Domain: 0 { - Equation: fluid - Density: 1.0 - Viscosity: Constant {Value: 0.04} - Backflow stabilization coefficient: 0.2 - } - - Domain: 1 { - Equation: struct # (or) ustruct - Constitutive model: nHK - Dilational penalty model: M94 - Density: 1.0 - Elasticity modulus: 1.0e7 - Poisson ratio: 0.3 - - ##### For ustruct eq. - ## Momentum stabilization coefficient: 0.001 - ## Continuity stabilization coefficient: 0.0 - } - - LS type: GMRES { -# Preconditioner: Trilinos-ILUT - Tolerance: 1e-6 - Max iterations: 100 - Krylov space dimension: 50 - } - - Output: Spatial { - Displacement: t - Velocity: t - Pressure: t - } - - Output: Alias { - Displacement: FS_Displacement - } - - Add BC: lumen_inlet { - Type: Neu - Value: 5.0e4 - } - - Add BC: wall_inlet { - Type: Dir - Value: 0.0 - Impose on state variable integral: t - Zero out perimeter: f - Effective direction: (0, 0, 1) - } - - Add BC: wall_outlet { - Type: Dir - Value: 0.0 - Impose on state variable integral: t - Zero out perimeter: f - Effective direction: (0, 0, 1) - } -} - -Add equation: mesh { - Coupled: 1 - Min iterations: 1 - Max iterations: 5 - Tolerance: 1e-4 - Poisson ratio: 0.3 - - LS type: CG { - Preconditioner: FSILS - Tolerance: 1e-4 - } - - Output: Spatial { - Displacement: t - } - - Add BC: lumen_inlet { - Type: Dir - Value: 0.0 - } - - Add BC: lumen_outlet { - Type: Dir - Value: 0.0 - } -} - diff --git a/tests/cases/fsi/pipe_3d/svFSI.xml b/tests/cases/fsi/pipe_3d/svFSI.xml index 065e9074..4befad05 100755 --- a/tests/cases/fsi/pipe_3d/svFSI.xml +++ b/tests/cases/fsi/pipe_3d/svFSI.xml @@ -58,8 +58,8 @@ true 1 - 10 - 1e-6 + 7 + 1e-12 fluid @@ -82,7 +82,7 @@ FSILS - 1e-6 + 1e-12 100 50 @@ -125,13 +125,13 @@ true 1 - 5 - 1e-4 + 7 + 1e-12 0.3 FSILS - 1e-4 + 1e-12 diff --git a/tests/cases/heats/diffusion_line_source/result_002.vtu b/tests/cases/heats/diffusion_line_source/result_002.vtu index 1ca87342..dc10846b 100644 --- a/tests/cases/heats/diffusion_line_source/result_002.vtu +++ b/tests/cases/heats/diffusion_line_source/result_002.vtu @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5908dabbd3a7e4985f483f42c1c7096b57969e48bfbd3aeac5a01631d72d93eb -size 246243 +oid sha256:cbf60baf3cc4afb1706707e92e579f0741dca81df84e1b5a13d36caa2245936d +size 289726 diff --git a/tests/cases/heats/diffusion_line_source/svFSI_BICG.xml b/tests/cases/heats/diffusion_line_source/svFSI_BICG.xml index f61c0c2b..bf19dc23 100755 --- a/tests/cases/heats/diffusion_line_source/svFSI_BICG.xml +++ b/tests/cases/heats/diffusion_line_source/svFSI_BICG.xml @@ -49,8 +49,8 @@ true 1 - 5 - 1e-6 + 3 + 1e-12 1.0 0.0 @@ -63,7 +63,7 @@ 100 - 1e-6 + 1e-12 diff --git a/tests/cases/heats/diffusion_line_source/svFSI_CG.xml b/tests/cases/heats/diffusion_line_source/svFSI_CG.xml index af8dbfdc..99579a64 100755 --- a/tests/cases/heats/diffusion_line_source/svFSI_CG.xml +++ b/tests/cases/heats/diffusion_line_source/svFSI_CG.xml @@ -49,8 +49,8 @@ true 1 - 5 - 1e-6 + 2 + 1e-12 1.0 0.0 @@ -63,7 +63,7 @@ RCS - 1e-6 + 1e-12 diff --git a/tests/cases/heats/diffusion_line_source/svFSI_GMRES.xml b/tests/cases/heats/diffusion_line_source/svFSI_GMRES.xml index 58486b88..f3f60bba 100755 --- a/tests/cases/heats/diffusion_line_source/svFSI_GMRES.xml +++ b/tests/cases/heats/diffusion_line_source/svFSI_GMRES.xml @@ -49,8 +49,8 @@ true 1 - 5 - 1e-6 + 2 + 1e-12 1.0 0.0 @@ -64,7 +64,7 @@ FSILS 100 - 1e-6 + 1e-12 50 diff --git a/tests/cases/stokes/manufactured_solution/P1P1/N004/result_250.vtu b/tests/cases/stokes/manufactured_solution/P1P1/N004/result_250.vtu index c2915e59..5a562915 100644 --- a/tests/cases/stokes/manufactured_solution/P1P1/N004/result_250.vtu +++ b/tests/cases/stokes/manufactured_solution/P1P1/N004/result_250.vtu @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:285501ee62baeafbb2b411ad132331fc52286cae76c2734592346945d1e1c39b -size 2071 +oid sha256:933f9a0d4d82744afe2679bff1e2c63fe019df354f72f2965d8ede8ea96b56a9 +size 4925 diff --git a/tests/cases/stokes/manufactured_solution/P1P1/N004/svFSI.inp b/tests/cases/stokes/manufactured_solution/P1P1/N004/svFSI.inp deleted file mode 100755 index 2aea6892..00000000 --- a/tests/cases/stokes/manufactured_solution/P1P1/N004/svFSI.inp +++ /dev/null @@ -1,85 +0,0 @@ -#---------------------------------------------------------------- -# General simulation parameters - -Continue previous simulation: 0 -Number of spatial dimensions: 2 -Number of time steps: 250 -Time step size: 0.002 -Spectral radius of infinite time step: 0.50 -Searched file name to trigger stop: STOP_SIM - -Save results to VTK format: 1 -Name prefix of saved VTK files: result -Increment in saving VTK files: 250 -Start saving after time step: 1 - -Increment in saving restart files: 250 -Convert BIN to VTK format: 0 - -Verbose: 1 -Warning: 0 -Debug: 0 - -#---------------------------------------------------------------- -# Mesh data -Add mesh: msh { - Mesh file path: ../mesh/N004/mesh-complete.mesh.vtu - Add face: bottom { - Face file path: ../mesh/N004/mesh-surfaces/bottom.vtp - } - Add face: top { - Face file path: ../mesh/N004/mesh-surfaces/top.vtp - } - Add face: left { - Face file path: ../mesh/N004/mesh-surfaces/left.vtp - } - Add face: right { - Face file path: ../mesh/N004/mesh-surfaces/right.vtp - } -} - -#---------------------------------------------------------------- -# Equations -Add equation: stokes { - Coupled: 1 - Min iterations: 1 - Max iterations: 2 - Tolerance: 1e-9 - Use Taylor-Hood type basis: f - - Viscosity: Constant {Value: 1.0} - Momentum stabilization coefficient: 10.0 - - LS type: GMRES - { - Preconditioner: svfsi - Tolerance: 1D-9 - Max iterations: 100 - Krylov space dimension: 50 - } - - Add BF: msh { - Type: vol - Time dependence: general - Temporal and spatial values file path: ../bforce/N004/bforce.dat - } - - Add BC: left { - Type: Dir - Time dependence: General - Temporal and spatial values file path: ../bforce/N004/left_vbc.dat - } - - Add BC: right { - Type: Dir - Time dependence: General - Temporal and spatial values file path: ../bforce/N004/right_vbc.dat - } - - Add BC: top { - Type: Dir - Time dependence: General - Temporal and spatial values file path: ../bforce/N004/top_vbc.dat - } -} - diff --git a/tests/cases/stokes/manufactured_solution/P1P1/N004/svFSI.xml b/tests/cases/stokes/manufactured_solution/P1P1/N004/svFSI.xml index 5f8e7375..6f726a08 100644 --- a/tests/cases/stokes/manufactured_solution/P1P1/N004/svFSI.xml +++ b/tests/cases/stokes/manufactured_solution/P1P1/N004/svFSI.xml @@ -44,7 +44,7 @@ true 1 2 - 1e-9 + 1e-12 false @@ -55,16 +55,18 @@ svfsi - 1e-9 + 1e-12 100 50 - true - true - true - true + true + true + true + true + true + true diff --git a/tests/cases/stokes/manufactured_solution/P1P1/N008/result_250.vtu b/tests/cases/stokes/manufactured_solution/P1P1/N008/result_250.vtu index b63ae23f..5444a364 100644 --- a/tests/cases/stokes/manufactured_solution/P1P1/N008/result_250.vtu +++ b/tests/cases/stokes/manufactured_solution/P1P1/N008/result_250.vtu @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6e3589e5644aba34d3a8b7692311c70bce2f49bdfaa23cab4e828f7d655ec8fc -size 3975 +oid sha256:6cc534cf045d3782da6e0b249b48872ac5ec029bc9fb33cedd0191f8d3bcc7e0 +size 9197 diff --git a/tests/cases/stokes/manufactured_solution/P1P1/N008/svFSI.inp b/tests/cases/stokes/manufactured_solution/P1P1/N008/svFSI.inp deleted file mode 100755 index 2a6a9768..00000000 --- a/tests/cases/stokes/manufactured_solution/P1P1/N008/svFSI.inp +++ /dev/null @@ -1,85 +0,0 @@ -#---------------------------------------------------------------- -# General simulation parameters - -Continue previous simulation: 0 -Number of spatial dimensions: 2 -Number of time steps: 250 -Time step size: 0.002 -Spectral radius of infinite time step: 0.50 -Searched file name to trigger stop: STOP_SIM - -Save results to VTK format: 1 -Name prefix of saved VTK files: result -Increment in saving VTK files: 250 -Start saving after time step: 1 - -Increment in saving restart files: 250 -Convert BIN to VTK format: 0 - -Verbose: 1 -Warning: 0 -Debug: 0 - -#---------------------------------------------------------------- -# Mesh data -Add mesh: msh { - Mesh file path: ../mesh/N008/mesh-complete.mesh.vtu - Add face: bottom { - Face file path: ../mesh/N008/mesh-surfaces/bottom.vtp - } - Add face: top { - Face file path: ../mesh/N008/mesh-surfaces/top.vtp - } - Add face: left { - Face file path: ../mesh/N008/mesh-surfaces/left.vtp - } - Add face: right { - Face file path: ../mesh/N008/mesh-surfaces/right.vtp - } -} - -#---------------------------------------------------------------- -# Equations -Add equation: stokes { - Coupled: 1 - Min iterations: 1 - Max iterations: 2 - Tolerance: 1e-9 - Use Taylor-Hood type basis: f - - Viscosity: Constant {Value: 1.0} - Momentum stabilization coefficient: 10.0 - - LS type: GMRES - { - Preconditioner: svfsi - Tolerance: 1D-9 - Max iterations: 100 - Krylov space dimension: 50 - } - - Add BF: msh { - Type: vol - Time dependence: general - Temporal and spatial values file path: ../bforce/N008/bforce.dat - } - - Add BC: left { - Type: Dir - Time dependence: General - Temporal and spatial values file path: ../bforce/N008/left_vbc.dat - } - - Add BC: right { - Type: Dir - Time dependence: General - Temporal and spatial values file path: ../bforce/N008/right_vbc.dat - } - - Add BC: top { - Type: Dir - Time dependence: General - Temporal and spatial values file path: ../bforce/N008/top_vbc.dat - } -} - diff --git a/tests/cases/stokes/manufactured_solution/P1P1/N008/svFSI.xml b/tests/cases/stokes/manufactured_solution/P1P1/N008/svFSI.xml index f5b6c19c..41d99f7a 100644 --- a/tests/cases/stokes/manufactured_solution/P1P1/N008/svFSI.xml +++ b/tests/cases/stokes/manufactured_solution/P1P1/N008/svFSI.xml @@ -44,7 +44,7 @@ true 1 2 - 1e-9 + 1e-12 false @@ -55,16 +55,18 @@ svfsi - 1e-9 + 1e-12 100 50 - true - true - true - true + true + true + true + true + true + true diff --git a/tests/cases/stokes/manufactured_solution/P1P1/N016/result_250.vtu b/tests/cases/stokes/manufactured_solution/P1P1/N016/result_250.vtu index 9c314247..1c769153 100644 --- a/tests/cases/stokes/manufactured_solution/P1P1/N016/result_250.vtu +++ b/tests/cases/stokes/manufactured_solution/P1P1/N016/result_250.vtu @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4ef2f36834ffda186542b4a7bc965ed83c658e6e606f80d4ca25d11fde2deb18 -size 11103 +oid sha256:9557d40260b8728d75e754a8ab8fcc6d3a328b2b517f774bea6c158ed7eb2675 +size 22885 diff --git a/tests/cases/stokes/manufactured_solution/P1P1/N016/svFSI.inp b/tests/cases/stokes/manufactured_solution/P1P1/N016/svFSI.inp deleted file mode 100755 index 54fe3a62..00000000 --- a/tests/cases/stokes/manufactured_solution/P1P1/N016/svFSI.inp +++ /dev/null @@ -1,85 +0,0 @@ -#---------------------------------------------------------------- -# General simulation parameters - -Continue previous simulation: 0 -Number of spatial dimensions: 2 -Number of time steps: 250 -Time step size: 0.002 -Spectral radius of infinite time step: 0.50 -Searched file name to trigger stop: STOP_SIM - -Save results to VTK format: 1 -Name prefix of saved VTK files: result -Increment in saving VTK files: 250 -Start saving after time step: 1 - -Increment in saving restart files: 250 -Convert BIN to VTK format: 0 - -Verbose: 1 -Warning: 0 -Debug: 0 - -#---------------------------------------------------------------- -# Mesh data -Add mesh: msh { - Mesh file path: ../mesh/N016/mesh-complete.mesh.vtu - Add face: bottom { - Face file path: ../mesh/N016/mesh-surfaces/bottom.vtp - } - Add face: top { - Face file path: ../mesh/N016/mesh-surfaces/top.vtp - } - Add face: left { - Face file path: ../mesh/N016/mesh-surfaces/left.vtp - } - Add face: right { - Face file path: ../mesh/N016/mesh-surfaces/right.vtp - } -} - -#---------------------------------------------------------------- -# Equations -Add equation: stokes { - Coupled: 1 - Min iterations: 1 - Max iterations: 2 - Tolerance: 1e-9 - Use Taylor-Hood type basis: f - - Viscosity: Constant {Value: 1.0} - Momentum stabilization coefficient: 10.0 - - LS type: GMRES - { - Preconditioner: svfsi - Tolerance: 1D-9 - Max iterations: 100 - Krylov space dimension: 50 - } - - Add BF: msh { - Type: vol - Time dependence: general - Temporal and spatial values file path: ../bforce/N016/bforce.dat - } - - Add BC: left { - Type: Dir - Time dependence: General - Temporal and spatial values file path: ../bforce/N016/left_vbc.dat - } - - Add BC: right { - Type: Dir - Time dependence: General - Temporal and spatial values file path: ../bforce/N016/right_vbc.dat - } - - Add BC: top { - Type: Dir - Time dependence: General - Temporal and spatial values file path: ../bforce/N016/top_vbc.dat - } -} - diff --git a/tests/cases/stokes/manufactured_solution/P1P1/N016/svFSI.xml b/tests/cases/stokes/manufactured_solution/P1P1/N016/svFSI.xml index 9c29f6f9..91dd1cfa 100644 --- a/tests/cases/stokes/manufactured_solution/P1P1/N016/svFSI.xml +++ b/tests/cases/stokes/manufactured_solution/P1P1/N016/svFSI.xml @@ -44,7 +44,7 @@ true 1 2 - 1e-9 + 1e-12 false @@ -55,16 +55,18 @@ svfsi - 1e-9 + 1e-12 100 50 - + - true - true - true - true + true + true + true + true + true + true diff --git a/tests/cases/stokes/manufactured_solution/P1P1/N032/result_250.vtu b/tests/cases/stokes/manufactured_solution/P1P1/N032/result_250.vtu index 3ce2ca73..0f65ab0b 100644 --- a/tests/cases/stokes/manufactured_solution/P1P1/N032/result_250.vtu +++ b/tests/cases/stokes/manufactured_solution/P1P1/N032/result_250.vtu @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:578963adc4e142c7876dfba8de09a4d29e5819e2b379f589756bb361f8681ca0 -size 38947 +oid sha256:a78173d05a7f46e016e1ea523cd620c11d39aab06ce0dcc9159e1cc330d7dce4 +size 72253 diff --git a/tests/cases/stokes/manufactured_solution/P1P1/N032/svFSI.inp b/tests/cases/stokes/manufactured_solution/P1P1/N032/svFSI.inp deleted file mode 100755 index 65f5a13f..00000000 --- a/tests/cases/stokes/manufactured_solution/P1P1/N032/svFSI.inp +++ /dev/null @@ -1,85 +0,0 @@ -#---------------------------------------------------------------- -# General simulation parameters - -Continue previous simulation: 0 -Number of spatial dimensions: 2 -Number of time steps: 250 -Time step size: 0.002 -Spectral radius of infinite time step: 0.50 -Searched file name to trigger stop: STOP_SIM - -Save results to VTK format: 1 -Name prefix of saved VTK files: result -Increment in saving VTK files: 250 -Start saving after time step: 1 - -Increment in saving restart files: 250 -Convert BIN to VTK format: 0 - -Verbose: 1 -Warning: 0 -Debug: 0 - -#---------------------------------------------------------------- -# Mesh data -Add mesh: msh { - Mesh file path: ../mesh/N032/mesh-complete.mesh.vtu - Add face: bottom { - Face file path: ../mesh/N032/mesh-surfaces/bottom.vtp - } - Add face: top { - Face file path: ../mesh/N032/mesh-surfaces/top.vtp - } - Add face: left { - Face file path: ../mesh/N032/mesh-surfaces/left.vtp - } - Add face: right { - Face file path: ../mesh/N032/mesh-surfaces/right.vtp - } -} - -#---------------------------------------------------------------- -# Equations -Add equation: stokes { - Coupled: 1 - Min iterations: 1 - Max iterations: 2 - Tolerance: 1e-9 - Use Taylor-Hood type basis: f - - Viscosity: Constant {Value: 1.0} - Momentum stabilization coefficient: 10.0 - - LS type: GMRES - { - Preconditioner: svfsi - Tolerance: 1D-9 - Max iterations: 100 - Krylov space dimension: 50 - } - - Add BF: msh { - Type: vol - Time dependence: general - Temporal and spatial values file path: ../bforce/N032/bforce.dat - } - - Add BC: left { - Type: Dir - Time dependence: General - Temporal and spatial values file path: ../bforce/N032/left_vbc.dat - } - - Add BC: right { - Type: Dir - Time dependence: General - Temporal and spatial values file path: ../bforce/N032/right_vbc.dat - } - - Add BC: top { - Type: Dir - Time dependence: General - Temporal and spatial values file path: ../bforce/N032/top_vbc.dat - } -} - diff --git a/tests/cases/stokes/manufactured_solution/P1P1/N032/svFSI.xml b/tests/cases/stokes/manufactured_solution/P1P1/N032/svFSI.xml index 8fd6823c..e394d60f 100644 --- a/tests/cases/stokes/manufactured_solution/P1P1/N032/svFSI.xml +++ b/tests/cases/stokes/manufactured_solution/P1P1/N032/svFSI.xml @@ -44,7 +44,7 @@ true 1 2 - 1e-9 + 1e-12 false @@ -55,16 +55,18 @@ svfsi - 1e-9 + 1e-12 100 50 - true - true - true - true + true + true + true + true + true + true diff --git a/tests/cases/stokes/manufactured_solution/P1P1/N064/result_250.vtu b/tests/cases/stokes/manufactured_solution/P1P1/N064/result_250.vtu index d6519766..5ade1444 100644 --- a/tests/cases/stokes/manufactured_solution/P1P1/N064/result_250.vtu +++ b/tests/cases/stokes/manufactured_solution/P1P1/N064/result_250.vtu @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a21527d04d652f09868d5f0bd7ddac7e0e7480a1e62a27054e771df549f6032c -size 151005 +oid sha256:bc4003d2949f77f3e5d5d3f65fc125d505e3d332cbeab22a00841be0e27cb2b8 +size 262042 diff --git a/tests/cases/stokes/manufactured_solution/P1P1/N064/svFSI.inp b/tests/cases/stokes/manufactured_solution/P1P1/N064/svFSI.inp deleted file mode 100755 index 9af6f260..00000000 --- a/tests/cases/stokes/manufactured_solution/P1P1/N064/svFSI.inp +++ /dev/null @@ -1,85 +0,0 @@ -#---------------------------------------------------------------- -# General simulation parameters - -Continue previous simulation: 0 -Number of spatial dimensions: 2 -Number of time steps: 250 -Time step size: 0.002 -Spectral radius of infinite time step: 0.50 -Searched file name to trigger stop: STOP_SIM - -Save results to VTK format: 1 -Name prefix of saved VTK files: result -Increment in saving VTK files: 250 -Start saving after time step: 1 - -Increment in saving restart files: 250 -Convert BIN to VTK format: 0 - -Verbose: 1 -Warning: 0 -Debug: 0 - -#---------------------------------------------------------------- -# Mesh data -Add mesh: msh { - Mesh file path: ../mesh/N064/mesh-complete.mesh.vtu - Add face: bottom { - Face file path: ../mesh/N064/mesh-surfaces/bottom.vtp - } - Add face: top { - Face file path: ../mesh/N064/mesh-surfaces/top.vtp - } - Add face: left { - Face file path: ../mesh/N064/mesh-surfaces/left.vtp - } - Add face: right { - Face file path: ../mesh/N064/mesh-surfaces/right.vtp - } -} - -#---------------------------------------------------------------- -# Equations -Add equation: stokes { - Coupled: 1 - Min iterations: 1 - Max iterations: 2 - Tolerance: 1e-9 - Use Taylor-Hood type basis: f - - Viscosity: Constant {Value: 1.0} - Momentum stabilization coefficient: 10.0 - - LS type: GMRES - { - Preconditioner: svfsi - Tolerance: 1D-9 - Max iterations: 100 - Krylov space dimension: 50 - } - - Add BF: msh { - Type: vol - Time dependence: general - Temporal and spatial values file path: ../bforce/N064/bforce.dat - } - - Add BC: left { - Type: Dir - Time dependence: General - Temporal and spatial values file path: ../bforce/N064/left_vbc.dat - } - - Add BC: right { - Type: Dir - Time dependence: General - Temporal and spatial values file path: ../bforce/N064/right_vbc.dat - } - - Add BC: top { - Type: Dir - Time dependence: General - Temporal and spatial values file path: ../bforce/N064/top_vbc.dat - } -} - diff --git a/tests/cases/stokes/manufactured_solution/P1P1/N064/svFSI.xml b/tests/cases/stokes/manufactured_solution/P1P1/N064/svFSI.xml index d7528763..321c300b 100644 --- a/tests/cases/stokes/manufactured_solution/P1P1/N064/svFSI.xml +++ b/tests/cases/stokes/manufactured_solution/P1P1/N064/svFSI.xml @@ -49,7 +49,7 @@ true 1 2 - 1e-9 + 1e-12 false @@ -61,16 +61,18 @@ svfsi - 1e-9 + 1e-12 100 50 - true - true - true - true + true + true + true + true + true + true diff --git a/tests/cases/stokes/manufactured_solution/P1P1/N128/svFSI.inp b/tests/cases/stokes/manufactured_solution/P1P1/N128/svFSI.inp deleted file mode 100755 index 38e20d1c..00000000 --- a/tests/cases/stokes/manufactured_solution/P1P1/N128/svFSI.inp +++ /dev/null @@ -1,85 +0,0 @@ -#---------------------------------------------------------------- -# General simulation parameters - -Continue previous simulation: 0 -Number of spatial dimensions: 2 -Number of time steps: 250 -Time step size: 0.002 -Spectral radius of infinite time step: 0.50 -Searched file name to trigger stop: STOP_SIM - -Save results to VTK format: 1 -Name prefix of saved VTK files: result -Increment in saving VTK files: 250 -Start saving after time step: 1 - -Increment in saving restart files: 250 -Convert BIN to VTK format: 0 - -Verbose: 1 -Warning: 0 -Debug: 0 - -#---------------------------------------------------------------- -# Mesh data -Add mesh: msh { - Mesh file path: ../mesh/N128/mesh-complete.mesh.vtu - Add face: bottom { - Face file path: ../mesh/N128/mesh-surfaces/bottom.vtp - } - Add face: top { - Face file path: ../mesh/N128/mesh-surfaces/top.vtp - } - Add face: left { - Face file path: ../mesh/N128/mesh-surfaces/left.vtp - } - Add face: right { - Face file path: ../mesh/N128/mesh-surfaces/right.vtp - } -} - -#---------------------------------------------------------------- -# Equations -Add equation: stokes { - Coupled: 1 - Min iterations: 1 - Max iterations: 2 - Tolerance: 1e-9 - Use Taylor-Hood type basis: f - - Viscosity: Constant {Value: 1.0} - Momentum stabilization coefficient: 10.0 - - LS type: GMRES - { - Preconditioner: Trilinos-ILUT - Tolerance: 1D-9 - Max iterations: 100 - Krylov space dimension: 50 - } - - Add BF: msh { - Type: vol - Time dependence: general - Temporal and spatial values file path: ../bforce/N128/bforce.dat - } - - Add BC: left { - Type: Dir - Time dependence: General - Temporal and spatial values file path: ../bforce/N128/left_vbc.dat - } - - Add BC: right { - Type: Dir - Time dependence: General - Temporal and spatial values file path: ../bforce/N128/right_vbc.dat - } - - Add BC: top { - Type: Dir - Time dependence: General - Temporal and spatial values file path: ../bforce/N128/top_vbc.dat - } -} - diff --git a/tests/cases/stokes/manufactured_solution/P1P1/N128/svFSI.xml b/tests/cases/stokes/manufactured_solution/P1P1/N128/svFSI.xml index 5c2ee02e..779ed2cf 100644 --- a/tests/cases/stokes/manufactured_solution/P1P1/N128/svFSI.xml +++ b/tests/cases/stokes/manufactured_solution/P1P1/N128/svFSI.xml @@ -49,7 +49,7 @@ true 1 2 - 1e-9 + 1e-12 false @@ -62,16 +62,18 @@ Trilinos-ILUT - 1e-9 + 1e-12 100 50 - true - true - true - true + true + true + true + true + true + true diff --git a/tests/cases/stokes/manufactured_solution/P1P1/N256/svFSI.inp b/tests/cases/stokes/manufactured_solution/P1P1/N256/svFSI.inp deleted file mode 100755 index 55213c1a..00000000 --- a/tests/cases/stokes/manufactured_solution/P1P1/N256/svFSI.inp +++ /dev/null @@ -1,85 +0,0 @@ -#---------------------------------------------------------------- -# General simulation parameters - -Continue previous simulation: 0 -Number of spatial dimensions: 2 -Number of time steps: 250 -Time step size: 0.002 -Spectral radius of infinite time step: 0.50 -Searched file name to trigger stop: STOP_SIM - -Save results to VTK format: 1 -Name prefix of saved VTK files: result -Increment in saving VTK files: 250 -Start saving after time step: 1 - -Increment in saving restart files: 250 -Convert BIN to VTK format: 0 - -Verbose: 1 -Warning: 0 -Debug: 0 - -#---------------------------------------------------------------- -# Mesh data -Add mesh: msh { - Mesh file path: ../mesh/N256/mesh-complete.mesh.vtu - Add face: bottom { - Face file path: ../mesh/N256/mesh-surfaces/bottom.vtp - } - Add face: top { - Face file path: ../mesh/N256/mesh-surfaces/top.vtp - } - Add face: left { - Face file path: ../mesh/N256/mesh-surfaces/left.vtp - } - Add face: right { - Face file path: ../mesh/N256/mesh-surfaces/right.vtp - } -} - -#---------------------------------------------------------------- -# Equations -Add equation: stokes { - Coupled: 1 - Min iterations: 1 - Max iterations: 2 - Tolerance: 1e-9 - Use Taylor-Hood type basis: f - - Viscosity: Constant {Value: 1.0} - Momentum stabilization coefficient: 10.0 - - LS type: GMRES - { - Preconditioner: Trilinos-ILUT - Tolerance: 1D-9 - Max iterations: 100 - Krylov space dimension: 50 - } - - Add BF: msh { - Type: vol - Time dependence: general - Temporal and spatial values file path: ../bforce/N256/bforce.dat - } - - Add BC: left { - Type: Dir - Time dependence: General - Temporal and spatial values file path: ../bforce/N256/left_vbc.dat - } - - Add BC: right { - Type: Dir - Time dependence: General - Temporal and spatial values file path: ../bforce/N256/right_vbc.dat - } - - Add BC: top { - Type: Dir - Time dependence: General - Temporal and spatial values file path: ../bforce/N256/top_vbc.dat - } -} - diff --git a/tests/cases/stokes/manufactured_solution/P2P1/N004/svFSI.inp b/tests/cases/stokes/manufactured_solution/P2P1/N004/svFSI.inp deleted file mode 100755 index 6e5c376e..00000000 --- a/tests/cases/stokes/manufactured_solution/P2P1/N004/svFSI.inp +++ /dev/null @@ -1,85 +0,0 @@ -#---------------------------------------------------------------- -# General simulation parameters - -Continue previous simulation: 0 -Number of spatial dimensions: 2 -Number of time steps: 50 -Time step size: 0.01 -Spectral radius of infinite time step: 0.50 -Searched file name to trigger stop: STOP_SIM - -Save results to VTK format: 1 -Name prefix of saved VTK files: result -Increment in saving VTK files: 50 -Start saving after time step: 1 - -Increment in saving restart files: 50 -Convert BIN to VTK format: 0 - -Verbose: 1 -Warning: 0 -Debug: 0 - -#---------------------------------------------------------------- -# Mesh data -Add mesh: msh { - Mesh file path: ../mesh/N004/mesh-complete.mesh.vtu - Add face: bottom { - Face file path: ../mesh/N004/mesh-surfaces/bottom.vtp - } - Add face: top { - Face file path: ../mesh/N004/mesh-surfaces/top.vtp - } - Add face: left { - Face file path: ../mesh/N004/mesh-surfaces/left.vtp - } - Add face: right { - Face file path: ../mesh/N004/mesh-surfaces/right.vtp - } -} - -#---------------------------------------------------------------- -# Equations -Add equation: stokes { - Coupled: 1 - Min iterations: 4 - Max iterations: 4 - Tolerance: 1e-9 - Use Taylor-Hood type basis: t - - Viscosity: Constant {Value: 1.0} - Momentum stabilization coefficient: 0.0 - - LS type: BICG - { - Preconditioner: Trilinos-Diagonal - Tolerance: 1D-9 - Max iterations: 1000 - #Krylov space dimension: 50 - } - - Add BF: msh { - Type: vol - Time dependence: general - Temporal and spatial values file path: ../bforce/N004/bforce.dat - } - - Add BC: left { - Type: Dir - Time dependence: General - Temporal and spatial values file path: ../bforce/N004/left_vbc.dat - } - - Add BC: right { - Type: Dir - Time dependence: General - Temporal and spatial values file path: ../bforce/N004/right_vbc.dat - } - - Add BC: top { - Type: Dir - Time dependence: General - Temporal and spatial values file path: ../bforce/N004/top_vbc.dat - } -} - diff --git a/tests/cases/stokes/manufactured_solution/P2P1/N008/svFSI.inp b/tests/cases/stokes/manufactured_solution/P2P1/N008/svFSI.inp deleted file mode 100755 index 8cd7ddfe..00000000 --- a/tests/cases/stokes/manufactured_solution/P2P1/N008/svFSI.inp +++ /dev/null @@ -1,85 +0,0 @@ -#---------------------------------------------------------------- -# General simulation parameters - -Continue previous simulation: 0 -Number of spatial dimensions: 2 -Number of time steps: 50 -Time step size: 0.01 -Spectral radius of infinite time step: 0.50 -Searched file name to trigger stop: STOP_SIM - -Save results to VTK format: 1 -Name prefix of saved VTK files: result -Increment in saving VTK files: 50 -Start saving after time step: 1 - -Increment in saving restart files: 50 -Convert BIN to VTK format: 0 - -Verbose: 1 -Warning: 0 -Debug: 0 - -#---------------------------------------------------------------- -# Mesh data -Add mesh: msh { - Mesh file path: ../mesh/N008/mesh-complete.mesh.vtu - Add face: bottom { - Face file path: ../mesh/N008/mesh-surfaces/bottom.vtp - } - Add face: top { - Face file path: ../mesh/N008/mesh-surfaces/top.vtp - } - Add face: left { - Face file path: ../mesh/N008/mesh-surfaces/left.vtp - } - Add face: right { - Face file path: ../mesh/N008/mesh-surfaces/right.vtp - } -} - -#---------------------------------------------------------------- -# Equations -Add equation: stokes { - Coupled: 1 - Min iterations: 4 - Max iterations: 4 - Tolerance: 1e-9 - Use Taylor-Hood type basis: t - - Viscosity: Constant {Value: 1.0} - Momentum stabilization coefficient: 0.0 - - LS type: BICG - { - Preconditioner: Trilinos-Diagonal - Tolerance: 1D-9 - Max iterations: 1000 - #Krylov space dimension: 50 - } - - Add BF: msh { - Type: vol - Time dependence: general - Temporal and spatial values file path: ../bforce/N008/bforce.dat - } - - Add BC: left { - Type: Dir - Time dependence: General - Temporal and spatial values file path: ../bforce/N008/left_vbc.dat - } - - Add BC: right { - Type: Dir - Time dependence: General - Temporal and spatial values file path: ../bforce/N008/right_vbc.dat - } - - Add BC: top { - Type: Dir - Time dependence: General - Temporal and spatial values file path: ../bforce/N008/top_vbc.dat - } -} - diff --git a/tests/cases/stokes/manufactured_solution/P2P1/N016/svFSI.inp b/tests/cases/stokes/manufactured_solution/P2P1/N016/svFSI.inp deleted file mode 100755 index c451b3eb..00000000 --- a/tests/cases/stokes/manufactured_solution/P2P1/N016/svFSI.inp +++ /dev/null @@ -1,85 +0,0 @@ -#---------------------------------------------------------------- -# General simulation parameters - -Continue previous simulation: 0 -Number of spatial dimensions: 2 -Number of time steps: 50 -Time step size: 0.01 -Spectral radius of infinite time step: 0.50 -Searched file name to trigger stop: STOP_SIM - -Save results to VTK format: 1 -Name prefix of saved VTK files: result -Increment in saving VTK files: 50 -Start saving after time step: 1 - -Increment in saving restart files: 50 -Convert BIN to VTK format: 0 - -Verbose: 1 -Warning: 0 -Debug: 0 - -#---------------------------------------------------------------- -# Mesh data -Add mesh: msh { - Mesh file path: ../mesh/N016/mesh-complete.mesh.vtu - Add face: bottom { - Face file path: ../mesh/N016/mesh-surfaces/bottom.vtp - } - Add face: top { - Face file path: ../mesh/N016/mesh-surfaces/top.vtp - } - Add face: left { - Face file path: ../mesh/N016/mesh-surfaces/left.vtp - } - Add face: right { - Face file path: ../mesh/N016/mesh-surfaces/right.vtp - } -} - -#---------------------------------------------------------------- -# Equations -Add equation: stokes { - Coupled: 1 - Min iterations: 4 - Max iterations: 4 - Tolerance: 1e-9 - Use Taylor-Hood type basis: t - - Viscosity: Constant {Value: 1.0} - Momentum stabilization coefficient: 0.0 - - LS type: BICG - { - Preconditioner: Trilinos-Diagonal - Tolerance: 1D-9 - Max iterations: 1000 - #Krylov space dimension: 50 - } - - Add BF: msh { - Type: vol - Time dependence: general - Temporal and spatial values file path: ../bforce/N016/bforce.dat - } - - Add BC: left { - Type: Dir - Time dependence: General - Temporal and spatial values file path: ../bforce/N016/left_vbc.dat - } - - Add BC: right { - Type: Dir - Time dependence: General - Temporal and spatial values file path: ../bforce/N016/right_vbc.dat - } - - Add BC: top { - Type: Dir - Time dependence: General - Temporal and spatial values file path: ../bforce/N016/top_vbc.dat - } -} - diff --git a/tests/cases/stokes/manufactured_solution/P2P1/N032/svFSI.inp b/tests/cases/stokes/manufactured_solution/P2P1/N032/svFSI.inp deleted file mode 100755 index a1536f6e..00000000 --- a/tests/cases/stokes/manufactured_solution/P2P1/N032/svFSI.inp +++ /dev/null @@ -1,85 +0,0 @@ -#---------------------------------------------------------------- -# General simulation parameters - -Continue previous simulation: 0 -Number of spatial dimensions: 2 -Number of time steps: 50 -Time step size: 0.01 -Spectral radius of infinite time step: 0.50 -Searched file name to trigger stop: STOP_SIM - -Save results to VTK format: 1 -Name prefix of saved VTK files: result -Increment in saving VTK files: 50 -Start saving after time step: 1 - -Increment in saving restart files: 50 -Convert BIN to VTK format: 0 - -Verbose: 1 -Warning: 0 -Debug: 0 - -#---------------------------------------------------------------- -# Mesh data -Add mesh: msh { - Mesh file path: ../mesh/N032/mesh-complete.mesh.vtu - Add face: bottom { - Face file path: ../mesh/N032/mesh-surfaces/bottom.vtp - } - Add face: top { - Face file path: ../mesh/N032/mesh-surfaces/top.vtp - } - Add face: left { - Face file path: ../mesh/N032/mesh-surfaces/left.vtp - } - Add face: right { - Face file path: ../mesh/N032/mesh-surfaces/right.vtp - } -} - -#---------------------------------------------------------------- -# Equations -Add equation: stokes { - Coupled: 1 - Min iterations: 4 - Max iterations: 4 - Tolerance: 1e-9 - Use Taylor-Hood type basis: t - - Viscosity: Constant {Value: 1.0} - Momentum stabilization coefficient: 0.0 - - LS type: BICG - { - Preconditioner: Trilinos-Diagonal - Tolerance: 1D-9 - Max iterations: 1000 - #Krylov space dimension: 50 - } - - Add BF: msh { - Type: vol - Time dependence: general - Temporal and spatial values file path: ../bforce/N032/bforce.dat - } - - Add BC: left { - Type: Dir - Time dependence: General - Temporal and spatial values file path: ../bforce/N032/left_vbc.dat - } - - Add BC: right { - Type: Dir - Time dependence: General - Temporal and spatial values file path: ../bforce/N032/right_vbc.dat - } - - Add BC: top { - Type: Dir - Time dependence: General - Temporal and spatial values file path: ../bforce/N032/top_vbc.dat - } -} - diff --git a/tests/cases/stokes/manufactured_solution/P2P1/N064/svFSI.inp b/tests/cases/stokes/manufactured_solution/P2P1/N064/svFSI.inp deleted file mode 100755 index bebf0cd2..00000000 --- a/tests/cases/stokes/manufactured_solution/P2P1/N064/svFSI.inp +++ /dev/null @@ -1,85 +0,0 @@ -#---------------------------------------------------------------- -# General simulation parameters - -Continue previous simulation: 0 -Number of spatial dimensions: 2 -Number of time steps: 50 -Time step size: 0.01 -Spectral radius of infinite time step: 0.50 -Searched file name to trigger stop: STOP_SIM - -Save results to VTK format: 1 -Name prefix of saved VTK files: result -Increment in saving VTK files: 50 -Start saving after time step: 1 - -Increment in saving restart files: 50 -Convert BIN to VTK format: 0 - -Verbose: 1 -Warning: 0 -Debug: 0 - -#---------------------------------------------------------------- -# Mesh data -Add mesh: msh { - Mesh file path: ../mesh/N064/mesh-complete.mesh.vtu - Add face: bottom { - Face file path: ../mesh/N064/mesh-surfaces/bottom.vtp - } - Add face: top { - Face file path: ../mesh/N064/mesh-surfaces/top.vtp - } - Add face: left { - Face file path: ../mesh/N064/mesh-surfaces/left.vtp - } - Add face: right { - Face file path: ../mesh/N064/mesh-surfaces/right.vtp - } -} - -#---------------------------------------------------------------- -# Equations -Add equation: stokes { - Coupled: 1 - Min iterations: 4 - Max iterations: 4 - Tolerance: 1e-9 - Use Taylor-Hood type basis: t - - Viscosity: Constant {Value: 1.0} - Momentum stabilization coefficient: 0.0 - - LS type: GMRES - { - Preconditioner: RCS - Tolerance: 1D-9 - Max iterations: 100 - Krylov space dimension: 50 - } - - Add BF: msh { - Type: vol - Time dependence: general - Temporal and spatial values file path: ../bforce/N064/bforce.dat - } - - Add BC: left { - Type: Dir - Time dependence: General - Temporal and spatial values file path: ../bforce/N064/left_vbc.dat - } - - Add BC: right { - Type: Dir - Time dependence: General - Temporal and spatial values file path: ../bforce/N064/right_vbc.dat - } - - Add BC: top { - Type: Dir - Time dependence: General - Temporal and spatial values file path: ../bforce/N064/top_vbc.dat - } -} - diff --git a/tests/cases/stokes/manufactured_solution/P2P1/N128/svFSI.inp b/tests/cases/stokes/manufactured_solution/P2P1/N128/svFSI.inp deleted file mode 100755 index 351512f7..00000000 --- a/tests/cases/stokes/manufactured_solution/P2P1/N128/svFSI.inp +++ /dev/null @@ -1,85 +0,0 @@ -#---------------------------------------------------------------- -# General simulation parameters - -Continue previous simulation: 0 -Number of spatial dimensions: 2 -Number of time steps: 50 -Time step size: 0.01 -Spectral radius of infinite time step: 0.50 -Searched file name to trigger stop: STOP_SIM - -Save results to VTK format: 1 -Name prefix of saved VTK files: result -Increment in saving VTK files: 50 -Start saving after time step: 1 - -Increment in saving restart files: 50 -Convert BIN to VTK format: 0 - -Verbose: 1 -Warning: 0 -Debug: 0 - -#---------------------------------------------------------------- -# Mesh data -Add mesh: msh { - Mesh file path: ../mesh/N128/mesh-complete.mesh.vtu - Add face: bottom { - Face file path: ../mesh/N128/mesh-surfaces/bottom.vtp - } - Add face: top { - Face file path: ../mesh/N128/mesh-surfaces/top.vtp - } - Add face: left { - Face file path: ../mesh/N128/mesh-surfaces/left.vtp - } - Add face: right { - Face file path: ../mesh/N128/mesh-surfaces/right.vtp - } -} - -#---------------------------------------------------------------- -# Equations -Add equation: stokes { - Coupled: 1 - Min iterations: 4 - Max iterations: 4 - Tolerance: 1e-9 - Use Taylor-Hood type basis: t - - Viscosity: Constant {Value: 1.0} - Momentum stabilization coefficient: 0.0 - - LS type: GMRES - { - Preconditioner: RCS - Tolerance: 1D-9 - Max iterations: 100 - Krylov space dimension: 50 - } - - Add BF: msh { - Type: vol - Time dependence: general - Temporal and spatial values file path: ../bforce/N128/bforce.dat - } - - Add BC: left { - Type: Dir - Time dependence: General - Temporal and spatial values file path: ../bforce/N128/left_vbc.dat - } - - Add BC: right { - Type: Dir - Time dependence: General - Temporal and spatial values file path: ../bforce/N128/right_vbc.dat - } - - Add BC: top { - Type: Dir - Time dependence: General - Temporal and spatial values file path: ../bforce/N128/top_vbc.dat - } -} - diff --git a/tests/cases/struct/LV_Guccione_passive/result_001.vtu b/tests/cases/struct/LV_Guccione_passive/result_001.vtu index 7df51846..2310e805 100644 --- a/tests/cases/struct/LV_Guccione_passive/result_001.vtu +++ b/tests/cases/struct/LV_Guccione_passive/result_001.vtu @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:77a32f2c1475bcf0607d9dffa293bc72b2a838353bbb0659b3c82d2034bafd06 -size 19916 +oid sha256:7a9bc73226e027a050e019da4069980bfd0406146b9f499e316c89156fa2f9a0 +size 71061 diff --git a/tests/cases/struct/LV_Guccione_passive/svFSI.xml b/tests/cases/struct/LV_Guccione_passive/svFSI.xml index a303604b..fae73d81 100644 --- a/tests/cases/struct/LV_Guccione_passive/svFSI.xml +++ b/tests/cases/struct/LV_Guccione_passive/svFSI.xml @@ -50,8 +50,8 @@ true 1 - 100 - 1e-9 + 4 + 1e-10 880 @@ -71,11 +71,16 @@ true true true + true + true + true + true + true FSILS - 1e-9 + 1e-14 400 diff --git a/tests/cases/struct/LV_Holzapfel_passive/result_001.vtu b/tests/cases/struct/LV_Holzapfel_passive/result_001.vtu index 5dd87606..b77c5715 100644 --- a/tests/cases/struct/LV_Holzapfel_passive/result_001.vtu +++ b/tests/cases/struct/LV_Holzapfel_passive/result_001.vtu @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e63d0fa783aa31e8c984b2d02d03196798e2a689336d0b36346f1a726e85428e -size 157839 +oid sha256:4b6a02ee0e6f576026a76fccd18a887dd675dc699cdf526f50366807c9b883cc +size 248789 diff --git a/tests/cases/struct/LV_Holzapfel_passive/svFSI.inp b/tests/cases/struct/LV_Holzapfel_passive/svFSI.inp deleted file mode 100755 index 817f1774..00000000 --- a/tests/cases/struct/LV_Holzapfel_passive/svFSI.inp +++ /dev/null @@ -1,108 +0,0 @@ -#---------------------------------------------------------------- -# General simulation parameters - -Continue previous simulation: f -Number of spatial dimensions: 3 -Number of time steps: 1 -Time step size: 1e-3 -Spectral radius of infinite time step: 0.50 -Searched file name to trigger stop: STOP_SIM - -Save results to VTK format: t -Name prefix of saved VTK files: result -Save results in folder: results_svfsi -Increment in saving VTK files: 1 -Start saving after time step: 1 - -Increment in saving restart files: 50 -Convert BIN to VTK format: f - -Verbose: t -Warning: t -Debug: f - -#---------------------------------------------------------------- -# Mesh data -Add mesh: msh { - Mesh file path: mesh/mesh-complete.mesh.vtu - Add face: endo { - Face file path: mesh/mesh-surfaces/endo.vtp - } - Add face: epi { - Face file path: mesh/mesh-surfaces/epi.vtp - } - Add face: top { - Face file path: mesh/mesh-surfaces/top.vtp - } - - Fiber direction file path: mesh/fibersLongCells.vtu - Fiber direction file path: mesh/fibersSheetCells.vtu - - Mesh scale factor: 100.0 -} - -#---------------------------------------------------------------- -# Equations -Add equation: struct { - Coupled: t - Min iterations: 3 - Max iterations: 10 - Tolerance: 1e-6 - - Density: 1.0 - Elasticity modulus: 1.0e6 - Poisson ratio: 0.483333 - Viscosity: 0.0 - - Constitutive model: HO-ma { - a: 590.0 - b: 8.023 - a4f: 184720.0 - b4f: 16.026 - a4s: 24810.0 - b4s: 11.12 - afs: 2160.0 - bfs: 11.436 - k: 100.0 - } - Dilational penalty model: ST91 - - Output: Spatial { - Displacement: t - Velocity: t - Jacobian: t - Stress: t - Strain: t - VonMises_stress: t - } - - LS type: GMRES - { - Preconditioner: FSILS - Tolerance: 1e-6 - Max iterations: 1000 - Krylov space dimension: 50 - } - - Add BC: epi { - Type: Robin - Stiffness: 1.0e7 - Damping: 5.0e2 - Apply along normal direction: t - } - - Add BC: top { - Type: Robin - Stiffness: 1.0e4 - Damping: 5.0e2 - } - - Add BC: endo { - Type: Neu - Time dependence: Unsteady - Temporal values file path: endo_pressure.dat - Ramp function: f - Follower pressure load: t - } -} - diff --git a/tests/cases/struct/LV_Holzapfel_passive/svFSI.xml b/tests/cases/struct/LV_Holzapfel_passive/svFSI.xml index 6a05e93a..e854a060 100644 --- a/tests/cases/struct/LV_Holzapfel_passive/svFSI.xml +++ b/tests/cases/struct/LV_Holzapfel_passive/svFSI.xml @@ -52,8 +52,8 @@ true 3 - 10 - 1e-6 + 4 + 1e-10 1.0 1.0e6 @@ -82,12 +82,14 @@ true true true + true + true true FSILS - 1e-6 + 1e-12 1000 50 diff --git a/tests/cases/struct/block_compression/result_001.vtu b/tests/cases/struct/block_compression/result_001.vtu index 7f45ae4f..e05289c3 100644 --- a/tests/cases/struct/block_compression/result_001.vtu +++ b/tests/cases/struct/block_compression/result_001.vtu @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fe350c5ac40253fb9a322dde8ffa5a30c268189c5e65f40b5fee07027567f239 -size 78230 +oid sha256:5ee431cb36758c667c763044a5ded01b7ac080066e5995faf42f9bffe5d66d20 +size 74449 diff --git a/tests/cases/struct/block_compression/svFSI.xml b/tests/cases/struct/block_compression/svFSI.xml index 4d4ba59e..8a2536cf 100644 --- a/tests/cases/struct/block_compression/svFSI.xml +++ b/tests/cases/struct/block_compression/svFSI.xml @@ -61,8 +61,8 @@ true 1 - 10 - 1e-10 + 3 + 1e-9 1000.0 @@ -85,14 +85,14 @@ FSILS - 1e-11 + 1e-12 600 Dir 0.0 - (1, 0, 0) + (0, 0, 1) @@ -104,7 +104,7 @@ Dir 0.0 - (0, 0, 1) + (1, 0, 0) diff --git a/tests/cases/struct/robin/result_001.vtu b/tests/cases/struct/robin/result_001.vtu index e5f832a0..ff4f6d57 100644 --- a/tests/cases/struct/robin/result_001.vtu +++ b/tests/cases/struct/robin/result_001.vtu @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e26cafcf738ac45042edbcd2bac6936be01e47d03a33bede13ba9462465372ac -size 12685 +oid sha256:556dc8277bfbcd339d5524759057ebdfb4cd530fc5d03e9cbef9f6feb2b3ae27 +size 12681 diff --git a/tests/cases/struct/robin/svFSI.xml b/tests/cases/struct/robin/svFSI.xml index 30072a52..05581f91 100644 --- a/tests/cases/struct/robin/svFSI.xml +++ b/tests/cases/struct/robin/svFSI.xml @@ -51,8 +51,8 @@ true 1 - 10 - 1e-6 + 3 + 1e-8 0.0 @@ -72,7 +72,7 @@ FSILS - 1e-11 + 1e-12 600 diff --git a/tests/cases/ustruct/LV_Guccione_active/result_001.vtu b/tests/cases/ustruct/LV_Guccione_active/result_001.vtu index 8fcbc7f7..20dc8af9 100644 --- a/tests/cases/ustruct/LV_Guccione_active/result_001.vtu +++ b/tests/cases/ustruct/LV_Guccione_active/result_001.vtu @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8cca657ea95326e7ec02b873bb14de793fc555488adbb54c3f2260cfaa23f604 -size 45581 +oid sha256:e96385b077d909be53eb8db6d7b3fe23a485aa1c7183af28920474128126f622 +size 71817 diff --git a/tests/cases/ustruct/LV_Guccione_active/svFSI.xml b/tests/cases/ustruct/LV_Guccione_active/svFSI.xml index 9328f706..493e198e 100644 --- a/tests/cases/ustruct/LV_Guccione_active/svFSI.xml +++ b/tests/cases/ustruct/LV_Guccione_active/svFSI.xml @@ -39,8 +39,8 @@ true 1 - 2 - 1e-4 + 19 + 1e-12 false 1e-3 @@ -63,18 +63,20 @@ 1e-1 + true true true - true + true + true + true true + true true - true - true svfsi - 1e-4 + 1e-12 100 50 diff --git a/tests/cases/ustruct/block_compression/P1P1_VMS/result_001.vtu b/tests/cases/ustruct/block_compression/P1P1_VMS/result_001.vtu index 4f97bcab..9827da8e 100644 --- a/tests/cases/ustruct/block_compression/P1P1_VMS/result_001.vtu +++ b/tests/cases/ustruct/block_compression/P1P1_VMS/result_001.vtu @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1a86dc9aab7d9a563d07e54b4dcfcde5c0258ce795304522534521207d1e6c06 -size 64874 +oid sha256:d73ebe990ea5f6b87f5bf3ab762a9e0505f238bb79feb77c304ea548ad49a1fa +size 134943 diff --git a/tests/cases/ustruct/block_compression/P1P1_VMS/svFSI.xml b/tests/cases/ustruct/block_compression/P1P1_VMS/svFSI.xml index 610ea1e9..85f3e4a5 100644 --- a/tests/cases/ustruct/block_compression/P1P1_VMS/svFSI.xml +++ b/tests/cases/ustruct/block_compression/P1P1_VMS/svFSI.xml @@ -61,8 +61,8 @@ true 4 - 10 - 1e-8 + 5 + 1e-12 1e-3 @@ -74,12 +74,16 @@ 1e-3 + true + true true true - true - true + true true - true + true + true + true + true @@ -88,9 +92,9 @@ svfsi - 1e-8 + 1e-12 100 - 50 + 500 diff --git a/tests/cases/ustruct/tensile_adventitia_HGO/result_001.vtu b/tests/cases/ustruct/tensile_adventitia_HGO/result_001.vtu index 1049921f..b95727c8 100644 --- a/tests/cases/ustruct/tensile_adventitia_HGO/result_001.vtu +++ b/tests/cases/ustruct/tensile_adventitia_HGO/result_001.vtu @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:231f4a1654e6827aa2021ae4094112e389edeac8874c74467f1a7fa350d3df09 -size 31103 +oid sha256:71c2d49517cc87ecec317e68c5bb93e2cb8dd8f393dd0f49ec2cc9b26dee67d9 +size 78259 diff --git a/tests/cases/ustruct/tensile_adventitia_HGO/svFSI.xml b/tests/cases/ustruct/tensile_adventitia_HGO/svFSI.xml index 7c3ef108..dab127b8 100644 --- a/tests/cases/ustruct/tensile_adventitia_HGO/svFSI.xml +++ b/tests/cases/ustruct/tensile_adventitia_HGO/svFSI.xml @@ -62,8 +62,8 @@ true 1 - 2 - 1e-5 + 4 + 1e-10 false @@ -82,15 +82,21 @@ 1e-2 + true + true true true + true + true true + true + true true FSILS - 1e-4 + 1e-12 100 50 diff --git a/tests/conftest.py b/tests/conftest.py index 779cb2c2..39a0ddca 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -8,11 +8,24 @@ this_file_dir = os.path.abspath(os.path.dirname(__file__)) cpp_exec = os.path.join(this_file_dir, "..", "build", "svFSI-build", "bin", "svFSI") -# Default relative tolerances for tested results -DEFAULT_TOL = 1.0e-12 - -# Dictionary with exceptions from DEFAULT_TOL -RTOL = {} +# Relative tolerances for each tested field +RTOL = { + "Action_potential": 1.0e-10, + "Cauchy_stress": 1.0e-4, + "Def_grad": 1.0e-10, + "Divergence": 1.0e-9, + "Displacement": 1.0e-10, + "Jacobian": 1.0e-10, + "Pressure": 1.0e-6, + "Stress": 1.0e-4, + "Strain": 1.0e-10, + "Temperature": 1.0e-10, + "Traction": 1.0e-6, + "Velocity": 1.0e-7, + "VonMises_stress": 1.0e-3, + "Vorticity": 1.0e-7, + "WSS": 1.0e-8, +} # Number of processors to test PROCS = [1, 3, 4] @@ -53,7 +66,8 @@ def run_by_name(folder, name, t_max, n_proc=1): fname = os.path.join( folder, str(n_proc) + "-procs", "result_" + str(t_max).zfill(3) + "_cpp.vtu" ) - assert os.path.exists(fname), "no svFSIplus output: " + fname + if not os.path.exists(fname): + raise RuntimeError("No svFSIplus output: " + fname) return meshio.read(fname) @@ -89,8 +103,15 @@ def run_with_reference( ref = meshio.read(fname) # check results + msg = "" for f in fields: + # extract field + if f not in res.point_data.keys(): + raise ValueError("Field " + f + " not in simulation result") a = res.point_data[f] + + if f not in ref.point_data.keys(): + raise ValueError("Field " + f + " not in reference result") b = ref.point_data[f] # truncate last dimension if solution is 2D but reference is 3D @@ -99,19 +120,40 @@ def run_with_reference( assert not np.any(b[:, 2]) b = b[:, :2] - # compare solution to reference - if f in RTOL: - rtol = RTOL[f] - else: - rtol = DEFAULT_TOL - close = np.isclose(a, b, rtol=rtol) - if np.all(close): - return - else: - msg = "Test failed!" - msg += "\nResults in field " + f + " differ by more than rtol=" + str(rtol) - msg += ( - " in " + str(np.sum(close)) + " out of " + str(close.size) + " results." - ) - msg += " Max. abs. difference is " + "{:.1e}".format(np.max(np.abs(a - b))) - raise ValueError(msg) + # pick tolerance for current field + if f not in RTOL: + raise ValueError("No tolerance defined for field " + f) + rtol = RTOL[f] + + # relative difference (as computed in np.isclose) + # note that we consider rtol as absolute zero (and as relative tolerance) + a_fl = a.flatten() + b_fl = b.flatten() + rel_diff = np.abs(a_fl - b_fl) - rtol - rtol * np.abs(b_fl) + + # throw error if not all results are within relative tolerance + close = rel_diff <= 0.0 + if not np.all(close): + # portion of individual results that are above the tolerance + wrong = 1 - np.sum(close) / close.size + + # location of maximum relative difference + i_max = rel_diff.argmax() + + # maximum relative difference + max_rel = rel_diff[i_max] + + # maximum absolute difference at same location + max_abs = np.abs(a_fl[i_max] - b_fl[i_max]) + + # throw error message for pytest + msg += "Test failed in field " + f + "." + msg += " Results differ by more than rtol=" + str(rtol) + msg += " in {:.1%}".format(wrong) + msg += " of results." + msg += " Max. rel. difference is" + msg += " {:.1e}".format(max_rel) + msg += " (abs. {:.1e}".format(max_abs) + ")\n" + # check all fields first and then throw error if any failed + if msg: + raise AssertionError(msg) diff --git a/tests/test_cep.py b/tests/test_cep.py index 70e21d6e..53d5d3d3 100644 --- a/tests/test_cep.py +++ b/tests/test_cep.py @@ -3,7 +3,7 @@ import pandas as pd -from .conftest import run_with_reference, DEFAULT_TOL +from .conftest import run_with_reference, RTOL # Common folder for all tests in this file base_folder = "cep" @@ -60,12 +60,12 @@ def test_niederer_benchmark_ECGs_quadrature(confs_ecgs, n_proc): ) assert ( abs((ecg_trace.iloc[-1, 1] - confs_ecgs[jj + 1]) / confs_ecgs[jj + 1]) - < DEFAULT_TOL + < RTOL[fields[0]] ), ( "Results in field ecglead_" + str(jj + 1) + ".txt differ by more than rtol=" - + str(DEFAULT_TOL) + + str(RTOL[fields[0]]) + " for test case " + confs_ecgs[0] ) diff --git a/tests/test_cmm.py b/tests/test_cmm.py index 8dbf0946..f7fccd8b 100644 --- a/tests/test_cmm.py +++ b/tests/test_cmm.py @@ -6,14 +6,14 @@ base_folder = "cmm" # Fields to test -fields = ["Stress", "Displacement", "Pressure", "Velocity", "Traction", "WSS"] +fields = ["Stress", "Displacement", "Pressure", "Velocity", "Traction", "WSS"] def test_pipe_3d(n_proc): folder = "pipe_3d" inflate_folder = os.path.join(folder, "2a-inflate") t_max = 3 - run_with_reference(base_folder, inflate_folder, fields[1:2], 1, t_max) + run_with_reference(base_folder, inflate_folder, ["Displacement"], 1, t_max) inflate_cmm_folder = os.path.join(folder, "3a-inflate-cmm") t_max = 5 @@ -28,7 +28,6 @@ def test_pipe_3d(n_proc): run_with_reference(base_folder, prestress_cmm_folder, fields[1::], n_proc, t_max) - def test_iliac_artery_variable_wall_props(n_proc): folder = "iliac_artery_variable_wall_props" inflate_folder = os.path.join(folder, "2-inflate") @@ -38,4 +37,3 @@ def test_iliac_artery_variable_wall_props(n_proc): inflate_cmm_folder = os.path.join(folder, "3-inflate-cmm") t_max = 3 run_with_reference(base_folder, inflate_cmm_folder, fields[1::], n_proc, t_max) - diff --git a/tests/test_fluid.py b/tests/test_fluid.py index 03596bf2..641bb0d7 100644 --- a/tests/test_fluid.py +++ b/tests/test_fluid.py @@ -4,7 +4,7 @@ base_folder = "fluid" # Fields to test -fields = ["Velocity", "Pressure", "Traction", "WSS"] +fields = ["Velocity", "Pressure", "Traction", "WSS", "Vorticity", "Divergence"] def test_pipe_RCR_3d(n_proc): @@ -13,7 +13,7 @@ def test_pipe_RCR_3d(n_proc): run_with_reference(base_folder, test_folder, fields, n_proc, t_max) -def test_cavity_2d(n_proc): +def test_driven_cavity_2d(n_proc): test_folder = "driven_cavity_2d" t_max = 2 run_with_reference(base_folder, test_folder, fields, n_proc, t_max) diff --git a/tests/test_stokes.py b/tests/test_stokes.py index 5fb7342b..5061a180 100644 --- a/tests/test_stokes.py +++ b/tests/test_stokes.py @@ -7,7 +7,7 @@ base_folder = "stokes" # Fields to test -fields = ["Pressure", "Velocity"] +fields = ["Pressure", "Velocity", "Traction", "WSS", "Vorticity", "Divergence"] @pytest.mark.parametrize("mesh", ["N" + str(2**i).zfill(3) for i in range(2, 3)]) diff --git a/tests/test_struct.py b/tests/test_struct.py index a5a3e462..5376207d 100644 --- a/tests/test_struct.py +++ b/tests/test_struct.py @@ -5,25 +5,14 @@ # Fields to test fields = [ - "Displacement", - "Velocity", - "Jacobian", - "Stress", - "Strain", - "Caucy_stress", + "Cauchy_stress", "Def_grad", - "VonMises_stress", -] - -# Fields to test -fields = [ "Displacement", - "Velocity", + "Jacobian", "Jacobian", "Stress", "Strain", - "Caucy_stress", - "Def_grad", + "Velocity", "VonMises_stress", ] @@ -32,10 +21,12 @@ def test_LV_Guccione_passive(n_proc): test_folder = "LV_Guccione_passive" run_with_reference(base_folder, test_folder, fields, n_proc) + def test_LV_Holzapfel_passive(n_proc): test_folder = "LV_Holzapfel_passive" run_with_reference(base_folder, test_folder, fields, n_proc) - + + def test_block_compression(n_proc): test_folder = "block_compression" run_with_reference(base_folder, test_folder, fields, n_proc)