Merge 'trilinos/Trilinos:develop' (b3d0e46) into 'tcad-charon/Trilino…

…s:develop' (a6a844d). * trilinos-develop: Amesos2,Tpetra: Fix trilinos#3752 (remove HAVE_STD_NEW_COUNT_SYNTAX macro) Tempus: Add accessor to WrapperModelEvaluator Tpetra: Fix trilinos#4962
tcad-charon · Apr 21, 2019 · 517574c · 517574c
2 parents a6a844d + b3d0e46
commit 517574c
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 11 deletions.
diff --git a/packages/amesos2/cmake/Amesos2_config.h.in b/packages/amesos2/cmake/Amesos2_config.h.in
@@ -54,9 +54,6 @@
  * Config Options *
  ******************/
 
-/* define if new form of std::count is supported */
-#cmakedefine HAVE_STD_NEW_COUNT_SYNTAX
-
 /* Define if want to build amesos2-debug */
 #cmakedefine HAVE_AMESOS2_DEBUG
 

diff --git a/packages/tempus/src/Tempus_StepperImplicit_decl.hpp b/packages/tempus/src/Tempus_StepperImplicit_decl.hpp
@@ -58,6 +58,8 @@ class StepperImplicit : virtual public Tempus::Stepper<Scalar>
       const Teuchos::RCP<Thyra::ModelEvaluator<Scalar> >& appModel);
     virtual Teuchos::RCP<const Thyra::ModelEvaluator<Scalar> >
       getModel(){return wrapperModel_->getAppModel();}
+    virtual Teuchos::RCP<const WrapperModelEvaluator<Scalar> >
+      getWrapperModel(){return wrapperModel_;}
 
     /// Set solver via ParameterList solver name.
     virtual void setSolver(std::string solverName);

diff --git a/packages/tpetra/core/cmake/ExplicitInstantiationSupport.cmake b/packages/tpetra/core/cmake/ExplicitInstantiationSupport.cmake
@@ -141,8 +141,10 @@ TRIBITS_ETI_GENERATE_MACROS(
     "TPETRA_INSTANTIATE_LG(LO,GO)"                  TPETRA_ETIMACRO_LG 
     "TPETRA_INSTANTIATE_SL(S,LO)"                   TPETRA_ETIMACRO_SL
     "TPETRA_INSTANTIATE_SN(S,N)"                    TPETRA_ETIMACRO_SN
+    "TPETRA_INSTANTIATE_GN(GO,N)"                   TPETRA_ETIMACRO_GN
     "TPETRA_INSTANTIATE_S(S)"                       TPETRA_ETIMACRO_S
     "TPETRA_INSTANTIATE_L(LO)"                      TPETRA_ETIMACRO_L
+    "TPETRA_INSTANTIATE_G(GO)"                      TPETRA_ETIMACRO_G
     "TPETRA_INSTANTIATE_N(N)"                       TPETRA_ETIMACRO_N
     "TPETRA_INSTANTIATE_TSLGN(CS,DS,LO,GO,N)"       TPETRA_ETIMACRO_TSLGN 
     "TPETRA_INSTANTIATE_TSLG(CS,DS,LO,GO)"          TPETRA_ETIMACRO_TSLG

diff --git a/packages/tpetra/core/cmake/TpetraCore_ETIHelperMacros.h.in b/packages/tpetra/core/cmake/TpetraCore_ETIHelperMacros.h.in
@@ -36,10 +36,14 @@
 
 @TPETRA_ETIMACRO_SN@
 
+@TPETRA_ETIMACRO_GN@
+
 @TPETRA_ETIMACRO_S@
 
 @TPETRA_ETIMACRO_L@
 
+@TPETRA_ETIMACRO_G@
+
 @TPETRA_ETIMACRO_N@
 
 @TPETRA_ETIMACRO_TSLGN@

diff --git a/packages/tpetra/core/cmake/TpetraCore_config.h.in b/packages/tpetra/core/cmake/TpetraCore_config.h.in
@@ -5,9 +5,6 @@
 /* Define whether Tpetra enables deprecated code at compile time. */
 #cmakedefine TPETRA_ENABLE_DEPRECATED_CODE
 
-/* define if new form of std::count is supported */
-#cmakedefine HAVE_STD_NEW_COUNT_SYNTAX
-
 /* Define if want to build with epetra enabled */
 #cmakedefine HAVE_TPETRACORE_EPETRA
 #ifdef HAVE_TPETRACORE_EPETRA

diff --git a/packages/tpetra/core/src/Tpetra_Details_normImpl.cpp b/packages/tpetra/core/src/Tpetra_Details_normImpl.cpp
@@ -54,17 +54,20 @@
 #if defined(HAVE_TPETRA_INST_INT_INT)
 // don't need to do anything; Scalar=int is already added
 # define TPETRA_DETAILS_NORMIMPL_INSTANT_INT( NODE )
-#else 
+#else
 # define TPETRA_DETAILS_NORMIMPL_INSTANT_INT( NODE ) \
   TPETRA_DETAILS_NORMIMPL_INSTANT( int, NODE )
-#endif 
+#endif
 
 namespace Tpetra {
 
   TPETRA_ETI_MANGLING_TYPEDEFS()
 
-  TPETRA_INSTANTIATE_SN( TPETRA_DETAILS_NORMIMPL_INSTANT )
+  TPETRA_INSTANTIATE_SN_NO_ORDINAL_SCALAR( TPETRA_DETAILS_NORMIMPL_INSTANT )
+  TPETRA_INSTANTIATE_GN( TPETRA_DETAILS_NORMIMPL_INSTANT )
+#ifndef HAVE_TPETRA_INST_INT_INT
   TPETRA_INSTANTIATE_N( TPETRA_DETAILS_NORMIMPL_INSTANT_INT )
+#endif // NOT HAVE_TPETRA_INST_INT_INT
 
 #ifdef HAVE_TPETRA_INST_CUDA
 
@@ -75,10 +78,11 @@ namespace Tpetra {
 #define TPETRA_DETAILS_NORMIMPL_INSTANT_CUDAHOSTMIRROR( S ) \
   TPETRA_DETAILS_NORMIMPL_INSTANT( S, cuda_host_mirror_device_type )
 
-  TPETRA_INSTANTIATE_S( TPETRA_DETAILS_NORMIMPL_INSTANT_CUDAHOSTMIRROR )
+  TPETRA_INSTANTIATE_S_NO_ORDINAL_SCALAR( TPETRA_DETAILS_NORMIMPL_INSTANT_CUDAHOSTMIRROR )
+  TPETRA_INSTANTIATE_G( TPETRA_DETAILS_NORMIMPL_INSTANT_CUDAHOSTMIRROR )
 #if ! defined(HAVE_TPETRA_INST_INT_INT)
   TPETRA_DETAILS_NORMIMPL_INSTANT_CUDAHOSTMIRROR( int )
-#endif 
+#endif
 
 #endif // HAVE_TPETRA_INST_CUDA