Merge branch 'master' of github.com:SNLComputation/Albany

doc/dashboards/camobap.ca.sandia.gov/convert-cmake-to-cdash.sh

@@ -32,8 +32,10 @@ sed -i 's/-D /"-D/g' /nightlyCDash/cdash-$name-frag.txt
 awk '{print $0 "\""}' /nightlyCDash/cdash-$name-frag.txt >& tmp.txt
 mv tmp.txt /nightlyCDash/cdash-$name-frag.txt
 sed -i 's, \",\",g' /nightlyCDash/cdash-$name-frag.txt
-sed -i 's/-G/\"-G/g' /nightlyCDash/cdash-$name-frag.txt
-sed -i 's/-W/\"-W/g' /nightlyCDash/cdash-$name-frag.txt
 #sed -i '$ d' /nightlyCDash/cdash-$name-frag.txt
 sed -i 's,/",,g' /nightlyCDash/cdash-$name-frag.txt
+sed -i 's, \",,g' /nightlyCDash/cdash-$name-frag.txt
+sed -i 's/-G/\"-G/g' /nightlyCDash/cdash-$name-frag.txt
+sed -i 's/-W/\"-W/g' /nightlyCDash/cdash-$name-frag.txt
+sed -i 's/-D/\"-D/g' /nightlyCDash/cdash-$name-frag.txt
 cat /nightlyCDash/cdash-$name-frag.txt

src/Albany_Application.cpp

@@ -29,11 +29,6 @@
 #include "Teuchos_TimeMonitor.hpp"
 #include "Zoltan2_TpetraCrsColorer.hpp"
 
-
-#ifdef ALBANY_TEKO
-#include "Teko_InverseFactoryOperator.hpp"
-#endif
-
 #include <stdexcept>
 #include <string>
 

src/CMakeLists.txt

@@ -130,10 +130,7 @@ endif()
 
 #utility
 list (APPEND SOURCES
-  utility/Counter.cpp
-  utility/CounterMonitor.cpp
   utility/DisplayTable.cpp
-  utility/PerformanceContext.cpp
   utility/TimeMonitor.cpp
   utility/Albany_CombineAndScatterManager.cpp
   utility/Albany_CombineAndScatterManagerTpetra.cpp
@@ -148,17 +145,10 @@ list (APPEND SOURCES
   utility/Albany_ThyraUtils.cpp
   utility/Albany_TpetraThyraUtils.cpp
   utility/Albany_UnivariateDistribution.hpp
-  utility/VariableMonitor.cpp
-  utility/StaticAllocator.cpp
   )
 list (APPEND HEADERS
-  utility/Counter.hpp
-  utility/CounterMonitor.hpp
   utility/DisplayTable.hpp
-  utility/MonitorBase.hpp
-  utility/PerformanceContext.hpp
   utility/Albany_StringUtils.hpp
-  utility/TimeGuard.hpp
   utility/TimeMonitor.hpp
   utility/Albany_CombineAndScatterManager.hpp
   utility/Albany_CombineAndScatterManagerTpetra.hpp
@@ -172,12 +162,6 @@ list (APPEND HEADERS
   utility/Albany_ThyraBlockedCrsMatrixFactory.hpp
   utility/Albany_ThyraUtils.hpp
   utility/Albany_TpetraThyraUtils.hpp
-  utility/VariableMonitor.hpp
-  utility/StaticAllocator.hpp
-  utility/math/Tensor.hpp
-  utility/math/TensorCommon.hpp
-  utility/math/TensorDetail.hpp
-  utility/math/TensorImpl.hpp
   )
 
 if (ALBANY_EPETRA)
@@ -235,7 +219,6 @@ list (APPEND HEADERS
   problems/Albany_ResponseUtilities.hpp
   problems/Albany_ResponseUtilities_Def.hpp
   problems/Albany_MaterialDatabase.hpp
-  problems/Albany_ParamEnum.hpp
   )
 
 
@@ -393,7 +376,6 @@ list (APPEND SOURCES
   evaluators/interpolation/PHAL_DOFVecInterpolation.cpp
   evaluators/interpolation/PHAL_DOFVecInterpolationSide.cpp
   evaluators/interpolation/PHAL_P0Interpolation.cpp
-  evaluators/response/PHAL_ResponseFieldIntegral.cpp
   evaluators/response/PHAL_ResponseSquaredL2Difference.cpp
   evaluators/response/PHAL_ResponseSquaredL2DifferenceSide.cpp
   evaluators/scatter/PHAL_ScatterResidual.cpp
@@ -404,19 +386,15 @@ list (APPEND SOURCES
   evaluators/state/PHAL_LoadSideSetStateField.cpp
   evaluators/state/PHAL_LoadStateField.cpp
   evaluators/state/PHAL_ReadStateField.cpp
-  evaluators/state/PHAL_SaveCellStateField.cpp
-  evaluators/state/PHAL_SaveNodalField.cpp
   evaluators/state/PHAL_SaveSideSetStateField.cpp
   evaluators/state/PHAL_SaveStateField.cpp
   evaluators/utility/PHAL_Absorption.cpp
   evaluators/utility/PHAL_AddNoise.cpp
   evaluators/utility/PHAL_ComputeBasisFunctions.cpp
   evaluators/utility/PHAL_ComputeBasisFunctionsSide.cpp
-  evaluators/utility/PHAL_Constant.cpp
   evaluators/utility/PHAL_ConvertFieldType.cpp
   evaluators/utility/PHAL_DummyResidual.cpp
   evaluators/utility/PHAL_FieldFrobeniusNorm.cpp
-  evaluators/utility/PHAL_LangevinNoiseTerm.cpp
   evaluators/utility/PHAL_LinearCombinationParameter.cpp
   evaluators/utility/PHAL_LogGaussianDistributedParameter.cpp
   evaluators/utility/PHAL_MapToPhysicalFrame.cpp
@@ -484,8 +462,6 @@ list (APPEND HEADERS
   evaluators/interpolation/PHAL_P0Interpolation.hpp
   evaluators/interpolation/PHAL_P0Interpolation_Def.hpp
   evaluators/utility/PHAL_SharedParameter.hpp
-  evaluators/response/PHAL_ResponseFieldIntegral.hpp
-  evaluators/response/PHAL_ResponseFieldIntegral_Def.hpp
   evaluators/response/PHAL_ResponseSquaredL2Difference.hpp
   evaluators/response/PHAL_ResponseSquaredL2DifferenceSide.hpp
   evaluators/response/PHAL_ResponseSquaredL2DifferenceSide_Def.hpp
@@ -504,10 +480,6 @@ list (APPEND HEADERS
   evaluators/state/PHAL_LoadStateField_Def.hpp
   evaluators/state/PHAL_ReadStateField.hpp
   evaluators/state/PHAL_ReadStateField_Def.hpp
-  evaluators/state/PHAL_SaveCellStateField.hpp
-  evaluators/state/PHAL_SaveCellStateField_Def.hpp
-  evaluators/state/PHAL_SaveNodalField.hpp
-  evaluators/state/PHAL_SaveNodalField_Def.hpp
   evaluators/state/PHAL_SaveSideSetStateField.hpp
   evaluators/state/PHAL_SaveSideSetStateField_Def.hpp
   evaluators/state/PHAL_SaveStateField.hpp
@@ -520,16 +492,12 @@ list (APPEND HEADERS
   evaluators/utility/PHAL_ComputeBasisFunctions_Def.hpp
   evaluators/utility/PHAL_ComputeBasisFunctionsSide.hpp
   evaluators/utility/PHAL_ComputeBasisFunctionsSide_Def.hpp
-  evaluators/utility/PHAL_Constant.hpp
-  evaluators/utility/PHAL_Constant_Def.hpp
   evaluators/utility/PHAL_ConvertFieldType.hpp
   evaluators/utility/PHAL_ConvertFieldType_Def.hpp
   evaluators/utility/PHAL_DummyResidual.hpp
   evaluators/utility/PHAL_DummyResidual_Def.hpp
   evaluators/utility/PHAL_FieldFrobeniusNorm.hpp
   evaluators/utility/PHAL_FieldFrobeniusNorm_Def.hpp
-  evaluators/utility/PHAL_LangevinNoiseTerm.hpp
-  evaluators/utility/PHAL_LangevinNoiseTerm_Def.hpp
   evaluators/utility/PHAL_LinearCombinationParameter.hpp
   evaluators/utility/PHAL_LogGaussianDistributedParameter.hpp
   evaluators/utility/PHAL_MapToPhysicalFrame.hpp