Reorganized source folders and cleaning

Created folders src/corePDEs src/demoPDEs and move corresponding evaluators and problems to these folders. Removed files that were not used
sandialabs · Dec 20, 2022 · 8b0276e · 8b0276e
1 parent 6e9148b
commit 8b0276e
Show file tree

Hide file tree

Showing 329 changed files with 248 additions and 1,422 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -574,7 +574,7 @@ ENDIF()
 MESSAGE("\nAlbany physics packages:\n")
 
 # set optional dependency on demoPDEs, defaults to Enabled
-OPTION(ENABLE_DEMO_PDES "Flag to turn on demonstration PDEs problems" ON)
+OPTION(ENABLE_DEMO_PDES "Flag to turn on demonstration PDEs problems" OFF)
 IF (ENABLE_DEMO_PDES)
   MESSAGE("-- DEMO_PDES                               Enabled.")
   SET(ALBANY_DEMO_PDES TRUE)

diff --git a/PyAlbany/src/CMakeLists.txt b/PyAlbany/src/CMakeLists.txt
@@ -56,18 +56,20 @@ set(ALBANY_LIBRARIES
   albanyLib
 )
 
+list(APPEND ALBANY_LIBRARIES corePDEs)
+
 if(ALBANY_DEMO_PDES)
-  list(APPEND ALBANY_LIBRARIES albanyPDEs)
+  list(APPEND ALBANY_LIBRARIES demoPDEs)
 endif()
 
 if (ALBANY_LANDICE)
   list (APPEND ALBANY_INCLUDE_DIRS
-    ${Albany_SOURCE_DIR}/src/LandIce
-    ${Albany_SOURCE_DIR}/src/LandIce/evaluators
-    ${Albany_SOURCE_DIR}/src/LandIce/problems
+    ${Albany_SOURCE_DIR}/src/landIce
+    ${Albany_SOURCE_DIR}/src/landIce/evaluators
+    ${Albany_SOURCE_DIR}/src/landIce/problems
   )
 
-  list (APPEND ALBANY_LIBRARIES LandIce)
+  list (APPEND ALBANY_LIBRARIES landIce)
 
   if (ENABLE_MPAS_INTERFACE)
     list (APPEND ALBANY_LIBRARIES mpasInterface)

diff --git a/src/Albany_config.h.in b/src/Albany_config.h.in
@@ -4,6 +4,7 @@
 // ======================== Albany packages and subpackages macros ============================== //
 
 #cmakedefine ALBANY_LANDICE
+#cmakedefine ALBANY_DEMO_PDES
 
 // ===================== Macros to identify packages found in Trilinos ======================= //
 
@@ -32,9 +33,6 @@
 // Whether Albany was compiled with MPI enabled
 #cmakedefine ALBANY_MPI
 
-// Whether pde examples should be built
-#cmakedefine ALBANY_DEMO_PDES
-
 // Whether mesh and parameters depend on each others and/or solution
 #cmakedefine ALBANY_MESH_DEPENDS_ON_PARAMETERS
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -34,7 +34,6 @@ set (ALBANY_INCLUDE_DIRS
      ${Albany_SOURCE_DIR}/src/evaluators/bc
      ${Albany_SOURCE_DIR}/src/evaluators/gather
      ${Albany_SOURCE_DIR}/src/evaluators/interpolation
-     ${Albany_SOURCE_DIR}/src/evaluators/pde
      ${Albany_SOURCE_DIR}/src/evaluators/response
      ${Albany_SOURCE_DIR}/src/evaluators/scatter
      ${Albany_SOURCE_DIR}/src/evaluators/state
@@ -215,13 +214,9 @@ list (APPEND SOURCES
   problems/Albany_BCUtils.cpp
   problems/Albany_EvaluatorUtils.cpp
   problems/Albany_FieldUtils.cpp
-  problems/Albany_HeatProblem.cpp
   problems/Albany_Layouts.cpp
-  problems/Albany_PopulateMesh.cpp
-  problems/Albany_ProblemFactory.cpp
   problems/Albany_ProblemUtils.cpp
   problems/Albany_ResponseUtilities.cpp
-  problems/Albany_SideLaplacianProblem.cpp
   problems/Albany_MaterialDatabase.cpp
   )
 
@@ -234,14 +229,11 @@ list (APPEND HEADERS
   problems/Albany_FieldUtils.hpp
   problems/Albany_FieldUtils_Def.hpp
   problems/Albany_GeneralPurposeFieldsNames.hpp
-  problems/Albany_HeatProblem.hpp
   problems/Albany_Layouts.hpp
-  problems/Albany_PopulateMesh.hpp
   problems/Albany_ProblemFactory.hpp
   problems/Albany_ProblemUtils.hpp
   problems/Albany_ResponseUtilities.hpp
   problems/Albany_ResponseUtilities_Def.hpp
-  problems/Albany_SideLaplacianProblem.hpp
   problems/Albany_MaterialDatabase.hpp
   problems/Albany_ParamEnum.hpp
   )
@@ -252,16 +244,13 @@ list (APPEND SOURCES
   responses/Albany_CumulativeScalarResponseFunction.cpp
   responses/Albany_DistributedResponseFunction.cpp
   responses/Albany_FieldManagerScalarResponseFunction.cpp
-  responses/Albany_FieldManagerResidualOnlyResponseFunction.cpp
   responses/Albany_SamplingBasedScalarResponseFunction.cpp
-  responses/Albany_KLResponseFunction.cpp
   responses/Albany_WeightedMisfitResponseFunction.cpp
   responses/Albany_ScalarResponsePower.cpp
   responses/Albany_ResponseFactory.cpp
   responses/Albany_ScalarResponseFunction.cpp
   responses/Albany_SolutionCullingStrategy.cpp
   responses/Albany_SolutionAverageResponseFunction.cpp
-  responses/Albany_SolutionFileResponseFunction.cpp
   responses/Albany_SolutionMaxValueResponseFunction.cpp
   responses/Albany_SolutionMinValueResponseFunction.cpp
   responses/Albany_SolutionResponseFunction.cpp
@@ -274,15 +263,13 @@ list (APPEND HEADERS
   responses/Albany_CumulativeScalarResponseFunction.hpp
   responses/Albany_DistributedResponseFunction.hpp
   responses/Albany_FieldManagerScalarResponseFunction.hpp
-  responses/Albany_KLResponseFunction.hpp
   responses/Albany_WeightedMisfitResponseFunction.hpp
   responses/Albany_SamplingBasedScalarResponseFunction.hpp
   responses/Albany_ScalarResponsePower.hpp
   responses/Albany_ResponseFactory.hpp
   responses/Albany_ScalarResponseFunction.hpp
   responses/Albany_SolutionAverageResponseFunction.hpp
   responses/Albany_SolutionCullingStrategy.hpp
-  responses/Albany_SolutionFileResponseFunction.hpp
   responses/Albany_SolutionMaxValueResponseFunction.hpp
   responses/Albany_SolutionMinValueResponseFunction.cpp
   responses/Albany_SolutionResponseFunction.hpp
@@ -406,10 +393,6 @@ list (APPEND SOURCES
   evaluators/interpolation/PHAL_DOFVecInterpolation.cpp
   evaluators/interpolation/PHAL_DOFVecInterpolationSide.cpp
   evaluators/interpolation/PHAL_P0Interpolation.cpp
-  evaluators/pde/PHAL_HeatEqResid.cpp
-  evaluators/pde/PHAL_NSMaterialProperty.cpp
-  evaluators/pde/PHAL_SideLaplacianResidual.cpp
-  evaluators/pde/PHAL_ThermalConductivity.cpp
   evaluators/response/PHAL_ResponseFieldIntegral.cpp
   evaluators/response/PHAL_ResponseSquaredL2Difference.cpp
   evaluators/response/PHAL_ResponseSquaredL2DifferenceSide.cpp
@@ -500,14 +483,6 @@ list (APPEND HEADERS
   evaluators/interpolation/PHAL_DOFVecInterpolation_Def.hpp
   evaluators/interpolation/PHAL_P0Interpolation.hpp
   evaluators/interpolation/PHAL_P0Interpolation_Def.hpp
-  evaluators/pde/PHAL_HeatEqResid.hpp
-  evaluators/pde/PHAL_HeatEqResid_Def.hpp
-  evaluators/pde/PHAL_NSMaterialProperty.hpp
-  evaluators/pde/PHAL_NSMaterialProperty_Def.hpp
-  evaluators/pde/PHAL_SideLaplacianResidual.hpp
-  evaluators/pde/PHAL_SideLaplacianResidual_Def.hpp
-  evaluators/pde/PHAL_ThermalConductivity.hpp
-  evaluators/pde/PHAL_ThermalConductivity_Def.hpp
   evaluators/utility/PHAL_SharedParameter.hpp
   evaluators/response/PHAL_ResponseFieldIntegral.hpp
   evaluators/response/PHAL_ResponseFieldIntegral_Def.hpp
@@ -613,117 +588,17 @@ set(TPL_LIBRARIES
 
 set(ALBANY_LIBRARIES albanyLib)
 
-if(ALBANY_DEMO_PDES)
-  set(PDE_SRCS
-    problems/Albany_AdvDiffProblem.cpp
-    problems/Albany_ReactDiffSystem.cpp
-    problems/Albany_DemoProblemFactory.cpp
-    problems/Albany_Helmholtz2DProblem.cpp
-    problems/Albany_ODEProblem.cpp
-    problems/Albany_NavierStokes.cpp
-    problems/Albany_ThermoElectrostaticsProblem.cpp
-    problems/Albany_ThermalProblem.cpp
-    problems/Albany_AdvectionProblem.cpp
-    evaluators/pde/PHAL_AdvDiffResid.cpp
-    evaluators/pde/PHAL_ReactDiffSystemResid.cpp
-    evaluators/pde/PHAL_HelmholtzResid.cpp
-    evaluators/pde/PHAL_JouleHeating.cpp
-    evaluators/pde/PHAL_NSBodyForce.cpp
-    evaluators/pde/PHAL_NSContinuityResid.cpp
-    evaluators/pde/PHAL_NSContravarientMetricTensor.cpp
-    evaluators/pde/PHAL_NSForchheimerTerm.cpp
-    evaluators/pde/PHAL_NSMomentumResid.cpp
-    evaluators/pde/PHAL_NSNeutronEqResid.cpp
-    evaluators/pde/PHAL_NSPermeabilityTerm.cpp
-    evaluators/pde/PHAL_ThermalResid.cpp
-    evaluators/pde/PHAL_AdvectionResid.cpp
-    evaluators/pde/PHAL_NSRm.cpp
-    evaluators/pde/PHAL_NSTauM.cpp
-    evaluators/pde/PHAL_NSTauT.cpp
-    evaluators/pde/PHAL_NSThermalEqResid.cpp
-    evaluators/pde/PHAL_ODEResid.cpp
-    evaluators/pde/PHAL_PoissonResid.cpp
-    evaluators/pde/PHAL_Permittivity.cpp
-    evaluators/pde/PHAL_TEProp.cpp
-  )
-
-  set(PDE_HDRS
-    problems/Albany_AdvDiffProblem.hpp
-    problems/Albany_ReactDiffSystem.hpp
-    problems/Albany_Helmholtz2DProblem.hpp
-    problems/Albany_NavierStokes.hpp
-    problems/Albany_ODEProblem.hpp
-    problems/Albany_ThermoElectrostaticsProblem.hpp
-    problems/Albany_ThermalProblem.hpp
-    problems/Albany_AdvectionProblem.hpp
-    evaluators/pde/PHAL_AdvDiffResid.hpp
-    evaluators/pde/PHAL_AdvDiffResid_Def.hpp
-    evaluators/pde/PHAL_ReactDiffSystemResid.hpp
-    evaluators/pde/PHAL_ReactDiffSystemResid_Def.hpp
-    evaluators/pde/PHAL_HelmholtzResid.hpp
-    evaluators/pde/PHAL_HelmholtzResid_Def.hpp
-    evaluators/pde/PHAL_JouleHeating.hpp
-    evaluators/pde/PHAL_JouleHeating_Def.hpp
-    evaluators/pde/PHAL_NSContinuityResid.hpp
-    evaluators/pde/PHAL_NSContinuityResid_Def.hpp
-    evaluators/pde/PHAL_NSBodyForce.hpp
-    evaluators/pde/PHAL_NSBodyForce_Def.hpp
-    evaluators/pde/PHAL_NSContravarientMetricTensor.hpp
-    evaluators/pde/PHAL_NSContravarientMetricTensor_Def.hpp
-    evaluators/pde/PHAL_NSForchheimerTerm.hpp
-    evaluators/pde/PHAL_NSForchheimerTerm_Def.hpp
-    evaluators/pde/PHAL_NSMomentumResid.hpp
-    evaluators/pde/PHAL_NSMomentumResid_Def.hpp
-    evaluators/pde/PHAL_NSNeutronEqResid.hpp
-    evaluators/pde/PHAL_NSNeutronEqResid_Def.hpp
-    evaluators/pde/PHAL_NSPermeabilityTerm.hpp
-    evaluators/pde/PHAL_NSPermeabilityTerm_Def.hpp
-    evaluators/pde/PHAL_NSRm.hpp
-    evaluators/pde/PHAL_NSRm_Def.hpp
-    evaluators/pde/PHAL_NSTauM.hpp
-    evaluators/pde/PHAL_NSTauM_Def.hpp
-    evaluators/pde/PHAL_NSTauT.hpp
-    evaluators/pde/PHAL_NSTauT_Def.hpp
-    evaluators/pde/PHAL_NSThermalEqResid.hpp
-    evaluators/pde/PHAL_NSThermalEqResid_Def.hpp
-    evaluators/pde/PHAL_ODEResid.hpp
-    evaluators/pde/PHAL_ODEResid_Def.hpp
-    evaluators/pde/PHAL_PoissonResid.hpp
-    evaluators/pde/PHAL_PoissonResid_Def.hpp
-    evaluators/pde/PHAL_Permittivity.hpp
-    evaluators/pde/PHAL_Permittivity_Def.hpp
-    evaluators/pde/PHAL_TEProp.hpp
-    evaluators/pde/PHAL_TEProp_Def.hpp
-    evaluators/pde/PHAL_ThermalResid.hpp
-    evaluators/pde/PHAL_ThermalResid_Def.hpp
-    evaluators/pde/PHAL_AdvectionResid.hpp
-    evaluators/pde/PHAL_AdvectionResid_Def.hpp
-  )
-
-  add_library(albanyPDEs ${Albany_LIBRARY_TYPE} ${PDE_SRCS})
-  set_target_properties(albanyPDEs PROPERTIES PUBLIC_HEADER "${PDE_HDRS}")
-  target_link_libraries(albanyPDEs PUBLIC albanyLib)
-  if (ALBANY_SUPPRESS_TRILINOS_WARNINGS)
-    target_include_directories(albanyPDEs SYSTEM PUBLIC
-                              "${Trilinos_INCLUDE_DIRS};${Trilinos_TPL_INCLUDE_DIRS}")
-  else()
-    target_include_directories(albanyPDEs PUBLIC
-                              "${Trilinos_INCLUDE_DIRS};${Trilinos_TPL_INCLUDE_DIRS}")
-  endif()
-  target_include_directories(albanyPDEs PUBLIC
-                             "$<BUILD_INTERFACE:${ALBANY_INCLUDE_DIRS}>"
-                              $<INSTALL_INTERFACE:${CMAKE_INSTALL_LIBDIR}>)
-  list(APPEND ALBANY_LIBRARIES albanyPDEs)
+add_subdirectory(corePDEs)
+list (APPEND ALBANY_LIBRARIES corePDEs)
 
-  install(TARGETS albanyPDEs EXPORT albany-export
-          LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-          ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-          PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+if(ALBANY_DEMO_PDES)
+	add_subdirectory(demoPDEs)
+	list (APPEND ALBANY_LIBRARIES demoPDEs)
 endif()
 
 if (ALBANY_LANDICE)
-  add_subdirectory(LandIce)
-  list (APPEND ALBANY_LIBRARIES LandIce)
+  add_subdirectory(landIce)
+  list (APPEND ALBANY_LIBRARIES landIce)
 
   if (ENABLE_MPAS_INTERFACE)
     list (APPEND ALBANY_LIBRARIES mpasInterface)

diff --git a/src/corePDEs/CMakeLists.txt b/src/corePDEs/CMakeLists.txt
@@ -0,0 +1,56 @@
+##*****************************************************************//
+##    Albany 3.0:  Copyright 2016 Sandia Corporation               //
+##    This Software is released under the BSD license detailed     //
+##    in the file "license.txt" in the top-level Albany directory  //
+##*****************************************************************//
+
+
+set(SOURCES
+    problems/Albany_CoreProblemFactory.cpp
+    problems/Albany_HeatProblem.cpp
+    problems/Albany_PopulateMesh.cpp
+    problems/Albany_SideLaplacianProblem.cpp
+    evaluators/PHAL_HeatEqResid.cpp
+    evaluators/PHAL_SideLaplacianResidual.cpp
+    evaluators/PHAL_ThermalConductivity.cpp
+  )
+
+  set(HEADERS
+    problems/Albany_CoreProblemFactory.hpp
+    problems/Albany_HeatProblem.hpp
+    problems/Albany_PopulateMesh.hpp
+    problems/Albany_SideLaplacianProblem.hpp
+    evaluators/PHAL_HeatEqResid.hpp
+    evaluators/PHAL_HeatEqResid_Def.hpp
+    evaluators/PHAL_SideLaplacianResidual.hpp
+    evaluators/PHAL_SideLaplacianResidual_Def.hpp
+    evaluators/PHAL_ThermalConductivity.hpp
+    evaluators/PHAL_ThermalConductivity_Def.hpp
+  )
+
+add_library(corePDEs ${Albany_LIBRARY_TYPE} ${SOURCES})
+set_target_properties(corePDEs PROPERTIES PUBLIC_HEADER "${HEADERS}")
+target_link_libraries(corePDEs PUBLIC albanyLib)
+if (ALBANY_SUPPRESS_TRILINOS_WARNINGS)
+	target_include_directories(corePDEs SYSTEM PUBLIC
+                            "${Trilinos_INCLUDE_DIRS};${Trilinos_TPL_INCLUDE_DIRS}")
+else()
+	target_include_directories(corePDEs PUBLIC
+                            "${Trilinos_INCLUDE_DIRS};${Trilinos_TPL_INCLUDE_DIRS}")
+endif()
+
+set (COREPDES_INCLUDE_DIRS
+     ${ALBANY_INCLUDE_DIRS}
+     ${CMAKE_CURRENT_SOURCE_DIR}/evaluators
+     ${CMAKE_CURRENT_SOURCE_DIR}/problems
+)
+
+target_include_directories(corePDEs PUBLIC
+	"$<BUILD_INTERFACE:${COREPDES_INCLUDE_DIRS}>"
+                            $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
+
+install(TARGETS corePDEs EXPORT albany-export
+        LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}/"
+        ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}/"
+        PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
+
diff --git a/src/evaluators/pde/PHAL_HeatEqResid.cpp → src/corePDEs/evaluators/PHAL_HeatEqResid.cpp b/src/evaluators/pde/PHAL_HeatEqResid.cpp → src/corePDEs/evaluators/PHAL_HeatEqResid.cpp
diff --git a/src/evaluators/pde/PHAL_HeatEqResid.hpp → src/corePDEs/evaluators/PHAL_HeatEqResid.hpp b/src/evaluators/pde/PHAL_HeatEqResid.hpp → src/corePDEs/evaluators/PHAL_HeatEqResid.hpp
diff --git a/src/evaluators/pde/PHAL_HeatEqResid_Def.hpp → ...ePDEs/evaluators/PHAL_HeatEqResid_Def.hpp b/src/evaluators/pde/PHAL_HeatEqResid_Def.hpp → ...ePDEs/evaluators/PHAL_HeatEqResid_Def.hpp
diff --git a/...uators/pde/PHAL_SideLaplacianResidual.cpp → ...evaluators/PHAL_SideLaplacianResidual.cpp b/...uators/pde/PHAL_SideLaplacianResidual.cpp → ...evaluators/PHAL_SideLaplacianResidual.cpp
diff --git a/...uators/pde/PHAL_SideLaplacianResidual.hpp → ...evaluators/PHAL_SideLaplacianResidual.hpp b/...uators/pde/PHAL_SideLaplacianResidual.hpp → ...evaluators/PHAL_SideLaplacianResidual.hpp
diff --git a/...rs/pde/PHAL_SideLaplacianResidual_Def.hpp → ...uators/PHAL_SideLaplacianResidual_Def.hpp b/...rs/pde/PHAL_SideLaplacianResidual_Def.hpp → ...uators/PHAL_SideLaplacianResidual_Def.hpp
diff --git a/...aluators/pde/PHAL_ThermalConductivity.cpp → ...s/evaluators/PHAL_ThermalConductivity.cpp b/...aluators/pde/PHAL_ThermalConductivity.cpp → ...s/evaluators/PHAL_ThermalConductivity.cpp
diff --git a/...aluators/pde/PHAL_ThermalConductivity.hpp → ...s/evaluators/PHAL_ThermalConductivity.hpp b/...aluators/pde/PHAL_ThermalConductivity.hpp → ...s/evaluators/PHAL_ThermalConductivity.hpp
diff --git a/...tors/pde/PHAL_ThermalConductivity_Def.hpp → ...aluators/PHAL_ThermalConductivity_Def.hpp b/...tors/pde/PHAL_ThermalConductivity_Def.hpp → ...aluators/PHAL_ThermalConductivity_Def.hpp
diff --git a/src/problems/Albany_ProblemFactory.cpp → ...Es/problems/Albany_CoreProblemFactory.cpp b/src/problems/Albany_ProblemFactory.cpp → ...Es/problems/Albany_CoreProblemFactory.cpp
@@ -4,7 +4,7 @@
 //    in the file "license.txt" in the top-level Albany directory  //
 //*****************************************************************//
 
-#include "Albany_ProblemFactory.hpp"
+#include "Albany_CoreProblemFactory.hpp"
 
 #include "Albany_HeatProblem.hpp"
 #include "Albany_PopulateMesh.hpp"
@@ -13,7 +13,7 @@
 namespace Albany
 {
 
-bool BasicProblemFactory::provides (const std::string& key) const 
+bool CoreProblemFactory::provides (const std::string& key) const 
 {
   return key == "Heat 1D" ||
          key == "Heat 2D" ||
@@ -22,8 +22,8 @@ bool BasicProblemFactory::provides (const std::string& key) const
          key == "Side Laplacian 3D";
 }
 
-BasicProblemFactory::obj_ptr_type
-BasicProblemFactory::
+CoreProblemFactory::obj_ptr_type
+CoreProblemFactory::
 create (const std::string& key,
         const Teuchos::RCP<const Teuchos_Comm>&     comm,
         const Teuchos::RCP<Teuchos::ParameterList>& topLevelParams,

diff --git a/src/corePDEs/problems/Albany_CoreProblemFactory.hpp b/src/corePDEs/problems/Albany_CoreProblemFactory.hpp
@@ -0,0 +1,38 @@
+//*****************************************************************//
+//    Albany 3.0:  Copyright 2016 Sandia Corporation               //
+//    This Software is released under the BSD license detailed     //
+//    in the file "license.txt" in the top-level Albany directory  //
+//*****************************************************************//
+
+#ifndef ALBANY_CORE_PROBLEM_FACTORY_HPP
+#define ALBANY_CORE_PROBLEM_FACTORY_HPP
+
+#include "Albany_ProblemFactory.hpp"
+
+namespace Albany {
+
+// A concrete problem factory class for basic albany problems
+class CoreProblemFactory : public ProblemFactory
+{
+public:
+  obj_ptr_type create (const std::string& key,
+                       const Teuchos::RCP<const Teuchos_Comm>&     comm,
+                       const Teuchos::RCP<Teuchos::ParameterList>& topLevelParams,
+                       const Teuchos::RCP<ParamLib>&               paramLib) const;
+
+  bool provides (const std::string& key) const;
+
+  static CoreProblemFactory& instance () {
+    static CoreProblemFactory factory;
+    return factory;
+  }
+
+protected:
+
+  //! Default constructor
+  CoreProblemFactory () = default;
+};
+
+} // namespace Albany
+
+#endif // ALBANY_PROBLEM_FACTORY_HPP
diff --git a/src/problems/Albany_HeatProblem.cpp → src/corePDEs/problems/Albany_HeatProblem.cpp b/src/problems/Albany_HeatProblem.cpp → src/corePDEs/problems/Albany_HeatProblem.cpp
diff --git a/src/problems/Albany_HeatProblem.hpp → src/corePDEs/problems/Albany_HeatProblem.hpp b/src/problems/Albany_HeatProblem.hpp → src/corePDEs/problems/Albany_HeatProblem.hpp
diff --git a/src/problems/Albany_PopulateMesh.cpp → ...corePDEs/problems/Albany_PopulateMesh.cpp b/src/problems/Albany_PopulateMesh.cpp → ...corePDEs/problems/Albany_PopulateMesh.cpp
diff --git a/src/problems/Albany_PopulateMesh.hpp → ...corePDEs/problems/Albany_PopulateMesh.hpp b/src/problems/Albany_PopulateMesh.hpp → ...corePDEs/problems/Albany_PopulateMesh.hpp
diff --git a/src/problems/Albany_SideLaplacianProblem.cpp → .../problems/Albany_SideLaplacianProblem.cpp b/src/problems/Albany_SideLaplacianProblem.cpp → .../problems/Albany_SideLaplacianProblem.cpp
diff --git a/src/problems/Albany_SideLaplacianProblem.hpp → .../problems/Albany_SideLaplacianProblem.hpp b/src/problems/Albany_SideLaplacianProblem.hpp → .../problems/Albany_SideLaplacianProblem.hpp