Commit db2c8cd8 authored by niklas.baumgarten's avatar niklas.baumgarten
Browse files

renaming

parent 091c962b
......@@ -2,21 +2,21 @@
#define _DG_REACTION_H_
#include "timestepping/DGTAssemble.hpp"
#include "problem/ReactionProblem.hpp"
#include "problem/StochasticReactionProblem.hpp"
#include "IReactionAssemble.hpp"
class DGReactionAssemble : public IReactionAssemble {
public:
DGDiscretization *disc;
ReactionProblem *problem;
StochasticReactionProblem *problem;
Plot *plot;
double penalty = 1.0;
int sign = 1;
double flux_alpha = 1.0;
DGReactionAssemble(IDiscretization *disc, ReactionProblem *problem,
DGReactionAssemble(IDiscretization *disc, StochasticReactionProblem *problem,
Plot *plot)
: disc(dynamic_cast<DGDiscretization *> (disc)),
plot(plot), problem(problem) {
......
......@@ -5,19 +5,19 @@
#include "elements/Elements.h"
#include "Plot.h"
#include "utility/ctools.h"
#include "problem/ReactionProblem.hpp"
#include "problem/StochasticReactionProblem.hpp"
#include "IReactionAssemble.hpp"
class PGReactionAssemble : public IReactionAssemble {
public:
IDiscretization *disc;
ReactionProblem *problem;
StochasticReactionProblem *problem;
Plot *plot;
double delta = 0.0;
PGReactionAssemble(IDiscretization *disc, ReactionProblem *problem,
PGReactionAssemble(IDiscretization *disc, StochasticReactionProblem *problem,
Plot *plot)
: disc(disc), problem(problem), plot(plot) {
config.get("delta", delta);
......
#ifndef REACTIONPROBLEM_HPP
#define REACTIONPROBLEM_HPP
#ifndef STOCHASTICREACTIONPROBLEM_HPP
#define STOCHASTICREACTIONPROBLEM_HPP
#include "StochasticProblem.hpp"
#include "HybridFluxTransport.hpp"
class ReactionProblem : public StochasticProblem {
class StochasticReactionProblem : public StochasticProblem {
protected:
double convection = 1.0;
double diffusion = 0.001;
double reaction = 1.0;
public:
ReactionProblem() {
StochasticReactionProblem() {
config.get("Diffusion", diffusion);
config.get("Convection", convection);
config.get("Reaction", reaction);
......@@ -29,7 +29,7 @@ public:
return reaction;
}
virtual ~ReactionProblem() = default;
virtual ~StochasticReactionProblem() = default;
virtual Scalar Concentration(double t, const Point &x) const {
return 0.0;
......@@ -83,10 +83,10 @@ inline Scalar u0(const Point &x) {
else return 0.0;
}
class ExponentialReaction2D : public ReactionProblem {
class ExponentialReaction2D : public StochasticReactionProblem {
public:
ExponentialReaction2D() : ReactionProblem() {};
ExponentialReaction2D() : StochasticReactionProblem() {};
Scalar Concentration(double t, const Point &x) const override {
return u0(x);
......@@ -111,7 +111,7 @@ public:
string Name() const override { return "ExponentialReaction2D"; }
};
class LogisticReaction2D : public ReactionProblem {
class LogisticReaction2D : public StochasticReactionProblem {
private:
double r0 = 1.0;
double r1 = 0.0;
......@@ -175,4 +175,4 @@ class HybridLogisticReaction2D : public LogisticReaction2D,
string Name() const override { return "HybridLogisticReaction2D"; }
};
#endif //REACTIONPROBLEM_HPP
#endif //STOCHASTICREACTIONPROBLEM_HPP
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