Merge branch 'main' into feature/issue-442-integrator-class

mrp089 · web-flow · commit 4407dc199126 · 2025-12-11T15:49:34.000-05:00
diff --git a/Code/Source/solver/README-trilinos.md b/Code/Source/solver/README-trilinos.md
diff --git a/Code/Source/solver/mueluOptions.xml b/Code/Source/solver/mueluOptions.xml
@@ -0,0 +1,37 @@
+<ParameterList name="MueLu">
+  <Parameter name="verbosity" type="string" value="none"/>
+  <Parameter name="max levels" type="int" value="6"/>
+  <Parameter name="cycle type" type="string" value="V"/>
+  <Parameter name="fuse prolongation and update" type="bool" value="true"/>
+
+  <!-- Problem type -->
+  <Parameter name="problem: type" type="string" value="unknown"/>
+  <Parameter name="number of equations" type="int" value="4"/>
+
+  <!-- Aggregation -->
+  <Parameter name="aggregation: type" type="string" value="coupled"/>
+  <Parameter name="aggregation: min agg size" type="int" value="2"/>
+  <Parameter name="aggregation: max agg size" type="int" value="8"/>
+  <Parameter name="aggregation: ordering" type="string" value="natural"/>
+  <Parameter name="aggregation: drop scheme" type="string" value="classical"/>
+  <Parameter name="aggregation: strength-of-connection: measure" type="string" value="smoothed aggregation"/>
+  <Parameter name="aggregation: number of random vectors" type="int" value="5"/>
+  <Parameter name="aggregation: number of times to pre or post smooth" type="int" value="3"/>
+
+  <!-- Smoothed Aggregation -->
+  <Parameter name="sa: damping factor" type="double" value="1.0"/>
+  <Parameter name="sa: use filtered matrix" type="bool" value="false"/>
+
+  <!-- Smoother -->
+  <Parameter name="smoother: type" type="string" value="RELAXATION"/>
+  <Parameter name="smoother: pre or post" type="string" value="both"/>
+  <Parameter name="smoother: overlap" type="int" value="0"/>
+  <ParameterList name="smoother: params">
+    <Parameter name="relaxation: type" type="string" value="Gauss-Seidel"/>
+    <Parameter name="relaxation: sweeps" type="int" value="2"/>
+  </ParameterList>
+
+  <!-- Coarse solver -->
+  <Parameter name="coarse: type" type="string" value="KLU"/>
+  <Parameter name="coarse: max size" type="int" value="2000"/>
+</ParameterList>
diff --git a/Code/Source/solver/post.cpp b/Code/Source/solver/post.cpp
@@ -1985,7 +1985,7 @@ void tpost(Simulation* simulation, const mshType& lM, const int m, Array<double>
             for (int l = 0; l < nsd; l++) {
               sigma(l,l) = sigma(l,l) - trS;
             }
-            double vmises = sqrt(mat_ddot(sigma, sigma, nsd));
+            double vmises = sqrt(1.5 * mat_ddot(sigma, sigma, nsd));
             resl(0) = vmises;
             sE(e) = sE(e) + w*vmises;
           }
diff --git 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:ceccd8ba7067b8b894ae6a192117af6c3659890a850dd951995620c30f5eaffd
+oid sha256:54ac116931be9b2a7d5024de8359f9ea09cae964e9bd34ba949f4bfb9312c8af
 size 210065
diff --git a/tests/cases/fsi/pipe_3d_petsc/result_005.vtu b/tests/cases/fsi/pipe_3d_petsc/result_005.vtu
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ceccd8ba7067b8b894ae6a192117af6c3659890a850dd951995620c30f5eaffd
+oid sha256:54ac116931be9b2a7d5024de8359f9ea09cae964e9bd34ba949f4bfb9312c8af
 size 210065
diff --git a/tests/cases/fsi/pipe_3d_trilinos_bj/result_005.vtu b/tests/cases/fsi/pipe_3d_trilinos_bj/result_005.vtu
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ceccd8ba7067b8b894ae6a192117af6c3659890a850dd951995620c30f5eaffd
+oid sha256:54ac116931be9b2a7d5024de8359f9ea09cae964e9bd34ba949f4bfb9312c8af
 size 210065
diff --git a/tests/cases/fsi/pipe_3d_trilinos_ml/result_005.vtu b/tests/cases/fsi/pipe_3d_trilinos_ml/result_005.vtu
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ceccd8ba7067b8b894ae6a192117af6c3659890a850dd951995620c30f5eaffd
+oid sha256:54ac116931be9b2a7d5024de8359f9ea09cae964e9bd34ba949f4bfb9312c8af
 size 210065
diff --git a/tests/cases/fsi/pipe_RCR_3d/result_005.vtu b/tests/cases/fsi/pipe_RCR_3d/result_005.vtu
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:96844a0415f7d2d969d75bd9c204c5f555bbcf07e43883b23a8c4a4ecf83a045
-size 209837
+oid sha256:f194a3c364de0bf1a6cc79ba542306469e151de36275a06564022730c3f2c84c
+size 209865
diff --git a/tests/cases/fsi_ustruct/pipe_3d/result_005.vtu b/tests/cases/fsi_ustruct/pipe_3d/result_005.vtu
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e915a303f71e89e250b7b5c2e9302dd400ded6ff9f86172a22dda8e0e2120d69
-size 207848
+oid sha256:262ffb4d7b644280f15bb2e32c8e5fc5ddade7fa5cabd845c31fe3803e9ef0a0
+size 207864
diff --git a/tests/cases/fsi_ustruct/pipe_RCR_3d/result_005.vtu b/tests/cases/fsi_ustruct/pipe_RCR_3d/result_005.vtu
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7e3558f8a5f4511efe7b6f5a950c7f81b297c4897786f3152c6a87115bc21a74
-size 207636
+oid sha256:7dec176a56b610ed6b754f66e532a15ac1563b72c25198f49a0bc53adc6e4552
+size 207628
diff --git a/tests/cases/linear-elasticity/beam/result_001.vtu b/tests/cases/linear-elasticity/beam/result_001.vtu
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5f033f3c6bbc3840aa2c2ff438cdd27abe88bc5d97d1cbbbdedf85cc793c4f6e
-size 113071
+oid sha256:eb8401359d0c04de0b6b45ad93bc442019d61ee75611c81f7a1e35c9e8a906ab
+size 113079
diff --git a/tests/cases/struct/LV_CANN_artery_material_model/result_001.vtu b/tests/cases/struct/LV_CANN_artery_material_model/result_001.vtu
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:92edf92042952f5bb16fa4eea63a09d215e4bdc8f07b2ab1739822a9eada819a
-size 248065
+oid sha256:803b2dc01693f15eed56872b763a8ca6341ae61ff4141ee8c537e7a8047804ca
+size 248069
diff --git 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:482ee113c6a69ea07d4013b454d2bdc320b9138a79cc534b7f96ac24e8ec80bb
-size 71554
+oid sha256:1f08bda58c4c79ef978c6db270b0de43b1b2d6f3232746654176fb2a8f1b9edc
+size 71558
diff --git a/tests/cases/struct/LV_HolzapfelOgdenModifiedAnisotropy_passive/result_001.vtu b/tests/cases/struct/LV_HolzapfelOgdenModifiedAnisotropy_passive/result_001.vtu
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e746cb4795d037d5eebe943a73da2c457c116cd01c1e0c4c18dca1120c40dafe
-size 249854
+oid sha256:dca3c4531f1457f587858301a9d9c03c9485c2fd9fda81ece76619657c5f933c
+size 249870
diff --git a/tests/cases/struct/LV_HolzapfelOgden_active/result_001.vtu b/tests/cases/struct/LV_HolzapfelOgden_active/result_001.vtu
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:596c2cd4a299b1cbe1290a04f1175c50eae2a8f5514e40089f421fb88fd7bf23
-size 2148967
+oid sha256:51526e931f280ef532f060be864c23a64dca2016ee6ce333ffb9488c04efc401
+size 2148963
diff --git a/tests/cases/struct/LV_HolzapfelOgden_passive/result_001.vtu b/tests/cases/struct/LV_HolzapfelOgden_passive/result_001.vtu
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:98380148f70f0379a869619d69bab3c8916003185bb9ea5301eda2f88bb9aef9
-size 249906
+oid sha256:26c5db31e0a8dbad3c03abe9f9dd32bf3e2458a11667045e8df3b5ae2633e4ad
+size 249898
diff --git a/tests/cases/struct/LV_HolzapfelOgden_passive_CANN/result_001.vtu b/tests/cases/struct/LV_HolzapfelOgden_passive_CANN/result_001.vtu
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:596d49b06f19990639b4406be8123d9c95802aadb371b5ac3d049720b7df5525
-size 248837
+oid sha256:3af9906d4abfe620072387975b19b818426e2b4ce4cb54b246a2eabef14e62a2
+size 248833
diff --git a/tests/cases/struct/LV_NeoHookean_passive/result_005.vtu b/tests/cases/struct/LV_NeoHookean_passive/result_005.vtu
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dd922c75556517e91e3ea8fee3f22a86fca6d3c01b65345b667feea0cf97ba2e
-size 248993
+oid sha256:cd5872272d06cd92c9a9bc9e3d2ee10cfd77ac75bddd6979ad0ee03b53cd4266
+size 248997
diff --git a/tests/cases/struct/LV_NeoHookean_passive_genBC/result_003.vtu b/tests/cases/struct/LV_NeoHookean_passive_genBC/result_003.vtu
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:754e5eafbce51ce6f9c07061664738befea13c9573f2c2de60753c3cc8059bc9
-size 248325
+oid sha256:3d6ac306bd2a45c97325f53dce56e71feb5a063122278154a02ecf1629ce05d2
+size 248329
diff --git a/tests/cases/struct/LV_NeoHookean_passive_sv0D/result_003.vtu b/tests/cases/struct/LV_NeoHookean_passive_sv0D/result_003.vtu
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7d6e4557acc27f42f7048f4852b369a12a2b87e15b70d618b74663dac63245b7
-size 248293
+oid sha256:3f7d1f326990e28a5561fdd71e1c4cdac04b4047943ea6e86d44fbb55e5ba6b6
+size 248313
diff --git 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:b1bbb1fdd5ee8b3bc219befecd0f9f3604a86c9c9372cb008fa13af7e0cf36fd
-size 75102
+oid sha256:16da8ba35b00d27799e85c8ede7e6d617ca2201f570f23cb3aba41cafe35c55d
+size 75110
diff --git a/tests/cases/struct/block_compression_CANN/result_001.vtu b/tests/cases/struct/block_compression_CANN/result_001.vtu
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d0f55b57ea07d546a11f7e2d25a37e7cbc3967d5194f039951c538bf296fa791
-size 74513
+oid sha256:fb158ee842e9547406eddb83956eabbab68c6aadcbc8770030bff524b9e2b8d2
+size 74517
diff --git 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:2eb33af9513f681e820423cd0f1d47bb09f8d16f64afae96d0e8a12727a5eeec
-size 13170
+oid sha256:3453d8a293a6db724255a8d35c6b9efc2caa2148542c116817b4fe981cfc045f
+size 13166
diff --git a/tests/cases/struct/spatially_variable_robin/result_002.vtu b/tests/cases/struct/spatially_variable_robin/result_002.vtu
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fac37b324afe68b2ad6039dce51d18713f9400d83da5ab1a8b610067d3771d75
-size 73861
+oid sha256:9025a187c1052e356e8cb4128d6b4b3cfac900659ea575a04ff567da8c5ea0d4
+size 73865
diff --git a/tests/cases/struct/tensile_adventitia_Guccione_active/result_002.vtu b/tests/cases/struct/tensile_adventitia_Guccione_active/result_002.vtu
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dc6629a355444e5648a9895bd28a678e936e21f2c33530bd9c566646071069af
-size 76834
+oid sha256:906c4b394fe4e0901f5b0fbd7ebc8b55b96bf39faf5b4a75d81efa40ea61f36a
+size 76838
diff --git a/tests/cases/struct/tensile_adventitia_Newtonian_viscosity/result_001.vtu b/tests/cases/struct/tensile_adventitia_Newtonian_viscosity/result_001.vtu
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:88da8f9d0b6275eef0731efd4774edb3dd32acc2e8f3cde954c2c7b4f87e4c90
-size 76626
+oid sha256:bcf5e7702c9c57d2f67361766871ea9b28de6d52fa48b965468a0e60254a61df
+size 76614
diff --git a/tests/cases/struct/tensile_adventitia_Potential_viscosity/result_001.vtu b/tests/cases/struct/tensile_adventitia_Potential_viscosity/result_001.vtu
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:238e6783fbe88d0453f5ea64cd615c7eff9225a63a545d468844f339895c31f2
-size 77010
+oid sha256:c89bae144651211c9cfc4f02bc1c65c87074dc00d33265a03a05e121944b541e
+size 77018
diff --git 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:48525854e6062b81e71906a804fe559202dcd692efd3c6debcb7ae4617e1a644
-size 73470
+oid sha256:3c16cafb77f58a0a3d54f42d5d84bbc18ba9fad98d826533f80f7ea5de4eea06
+size 73482
diff --git a/tests/cases/ustruct/LV_HolzapfelOgdenModifiedAnisotropy_passive/result_001.vtu b/tests/cases/ustruct/LV_HolzapfelOgdenModifiedAnisotropy_passive/result_001.vtu
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fda0ce16348dd0d7e46f8fc3fd98dc68b71ec3d3c8363705656cfbfc7e8a1f71
-size 256530
+oid sha256:6330e273def09cdde6c4e5de8fd0723f0efaea87f5fe528612cb3615bd90c36c
+size 256534
diff --git a/tests/cases/ustruct/LV_HolzapfelOgdenModifiedAnisotropy_passive_trilinos/result_001.vtu b/tests/cases/ustruct/LV_HolzapfelOgdenModifiedAnisotropy_passive_trilinos/result_001.vtu
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fda0ce16348dd0d7e46f8fc3fd98dc68b71ec3d3c8363705656cfbfc7e8a1f71
-size 256530
+oid sha256:6330e273def09cdde6c4e5de8fd0723f0efaea87f5fe528612cb3615bd90c36c
+size 256534
diff --git a/tests/cases/ustruct/LV_HolzapfelOgden_active/result_001.vtu b/tests/cases/ustruct/LV_HolzapfelOgden_active/result_001.vtu
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1adf6fc288b6e02bcc4f629fbb5620c8e96c40775b85fcc7b2bbe2ea919cac4e
-size 1915077
+oid sha256:43ed358c031d16766d2e9f84a755015948561c0133307c9ea88c033ce1cfc1f3
+size 1915065
diff --git a/tests/cases/ustruct/LV_HolzapfelOgden_passive/result_001.vtu b/tests/cases/ustruct/LV_HolzapfelOgden_passive/result_001.vtu
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b062841ceadf91cf9893ee57852a0ed4d1afbe38e6092787a214fe154b7ce309
-size 256538
+oid sha256:d36fca9a75c853807ee279c02a8b1240749c001631667ff0d26ec8bf0b97b573
+size 256534
diff --git a/tests/cases/ustruct/LV_NeoHookean_passive_genBC/result_003.vtu b/tests/cases/ustruct/LV_NeoHookean_passive_genBC/result_003.vtu
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:aaa83f25721074517e0b99122e8a46cb2cd20c6b07ff8232005250b034d6e990
-size 254813
+oid sha256:b5cc213db3db4005acd37654bf437aebc250335b9b72deecf95df6be6e63ca08
+size 254801
diff --git a/tests/cases/ustruct/LV_NeoHookean_passive_sv0D/result_003.vtu b/tests/cases/ustruct/LV_NeoHookean_passive_sv0D/result_003.vtu
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fb12f1c216ab10f389c084f365b168a65100d14df4b6928265b0ecd4716273b6
+oid sha256:1bc07c8ea6573ead36256431236523aed8ca250a77d158bdd0f9f03b3fb1245f
 size 254837
diff --git 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:79d24b0604e405188c2e76ec1c2749db9c4f6b64c4e5730a8a1e79a1f642a5cc
-size 135916
+oid sha256:bd522048b400c3a1df1514e5f6a6ced202481f994ea85957443afc75b28e4797
+size 135848
diff --git a/tests/cases/ustruct/spatially_variable_robin/result_002.vtu b/tests/cases/ustruct/spatially_variable_robin/result_002.vtu
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:944fbebcb555aed331ae0f659370027cda7576041961bd6fb39bb105e44680ea
-size 78251
+oid sha256:a639211ba42ce69d7d9d9c8415cf7ee985d5f7dc43e04dea823af2d3a1b8ea46
+size 78239
diff --git 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:93800d0bb952fd4d4c611eeabd2a23d8cec2f3f7fc6efb92d920f936d2e95061
-size 78456
+oid sha256:769cb283c7ad092b60e86f6000da3eae566dc4226c73ee241ec23f99f26bca9d
+size 78468
diff --git a/tests/cases/ustruct/tensile_adventitia_Newtonian_viscosity/result_001.vtu b/tests/cases/ustruct/tensile_adventitia_Newtonian_viscosity/result_001.vtu
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:56a59efe0cb8214f54659f34cac97ef0c5028652abea1f434d23037768b9a26f
-size 81000
+oid sha256:1bc57cb1f7b412db6679b07393b5e7b78bf9d5864f36d08e7c1dbe0155558fc9
+size 81004
diff --git a/tests/cases/ustruct/tensile_adventitia_Potential_viscosity/result_001.vtu b/tests/cases/ustruct/tensile_adventitia_Potential_viscosity/result_001.vtu
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dafbffac82bd8ed8f5945656a75ee05bf61c73b7adaed04c49c730bf75223687
-size 81248
+oid sha256:247325356c4b70fd296ed2196307cd206a7c971f43b15792d0c8cf0017e4af44
+size 81252

Original file line number	Diff line number	Diff line change
`@@ -1985,7 +1985,7 @@ void tpost(Simulation* simulation, const mshType& lM, const int m, Array<double>`
`1985`	`1985`	`for (int l = 0; l < nsd; l++) {`
`1986`	`1986`	`sigma(l,l) = sigma(l,l) - trS;`
`1987`	`1987`	`}`
`1988`		`- double vmises = sqrt(mat_ddot(sigma, sigma, nsd));`
	`1988`	`+ double vmises = sqrt(1.5 * mat_ddot(sigma, sigma, nsd));`
`1989`	`1989`	`resl(0) = vmises;`
`1990`	`1990`	`sE(e) = sE(e) + w*vmises;`
`1991`	`1991`	`}`