Merge pull request #12104 from KratosMultiphysics/poro/cleanup-and-re…

…organization [Poro] Cleanup and refactoring of the App
KratosMultiphysics · Feb 22, 2024 · 50ebdf1 · 50ebdf1
2 parents 0392227 + dc1e519
commit 50ebdf1
Show file tree

Hide file tree

Showing 204 changed files with 12,840 additions and 12,891 deletions.
diff --git a/applications/DamApplication/custom_conditions/infinite_domain_condition.cpp b/applications/DamApplication/custom_conditions/infinite_domain_condition.cpp
@@ -49,7 +49,7 @@ void InfiniteDomainCondition<TDim,TNumNodes>::CalculateLHS( MatrixType& rLeftHan
 		double IntegrationCoefficient;
 
 		// Definition of the speed in the fluid
-        //~ const double BulkModulus = Prop[BULK_MODULUS_FLUID];
+        //~ const double BulkModulus = Prop[BULK_MODULUS_LIQUID];
         //~ const double Water_density = Prop[DENSITY_WATER];
         const double BulkModulus = 2.21e9;
         const double Water_density = 1000.0;
@@ -103,7 +103,7 @@ void InfiniteDomainCondition<TDim,TNumNodes>::CalculateRHS( VectorType& rRightHa
 		double IntegrationCoefficient;
 
 		// Definition of the speed in the fluid
-        //~ const double BulkModulus = Prop[BULK_MODULUS_FLUID];
+        //~ const double BulkModulus = Prop[BULK_MODULUS_LIQUID];
         //~ const double Water_density = Prop[DENSITY_WATER];
         const double BulkModulus = 2.21e9;
         const double Water_density = 1000.0;

diff --git a/applications/DamApplication/custom_constitutive/linear_elastic_3D_law_nodal.hpp b/applications/DamApplication/custom_constitutive/linear_elastic_3D_law_nodal.hpp
@@ -10,7 +10,7 @@
 
 // Project includes
 #include "includes/serializer.h"
-#include "custom_constitutive/linear_elastic_3D_law.hpp"
+#include "custom_constitutive/continuum_laws/linear_elastic_3D_law.hpp"
 
 #include "dam_application_variables.h"
 

diff --git a/applications/DamApplication/custom_constitutive/thermal_linear_elastic_3D_law.hpp b/applications/DamApplication/custom_constitutive/thermal_linear_elastic_3D_law.hpp
@@ -10,7 +10,7 @@
 
 // Project includes
 #include "includes/serializer.h"
-#include "custom_constitutive/linear_elastic_3D_law.hpp"
+#include "custom_constitutive/continuum_laws/linear_elastic_3D_law.hpp"
 
 #include "dam_application_variables.h"
 

diff --git a/applications/DamApplication/custom_constitutive/thermal_linear_elastic_3D_law_nodal.hpp b/applications/DamApplication/custom_constitutive/thermal_linear_elastic_3D_law_nodal.hpp
@@ -10,7 +10,7 @@
 
 // Project includes
 #include "includes/serializer.h"
-#include "custom_constitutive/linear_elastic_3D_law.hpp"
+#include "custom_constitutive/continuum_laws/linear_elastic_3D_law.hpp"
 
 #include "dam_application_variables.h"
 

diff --git a/applications/DamApplication/custom_constitutive/thermal_local_damage_3D_law.hpp b/applications/DamApplication/custom_constitutive/thermal_local_damage_3D_law.hpp
@@ -12,7 +12,7 @@
 #include "includes/serializer.h"
 
 // Application includes
-#include "custom_constitutive/local_damage_3D_law.hpp"
+#include "custom_constitutive/continuum_laws/local_damage_3D_law.hpp"
 #include "dam_application_variables.h"
 
 namespace Kratos

diff --git a/...ions/DamApplication/custom_constitutive/thermal_modified_mises_nonlocal_damage_3D_law.hpp b/...ions/DamApplication/custom_constitutive/thermal_modified_mises_nonlocal_damage_3D_law.hpp
@@ -13,9 +13,9 @@
 
 // Application includes
 #include "custom_constitutive/thermal_nonlocal_damage_3D_law.hpp"
-#include "custom_constitutive/custom_hardening_laws/modified_exponential_damage_hardening_law.hpp"
-#include "custom_constitutive/custom_yield_criteria/modified_mises_yield_criterion.hpp"
-#include "custom_constitutive/custom_flow_rules/nonlocal_damage_flow_rule.hpp"
+#include "custom_constitutive/continuum_laws/custom_hardening_laws/modified_exponential_damage_hardening_law.hpp"
+#include "custom_constitutive/continuum_laws/custom_yield_criteria/modified_mises_yield_criterion.hpp"
+#include "custom_constitutive/continuum_laws/custom_flow_rules/nonlocal_damage_flow_rule.hpp"
 #include "dam_application_variables.h"
 
 namespace Kratos

diff --git a/...cation/custom_constitutive/thermal_modified_mises_nonlocal_damage_plane_strain_2D_law.hpp b/...cation/custom_constitutive/thermal_modified_mises_nonlocal_damage_plane_strain_2D_law.hpp
@@ -13,9 +13,9 @@
 
 // Application includes
 #include "custom_constitutive/thermal_nonlocal_damage_plane_strain_2D_law.hpp"
-#include "custom_constitutive/custom_hardening_laws/modified_exponential_damage_hardening_law.hpp"
-#include "custom_constitutive/custom_yield_criteria/modified_mises_yield_criterion.hpp"
-#include "custom_constitutive/custom_flow_rules/nonlocal_damage_flow_rule.hpp"
+#include "custom_constitutive/continuum_laws/custom_hardening_laws/modified_exponential_damage_hardening_law.hpp"
+#include "custom_constitutive/continuum_laws/custom_yield_criteria/modified_mises_yield_criterion.hpp"
+#include "custom_constitutive/continuum_laws/custom_flow_rules/nonlocal_damage_flow_rule.hpp"
 #include "dam_application_variables.h"
 
 namespace Kratos

diff --git a/...cation/custom_constitutive/thermal_modified_mises_nonlocal_damage_plane_stress_2D_law.hpp b/...cation/custom_constitutive/thermal_modified_mises_nonlocal_damage_plane_stress_2D_law.hpp
@@ -13,9 +13,9 @@
 
 // Application includes
 #include "custom_constitutive/thermal_nonlocal_damage_plane_stress_2D_law.hpp"
-#include "custom_constitutive/custom_hardening_laws/modified_exponential_damage_hardening_law.hpp"
-#include "custom_constitutive/custom_yield_criteria/modified_mises_yield_criterion.hpp"
-#include "custom_constitutive/custom_flow_rules/nonlocal_damage_flow_rule.hpp"
+#include "custom_constitutive/continuum_laws/custom_hardening_laws/modified_exponential_damage_hardening_law.hpp"
+#include "custom_constitutive/continuum_laws/custom_yield_criteria/modified_mises_yield_criterion.hpp"
+#include "custom_constitutive/continuum_laws/custom_flow_rules/nonlocal_damage_flow_rule.hpp"
 #include "dam_application_variables.h"
 
 namespace Kratos

diff --git a/applications/DamApplication/custom_constitutive/thermal_nonlocal_damage_3D_law.hpp b/applications/DamApplication/custom_constitutive/thermal_nonlocal_damage_3D_law.hpp
@@ -12,7 +12,7 @@
 #include "includes/serializer.h"
 
 // Application includes
-#include "custom_constitutive/nonlocal_damage_3D_law.hpp"
+#include "custom_constitutive/continuum_laws/nonlocal_damage_3D_law.hpp"
 #include "dam_application_variables.h"
 
 namespace Kratos

diff --git a/applications/DamApplication/custom_constitutive/thermal_simo_ju_local_damage_3D_law.hpp b/applications/DamApplication/custom_constitutive/thermal_simo_ju_local_damage_3D_law.hpp
@@ -16,9 +16,9 @@
 
 // Application includes
 #include "custom_constitutive/thermal_local_damage_3D_law.hpp"
-#include "custom_constitutive/custom_hardening_laws/exponential_damage_hardening_law.hpp"
-#include "custom_constitutive/custom_yield_criteria/simo_ju_yield_criterion.hpp"
-#include "custom_constitutive/custom_flow_rules/local_damage_flow_rule.hpp"
+#include "custom_constitutive/continuum_laws/custom_hardening_laws/exponential_damage_hardening_law.hpp"
+#include "custom_constitutive/continuum_laws/custom_yield_criteria/simo_ju_yield_criterion.hpp"
+#include "custom_constitutive/continuum_laws/custom_flow_rules/local_damage_flow_rule.hpp"
 #include "dam_application_variables.h"
 
 namespace Kratos

diff --git a/...s/DamApplication/custom_constitutive/thermal_simo_ju_local_damage_plane_strain_2D_law.hpp b/...s/DamApplication/custom_constitutive/thermal_simo_ju_local_damage_plane_strain_2D_law.hpp
@@ -16,9 +16,9 @@
 
 // Application includes
 #include "custom_constitutive/thermal_local_damage_plane_strain_2D_law.hpp"
-#include "custom_constitutive/custom_hardening_laws/exponential_damage_hardening_law.hpp"
-#include "custom_constitutive/custom_yield_criteria/simo_ju_yield_criterion.hpp"
-#include "custom_constitutive/custom_flow_rules/local_damage_flow_rule.hpp"
+#include "custom_constitutive/continuum_laws/custom_hardening_laws/exponential_damage_hardening_law.hpp"
+#include "custom_constitutive/continuum_laws/custom_yield_criteria/simo_ju_yield_criterion.hpp"
+#include "custom_constitutive/continuum_laws/custom_flow_rules/local_damage_flow_rule.hpp"
 #include "dam_application_variables.h"
 
 namespace Kratos

diff --git a/...s/DamApplication/custom_constitutive/thermal_simo_ju_local_damage_plane_stress_2D_law.hpp b/...s/DamApplication/custom_constitutive/thermal_simo_ju_local_damage_plane_stress_2D_law.hpp
@@ -16,9 +16,9 @@
 
 // Application includes
 #include "custom_constitutive/thermal_local_damage_plane_stress_2D_law.hpp"
-#include "custom_constitutive/custom_hardening_laws/exponential_damage_hardening_law.hpp"
-#include "custom_constitutive/custom_yield_criteria/simo_ju_yield_criterion.hpp"
-#include "custom_constitutive/custom_flow_rules/local_damage_flow_rule.hpp"
+#include "custom_constitutive/continuum_laws/custom_hardening_laws/exponential_damage_hardening_law.hpp"
+#include "custom_constitutive/continuum_laws/custom_yield_criteria/simo_ju_yield_criterion.hpp"
+#include "custom_constitutive/continuum_laws/custom_flow_rules/local_damage_flow_rule.hpp"
 #include "dam_application_variables.h"
 
 namespace Kratos

diff --git a/applications/DamApplication/custom_constitutive/thermal_simo_ju_nonlocal_damage_3D_law.hpp b/applications/DamApplication/custom_constitutive/thermal_simo_ju_nonlocal_damage_3D_law.hpp
@@ -16,9 +16,9 @@
 
 // Application includes
 #include "custom_constitutive/thermal_nonlocal_damage_3D_law.hpp"
-#include "custom_constitutive/custom_hardening_laws/exponential_damage_hardening_law.hpp"
-#include "custom_constitutive/custom_yield_criteria/simo_ju_yield_criterion.hpp"
-#include "custom_constitutive/custom_flow_rules/nonlocal_damage_flow_rule.hpp"
+#include "custom_constitutive/continuum_laws/custom_hardening_laws/exponential_damage_hardening_law.hpp"
+#include "custom_constitutive/continuum_laws/custom_yield_criteria/simo_ju_yield_criterion.hpp"
+#include "custom_constitutive/continuum_laws/custom_flow_rules/nonlocal_damage_flow_rule.hpp"
 #include "dam_application_variables.h"
 
 namespace Kratos

diff --git a/...amApplication/custom_constitutive/thermal_simo_ju_nonlocal_damage_plane_strain_2D_law.hpp b/...amApplication/custom_constitutive/thermal_simo_ju_nonlocal_damage_plane_strain_2D_law.hpp
@@ -16,9 +16,9 @@
 
 // Application includes
 #include "custom_constitutive/thermal_nonlocal_damage_plane_strain_2D_law.hpp"
-#include "custom_constitutive/custom_hardening_laws/exponential_damage_hardening_law.hpp"
-#include "custom_constitutive/custom_yield_criteria/simo_ju_yield_criterion.hpp"
-#include "custom_constitutive/custom_flow_rules/nonlocal_damage_flow_rule.hpp"
+#include "custom_constitutive/continuum_laws/custom_hardening_laws/exponential_damage_hardening_law.hpp"
+#include "custom_constitutive/continuum_laws/custom_yield_criteria/simo_ju_yield_criterion.hpp"
+#include "custom_constitutive/continuum_laws/custom_flow_rules/nonlocal_damage_flow_rule.hpp"
 #include "dam_application_variables.h"
 
 namespace Kratos

diff --git a/...amApplication/custom_constitutive/thermal_simo_ju_nonlocal_damage_plane_stress_2D_law.hpp b/...amApplication/custom_constitutive/thermal_simo_ju_nonlocal_damage_plane_stress_2D_law.hpp
@@ -16,9 +16,9 @@
 
 // Application includes
 #include "custom_constitutive/thermal_nonlocal_damage_plane_stress_2D_law.hpp"
-#include "custom_constitutive/custom_hardening_laws/exponential_damage_hardening_law.hpp"
-#include "custom_constitutive/custom_yield_criteria/simo_ju_yield_criterion.hpp"
-#include "custom_constitutive/custom_flow_rules/nonlocal_damage_flow_rule.hpp"
+#include "custom_constitutive/continuum_laws/custom_hardening_laws/exponential_damage_hardening_law.hpp"
+#include "custom_constitutive/continuum_laws/custom_yield_criteria/simo_ju_yield_criterion.hpp"
+#include "custom_constitutive/continuum_laws/custom_flow_rules/nonlocal_damage_flow_rule.hpp"
 #include "dam_application_variables.h"
 
 namespace Kratos

diff --git a/applications/DamApplication/custom_elements/wave_equation_element.cpp b/applications/DamApplication/custom_elements/wave_equation_element.cpp
@@ -60,8 +60,8 @@ int WaveEquationElement<TDim,TNumNodes>::Check(const ProcessInfo& rCurrentProces
         KRATOS_THROW_ERROR( std::invalid_argument,"ACCELERATION_PRESSURE_COEFFICIENT has Key zero at element", this->Id() )
 
        // Verify properties
-    if ( BULK_MODULUS_FLUID.Key() == 0 || Prop.Has( BULK_MODULUS_FLUID ) == false || Prop[BULK_MODULUS_FLUID] < 0.0 )
-        KRATOS_THROW_ERROR( std::invalid_argument,"BULK_MODULUS_FLUID has Key zero, is not defined or has an invalid value at element", this->Id() )
+    if ( BULK_MODULUS_LIQUID.Key() == 0 || Prop.Has( BULK_MODULUS_LIQUID ) == false || Prop[BULK_MODULUS_LIQUID] < 0.0 )
+        KRATOS_THROW_ERROR( std::invalid_argument,"BULK_MODULUS_LIQUID has Key zero, is not defined or has an invalid value at element", this->Id() )
     if ( DENSITY_WATER.Key() == 0 || Prop.Has( DENSITY_WATER ) == false || Prop[DENSITY_WATER] < 0.0 )
         KRATOS_THROW_ERROR( std::invalid_argument,"DENSITY_WATER has Key zero, is not defined or has an invalid value at element", this->Id() )
 
@@ -266,7 +266,7 @@ void WaveEquationElement<TDim,TNumNodes>::CalculateLHS( MatrixType& rLeftHandSid
 		double IntegrationCoefficient;
 
         // Definition of the speed in the fluid
-        const double BulkModulus = Prop[BULK_MODULUS_FLUID];
+        const double BulkModulus = Prop[BULK_MODULUS_LIQUID];
         const double Water_density = Prop[DENSITY_WATER];
         const double inv_c_speed = 1.0 /sqrt(BulkModulus/Water_density);
 
@@ -316,7 +316,7 @@ void WaveEquationElement<TDim,TNumNodes>::CalculateRHS(VectorType& rRightHandSid
 		double IntegrationCoefficient;
 
         // Definition of the speed in the fluid
-        const double BulkModulus = Prop[BULK_MODULUS_FLUID];
+        const double BulkModulus = Prop[BULK_MODULUS_LIQUID];
         const double Water_density = Prop[DENSITY_WATER];
         const double inv_c_speed = 1.0 /sqrt(BulkModulus/Water_density);