Commit bd34db10 authored by niklas.baumgarten's avatar niklas.baumgarten

adapted imports

parent e844ec7a
Pipeline #114635 failed with stages
in 6 minutes and 5 seconds
......@@ -2,7 +2,7 @@
#define _DGLAPLACE_H_
#include "discretization/DGDiscretization.hpp"
#include "elements/Elements.h"
#include "elements/Elements.hpp"
#include "IStochasticEllipticAssemble.hpp"
class DGEllipticAssemble : public IStochasticEllipticAssemble {
......
......@@ -4,9 +4,9 @@
#include "timestepping/DGTAssemble.hpp"
#include "assemble/IStochasticTransportAssemble.hpp"
#include "problem/StochasticTransportProblem.hpp"
#include "TimeSeries.h"
#include "TimeSeries.hpp"
#include "utility/Logging.hpp"
#include "elements/DGFaceElement.h"
#include "elements/DGFaceElement.hpp"
class DGTransportAssemble : public IStochasticTransportAssemble {
......
......@@ -36,7 +36,7 @@ void HybridEllipticAssemble::Residual(const cell &c, const Vector &u, Vector &r)
SmallVector RU(R);
SmallVector UU(R);
RT0_LagrangeElementT<> elem(*disc, u, c);
RTLagrangeElement elem(*disc, u, c);
for (int face = 0; face < Faces; ++face)
UU[face] = u(elem[face], 0);
for (int face = 0; face < Faces; ++face)
......@@ -73,7 +73,7 @@ void HybridEllipticAssemble::Jacobi(const cell &c, const Vector &u, Matrix &J) c
SmallVector IAB(IA, B);
Scalar BIAB = B * IAB;
RT0_LagrangeElementT<> elem(*disc, u, c);
RTLagrangeElement elem(*disc, u, c);
RowEntries J_c(J, elem);
for (int face_i = 0; face_i < Faces; ++face_i)
for (int face_j = 0; face_j < Faces; ++face_j)
......@@ -85,7 +85,7 @@ void HybridEllipticAssemble::LocalProblem(const cell &c, const Vector &u,
SmallMatrix &A,
SmallVector &B, SmallVector &R) const {
A = 0, B = 0, R = 0;
RT0_LagrangeElementT<> elem(*disc, u, c);
RTLagrangeElement elem(*disc, u, c);
for (int q = 0; q < elem.nQ(); ++q) {
double w = elem.QWeight(q);
Tensor IK = Invert(problem->Permeability(c));
......@@ -167,7 +167,7 @@ void HybridEllipticAssemble::SetFlux(const Vector &u, Vector &flux) {
Scalar BIAB = B * IAB;
SmallVector RU(R);
SmallVector UU(R);
RT0_LagrangeElementT<> elem(*disc, u, c);
RTLagrangeElement elem(*disc, u, c);
for (int i = 0; i < c.Faces(); ++i)
UU[i] = u(elem[i], 0);
for (int i = 0; i < c.Faces(); ++i)
......@@ -213,7 +213,7 @@ void HybridEllipticAssemble::SetNormalFlux(const Vector &u, Vector &flux) {
Scalar BIAB = B * IAB;
SmallVector RU(R);
SmallVector UU(R);
RT0_LagrangeElementT<> elem(*disc, u, c);
RTLagrangeElement elem(*disc, u, c);
for (int face = 0; face < c.Faces(); ++face)
UU[face] = u(elem[face], 0);
for (int face = 0; face < c.Faces(); ++face)
......@@ -233,7 +233,7 @@ VectorField HybridEllipticAssemble::EvaluateCellFlux(const Vector &flux,
const cell &c) const {
const Mesh &M = flux.GetMesh();
if (M.find_cell(c()) == M.cells_end()) return zero;
RT0_LagrangeElementT<> elem(*disc, flux, c);
RTLagrangeElement elem(*disc, flux, c);
VectorField F = zero;
double area = 0;
for (int q = 0; q < elem.nQ(); ++q) {
......@@ -249,19 +249,19 @@ double HybridEllipticAssemble::EvaluateNormalFlux(const Vector &flux, const cell
int i) const {
const Mesh &M = flux.GetMesh();
if (M.find_cell(c()) == M.cells_end()) return 0;
RT0_LagrangeElementT<> elem(*disc, flux, c);
RTLagrangeElement elem(*disc, flux, c);
RTFaceElementT<> faceElem(*disc, flux, c, i);
return flux(elem[i], 0) * elem.Sign(i) / faceElem.Area();
}
VectorField HybridEllipticAssemble::EvaluateNormal(const Vector &flux,
const cell &c, int i) const {
RT0_LagrangeElementT<> elem(*disc, flux, c);
RTLagrangeElement elem(*disc, flux, c);
return elem.Normal(i);
}
Scalar HybridEllipticAssemble::Value(const cell &c, const Vector &u,
RT0_LagrangeElementT<> &elem) const {
RTLagrangeElement &elem) const {
int Faces = c.Faces();
SmallMatrix A(Faces);
SmallVector B(Faces), R(Faces);
......@@ -271,7 +271,7 @@ Scalar HybridEllipticAssemble::Value(const cell &c, const Vector &u,
Scalar BIAB = B * IAB;
SmallVector RU(R);
SmallVector UU(R);
RT0_LagrangeElementT<> E(*disc, u, c);
RTLagrangeElement E(*disc, u, c);
for (int face = 0; face < c.Faces(); ++face)
UU[face] = u(E[face], 0);
for (int face = 0; face < c.Faces(); ++face)
......@@ -292,7 +292,7 @@ Scalar HybridEllipticAssemble::FaceValue(const cell &c, const Vector &u,
Scalar BIAB = B * IAB;
SmallVector RU(R);
SmallVector UU(R);
RT0_LagrangeElementT<> elem(*disc, u, c);
RTLagrangeElement elem(*disc, u, c);
for (int face = 0; face < c.Faces(); ++face)
UU[face] = u(elem[face], 0);
for (int face = 0; face < Faces; ++face)
......@@ -303,7 +303,7 @@ Scalar HybridEllipticAssemble::FaceValue(const cell &c, const Vector &u,
}
VectorField HybridEllipticAssemble::Flux(const cell &c, const Vector &u,
RT0_LagrangeElementT<> &elem, int q) const {
RTLagrangeElement &elem, int q) const {
int Faces = c.Faces();
SmallMatrix A(Faces);
SmallVector B(Faces), R(Faces);
......@@ -334,7 +334,7 @@ VectorField HybridEllipticAssemble::Flux(const cell &c, const Vector &u,
VectorField HybridEllipticAssemble::FaceFlux(const cell &c, const Vector &u,
RTFaceElementT<> &faceElem,
int q, int face) const {
RT0_LagrangeElementT<> elem(*disc, u, c);
RTLagrangeElement elem(*disc, u, c);
int Faces = c.Faces();
SmallMatrix A(Faces);
SmallVector B(Faces), R(Faces);
......@@ -360,7 +360,7 @@ VectorField HybridEllipticAssemble::FaceFlux(const cell &c, const Vector &u,
double HybridEllipticAssemble::EnergyError(const Vector &u) const {
double err = 0.0;
for (cell c = u.cells(); c != u.cells_end(); ++c) {
RT0_LagrangeElementT<> elem(*disc, u, c);
RTLagrangeElement elem(*disc, u, c);
for (int q = 0; q < elem.nQ(); ++q) {
double w = elem.QWeight(q);
Tensor IK = Invert(problem->Permeability(c));
......@@ -375,7 +375,7 @@ double HybridEllipticAssemble::EnergyError(const Vector &u) const {
double HybridEllipticAssemble::L2(const Vector &u) const {
double l2 = 0.0;
for (cell c = u.cells(); c != u.cells_end(); ++c) {
RT0_LagrangeElementT<> elem(*disc, u, c);
RTLagrangeElement elem(*disc, u, c);
for (int q = 0; q < elem.nQ(); ++q) {
double w = elem.QWeight(q);
Scalar U = Value(c, u, elem);
......@@ -388,7 +388,7 @@ double HybridEllipticAssemble::L2(const Vector &u) const {
double HybridEllipticAssemble::H1(const Vector &u) const {
double err = 0.0;
for (cell c = u.cells(); c != u.cells_end(); ++c) {
RT0_LagrangeElementT<> elem(*disc, u, c);
RTLagrangeElement elem(*disc, u, c);
for (int q = 0; q < elem.nQ(); ++q) {
double w = elem.QWeight(q);
Scalar U = Value(c, u, elem);
......@@ -403,7 +403,7 @@ double HybridEllipticAssemble::H1(const Vector &u) const {
double HybridEllipticAssemble::L2Error(const Vector &u) const {
double err = 0.0;
for (cell c = u.cells(); c != u.cells_end(); ++c) {
RT0_LagrangeElementT<> elem(*disc, u, c);
RTLagrangeElement elem(*disc, u, c);
for (int q = 0; q < elem.nQ(); ++q) {
double w = elem.QWeight(q);
Scalar U = Value(c, u, elem);
......@@ -417,7 +417,7 @@ double HybridEllipticAssemble::L2Error(const Vector &u) const {
double HybridEllipticAssemble::L2CellAverageError(const Vector &u) const {
double err = 0;
for (cell c = u.cells(); c != u.cells_end(); ++c) {
RT0_LagrangeElementT<> elem(*disc, u, c);
RTLagrangeElement elem(*disc, u, c);
double w = 0;
Scalar U = 0;
Scalar Sol = 0;
......@@ -434,7 +434,7 @@ double HybridEllipticAssemble::L2CellAverageError(const Vector &u) const {
double HybridEllipticAssemble::MaxError(const Vector &u) const {
double err = 0;
for (cell c = u.cells(); c != u.cells_end(); ++c) {
RT0_LagrangeElementT<> elem(*disc, u, c);
RTLagrangeElement elem(*disc, u, c);
for (int q = 0; q < elem.nQ(); ++q) {
Scalar U = Value(c, u, elem);
err = max(err, abs(U - problem->Solution(elem.QPoint(q))));
......
#ifndef _HYBRID_H_
#define _HYBRID_H_
#include "Small.h"
#include "Small.hpp"
#include "MixedEllipticAssemble.hpp"
......@@ -67,13 +67,13 @@ public:
VectorField EvaluateNormal(const Vector &flux, const cell &c, int i) const;
Scalar Value(const cell &c, const Vector &u,
RT0_LagrangeElementT<> &elem) const;
RTLagrangeElement &elem) const;
Scalar FaceValue(const cell &c, const Vector &u,
RTFaceElementT<> &faceElem) const;
VectorField Flux(const cell &c, const Vector &u,
RT0_LagrangeElementT<> &elem, int q) const;
RTLagrangeElement &elem, int q) const;
VectorField FaceFlux(const cell &c, const Vector &u,
RTFaceElementT<> &faceElem,
......
#ifndef IREACTIONASSEMBLE_HPP
#define IREACTIONASSEMBLE_HPP
#include "Assemble.h"
#include "Assemble.hpp"
class IReactionAssemble : public TAssemble {
......
#ifndef ISTOCHASTICELLIPTICASSEMBLE_HPP
#define ISTOCHASTICELLIPTICASSEMBLE_HPP
#include "Assemble.h"
#include "Assemble.hpp"
#include "problem/StochasticEllipticProblem.hpp"
......
#ifndef ISTOCHASTICTRANSPORTASSEMBLE_HPP
#define ISTOCHASTICTRANSPORTASSEMBLE_HPP
#include "Assemble.h"
#include "Assemble.hpp"
#include "problem/StochasticTransportProblem.hpp"
......
......@@ -2,7 +2,7 @@
#define _LAPLACE_H_
#include "discretization/LagrangeDiscretization.hpp"
#include "elements/Elements.h"
#include "elements/Elements.hpp"
#include "IStochasticEllipticAssemble.hpp"
......
......@@ -3,7 +3,7 @@
#include "discretization/RTLagrangeDiscretization.hpp"
#include "discretization/LagrangeDiscretization.hpp"
#include "elements/Elements.h"
#include "elements/Elements.hpp"
#include "IStochasticEllipticAssemble.hpp"
......
......@@ -2,9 +2,9 @@
#define _REACTION_H_
#include "discretization/LagrangeDiscretization.hpp"
#include "elements/Elements.h"
#include "Plot.h"
#include "utility/ctools.h"
#include "elements/Elements.hpp"
#include "Plot.hpp"
#include "utility/ctools.hpp"
#include "problem/StochasticReactionProblem.hpp"
#include "IReactionAssemble.hpp"
......
#ifndef MULTILEVELPLOTTER_HPP
#define MULTILEVELPLOTTER_HPP
#include "Plot.h"
#include "Plot.hpp"
#include "mesh/Meshes.hpp"
#include "montecarlo/Sample.hpp"
#include <memory>
......
#include "EmpiricMeasures.hpp"
#include "utility/Assertion.h"
#include "utility/Assertion.hpp"
#include <math.h>
......
......@@ -2,8 +2,8 @@
#define PDESOLVER_HPP
#include "Sample.hpp"
#include "solver/Solver.h"
#include "solver/Newton.h"
#include "solver/Solver.hpp"
#include "solver/Newton.hpp"
#include "timestepping/TimeIntegrator.hpp"
#include "assemble/IStochasticEllipticAssemble.hpp"
#include "assemble/IStochasticTransportAssemble.hpp"
......
#ifndef SAMPLE_HPP
#define SAMPLE_HPP
#include "Algebra.h"
#include "Algebra.hpp"
#include <string>
......
#ifndef STOCHASTICPROBLEM_HPP
#define STOCHASTICPROBLEM_HPP
#include "Algebra.h"
#include "Algebra.hpp"
#include "montecarlo/Sample.hpp"
#include "stochastics/SampleGenerator.hpp"
#include "main/Utils.hpp"
......
......@@ -4,7 +4,7 @@
#include "RandomNumberManager.hpp"
#include "CovarianceFunction.hpp"
#include "main/Utils.hpp"
#include "Algebra.h"
#include "Algebra.hpp"
#include "SampleGenerator.hpp"
#include "dof/BasicDoFs.hpp"
#include "main/MultilevelPlotter.hpp"
......
......@@ -2,7 +2,7 @@
#define M_COVARIANCEFUNCTION_H
#include "utility/Config.hpp"
#include "utility/Assertion.h"
#include "utility/Assertion.hpp"
typedef std::vector<double> ToeplitzRow;
......
......@@ -7,7 +7,7 @@
#include "assemble/HybridEllipticAssemble.hpp"
#include "problem/StochasticHybridFlux.hpp"
#include "discretization/RTLagrangeDiscretization.hpp"
#include "solver/Newton.h"
#include "solver/Newton.hpp"
#include <memory>
......@@ -96,7 +96,7 @@ public:
};
VectorField EvalVectorFieldSample(const cell &c) override {
RT0_LagrangeElementT<> elem(*disc, *faceFlux, c);
RTLagrangeElement elem(*disc, *faceFlux, c);
VectorField F = zero;
double area = 0;
for (int q = 0; q < elem.nQ(); ++q) {
......@@ -109,7 +109,7 @@ public:
}
Scalar EvalScalarSample(int face, const cell &c) override {
RT0_LagrangeElementT<> elem(*disc, *faceFlux, c);
RTLagrangeElement elem(*disc, *faceFlux, c);
RTFaceElementT<> faceElem(*disc, *faceFlux, c, face);
return (*faceFlux)(elem[face], 0) * elem.Sign(face) / faceElem.Area();
}
......
Markdown is supported
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