Hybrid h1 adaptative

CMakeLists.txt

@@ -10,8 +10,21 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
 include(cmake/StandardProjectSettings.cmake)
 
 # Enables NeoPZ library
-include(cmake/EnableNeoPZ.cmake)
-enable_pz()
+find_package(NeoPZ REQUIRED)
+
+# Mac OS X specific code
+if (APPLE)
+  add_definitions(-DMACOSX)
+endif()
+
+
+#TODO: Define this using modern CMake standards. @Gustavo, do you know how to do this?
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+    option(ERRORESTIMATION_DEBUG "Debug verifications" OFF)
+    if(ERRORESTIMATION_DEBUG)
+        add_definitions(-DERRORESTIMATION_DEBUG)
+    endif()
+endif()
 
 # This option enables a lot of warnings and treat them as errors, to ensure
 # good programming practices are used. Since its behaviour is extreme, it
@@ -24,17 +37,8 @@ if (ENABLE_ALL_WARNINGS)
     set(CMAKE_CXX_FLAGS "")
 endif ()
 
-find_package(Threads)
 # Creates ErrorEstimationLib with common error estimation file
 add_subdirectory(ErrorEstimation)
 
 # Created executable targets
 add_subdirectory(Projects)
-
-option(USING_LOG4CXX "Whether the LOG4CXX library will be linked in" ON)
-if(USING_LOG4CXX)
-    #this is the definition used in pz lib
-    find_package(Log4cxx REQUIRED)
-    target_link_libraries(ErrorEstimationLib PRIVATE ${Log4cxx_LIBRARY})
-    target_include_directories(ErrorEstimationLib PRIVATE ${Log4cxx_INCLUDE_DIR})
-endif(USING_LOG4CXX)

ConfigElasticity.h

@@ -0,0 +1,77 @@
+//
+//  ConfigElasticity.hpp
+//  ALL_BUILD
+//
+//  Created by Denise De Siqueira on 04/09/23.
+//
+
+#ifndef ConfigElasticity_hpp
+#define ConfigElasticity_hpp
+
+#include <stdio.h>
+
+struct ConfigElasticity{
+
+
+    const int xdiv = 1; //Number of elements in each direction
+    const int pOrder = 1; // Polynomial degree
+    // Family of HDiv approximation spaces.
+    // The possible choices are HDivFamily::EHDivStandard, HDivFamily::EHDivConstant and HDivFamily::EHDivKernel
+    HDivFamily hdivfam = HDivFamily::EHDivStandard;
+
+
+
+
+    std::ofstream Erro, timer;
+    TPZVec<REAL> *rate, *Log;
+    int refLevel = -1;
+
+    int k = 1;
+    int n = 1;
+    int dim = 1;
+    /// element type to be used
+    int topologyMode = -1;
+
+    /// determines the problem that will be run. This string will translate in a value of the "type" data structure
+    std::string problem;
+    /// integral order of the forcing function
+    int integrationorder = -1;
+    /// determines the the approximation space, will translate in an integer value of mode data (should be an enum)
+    std::string approx;
+    /// indicates the element topology that should be used
+    std::string topology;           //Topology' name typed as input will translate in a value of topologyMode (should be an enum)
+
+    std::string topologyFileName;   //Simplified name used for naming files/directories
+    std::string FEMoutput = "ElasticityFEMSilumation/";
+
+    int numberAdapativitySteps =-1;
+
+    int vtkResolution = -1;
+
+
+    int numErrors = 4;
+
+    std::string plotfile;
+    int mode = -1;           // 0 = "H1"; 1 = "Hybrid"; 2 = "Mixed";
+    // argc is the number of arguments passed by the command line. Will be set to 5 if the problem is run from command line
+    int argc = 1;
+    // the type is an integer indicating which problem will be approximated (it should be an enum)
+    int type= -1;
+    int maxIter = 15;
+
+    bool estimateError;
+    bool debugger = true;
+    int exp = 2; // Initial exponent of mesh refinement (numElem = 2*2^exp)
+
+    ConfigElasticity() {
+        std::string FEMsimulationOutput = "ElasticityFEMSilumation/";
+        std::string temp = FEMsimulationOutput;
+        temp.pop_back();
+        std::string command = "mkdir -p " + temp;
+    }
+};
+
+
+
+
+#endif /* ConfigElasticity_hpp */

ConfigElasticity.hpp

@@ -0,0 +1,13 @@
+//
+//  ConfigElasticity.hpp
+//  ALL_BUILD
+//
+//  Created by Denise De Siqueira on 04/09/23.
+//
+
+#ifndef ConfigElasticity_hpp
+#define ConfigElasticity_hpp
+
+#include <stdio.h>
+
+#endif /* ConfigElasticity_hpp */

ErrorEstimation/CMakeLists.txt

@@ -2,23 +2,30 @@
 add_library(ErrorEstimationLib
     # Error estimation
     ProblemConfig.h
-    TPZHDivErrorEstimatorH1.cpp
-    TPZHDivErrorEstimatorH1.h
-    TPZHybridHDivErrorEstimator.cpp
-    TPZHybridHDivErrorEstimator.h
+    ProblemConfig.cpp
+    TPZHDivErrorEstimator.cpp
+    TPZHDivErrorEstimator.h
     TPZHybridH1ErrorEstimator.cpp
     TPZHybridH1ErrorEstimator.h
+    TPZHybridH1CreateHDivReconstruction.h
+    TPZHybridH1CreateHDivReconstruction.cpp
+    TPZHybridH1CreateH1Reconstruction.h
+    TPZHybridH1CreateH1Reconstruction.cpp
+    TPZHybridH1ReconstructionBase.h
+    TPZHybridH1ReconstructionBase.cpp
     TPZMHMHDivErrorEstimator.cpp
     TPZMHMHDivErrorEstimator.h
+	TPZElasticityErrorEstimator.h
+	TPZElasticityErrorEstimator.cpp
     # Related tools
     TPZCreateMultiphysicsSpace.cpp
     TPZCreateMultiphysicsSpace.h
     TPZMFSolutionTransfer.cpp
     TPZMFSolutionTransfer.h
-)
+    )
 
 target_link_libraries(ErrorEstimationLib PRIVATE NeoPZ::pz)
-target_include_directories(ErrorEstimationLib PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${PZ_INCLUDE_DIR})
+target_include_directories(ErrorEstimationLib PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${PZ_INCLUDE_DIRS})
 
 # Add material files to ErrorEstimationLib
 add_subdirectory(Material)

ErrorEstimation/Material/CMakeLists.txt

@@ -10,6 +10,10 @@ target_sources(ErrorEstimationLib PUBLIC
     TPZPressureProjection.cpp
     TPZHybridH1ErrorEstimateMaterial.h
     TPZHybridH1ErrorEstimateMaterial.cpp
+    TPZHybridH1HdivFluxRecMaterial.h
+    TPZHybridH1HdivFluxRecMaterial.cpp
+    TPZHybridH1PressureRecMaterial.h
+    TPZHybridH1PressureRecMaterial.cpp
     TPZSteklovMaterial.h
     TPZSteklovMaterial.cpp
 )