Skip to content

Commit

Permalink
Revert to 51b3e46
Browse files Browse the repository at this point in the history
  • Loading branch information
rubenzorrilla committed Dec 13, 2024
1 parent b0013b8 commit 81b3e04
Show file tree
Hide file tree
Showing 34 changed files with 71 additions and 73 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

// Aplication includes
#include "alternative_d_vms_dem_coupled.h"
#include "data_containers/qs_vms_dem_coupled/qs_vms_dem_coupled_data.h"
#include "custom_elements/data_containers/qs_vms_dem_coupled/qs_vms_dem_coupled_data.h"
#include "custom_utilities/fluid_element_utilities.h"
#include "fluid_dynamics_application_variables.h"

Expand Down Expand Up @@ -1557,4 +1557,4 @@ template class AlternativeDVMSDEMCoupled< QSVMSDEMCoupledData<2,9> >;
template class AlternativeDVMSDEMCoupled< QSVMSDEMCoupledData<3,8> >;
template class AlternativeDVMSDEMCoupled< QSVMSDEMCoupledData<3,27> >;

} // namespace Kratos
} // namespace Kratos
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

// Aplication includes
#include "alternative_qs_vms_dem_coupled.h"
#include "data_containers/qs_vms_dem_coupled/qs_vms_dem_coupled_data.h"
#include "custom_elements/data_containers/qs_vms_dem_coupled/qs_vms_dem_coupled_data.h"
#include "custom_utilities/fluid_element_utilities.h"
#include "fluid_dynamics_application_variables.h"
#include "utilities/sparse_matrix_multiplication_utility.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
#include "includes/cfd_variables.h"
#include "includes/checks.h"

#include "data_containers/qs_vms/qs_vms_data.h"
#include "data_containers/qs_vms_dem_coupled/qs_vms_dem_coupled_data.h"
//#include "data_containers/time_integrated_qs_vms/time_integrated_qs_vms_data.h"
#include "custom_elements/data_containers/qs_vms/qs_vms_data.h"
#include "custom_elements/data_containers/qs_vms_dem_coupled/qs_vms_dem_coupled_data.h"
//#include "custom_elements/data_containers/time_integrated_qs_vms/time_integrated_qs_vms_data.h"
#include "custom_utilities/fluid_element_utilities.h"

namespace Kratos
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

// Aplication includes
#include "d_vms_dem_coupled.h"
#include "data_containers/qs_vms_dem_coupled/qs_vms_dem_coupled_data.h"
#include "custom_elements/data_containers/qs_vms_dem_coupled/qs_vms_dem_coupled_data.h"
#include "custom_utilities/fluid_element_utilities.h"
#include "fluid_dynamics_application_variables.h"

Expand Down Expand Up @@ -1315,4 +1315,4 @@ template class DVMSDEMCoupled< QSVMSDEMCoupledData<2,9> >;
template class DVMSDEMCoupled< QSVMSDEMCoupledData<3,8> >;
template class DVMSDEMCoupled< QSVMSDEMCoupledData<3,27> >;

} // namespace Kratos
} // namespace Kratos
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

// Application includes
#include "fluid_dynamics_application_variables.h"
#include "data_containers/fluid_element_data.h"
#include "custom_elements/data_containers/fluid_element_data.h"
#include "utilities/element_size_calculator.h"

namespace Kratos {
Expand Down Expand Up @@ -144,4 +144,4 @@ static int Check(const Element& rElement, const ProcessInfo& rProcessInfo)

///@}

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#define KRATOS_EMBEDDED_DATA_H

#include "fluid_dynamics_application_variables.h"
#include "data_containers/fluid_element_data.h"
#include "custom_elements/data_containers/fluid_element_data.h"

namespace Kratos {

Expand Down Expand Up @@ -123,4 +123,4 @@ bool IsCut() {

}

#endif
#endif
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#define KRATOS_EMBEDDED_DISCONTINUOUS_DATA_H

#include "fluid_dynamics_application_variables.h"
#include "data_containers/fluid_element_data.h"
#include "custom_elements/data_containers/fluid_element_data.h"

namespace Kratos {

Expand Down Expand Up @@ -169,4 +169,4 @@ inline bool IsIncised()

}

#endif
#endif
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#define KRATOS_FIC_DATA_H

#include "fluid_dynamics_application_variables.h"
#include "data_containers/fluid_element_data.h"
#include "custom_elements/data_containers/fluid_element_data.h"

namespace Kratos {

Expand Down Expand Up @@ -102,4 +102,4 @@ static int Check(const Element& rElement, const ProcessInfo& rProcessInfo)

}

#endif
#endif
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#define KRATOS_QSVMS_DATA_H

#include "fluid_dynamics_application_variables.h"
#include "data_containers/fluid_element_data.h"
#include "custom_elements/data_containers/fluid_element_data.h"
#include "utilities/element_size_calculator.h"

namespace Kratos {
Expand Down Expand Up @@ -116,4 +116,4 @@ static int Check(const Element& rElement, const ProcessInfo& rProcessInfo)

}

#endif
#endif
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@

// Application includes
#include "fluid_dynamics_application_variables.h"
#include "data_containers/fluid_element_data.h"
#include "data_containers/qs_vms/qs_vms_data.h"
#include "custom_elements/data_containers/fluid_element_data.h"
#include "custom_elements/data_containers/qs_vms/qs_vms_data.h"

namespace Kratos {

Expand Down Expand Up @@ -111,4 +111,4 @@ void UpdateSecondDerivativesValues(const ShapeFunctionsSecondDerivativesType& rD

}

#endif
#endif
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

// Application includes
#include "fluid_dynamics_application_variables.h"
#include "data_containers/fluid_element_data.h"
#include "custom_elements/data_containers/fluid_element_data.h"
#include "utilities/element_size_calculator.h"

namespace Kratos {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#define KRATOS_TIME_INTEGRATED_FIC_DATA_H

#include "fluid_dynamics_application_variables.h"
#include "data_containers/fic/fic_data.h"
#include "custom_elements/data_containers/fic/fic_data.h"

namespace Kratos {

Expand Down Expand Up @@ -83,4 +83,4 @@ static int Check(const Element& rElement, const ProcessInfo& rProcessInfo)

}

#endif
#endif
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#define KRATOS_TIME_INTEGRATED_QSVMS_DATA_H

#include "fluid_dynamics_application_variables.h"
#include "data_containers/qs_vms/qs_vms_data.h"
#include "custom_elements/data_containers/qs_vms/qs_vms_data.h"

namespace Kratos {

Expand Down Expand Up @@ -83,4 +83,4 @@ static int Check(const Element& rElement, const ProcessInfo& rProcessInfo)

}

#endif
#endif
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include "includes/constitutive_law.h"

#include "fluid_dynamics_application_variables.h"
#include "data_containers/fluid_element_data.h"
#include "custom_elements/data_containers/fluid_element_data.h"
#include "utilities/element_size_calculator.h"
#include "custom_utilities/fluid_element_utilities.h"

Expand Down Expand Up @@ -367,4 +367,4 @@ void ComputeDarcyTerm()

}

#endif
#endif
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include "includes/constitutive_law.h"

#include "fluid_dynamics_application_variables.h"
#include "data_containers/fluid_element_data.h"
#include "custom_elements/data_containers/fluid_element_data.h"
#include "utilities/element_size_calculator.h"
#include "custom_utilities/fluid_element_utilities.h"

Expand Down Expand Up @@ -376,4 +376,4 @@ void ComputeDarcyTerm()

}

#endif
#endif
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

// Application includes
#include "fluid_dynamics_application_variables.h"
#include "data_containers/fluid_element_data.h"
#include "custom_elements/data_containers/fluid_element_data.h"
#include "utilities/element_size_calculator.h"

namespace Kratos {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@
#include "custom_elements/qs_vms.h"
#include "custom_elements/weakly_compressible_navier_stokes.h"

#include "custom_elements/data_containers/embedded_data.h"
#include "utilities/element_size_calculator.h"

#include "data_containers/embedded_data.h"
#include "data_containers/time_integrated_qs_vms/time_integrated_qs_vms_data.h"
#include "data_containers/weakly_compressible_navier_stokes/weakly_compressible_navier_stokes_data.h"
#include "custom_elements/data_containers/time_integrated_qs_vms/time_integrated_qs_vms_data.h"
#include "custom_elements/data_containers/weakly_compressible_navier_stokes/weakly_compressible_navier_stokes_data.h"

#include "modified_shape_functions/triangle_2d_3_modified_shape_functions.h"
#include "modified_shape_functions/tetrahedra_3d_4_modified_shape_functions.h"
Expand Down Expand Up @@ -1131,4 +1130,4 @@ template class EmbeddedFluidElement< WeaklyCompressibleNavierStokes< WeaklyCompr

///////////////////////////////////////////////////////////////////////////////////////////////////

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include "includes/cfd_variables.h"
#include "custom_elements/fluid_element.h"

#include "data_containers/embedded_data.h"
#include "custom_elements/data_containers/embedded_data.h"

namespace Kratos
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,9 @@
#include "custom_elements/weakly_compressible_navier_stokes.h"

#include "utilities/element_size_calculator.h"

#include "data_containers/embedded_discontinuous_data.h"
#include "data_containers/time_integrated_qs_vms/time_integrated_qs_vms_data.h"
#include "data_containers/weakly_compressible_navier_stokes/weakly_compressible_navier_stokes_data.h"
#include "custom_elements/data_containers/embedded_discontinuous_data.h"
#include "custom_elements/data_containers/time_integrated_qs_vms/time_integrated_qs_vms_data.h"
#include "custom_elements/data_containers/weakly_compressible_navier_stokes/weakly_compressible_navier_stokes_data.h"

#include "modified_shape_functions/triangle_2d_3_modified_shape_functions.h"
#include "modified_shape_functions/tetrahedra_3d_4_modified_shape_functions.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include "includes/cfd_variables.h"
#include "custom_elements/fluid_element.h"

#include "data_containers/embedded_discontinuous_data.h"
#include "custom_elements/data_containers/embedded_discontinuous_data.h"

namespace Kratos
{
Expand Down
4 changes: 2 additions & 2 deletions applications/FluidDynamicsApplication/custom_elements/fic.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
#include "includes/cfd_variables.h"
#include "includes/checks.h"

#include "data_containers/fic/fic_data.h"
#include "data_containers/time_integrated_fic/time_integrated_fic_data.h"
#include "custom_elements/data_containers/fic/fic_data.h"
#include "custom_elements/data_containers/time_integrated_fic/time_integrated_fic_data.h"
#include "custom_utilities/fluid_element_utilities.h"
#include "utilities/element_size_calculator.h"
#include "custom_utilities/fluid_element_time_integration_detail.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@
#include "includes/checks.h"

#include "data_containers/axisymmetric_navier_stokes/axisymmetric_navier_stokes_data.h"
#include "data_containers/qs_vms/qs_vms_data.h"
#include "data_containers/time_integrated_qs_vms/time_integrated_qs_vms_data.h"
#include "data_containers/qs_vms_dem_coupled/qs_vms_dem_coupled_data.h"
#include "data_containers/fic/fic_data.h"
#include "data_containers/time_integrated_fic/time_integrated_fic_data.h"
#include "data_containers/stokes/stokes_data.h"
#include "data_containers/two_fluid_navier_stokes/two_fluid_navier_stokes_data.h"
#include "data_containers/two_fluid_navier_stokes_alpha_method/two_fluid_navier_stokes_alpha_method_data.h"
#include "data_containers/weakly_compressible_navier_stokes/weakly_compressible_navier_stokes_data.h"
#include "custom_elements/data_containers/qs_vms/qs_vms_data.h"
#include "custom_elements/data_containers/time_integrated_qs_vms/time_integrated_qs_vms_data.h"
#include "custom_elements/data_containers/qs_vms_dem_coupled/qs_vms_dem_coupled_data.h"
#include "custom_elements/data_containers/fic/fic_data.h"
#include "custom_elements/data_containers/time_integrated_fic/time_integrated_fic_data.h"
#include "custom_elements/data_containers/stokes/stokes_data.h"
#include "custom_elements/data_containers/two_fluid_navier_stokes/two_fluid_navier_stokes_data.h"
#include "custom_elements/data_containers/two_fluid_navier_stokes_alpha_method/two_fluid_navier_stokes_alpha_method_data.h"
#include "custom_elements/data_containers/weakly_compressible_navier_stokes/weakly_compressible_navier_stokes_data.h"
#include "utilities/element_size_calculator.h"
#include "custom_utilities/vorticity_utilities.h"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include "geometries/geometry.h"

#include "includes/cfd_variables.h"
#include "data_containers/fluid_element_data.h"
#include "custom_elements/data_containers/fluid_element_data.h"
#include "fluid_dynamics_application_variables.h"


Expand Down Expand Up @@ -664,4 +664,4 @@ inline std::ostream& operator <<(std::ostream& rOStream,

} // namespace Kratos.

#endif // KRATOS_FLUID_ELEMENT_H
#endif // KRATOS_FLUID_ELEMENT_H
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
#include "includes/cfd_variables.h"
#include "includes/checks.h"

#include "data_containers/qs_vms/qs_vms_data.h"
#include "data_containers/time_integrated_qs_vms/time_integrated_qs_vms_data.h"
#include "data_containers/qs_vms_dem_coupled/qs_vms_dem_coupled_data.h"
#include "custom_elements/data_containers/qs_vms/qs_vms_data.h"
#include "custom_elements/data_containers/time_integrated_qs_vms/time_integrated_qs_vms_data.h"
#include "custom_elements/data_containers/qs_vms_dem_coupled/qs_vms_dem_coupled_data.h"
#include "custom_utilities/fluid_element_utilities.h"
#include "custom_utilities/fluid_element_time_integration_detail.h"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

// Aplication includes
#include "qs_vms_dem_coupled.h"
#include "data_containers/qs_vms_dem_coupled/qs_vms_dem_coupled_data.h"
#include "custom_elements/data_containers/qs_vms_dem_coupled/qs_vms_dem_coupled_data.h"
#include "custom_utilities/fluid_element_utilities.h"
#include "fluid_dynamics_application_variables.h"

Expand Down Expand Up @@ -1124,4 +1124,4 @@ template class QSVMSDEMCoupled< QSVMSDEMCoupledData<2,9> >;

template class QSVMSDEMCoupled< QSVMSDEMCoupledData<3,8> >;
template class QSVMSDEMCoupled< QSVMSDEMCoupledData<3,27> >;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

// Application includes
#include "symbolic_stokes.h"
#include "data_containers/stokes/stokes_data.h"
#include "custom_elements/data_containers/stokes/stokes_data.h"
#include "custom_utilities/fluid_element_utilities.h"

namespace Kratos
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
//

#include "two_fluid_navier_stokes.h"
#include "data_containers/two_fluid_navier_stokes/two_fluid_navier_stokes_data.h"
#include "data_containers/two_fluid_navier_stokes_alpha_method/two_fluid_navier_stokes_alpha_method_data.h"
#include "custom_elements/data_containers/two_fluid_navier_stokes/two_fluid_navier_stokes_data.h"
#include "custom_elements/data_containers/two_fluid_navier_stokes_alpha_method/two_fluid_navier_stokes_alpha_method_data.h"

namespace Kratos
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
//

#include "two_fluid_navier_stokes_alpha_method.h"
#include "data_containers/two_fluid_navier_stokes_alpha_method/two_fluid_navier_stokes_alpha_method_data.h"
#include "custom_elements/data_containers/two_fluid_navier_stokes_alpha_method/two_fluid_navier_stokes_alpha_method_data.h"

namespace Kratos
{
Expand Down
Loading

0 comments on commit 81b3e04

Please sign in to comment.