Skip to content
Snippets Groups Projects
Commit 62d43914 authored by Alexandre Gangloff's avatar Alexandre Gangloff
Browse files

Fix bug on the limiter and add one state law

parent acdb51c4
No related branches found
No related tags found
No related merge requests found
...@@ -226,9 +226,10 @@ LocalFSIModule::LocalFSIModule() ...@@ -226,9 +226,10 @@ LocalFSIModule::LocalFSIModule()
const std::shared_ptr<const DiscreteFunctionVariant>& p, const std::shared_ptr<const DiscreteFunctionVariant>& p,
const std::vector<std::shared_ptr<const IBoundaryConditionDescriptor>>& const std::vector<std::shared_ptr<const IBoundaryConditionDescriptor>>&
bc_descriptor_list, bc_descriptor_list,
const std::shared_ptr<const DiscreteFunctionVariant>& chi_solid, const std::shared_ptr<const DiscreteFunctionVariant>& lambda,
const double& lambda, const std::shared_ptr<const DiscreteFunctionVariant>& mu,
const double& mu, const std::shared_ptr<const DiscreteFunctionVariant>& gamma,
const std::shared_ptr<const DiscreteFunctionVariant>& p_inf,
const double& dt) -> std::tuple<std::shared_ptr<const MeshVariant>, const double& dt) -> std::tuple<std::shared_ptr<const MeshVariant>,
std::shared_ptr<const DiscreteFunctionVariant>, std::shared_ptr<const DiscreteFunctionVariant>,
std::shared_ptr<const DiscreteFunctionVariant>, std::shared_ptr<const DiscreteFunctionVariant>,
...@@ -237,7 +238,7 @@ LocalFSIModule::LocalFSIModule() ...@@ -237,7 +238,7 @@ LocalFSIModule::LocalFSIModule()
return Order2HyperelasticSolverHandler{getCommonMesh({rho, u, E, CG, aL, aT, sigma})} return Order2HyperelasticSolverHandler{getCommonMesh({rho, u, E, CG, aL, aT, sigma})}
.solver() .solver()
.apply(Order2HyperelasticSolverHandler::SolverType::Eucclhyd, 1, dt, rho, u, E, CG, aL, aT, .apply(Order2HyperelasticSolverHandler::SolverType::Eucclhyd, 1, dt, rho, u, E, CG, aL, aT,
sigma, p, bc_descriptor_list, chi_solid, lambda, mu, 0, 0, 0, 0); sigma, p, bc_descriptor_list, lambda, mu, gamma, p_inf);
} }
)); ));
...@@ -255,11 +256,8 @@ LocalFSIModule::LocalFSIModule() ...@@ -255,11 +256,8 @@ LocalFSIModule::LocalFSIModule()
const std::shared_ptr<const DiscreteFunctionVariant>& p, const std::shared_ptr<const DiscreteFunctionVariant>& p,
const std::vector<std::shared_ptr<const IBoundaryConditionDescriptor>>& const std::vector<std::shared_ptr<const IBoundaryConditionDescriptor>>&
bc_descriptor_list, bc_descriptor_list,
const std::shared_ptr<const DiscreteFunctionVariant>& chi_solid, const std::shared_ptr<const DiscreteFunctionVariant>& lambda,
const double& lambda, const std::shared_ptr<const DiscreteFunctionVariant>& mu,
const double& mu,
const double& gamma,
const double& p_inf,
const double& dt) -> std::tuple<std::shared_ptr<const MeshVariant>, const double& dt) -> std::tuple<std::shared_ptr<const MeshVariant>,
std::shared_ptr<const DiscreteFunctionVariant>, std::shared_ptr<const DiscreteFunctionVariant>,
std::shared_ptr<const DiscreteFunctionVariant>, std::shared_ptr<const DiscreteFunctionVariant>,
...@@ -267,8 +265,8 @@ LocalFSIModule::LocalFSIModule() ...@@ -267,8 +265,8 @@ LocalFSIModule::LocalFSIModule()
std::shared_ptr<const DiscreteFunctionVariant>> { std::shared_ptr<const DiscreteFunctionVariant>> {
return Order2HyperelasticSolverHandler{getCommonMesh({rho, u, E, CG, aL, aT, sigma})} return Order2HyperelasticSolverHandler{getCommonMesh({rho, u, E, CG, aL, aT, sigma})}
.solver() .solver()
.apply(Order2HyperelasticSolverHandler::SolverType::Eucclhyd, 1, dt, rho, u, E, CG, aL, aT, .apply(Order2HyperelasticSolverHandler::SolverType::Eucclhyd, 3, dt, rho, u, E, CG, aL, aT,
sigma, p, bc_descriptor_list, chi_solid, lambda, mu, gamma, p_inf, 0, 0); sigma, p, bc_descriptor_list, lambda, mu, lambda, mu);
} }
)); ));
...@@ -286,13 +284,10 @@ LocalFSIModule::LocalFSIModule() ...@@ -286,13 +284,10 @@ LocalFSIModule::LocalFSIModule()
const std::shared_ptr<const DiscreteFunctionVariant>& p, const std::shared_ptr<const DiscreteFunctionVariant>& p,
const std::vector<std::shared_ptr<const IBoundaryConditionDescriptor>>& const std::vector<std::shared_ptr<const IBoundaryConditionDescriptor>>&
bc_descriptor_list, bc_descriptor_list,
const std::shared_ptr<const DiscreteFunctionVariant>& chi_solid, const std::shared_ptr<const DiscreteFunctionVariant>& lambda,
const double& lambda, const std::shared_ptr<const DiscreteFunctionVariant>& mu,
const double& mu, const std::shared_ptr<const DiscreteFunctionVariant>& gamma,
const double& gamma_f, const std::shared_ptr<const DiscreteFunctionVariant>& p_inf,
const double& p_inf_f,
const double& gamma_s,
const double& p_inf_s,
const double& dt) -> std::tuple<std::shared_ptr<const MeshVariant>, const double& dt) -> std::tuple<std::shared_ptr<const MeshVariant>,
std::shared_ptr<const DiscreteFunctionVariant>, std::shared_ptr<const DiscreteFunctionVariant>,
std::shared_ptr<const DiscreteFunctionVariant>, std::shared_ptr<const DiscreteFunctionVariant>,
...@@ -301,7 +296,7 @@ LocalFSIModule::LocalFSIModule() ...@@ -301,7 +296,7 @@ LocalFSIModule::LocalFSIModule()
return Order2HyperelasticSolverHandler{getCommonMesh({rho, u, E, CG, aL, aT, sigma})} return Order2HyperelasticSolverHandler{getCommonMesh({rho, u, E, CG, aL, aT, sigma})}
.solver() .solver()
.apply(Order2HyperelasticSolverHandler::SolverType::Eucclhyd, 2, dt, rho, u, E, CG, aL, aT, .apply(Order2HyperelasticSolverHandler::SolverType::Eucclhyd, 2, dt, rho, u, E, CG, aL, aT,
sigma, p, bc_descriptor_list, chi_solid, lambda, mu, gamma_f, p_inf_f, gamma_s, p_inf_s); sigma, p, bc_descriptor_list, lambda, mu, gamma, p_inf);
} }
)); ));
......
This diff is collapsed.
...@@ -42,13 +42,10 @@ class Order2HyperelasticSolverHandler ...@@ -42,13 +42,10 @@ class Order2HyperelasticSolverHandler
const std::shared_ptr<const DiscreteFunctionVariant>& sigma, const std::shared_ptr<const DiscreteFunctionVariant>& sigma,
const std::shared_ptr<const DiscreteFunctionVariant>& p, const std::shared_ptr<const DiscreteFunctionVariant>& p,
const std::vector<std::shared_ptr<const IBoundaryConditionDescriptor>>& bc_descriptor_list, const std::vector<std::shared_ptr<const IBoundaryConditionDescriptor>>& bc_descriptor_list,
const std::shared_ptr<const DiscreteFunctionVariant>& chi_solid, const std::shared_ptr<const DiscreteFunctionVariant>& lambda,
const double& lambda, const std::shared_ptr<const DiscreteFunctionVariant>& mu,
const double& mu, const std::shared_ptr<const DiscreteFunctionVariant>& gamma,
const double& gamma_f, const std::shared_ptr<const DiscreteFunctionVariant>& p_inf) const = 0;
const double& p_inf_f,
const double& gamma_s,
const double& p_inf_s) const = 0;
IOrder2HyperelasticSolver() = default; IOrder2HyperelasticSolver() = default;
IOrder2HyperelasticSolver(IOrder2HyperelasticSolver&&) = default; IOrder2HyperelasticSolver(IOrder2HyperelasticSolver&&) = default;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment