diff --git a/applications/CableNetApplication/CMakeLists.txt b/applications/CableNetApplication/CMakeLists.txt index 81ed36eebe4d..783e22310fd5 100644 --- a/applications/CableNetApplication/CMakeLists.txt +++ b/applications/CableNetApplication/CMakeLists.txt @@ -23,7 +23,7 @@ file(GLOB_RECURSE KRATOS_CABLE_NET_APPLICATION_CORE ## CableNet Testing sources if(${KRATOS_BUILD_TESTING} MATCHES ON) file(GLOB_RECURSE KRATOS_CABLE_NET_APPLICATION_TESTING_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/tests/*.cpp) - kratos_add_gtests(TARGET KratosCableNetCore SOURCES "${KRATOS_CABLE_NET_APPLICATION_TESTING_SOURCES}" USE_CUSTOM_MAIN) + kratos_add_gtests(TARGET KratosCableNetCore SOURCES "${KRATOS_CABLE_NET_APPLICATION_TESTING_SOURCES}") endif(${KRATOS_BUILD_TESTING} MATCHES ON) ## CableNet python interface sources diff --git a/applications/ChimeraApplication/CMakeLists.txt b/applications/ChimeraApplication/CMakeLists.txt index 9cd57864acd0..a1786c903fe5 100644 --- a/applications/ChimeraApplication/CMakeLists.txt +++ b/applications/ChimeraApplication/CMakeLists.txt @@ -28,7 +28,7 @@ endif(${KRATOS_BUILD_TESTING} MATCHES ON) ## ChimeraApplication Testing sources if(${KRATOS_BUILD_TESTING} MATCHES ON) file(GLOB_RECURSE KRATOS_CHIMERA_APPLICATION_TESTING_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/tests/*.cpp) - kratos_add_gtests(TARGET KratosChimeraApplicationCore SOURCES "${KRATOS_CHIMERA_APPLICATION_TESTING_SOURCES}" USE_CUSTOM_MAIN) + kratos_add_gtests(TARGET KratosChimeraApplicationCore SOURCES "${KRATOS_CHIMERA_APPLICATION_TESTING_SOURCES}") endif(${KRATOS_BUILD_TESTING} MATCHES ON) ## ChimeraApplication python interface sources diff --git a/applications/CompressiblePotentialFlowApplication/CMakeLists.txt b/applications/CompressiblePotentialFlowApplication/CMakeLists.txt index c7551382e670..d1ad5de72ec9 100644 --- a/applications/CompressiblePotentialFlowApplication/CMakeLists.txt +++ b/applications/CompressiblePotentialFlowApplication/CMakeLists.txt @@ -30,7 +30,7 @@ file( GLOB_RECURSE KRATOS_COMPRESSIBLE_POTENTIAL_APPLICATION_PYTHON_INTERFACE ## define compressible potential application test sources if(${KRATOS_BUILD_TESTING} MATCHES ON) file(GLOB_RECURSE KRATOS_COMPRESSIBLE_POTENTIAL_APPLICATION_TESTING_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/tests/cpp_tests/*.cpp) - kratos_add_gtests(TARGET KratosCompressiblePotentialFlowCore SOURCES "${KRATOS_COMPRESSIBLE_POTENTIAL_APPLICATION_TESTING_SOURCES}" USE_CUSTOM_MAIN) + kratos_add_gtests(TARGET KratosCompressiblePotentialFlowCore SOURCES "${KRATOS_COMPRESSIBLE_POTENTIAL_APPLICATION_TESTING_SOURCES}") endif(${KRATOS_BUILD_TESTING} MATCHES ON) add_library(KratosCompressiblePotentialFlowCore SHARED ${KRATOS_COMPRESSIBLE_POTENTIAL_APPLICATION_CORE}) diff --git a/applications/CompressiblePotentialFlowApplication/tests/cpp_tests/compressible_potential_flow_fast_suite.cpp b/applications/CompressiblePotentialFlowApplication/tests/cpp_tests/compressible_potential_flow_fast_suite.cpp index e02c92bf5485..ebed672b10e0 100644 --- a/applications/CompressiblePotentialFlowApplication/tests/cpp_tests/compressible_potential_flow_fast_suite.cpp +++ b/applications/CompressiblePotentialFlowApplication/tests/cpp_tests/compressible_potential_flow_fast_suite.cpp @@ -8,27 +8,20 @@ // Kratos default license: kratos/license.txt // // Main authors: Richard Faasse +// Carlos A. Roig // -// External includes -#include -#include - // Project includes -#include "testing/testing.h" -#include "compressible_potential_flow_application.h" +#include "compressible_potential_flow_fast_suite.h" -int main(int argc, char* argv[]) +namespace Kratos::Testing { - ::testing::InitGoogleTest(&argc, argv); - - Kratos::Testing::mApplicationInitializerList.push_back([](std::vector & rRegisteredApplications, Kratos::Kernel & rKernel) { - if (!rKernel.IsImported("CompressiblePotentialFlowApplication")) { - auto pApplication = std::make_shared(); - rKernel.ImportApplication(pApplication); - rRegisteredApplications.push_back(std::move(pApplication)); - } - }); - return RUN_ALL_TESTS(); +CompressiblePotentialFlowApplicationFastSuite::CompressiblePotentialFlowApplicationFastSuite() + : KratosCoreFastSuite() +{ + mpCompressiblePotentialFlowApp = std::make_shared(); + this->ImportApplicationIntoKernel(mpCompressiblePotentialFlowApp); } + +} // namespace Kratos::Testing \ No newline at end of file diff --git a/applications/CompressiblePotentialFlowApplication/tests/cpp_tests/compressible_potential_flow_fast_suite.h b/applications/CompressiblePotentialFlowApplication/tests/cpp_tests/compressible_potential_flow_fast_suite.h index 3f30367038a2..03efcd1020e1 100644 --- a/applications/CompressiblePotentialFlowApplication/tests/cpp_tests/compressible_potential_flow_fast_suite.h +++ b/applications/CompressiblePotentialFlowApplication/tests/cpp_tests/compressible_potential_flow_fast_suite.h @@ -17,9 +17,9 @@ namespace Kratos::Testing { -class KratosCompressiblePotentialFlowFastSuite : public KratosCoreFastSuite { +class CompressiblePotentialFlowApplicationFastSuite : public KratosCoreFastSuite { public: - KratosCompressiblePotentialFlowFastSuite(); + CompressiblePotentialFlowApplicationFastSuite(); private: KratosCompressiblePotentialFlowApplication::Pointer mpCompressiblePotentialFlowApp; diff --git a/applications/CompressiblePotentialFlowApplication/tests/cpp_tests/test_compressible_perturbation_potential_element.cpp b/applications/CompressiblePotentialFlowApplication/tests/cpp_tests/test_compressible_perturbation_potential_element.cpp index efc2fa502ef0..20de6de9763f 100644 --- a/applications/CompressiblePotentialFlowApplication/tests/cpp_tests/test_compressible_perturbation_potential_element.cpp +++ b/applications/CompressiblePotentialFlowApplication/tests/cpp_tests/test_compressible_perturbation_potential_element.cpp @@ -13,7 +13,7 @@ // Project includes #include "containers/model.h" -#include "testing/testing.h" +#include "tests/cpp_tests/compressible_potential_flow_fast_suite.h" #include "compressible_potential_flow_application_variables.h" #include "fluid_dynamics_application_variables.h" #include "custom_elements/compressible_perturbation_potential_flow_element.h" diff --git a/applications/CompressiblePotentialFlowApplication/tests/cpp_tests/test_compressible_perturbation_potential_element_3d.cpp b/applications/CompressiblePotentialFlowApplication/tests/cpp_tests/test_compressible_perturbation_potential_element_3d.cpp index 9f3ce4944fde..6de002ea15ce 100644 --- a/applications/CompressiblePotentialFlowApplication/tests/cpp_tests/test_compressible_perturbation_potential_element_3d.cpp +++ b/applications/CompressiblePotentialFlowApplication/tests/cpp_tests/test_compressible_perturbation_potential_element_3d.cpp @@ -13,7 +13,7 @@ // Project includes #include "containers/model.h" -#include "testing/testing.h" +#include "tests/cpp_tests/compressible_potential_flow_fast_suite.h" #include "compressible_potential_flow_application_variables.h" #include "fluid_dynamics_application_variables.h" #include "custom_elements/compressible_perturbation_potential_flow_element.h" diff --git a/applications/CompressiblePotentialFlowApplication/tests/cpp_tests/test_compressible_potential_element.cpp b/applications/CompressiblePotentialFlowApplication/tests/cpp_tests/test_compressible_potential_element.cpp index 41152a01251a..f0064c58da82 100644 --- a/applications/CompressiblePotentialFlowApplication/tests/cpp_tests/test_compressible_potential_element.cpp +++ b/applications/CompressiblePotentialFlowApplication/tests/cpp_tests/test_compressible_potential_element.cpp @@ -13,7 +13,7 @@ // Project includes #include "containers/model.h" -#include "testing/testing.h" +#include "tests/cpp_tests/compressible_potential_flow_fast_suite.h" #include "compressible_potential_flow_application_variables.h" #include "fluid_dynamics_application_variables.h" #include "custom_elements/compressible_potential_flow_element.h" diff --git a/applications/CompressiblePotentialFlowApplication/tests/cpp_tests/test_embedded_transonic_perturbation_potential_element.cpp b/applications/CompressiblePotentialFlowApplication/tests/cpp_tests/test_embedded_transonic_perturbation_potential_element.cpp index 4388ff9595f5..f862f12f97a6 100644 --- a/applications/CompressiblePotentialFlowApplication/tests/cpp_tests/test_embedded_transonic_perturbation_potential_element.cpp +++ b/applications/CompressiblePotentialFlowApplication/tests/cpp_tests/test_embedded_transonic_perturbation_potential_element.cpp @@ -13,7 +13,7 @@ // Project includes #include "containers/model.h" -#include "testing/testing.h" +#include "tests/cpp_tests/compressible_potential_flow_fast_suite.h" #include "compressible_potential_flow_application_variables.h" #include "fluid_dynamics_application_variables.h" #include "custom_elements/embedded_transonic_perturbation_potential_flow_element.h" diff --git a/applications/CompressiblePotentialFlowApplication/tests/cpp_tests/test_incompressible_perturbation_potential_element.cpp b/applications/CompressiblePotentialFlowApplication/tests/cpp_tests/test_incompressible_perturbation_potential_element.cpp index cb06b00cc3ce..c8cd4fcbc708 100644 --- a/applications/CompressiblePotentialFlowApplication/tests/cpp_tests/test_incompressible_perturbation_potential_element.cpp +++ b/applications/CompressiblePotentialFlowApplication/tests/cpp_tests/test_incompressible_perturbation_potential_element.cpp @@ -12,7 +12,7 @@ // // Project includes -#include "testing/testing.h" +#include "tests/cpp_tests/compressible_potential_flow_fast_suite.h" #include "containers/model.h" #include "includes/model_part.h" #include "compressible_potential_flow_application_variables.h" diff --git a/applications/CompressiblePotentialFlowApplication/tests/cpp_tests/test_incompressible_perturbation_potential_element_3d.cpp b/applications/CompressiblePotentialFlowApplication/tests/cpp_tests/test_incompressible_perturbation_potential_element_3d.cpp index 3ed04e041dab..d5591e21456e 100644 --- a/applications/CompressiblePotentialFlowApplication/tests/cpp_tests/test_incompressible_perturbation_potential_element_3d.cpp +++ b/applications/CompressiblePotentialFlowApplication/tests/cpp_tests/test_incompressible_perturbation_potential_element_3d.cpp @@ -12,7 +12,7 @@ // // Project includes -#include "testing/testing.h" +#include "tests/cpp_tests/compressible_potential_flow_fast_suite.h" #include "containers/model.h" #include "includes/model_part.h" #include "compressible_potential_flow_application_variables.h" diff --git a/applications/CompressiblePotentialFlowApplication/tests/cpp_tests/test_incompressible_potential_element.cpp b/applications/CompressiblePotentialFlowApplication/tests/cpp_tests/test_incompressible_potential_element.cpp index 7339f8021228..f974bf226f45 100644 --- a/applications/CompressiblePotentialFlowApplication/tests/cpp_tests/test_incompressible_potential_element.cpp +++ b/applications/CompressiblePotentialFlowApplication/tests/cpp_tests/test_incompressible_potential_element.cpp @@ -12,7 +12,7 @@ // // Project includes -#include "testing/testing.h" +#include "tests/cpp_tests/compressible_potential_flow_fast_suite.h" #include "containers/model.h" #include "includes/model_part.h" #include "compressible_potential_flow_application_variables.h" diff --git a/applications/CompressiblePotentialFlowApplication/tests/cpp_tests/test_incompressible_potential_element_3d.cpp b/applications/CompressiblePotentialFlowApplication/tests/cpp_tests/test_incompressible_potential_element_3d.cpp index a9398c0ad12d..111853befa0e 100644 --- a/applications/CompressiblePotentialFlowApplication/tests/cpp_tests/test_incompressible_potential_element_3d.cpp +++ b/applications/CompressiblePotentialFlowApplication/tests/cpp_tests/test_incompressible_potential_element_3d.cpp @@ -12,7 +12,7 @@ // // Project includes -#include "testing/testing.h" +#include "tests/cpp_tests/compressible_potential_flow_fast_suite.h" #include "containers/model.h" #include "includes/model_part.h" #include "compressible_potential_flow_application_variables.h" diff --git a/applications/CompressiblePotentialFlowApplication/tests/cpp_tests/test_operations.cpp b/applications/CompressiblePotentialFlowApplication/tests/cpp_tests/test_operations.cpp index 4c0acb98371b..059023e6c386 100644 --- a/applications/CompressiblePotentialFlowApplication/tests/cpp_tests/test_operations.cpp +++ b/applications/CompressiblePotentialFlowApplication/tests/cpp_tests/test_operations.cpp @@ -13,7 +13,7 @@ // Project includes #include "containers/model.h" -#include "testing/testing.h" +#include "tests/cpp_tests/compressible_potential_flow_fast_suite.h" #include "fluid_dynamics_application_variables.h" #include "compressible_potential_flow_application_variables.h" #include "custom_operations/potential_to_compressible_navier_stokes_operation.h" diff --git a/applications/CompressiblePotentialFlowApplication/tests/cpp_tests/test_potential_flow_utilities.cpp b/applications/CompressiblePotentialFlowApplication/tests/cpp_tests/test_potential_flow_utilities.cpp index 80e14dbf38c8..f9598cb94455 100644 --- a/applications/CompressiblePotentialFlowApplication/tests/cpp_tests/test_potential_flow_utilities.cpp +++ b/applications/CompressiblePotentialFlowApplication/tests/cpp_tests/test_potential_flow_utilities.cpp @@ -13,7 +13,7 @@ // Project includes #include "containers/model.h" -#include "testing/testing.h" +#include "tests/cpp_tests/compressible_potential_flow_fast_suite.h" #include "custom_utilities/potential_flow_utilities.h" #include "compressible_potential_flow_application_variables.h" #include "fluid_dynamics_application_variables.h" diff --git a/applications/CompressiblePotentialFlowApplication/tests/cpp_tests/test_processes.cpp b/applications/CompressiblePotentialFlowApplication/tests/cpp_tests/test_processes.cpp index f02cab8e97e2..2c4d327c555f 100644 --- a/applications/CompressiblePotentialFlowApplication/tests/cpp_tests/test_processes.cpp +++ b/applications/CompressiblePotentialFlowApplication/tests/cpp_tests/test_processes.cpp @@ -13,7 +13,7 @@ // Project includes #include "containers/model.h" -#include "testing/testing.h" +#include "tests/cpp_tests/compressible_potential_flow_fast_suite.h" #include "compressible_potential_flow_application_variables.h" #include "custom_processes/move_model_part_process.h" #include "custom_processes/compute_embedded_lift_process.h" diff --git a/applications/CompressiblePotentialFlowApplication/tests/cpp_tests/test_transonic_perturbation_potential_element.cpp b/applications/CompressiblePotentialFlowApplication/tests/cpp_tests/test_transonic_perturbation_potential_element.cpp index 10d1d3a514f0..323d3b0de5d4 100644 --- a/applications/CompressiblePotentialFlowApplication/tests/cpp_tests/test_transonic_perturbation_potential_element.cpp +++ b/applications/CompressiblePotentialFlowApplication/tests/cpp_tests/test_transonic_perturbation_potential_element.cpp @@ -13,7 +13,7 @@ // Project includes #include "containers/model.h" -#include "testing/testing.h" +#include "tests/cpp_tests/compressible_potential_flow_fast_suite.h" #include "compressible_potential_flow_application_variables.h" #include "fluid_dynamics_application_variables.h" #include "custom_elements/transonic_perturbation_potential_flow_element.h" diff --git a/applications/CompressiblePotentialFlowApplication/tests/cpp_tests/test_transonic_perturbation_potential_element_3d.cpp b/applications/CompressiblePotentialFlowApplication/tests/cpp_tests/test_transonic_perturbation_potential_element_3d.cpp index 0a5ea0ee1f66..30e1e8ed16e6 100644 --- a/applications/CompressiblePotentialFlowApplication/tests/cpp_tests/test_transonic_perturbation_potential_element_3d.cpp +++ b/applications/CompressiblePotentialFlowApplication/tests/cpp_tests/test_transonic_perturbation_potential_element_3d.cpp @@ -13,7 +13,7 @@ // Project includes #include "containers/model.h" -#include "testing/testing.h" +#include "tests/cpp_tests/compressible_potential_flow_fast_suite.h" #include "compressible_potential_flow_application_variables.h" #include "fluid_dynamics_application_variables.h" #include "custom_elements/transonic_perturbation_potential_flow_element.h" diff --git a/applications/ConvectionDiffusionApplication/tests/cpp_tests/convection_diffusion_fast_suite.cpp b/applications/ConvectionDiffusionApplication/tests/cpp_tests/convection_diffusion_fast_suite.cpp index 4d7d0de43f15..4b563f725be0 100644 --- a/applications/ConvectionDiffusionApplication/tests/cpp_tests/convection_diffusion_fast_suite.cpp +++ b/applications/ConvectionDiffusionApplication/tests/cpp_tests/convection_diffusion_fast_suite.cpp @@ -8,27 +8,20 @@ // Kratos default license: kratos/license.txt // // Main authors: Richard Faasse +// Carlos A. Roig // -// External includes -#include -#include - // Project includes -#include "testing/testing.h" -#include "convection_diffusion_application.h" +#include "convection_diffusion_fast_suite.h" -int main(int argc, char* argv[]) +namespace Kratos::Testing { - ::testing::InitGoogleTest(&argc, argv); - Kratos::Testing::mApplicationInitializerList.push_back([](std::vector & rRegisteredApplications, Kratos::Kernel & rKernel) { - if (!rKernel.IsImported("ConvectionDiffusionApplication")) { - auto pApplication = std::make_shared(); - rKernel.ImportApplication(pApplication); - rRegisteredApplications.push_back(std::move(pApplication)); - } - }); +KratosConvectionDiffusionFastSuite::KratosConvectionDiffusionFastSuite() + : KratosCoreFastSuite() +{ + mpConvectionDiffusionApp = std::make_shared(); + this->ImportApplicationIntoKernel(mpConvectionDiffusionApp); +} - return RUN_ALL_TESTS(); -} \ No newline at end of file +} // namespace Kratos::Testing \ No newline at end of file diff --git a/applications/ConvectionDiffusionApplication/tests/cpp_tests/convection_diffusion_fast_suite.h b/applications/ConvectionDiffusionApplication/tests/cpp_tests/convection_diffusion_fast_suite.h index 4bf441be9311..d921ca4a151c 100644 --- a/applications/ConvectionDiffusionApplication/tests/cpp_tests/convection_diffusion_fast_suite.h +++ b/applications/ConvectionDiffusionApplication/tests/cpp_tests/convection_diffusion_fast_suite.h @@ -12,8 +12,8 @@ #pragma once -#include "convection_diffusion_application.h" #include "testing/testing.h" +#include "convection_diffusion_application.h" namespace Kratos::Testing { diff --git a/applications/ConvectionDiffusionApplication/tests/cpp_tests/test_axisymmetric_eulerian_convection_diffusion.cpp b/applications/ConvectionDiffusionApplication/tests/cpp_tests/test_axisymmetric_eulerian_convection_diffusion.cpp index 023cb735f4ed..4960d03aa7df 100644 --- a/applications/ConvectionDiffusionApplication/tests/cpp_tests/test_axisymmetric_eulerian_convection_diffusion.cpp +++ b/applications/ConvectionDiffusionApplication/tests/cpp_tests/test_axisymmetric_eulerian_convection_diffusion.cpp @@ -16,7 +16,7 @@ // Project includes -#include "testing/testing.h" +#include "tests/cpp_tests/convection_diffusion_fast_suite.h" #include "containers/model.h" #include "includes/convection_diffusion_settings.h" diff --git a/applications/ConvectionDiffusionApplication/tests/cpp_tests/test_d_convection_diffusion_explicit_element.cpp b/applications/ConvectionDiffusionApplication/tests/cpp_tests/test_d_convection_diffusion_explicit_element.cpp index a39cbb1880f3..2349e095379a 100644 --- a/applications/ConvectionDiffusionApplication/tests/cpp_tests/test_d_convection_diffusion_explicit_element.cpp +++ b/applications/ConvectionDiffusionApplication/tests/cpp_tests/test_d_convection_diffusion_explicit_element.cpp @@ -14,7 +14,7 @@ // External includes // Project includes -#include "testing/testing.h" +#include "tests/cpp_tests/convection_diffusion_fast_suite.h" #include "containers/model.h" #include "includes/convection_diffusion_settings.h" diff --git a/applications/ConvectionDiffusionApplication/tests/cpp_tests/test_embedded_laplacian_element.cpp b/applications/ConvectionDiffusionApplication/tests/cpp_tests/test_embedded_laplacian_element.cpp index 5e49fb5da070..7cc77422e3ea 100644 --- a/applications/ConvectionDiffusionApplication/tests/cpp_tests/test_embedded_laplacian_element.cpp +++ b/applications/ConvectionDiffusionApplication/tests/cpp_tests/test_embedded_laplacian_element.cpp @@ -14,7 +14,7 @@ // External includes // Project includes -#include "testing/testing.h" +#include "tests/cpp_tests/convection_diffusion_fast_suite.h" #include "containers/model.h" #include "includes/convection_diffusion_settings.h" #include "includes/variables.h" diff --git a/applications/ConvectionDiffusionApplication/tests/cpp_tests/test_embedded_mls_constraint_process.cpp b/applications/ConvectionDiffusionApplication/tests/cpp_tests/test_embedded_mls_constraint_process.cpp index 1ae2898f9196..4f49129fb8b3 100644 --- a/applications/ConvectionDiffusionApplication/tests/cpp_tests/test_embedded_mls_constraint_process.cpp +++ b/applications/ConvectionDiffusionApplication/tests/cpp_tests/test_embedded_mls_constraint_process.cpp @@ -14,7 +14,7 @@ // External includes // Project includes -#include "testing/testing.h" +#include "tests/cpp_tests/convection_diffusion_fast_suite.h" #include "containers/model.h" #include "includes/model_part.h" #include "includes/model_part_io.h" diff --git a/applications/ConvectionDiffusionApplication/tests/cpp_tests/test_eulerian_conv_diff.cpp b/applications/ConvectionDiffusionApplication/tests/cpp_tests/test_eulerian_conv_diff.cpp index 70ec72b0cbf2..0d247057f030 100644 --- a/applications/ConvectionDiffusionApplication/tests/cpp_tests/test_eulerian_conv_diff.cpp +++ b/applications/ConvectionDiffusionApplication/tests/cpp_tests/test_eulerian_conv_diff.cpp @@ -14,7 +14,7 @@ // External includes // Project includes -#include "testing/testing.h" +#include "tests/cpp_tests/convection_diffusion_fast_suite.h" #include "containers/model.h" #include "includes/convection_diffusion_settings.h" diff --git a/applications/ConvectionDiffusionApplication/tests/cpp_tests/test_eulerian_diff.cpp b/applications/ConvectionDiffusionApplication/tests/cpp_tests/test_eulerian_diff.cpp index 03cf9f020c3e..4e8becf9775e 100644 --- a/applications/ConvectionDiffusionApplication/tests/cpp_tests/test_eulerian_diff.cpp +++ b/applications/ConvectionDiffusionApplication/tests/cpp_tests/test_eulerian_diff.cpp @@ -14,7 +14,7 @@ // External includes // Project includes -#include "testing/testing.h" +#include "tests/cpp_tests/convection_diffusion_fast_suite.h" #include "containers/model.h" #include "includes/convection_diffusion_settings.h" diff --git a/applications/ConvectionDiffusionApplication/tests/cpp_tests/test_laplacian_element.cpp b/applications/ConvectionDiffusionApplication/tests/cpp_tests/test_laplacian_element.cpp index a73609ca46a5..15fac175012c 100644 --- a/applications/ConvectionDiffusionApplication/tests/cpp_tests/test_laplacian_element.cpp +++ b/applications/ConvectionDiffusionApplication/tests/cpp_tests/test_laplacian_element.cpp @@ -14,7 +14,7 @@ // External includes // Project includes -#include "testing/testing.h" +#include "tests/cpp_tests/convection_diffusion_fast_suite.h" #include "containers/model.h" #include "includes/convection_diffusion_settings.h" diff --git a/applications/ConvectionDiffusionApplication/tests/cpp_tests/test_mixed_laplacian_element.cpp b/applications/ConvectionDiffusionApplication/tests/cpp_tests/test_mixed_laplacian_element.cpp index 632ed9a6ef76..14d4d9bba1de 100644 --- a/applications/ConvectionDiffusionApplication/tests/cpp_tests/test_mixed_laplacian_element.cpp +++ b/applications/ConvectionDiffusionApplication/tests/cpp_tests/test_mixed_laplacian_element.cpp @@ -14,7 +14,7 @@ // External includes // Project includes -#include "testing/testing.h" +#include "tests/cpp_tests/convection_diffusion_fast_suite.h" #include "containers/model.h" #include "includes/convection_diffusion_settings.h" diff --git a/applications/ConvectionDiffusionApplication/tests/cpp_tests/test_qs_convection_diffusion_explicit_element.cpp b/applications/ConvectionDiffusionApplication/tests/cpp_tests/test_qs_convection_diffusion_explicit_element.cpp index 98b9ecfc7e2a..cd7594bd1e8a 100644 --- a/applications/ConvectionDiffusionApplication/tests/cpp_tests/test_qs_convection_diffusion_explicit_element.cpp +++ b/applications/ConvectionDiffusionApplication/tests/cpp_tests/test_qs_convection_diffusion_explicit_element.cpp @@ -14,7 +14,7 @@ // External includes // Project includes -#include "testing/testing.h" +#include "tests/cpp_tests/convection_diffusion_fast_suite.h" #include "containers/model.h" #include "includes/convection_diffusion_settings.h" diff --git a/applications/ConvectionDiffusionApplication/tests/cpp_tests/test_thermal_face.cpp b/applications/ConvectionDiffusionApplication/tests/cpp_tests/test_thermal_face.cpp index e7fca3d4d3f0..f6acc06053ea 100644 --- a/applications/ConvectionDiffusionApplication/tests/cpp_tests/test_thermal_face.cpp +++ b/applications/ConvectionDiffusionApplication/tests/cpp_tests/test_thermal_face.cpp @@ -14,7 +14,7 @@ // External includes // Project includes -#include "testing/testing.h" +#include "tests/cpp_tests/convection_diffusion_fast_suite.h" #include "containers/model.h" #include "includes/convection_diffusion_settings.h" diff --git a/applications/FluidDynamicsApplication/custom_elements/dpg_vms.h b/applications/FluidDynamicsApplication/custom_elements/dpg_vms.h index c321d12261be..fa81b4b1b61e 100644 --- a/applications/FluidDynamicsApplication/custom_elements/dpg_vms.h +++ b/applications/FluidDynamicsApplication/custom_elements/dpg_vms.h @@ -450,16 +450,19 @@ class DPGVMS : public VMS ElementBaseType::CalculateLocalVelocityContribution(rDampingMatrix, rRightHandSideVector, rCurrentProcessInfo); //compute boundary term - int boundary_nodes = 0; + // int boundary_nodes = 0; //unsigned int inside_index = -1; - for (unsigned int i = 0; i < TNumNodes; i++) - { - double nd_flag = this->GetGeometry()[i].FastGetSolutionStepValue(FLAG_VARIABLE); - if (nd_flag == 5.0) - boundary_nodes++; - //else - //inside_index = i; - } + + // for (unsigned int i = 0; i < TNumNodes; i++) + // { + // double nd_flag = this->GetGeometry()[i].FastGetSolutionStepValue(FLAG_VARIABLE); + + // if (nd_flag == 5.0) { + // boundary_nodes++; + // } else { + // inside_index = i; + // } + // } /* if(boundary_nodes == TDim) diff --git a/kratos/tests/test_utilities/test_suite.h b/kratos/tests/test_utilities/test_suite.h index 6e49c985ffee..40afa51ded99 100644 --- a/kratos/tests/test_utilities/test_suite.h +++ b/kratos/tests/test_utilities/test_suite.h @@ -81,7 +81,6 @@ class KratosCoreStressSuite : public KratosCoreFastSuite {}; // This classes are temporal and should be changed. Please see: GeoMechanicsApplication, StructuralMechanicsApplication or TrilinosApplication // TODO: Remove once every test includes its own suit class CompressiblePotentialApplicationFastSuite : public KratosCoreFastSuite {}; -class KratosConvectionDiffusionFastSuite : public KratosCoreFastSuite {}; class KratosCSharpWrapperApplicationFastSuite : public KratosCoreFastSuite {}; class ExaquteSandboxApplicationFastSuite : public KratosCoreFastSuite {}; class FSIApplicationFastSuite : public KratosCoreFastSuite {}; diff --git a/kratos/utilities/enrichment_utilities.h b/kratos/utilities/enrichment_utilities.h index 3459f2eef872..35023c513cd4 100644 --- a/kratos/utilities/enrichment_utilities.h +++ b/kratos/utilities/enrichment_utilities.h @@ -1238,7 +1238,7 @@ class EnrichmentUtilities BoundedMatrix coord_subdomain; //used to pass arguments when we must calculate areas, shape functions, etc BoundedMatrix DN_DX_subdomain; //used to retrieve derivatives - double most_common_sign=0; //the side of the cut in which two nodes are found (same sign) will be the ones that remains unchanged when builing the discontinuity + // double most_common_sign=0; //the side of the cut in which two nodes are found (same sign) will be the ones that remains unchanged when builing the discontinuity double Area;//area of the complete element rGPShapeFunctionValues(0,0)=one_third; rGPShapeFunctionValues(0,1)=one_third; @@ -1392,12 +1392,12 @@ class EnrichmentUtilities if (rDistances[i] < 0.0) { exact_distance[i] = -abs_distance[i]; - --most_common_sign; + // --most_common_sign; } else { exact_distance[i] = abs_distance[i]; - ++most_common_sign; + // ++most_common_sign; } }