Skip to content

Commit

Permalink
Merge pull request #7102 from cgcgcg/fixGoldFiles
Browse files Browse the repository at this point in the history 
MiniEM: Update solver parameters
  • Loading branch information
@cgcgcg
cgcgcg authored Mar 31, 2020
2 parents d909d97 + f6dc7b1 commit f149931
Show file tree
Hide file tree
Showing 3 changed files with 144 additions and 162 deletions.
156 changes: 90 additions & 66 deletions packages/panzer/mini-em/example/BlockPrec/solverMueLuRefMaxwell.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,69 +152,85 @@
<Parameter name="refmaxwell: dump matrices" type="bool" value="false"/>
<Parameter name="refmaxwell: max coarse size" type="int" value="2500"/>
<Parameter name="refmaxwell: subsolves on subcommunicators" type="bool" value="true"/>
<Parameter name="refmaxwell: subsolves striding" type="int" value="1"/>

<!-- <Parameter name="rap: triple product" type="bool" value="true"/> -->
<!-- <Parameter name="transpose: use implicit" type="bool" value="true"/> -->

<Parameter name="aggregation: type" type="string" value="uncoupled"/>
<Parameter name="aggregation: drop tol" type="double" value="0.02"/>
<Parameter name="aggregation: drop scheme" type="string" value="distance laplacian"/>
<Parameter name="aggregation: distance laplacian algo" type="string" value="scaled cut"/>
<Parameter name="aggregation: drop tol" type="double" value="8.0"/>

<!-- <Parameter name="smoother: type" type="string" value="CHEBYSHEV"/> -->
<!-- <ParameterList name="smoother: params"> -->
<!-- <Parameter name="chebyshev: degree" type="int" value="2"/> -->
<!-- <Parameter name="chebyshev: ratio eigenvalue" type="double" value="5.4"/> -->
<!-- <Parameter name="chebyshev: eigenvalue max iterations" type="int" value="100"/> -->
<!-- </ParameterList> -->

<Parameter name="smoother: pre type" type="string" value="RELAXATION"/>
<ParameterList name="smoother: pre params">
<Parameter name="relaxation: type" type="string" value="Gauss-Seidel"/>
<Parameter name="relaxation: symmetric matrix structure" type="bool" value="true"/>
<Parameter name="relaxation: sweeps" type="int" value="2"/>
<Parameter name="relaxation: use l1" type="bool" value="true"/>
<Parameter name="relaxation: backward mode" type="bool" value="false"/>
<ParameterList name="matvec params">
<!-- <Parameter name="Send type" type="string" value="Send"/> -->
<Parameter name="Send type" type="string" value="Isend"/>
</ParameterList>
<Parameter name="smoother: post type" type="string" value="RELAXATION"/>
<ParameterList name="smoother: post params">
<Parameter name="relaxation: type" type="string" value="Gauss-Seidel"/>
<Parameter name="relaxation: symmetric matrix structure" type="bool" value="true"/>
<Parameter name="relaxation: sweeps" type="int" value="2"/>
<Parameter name="relaxation: use l1" type="bool" value="true"/>
<Parameter name="relaxation: backward mode" type="bool" value="true"/>

<Parameter name="smoother: type" type="string" value="CHEBYSHEV"/>
<ParameterList name="smoother: params">
<Parameter name="chebyshev: degree" type="int" value="2"/>
<Parameter name="chebyshev: ratio eigenvalue" type="double" value="20.0"/>
<Parameter name="chebyshev: eigenvalue max iterations" type="int" value="100"/>
</ParameterList>

<!-- <Parameter name="smoother: pre type" type="string" value="RELAXATION"/> -->
<!-- <ParameterList name="smoother: pre params"> -->
<!-- <Parameter name="relaxation: type" type="string" value="Gauss-Seidel"/> -->
<!-- <Parameter name="relaxation: symmetric matrix structure" type="bool" value="true"/> -->
<!-- <Parameter name="relaxation: sweeps" type="int" value="2"/> -->
<!-- <Parameter name="relaxation: use l1" type="bool" value="true"/> -->
<!-- <Parameter name="relaxation: backward mode" type="bool" value="false"/> -->
<!-- </ParameterList> -->
<!-- <Parameter name="smoother: post type" type="string" value="RELAXATION"/> -->
<!-- <ParameterList name="smoother: post params"> -->
<!-- <Parameter name="relaxation: type" type="string" value="Gauss-Seidel"/> -->
<!-- <Parameter name="relaxation: symmetric matrix structure" type="bool" value="true"/> -->
<!-- <Parameter name="relaxation: sweeps" type="int" value="2"/> -->
<!-- <Parameter name="relaxation: use l1" type="bool" value="true"/> -->
<!-- <Parameter name="relaxation: backward mode" type="bool" value="true"/> -->
<!-- </ParameterList> -->

<ParameterList name="refmaxwell: 11list">
<Parameter name="verbosity" type="string" value="extreme"/>
<Parameter name="coarse: max size" type="int" value="2500"/>
<Parameter name="number of equations" type="int" value="3"/>
<Parameter name="multigrid algorithm" type="string" value="unsmoothed"/>
<Parameter name="aggregation: type" type="string" value="uncoupled"/>
<Parameter name="aggregation: drop tol" type="double" value="0.02"/>

<!-- <Parameter name="smoother: type" type="string" value="CHEBYSHEV"/> -->
<!-- <ParameterList name="smoother: params"> -->
<!-- <Parameter name="chebyshev: degree" type="int" value="2"/> -->
<!-- <Parameter name="chebyshev: ratio eigenvalue" type="double" value="5.4"/> -->
<!-- <Parameter name="chebyshev: eigenvalue max iterations" type="int" value="100"/> -->
<!-- </ParameterList> -->
<Parameter name="aggregation: type" type="string" value="uncoupled"/>
<Parameter name="aggregation: drop scheme" type="string" value="distance laplacian"/>
<Parameter name="aggregation: distance laplacian algo" type="string" value="scaled cut"/>
<Parameter name="aggregation: drop tol" type="double" value="8.0"/>

<Parameter name="smoother: pre type" type="string" value="RELAXATION"/>
<ParameterList name="smoother: pre params">
<Parameter name="relaxation: type" type="string" value="Gauss-Seidel"/>
<Parameter name="relaxation: symmetric matrix structure" type="bool" value="true"/>
<Parameter name="relaxation: sweeps" type="int" value="2"/>
<Parameter name="relaxation: use l1" type="bool" value="true"/>
<Parameter name="relaxation: backward mode" type="bool" value="false"/>
<ParameterList name="matvec params">
<!-- <Parameter name="Send type" type="string" value="Send"/> -->
<Parameter name="Send type" type="string" value="Isend"/>
</ParameterList>
<Parameter name="smoother: post type" type="string" value="RELAXATION"/>
<ParameterList name="smoother: post params">
<Parameter name="relaxation: type" type="string" value="Gauss-Seidel"/>
<Parameter name="relaxation: symmetric matrix structure" type="bool" value="true"/>
<Parameter name="relaxation: sweeps" type="int" value="2"/>
<Parameter name="relaxation: use l1" type="bool" value="true"/>
<Parameter name="relaxation: backward mode" type="bool" value="true"/>

<Parameter name="smoother: type" type="string" value="CHEBYSHEV"/>
<ParameterList name="smoother: params">
<Parameter name="chebyshev: degree" type="int" value="2"/>
<Parameter name="chebyshev: ratio eigenvalue" type="double" value="5.4"/>
<Parameter name="chebyshev: eigenvalue max iterations" type="int" value="100"/>
</ParameterList>

<!-- <Parameter name="smoother: pre type" type="string" value="RELAXATION"/> -->
<!-- <ParameterList name="smoother: pre params"> -->
<!-- <Parameter name="relaxation: type" type="string" value="Gauss-Seidel"/> -->
<!-- <Parameter name="relaxation: symmetric matrix structure" type="bool" value="true"/> -->
<!-- <Parameter name="relaxation: sweeps" type="int" value="2"/> -->
<!-- <Parameter name="relaxation: use l1" type="bool" value="true"/> -->
<!-- <Parameter name="relaxation: backward mode" type="bool" value="false"/> -->
<!-- </ParameterList> -->
<!-- <Parameter name="smoother: post type" type="string" value="RELAXATION"/> -->
<!-- <ParameterList name="smoother: post params"> -->
<!-- <Parameter name="relaxation: type" type="string" value="Gauss-Seidel"/> -->
<!-- <Parameter name="relaxation: symmetric matrix structure" type="bool" value="true"/> -->
<!-- <Parameter name="relaxation: sweeps" type="int" value="2"/> -->
<!-- <Parameter name="relaxation: use l1" type="bool" value="true"/> -->
<!-- <Parameter name="relaxation: backward mode" type="bool" value="true"/> -->
<!-- </ParameterList> -->

<Parameter name="repartition: enable" type="bool" value="true"/>
<Parameter name="repartition: partitioner" type="string" value="zoltan2"/>
<Parameter name="repartition: start level" type="int" value="1"/>
Expand All @@ -232,33 +248,41 @@
<Parameter name="verbosity" type="string" value="extreme"/>
<Parameter name="coarse: max size" type="int" value="2500"/>
<Parameter name="multigrid algorithm" type="string" value="unsmoothed"/>
<Parameter name="aggregation: type" type="string" value="uncoupled"/>
<Parameter name="aggregation: drop tol" type="double" value="0.0"/>

<!-- <Parameter name="smoother: type" type="string" value="CHEBYSHEV"/> -->
<!-- <ParameterList name="smoother: params"> -->
<!-- <Parameter name="chebyshev: degree" type="int" value="2"/> -->
<!-- <Parameter name="chebyshev: ratio eigenvalue" type="double" value="5.4"/> -->
<!-- <Parameter name="chebyshev: eigenvalue max iterations" type="int" value="100"/> -->
<!-- </ParameterList> -->
<Parameter name="aggregation: type" type="string" value="uncoupled"/>
<Parameter name="aggregation: drop scheme" type="string" value="distance laplacian"/>
<Parameter name="aggregation: distance laplacian algo" type="string" value="scaled cut"/>
<Parameter name="aggregation: drop tol" type="double" value="8.0"/>

<Parameter name="smoother: pre type" type="string" value="RELAXATION"/>
<ParameterList name="smoother: pre params">
<Parameter name="relaxation: type" type="string" value="Gauss-Seidel"/>
<Parameter name="relaxation: symmetric matrix structure" type="bool" value="true"/>
<Parameter name="relaxation: sweeps" type="int" value="2"/>
<Parameter name="relaxation: use l1" type="bool" value="true"/>
<Parameter name="relaxation: backward mode" type="bool" value="false"/>
<ParameterList name="matvec params">
<!-- <Parameter name="Send type" type="string" value="Send"/> -->
<Parameter name="Send type" type="string" value="Isend"/>
</ParameterList>
<Parameter name="smoother: post type" type="string" value="RELAXATION"/>
<ParameterList name="smoother: post params">
<Parameter name="relaxation: type" type="string" value="Gauss-Seidel"/>
<Parameter name="relaxation: symmetric matrix structure" type="bool" value="true"/>
<Parameter name="relaxation: sweeps" type="int" value="2"/>
<Parameter name="relaxation: use l1" type="bool" value="true"/>
<Parameter name="relaxation: backward mode" type="bool" value="true"/>

<Parameter name="smoother: type" type="string" value="CHEBYSHEV"/>
<ParameterList name="smoother: params">
<Parameter name="chebyshev: degree" type="int" value="2"/>
<Parameter name="chebyshev: ratio eigenvalue" type="double" value="7.0"/>
<Parameter name="chebyshev: eigenvalue max iterations" type="int" value="100"/>
</ParameterList>

<!-- <Parameter name="smoother: pre type" type="string" value="RELAXATION"/> -->
<!-- <ParameterList name="smoother: pre params"> -->
<!-- <Parameter name="relaxation: type" type="string" value="Gauss-Seidel"/> -->
<!-- <Parameter name="relaxation: symmetric matrix structure" type="bool" value="true"/> -->
<!-- <Parameter name="relaxation: sweeps" type="int" value="2"/> -->
<!-- <Parameter name="relaxation: use l1" type="bool" value="true"/> -->
<!-- <Parameter name="relaxation: backward mode" type="bool" value="false"/> -->
<!-- </ParameterList> -->
<!-- <Parameter name="smoother: post type" type="string" value="RELAXATION"/> -->
<!-- <ParameterList name="smoother: post params"> -->
<!-- <Parameter name="relaxation: type" type="string" value="Gauss-Seidel"/> -->
<!-- <Parameter name="relaxation: symmetric matrix structure" type="bool" value="true"/> -->
<!-- <Parameter name="relaxation: sweeps" type="int" value="2"/> -->
<!-- <Parameter name="relaxation: use l1" type="bool" value="true"/> -->
<!-- <Parameter name="relaxation: backward mode" type="bool" value="true"/> -->
<!-- </ParameterList> -->

<Parameter name="repartition: enable" type="bool" value="true"/>
<Parameter name="repartition: partitioner" type="string" value="zoltan2"/>
<Parameter name="repartition: start level" type="int" value="1"/>
Expand Down
48 changes: 3 additions & 45 deletions packages/panzer/mini-em/example/BlockPrec/solverMueLuRefMaxwellCuda.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,66 +8,24 @@
<ParameterList name="S_E Preconditioner">
<ParameterList name="Preconditioner Types">
<ParameterList name="MueLuRefMaxwell">
<Parameter name="use kokkos refactor" type="bool" value="true"/>
<Parameter name="use kokkos refactor" type="bool" value="false"/>
<Parameter name="rap: triple product" type="bool" value="false"/>
<!-- <Parameter name="transpose: use implicit" type="bool" value="true"/> -->

<Parameter name="smoother: pre type" type="string" value="CHEBYSHEV"/>
<ParameterList name="smoother: pre params">
<Parameter name="chebyshev: degree" type="int" value="2"/>
<Parameter name="chebyshev: ratio eigenvalue" type="double" value="5.4"/>
<Parameter name="chebyshev: eigenvalue max iterations" type="int" value="100"/>
</ParameterList>

<Parameter name="smoother: post type" type="string" value="CHEBYSHEV"/>
<ParameterList name="smoother: post params">
<Parameter name="chebyshev: degree" type="int" value="2"/>
<Parameter name="chebyshev: ratio eigenvalue" type="double" value="5.4"/>
<Parameter name="chebyshev: eigenvalue max iterations" type="int" value="100"/>
</ParameterList>

<ParameterList name="refmaxwell: 11list">
<Parameter name="use kokkos refactor" type="bool" value="true"/>
<Parameter name="use kokkos refactor" type="bool" value="false"/>
<Parameter name="tentative: calculate qr" type="bool" value="false"/>
<Parameter name="rap: triple product" type="bool" value="false"/>

<Parameter name="smoother: pre type" type="string" value="CHEBYSHEV"/>
<ParameterList name="smoother: pre params">
<Parameter name="chebyshev: degree" type="int" value="2"/>
<Parameter name="chebyshev: ratio eigenvalue" type="double" value="5.4"/>
<Parameter name="chebyshev: eigenvalue max iterations" type="int" value="100"/>
</ParameterList>

<Parameter name="smoother: post type" type="string" value="CHEBYSHEV"/>
<ParameterList name="smoother: post params">
<Parameter name="chebyshev: degree" type="int" value="2"/>
<Parameter name="chebyshev: ratio eigenvalue" type="double" value="5.4"/>
<Parameter name="chebyshev: eigenvalue max iterations" type="int" value="100"/>
</ParameterList>

<Parameter name="repartition: target rows per proc" type="int" value="100000"/>
<Parameter name="repartition: min rows per proc" type="int" value="40000"/>

</ParameterList>

<ParameterList name="refmaxwell: 22list">
<Parameter name="use kokkos refactor" type="bool" value="true"/>
<Parameter name="use kokkos refactor" type="bool" value="false"/>
<Parameter name="rap: triple product" type="bool" value="false"/>

<Parameter name="smoother: pre type" type="string" value="CHEBYSHEV"/>
<ParameterList name="smoother: pre params">
<Parameter name="chebyshev: degree" type="int" value="2"/>
<Parameter name="chebyshev: ratio eigenvalue" type="double" value="5.4"/>
<Parameter name="chebyshev: eigenvalue max iterations" type="int" value="100"/>
</ParameterList>

<Parameter name="smoother: post type" type="string" value="CHEBYSHEV"/>
<ParameterList name="smoother: post params">
<Parameter name="chebyshev: degree" type="int" value="2"/>
<Parameter name="chebyshev: ratio eigenvalue" type="double" value="5.4"/>
<Parameter name="chebyshev: eigenvalue max iterations" type="int" value="100"/>
</ParameterList>

<Parameter name="repartition: target rows per proc" type="int" value="100000"/>
<Parameter name="repartition: min rows per proc" type="int" value="40000"/>

Expand Down
Loading

0 comments on commit f149931

Please sign in to comment.