Merge remote-tracking branch '7094-cts1-gnu-make-files' into atdm-nig…

…htly-manual-updates (#7094, #7109) I am manaully merging this to 'atdm-nightly' so I can see this running tomorrow. Also see ATDV-328.
trilinos · Apr 2, 2020 · e44c98b · e44c98b
2 parents bf753cc + b667742
commit e44c98b
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/cmake/std/atdm/common/toss3/environment_new.sh b/cmake/std/atdm/common/toss3/environment_new.sh
@@ -9,7 +9,7 @@
 echo "Using $ATDM_CONFIG_SYSTEM_NAME toss3 compiler stack $ATDM_CONFIG_COMPILER to build $ATDM_CONFIG_BUILD_TYPE code with Kokkos node type $ATDM_CONFIG_NODE_TYPE"
 
 export ATDM_CONFIG_ENABLE_SPARC_SETTINGS=ON
-export ATDM_CONFIG_USE_NINJA=ON
+export ATDM_CONFIG_USE_NINJA=OFF
 export ATDM_CONFIG_BUILD_COUNT=8
 # export ATDM_CONFIG_CMAKE_JOB_POOL_LINK=2
 # NOTE: Above, currently setting CMAKE_JOB_POOL_LINK results in a build

diff --git a/cmake/std/atdm/common/toss3/environment_tlcc2.sh b/cmake/std/atdm/common/toss3/environment_tlcc2.sh
@@ -12,7 +12,7 @@ fi
 
 echo "Using toss3 compiler stack $ATDM_CONFIG_COMPILER to build $ATDM_CONFIG_BUILD_TYPE code with Kokkos node type $ATDM_CONFIG_NODE_TYPE"
 
-export ATDM_CONFIG_USE_NINJA=ON
+export ATDM_CONFIG_USE_NINJA=OFF
 export ATDM_CONFIG_BUILD_COUNT=8
 # export ATDM_CONFIG_CMAKE_JOB_POOL_LINK=2
 # NOTE: Above, currently setting CMAKE_JOB_POOL_LINK results in a build

diff --git a/packages/panzer/mini-em/example/BlockPrec/solverMueLuRefMaxwell.xml b/packages/panzer/mini-em/example/BlockPrec/solverMueLuRefMaxwell.xml
@@ -145,6 +145,7 @@
             <ParameterList name="Preconditioner Types">
               <ParameterList name="MueLuRefMaxwell">
                 <Parameter name="parameterlist: syntax" type="string" value="muelu"/>
+                <Parameter name="use kokkos refactor" type="bool" value="false"/>
                 <Parameter name="verbosity" type="string" value="extreme"/>
                 <Parameter name="refmaxwell: use as preconditioner" type="bool" value="true"/>
                 <Parameter name="refmaxwell: mode" type="string" value="additive"/>
@@ -192,6 +193,7 @@
                 <!-- </ParameterList> -->
 
                 <ParameterList name="refmaxwell: 11list">
+                  <Parameter name="use kokkos refactor" type="bool" value="false"/>
                   <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"/>
@@ -245,6 +247,7 @@
                 </ParameterList>
 
                 <ParameterList name="refmaxwell: 22list">
+                  <Parameter name="use kokkos refactor" type="bool" value="false"/>
                   <Parameter name="verbosity" type="string" value="extreme"/>
                   <Parameter name="coarse: max size" type="int" value="2500"/>
                   <Parameter name="multigrid algorithm" type="string" value="unsmoothed"/>

diff --git a/packages/trilinoscouplings/examples/scaling/IntrepidPoisson_Pamgen_Tpetra_main.cpp b/packages/trilinoscouplings/examples/scaling/IntrepidPoisson_Pamgen_Tpetra_main.cpp
@@ -180,6 +180,12 @@ main (int argc, char *argv[])
     cmdp.setOption ("matrixFilename", &matrixFilename, "If nonempty, dump the "
                     "generated matrix to that file in MatrixMarket format.");
 
+    // If coordsFilename is nonempty, dump the coords to that file
+    // in MatrixMarket format.
+    std::string coordsFilename;
+    cmdp.setOption ("coordsFilename", &coordsFilename, "If nonempty, dump the "
+                    "generated coordinates to that file in MatrixMarket format.");
+
     // If rowMapFilename is nonempty, dump the matrix's row Map to
     // that file in MatrixMarket format.
     std::string rowMapFilename;
@@ -191,8 +197,8 @@ main (int argc, char *argv[])
     bool exitAfterAssembly = false;
     cmdp.setOption ("exitAfterAssembly", "dontExitAfterAssembly",
                     &exitAfterAssembly, "If true, exit after building the "
-                    "sparse matrix and dense right-hand side vector.  If either"
-                    " --matrixFilename or --rowMapFilename are nonempty strings"
+                    "sparse matrix and dense right-hand side vector.  If "
+                    " --matrixFilename --coordsFilename or --rowMapFilename are nonempty strings"
                     ", dump the matrix resp. row Map to their respective files "
                     "before exiting.");
 
@@ -202,9 +208,7 @@ main (int argc, char *argv[])
                     &exitAfterPrecond, "If true, exit after building the "
                     "preconditioner.");
 
-
-     // If matrixFilename is nonempty, dump the matrix to that file
-    // in MatrixMarket format.
+    // Number of rebuilds of the MueLu hierarchy
     int numMueluRebuilds=0;
     cmdp.setOption ("rebuild", &numMueluRebuilds, "Number of times to rebuild the MueLu hierarchy.");
 
@@ -280,6 +284,9 @@ main (int argc, char *argv[])
         if (matrixFilename != "") {
           writer_type::writeSparseFile (matrixFilename, A);
         }
+        if (coordsFilename != "") {
+          writer_type::writeDenseFile (coordsFilename, coords);
+        }
         if (rowMapFilename != "") {
           writer_type::writeMapFile (rowMapFilename, * (A->getRowMap ()));
         }