Commit 63de6d1e authored by gt2651's avatar gt2651
Browse files

Testing and removed VectorFieldFaceElements

parent 0ec7d667
Pipeline #222217 passed with stages
in 29 minutes and 51 seconds
......@@ -9,7 +9,7 @@ h_min=1e-6
Model = ActiveStrainElasticity
MechModel = Static
MechDiscretization = DG
#MechDiscretization = DG
MechDiscretization = Conforming
CalculateReference = 1
......
......@@ -11,14 +11,14 @@ GeoPath = ../geo/
# = Choose Configuration for Problems =
# ======================================
# === Electrophysiology ================
loadconf = elphy.conf
#loadconf = elphy.conf
#loadconf = monodomain.conf;
# === Cardiac Mechanics ================
#loadconf = coupled.conf
#loadconf = klotz.conf
#loadconf = elasticity_benchmarks/test.conf
#loadconf = elasticity_benchmarks/linear.conf
#loadconf = elasticity_benchmarks/beam.conf
loadconf = elasticity_benchmarks/beam.conf
#loadconf = elasticity_benchmarks/ellipsoid.conf
#loadconf = elasticity.conf
# ======================================
......
#include <DGDiscretization.hpp>
#include <EGDiscretization.hpp>
#include "VectorFieldElement.hpp"
#include "VectorFieldFaceElement.hpp"
#include "assemble/LagrangeElasticity.hpp"
#include "assemble/DGElasticity.hpp"
......
......@@ -2,7 +2,6 @@
#include "problem/PressureProblem.hpp"
#include "DGDoF.hpp"
#include "DGVectorFieldElement.hpp"
#include "DGVectorFieldFaceElement.hpp"
#include "VectorAccess.hpp"
DGElasticity::DGElasticity(const ElasticityProblem &eP, const PressureProblem &pP, const Meshes &mesh, int degree, bool isStatic)
......
......@@ -11,7 +11,6 @@
#include "EGDoF.hpp"
#include "EGDiscretization.hpp"
#include "EGVectorFieldElement.hpp"
#include "EGVectorFieldFaceElement.hpp"
EGElasticity::EGElasticity(const ElasticityProblem &eP, const PressureProblem &pP, const Meshes &mesh, int degree, bool isStatic)
: FiniteElasticity(eP, pP) , disc(mesh, degree, size){
......
#include <VectorFieldFaceElement.hpp>
//#include <LagrangeDiscretization.hpp>
#include "Plotting.hpp"
#include "FiniteElasticity.hpp"
......
......@@ -76,7 +76,6 @@ void IterativePressureSolver::Solve(Vector &displacement, int pressureSteps) {
bool IterativePressureSolver::SolveStep(Newton &newton, double t, double dt, Vector &uNew) {
std::array<double, 4> mechVolumes = mechA.ChamberVolume(uNew);
problem.Initialize(dt, t, mechVolumes);
newton.PrintIterationInfo();
for (int i = 0; i < maxPressureIterations; ++i) {
mout << "Update Pressure" << endl;
problem.Update(dt, t, mechVolumes);
......@@ -88,6 +87,7 @@ bool IterativePressureSolver::SolveStep(Newton &newton, double t, double dt, Vec
PrintInfoEntry("LA Pressure", problem.Pressure(t, Origin, PRESSURE_BC_LA), 3),
PrintInfoEntry("RA Pressure", problem.Pressure(t, Origin, PRESSURE_BC_RA), 3));
newton(mechA, uNew);
newton.PrintIterationInfo();
mechVolumes = mechA.ChamberVolume(uNew);
if (problem.Converged(mechVolumes)) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment