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

fixed imports 2

parent dfa02e50
Pipeline #87148 failed with stages
in 3 minutes and 7 seconds
......@@ -5,6 +5,7 @@
#include "assemble/DGTransportAssemble.h"
#include "timestepping/TimeIntegrator.h"
#include "matrixgraph/CellMatrixGraph.hpp"
#include "TimeSeries.h"
class MonteCarloTransport : public MonteCarlo {
......
......@@ -4,6 +4,7 @@
#include "RNManager.h"
#include "CovarianceFunction.h"
#include "utils/Utils.hpp"
#include "Algebra.h"
#include "SampleGenerator.h"
......
......@@ -2,6 +2,8 @@
#define M_COVARIANCEFUNCTION_H
#include "Config.hpp"
#include "Debug.h"
class CovarianceFunction {
public:
......@@ -14,9 +16,9 @@ public:
CovarianceFunction() {
config.get("sigma", sigma);
config.get("norm_p", norm_p);
config.get( "lambda1", lambda1);
config.get( "lambda2", lambda2);
config.get( "smoothing", smoothing);
config.get("lambda1", lambda1);
config.get("lambda2", lambda2);
config.get("smoothing", smoothing);
}
virtual double covariance_fct(double *tau) = 0;
......
......@@ -2,7 +2,7 @@
#define SAMPLEGENERATOR_H
#include <utility>
#include "Config.hpp"
#include "utils/IndentedLogger.hpp"
#include "utils/MultilevelPlotter.hpp"
......
......@@ -2,6 +2,8 @@
#define _TIME_INTGRATROR_H_
#include "assemble/DGTAssemble.h"
#include "TimeSeries.h"
class DGTimeIntegrator {
Solver &S;
......@@ -23,9 +25,9 @@ class DGTimeIntegrator {
Time TComp;
public:
DGTimeIntegrator(Solver &__S, Solver &__S2, Solver &__S3, Solver &__IM) :
S(__S), S2(__S2), S3(__S3), IM(__IM), plot_tStep(1), rkorder(1),
Kmin(2), Kmax(10), Keps(0.001), gamma(1),
SSum(0), MSum(0), KSum(0), KPre(0) {
S(__S), S2(__S2), S3(__S3), IM(__IM), plot_tStep(1), rkorder(1),
Kmin(2), Kmax(10), Keps(0.001), gamma(1),
SSum(0), MSum(0), KSum(0), KPre(0) {
ReadConfig(Settings, "plot_tStep", plot_tStep);
ReadConfig(Settings, "rkorder", rkorder);
ReadConfig(Settings, "Kmin", Kmin);
......@@ -422,7 +424,7 @@ public:
double t_old = t;
t = TS.NextTStep(t);
double dt = t - t_old;
switch (rkorder) {
switch(rkorder) {
case 1:
Euler(dt, u, A, du);
break;
......@@ -481,12 +483,12 @@ public:
case -3:
if (abs(dt - dt_old) > 1e-13) {
const Scalar gamma =
4.0 - 2 * pow(2.0 / (1.0 + sqrt(5.0)), 1.0 / 3.0)
4.0 - 2 * pow(2.0 / (1.0 + sqrt(5.0)), 1.0 / 3.0)
+ pow(2.0, 2.0 / 3.0) * pow(1.0 + sqrt(5), 1.0 / 3.0);
const Scalar alpha = 4.0 + (1.0 - iUnit * sqrt(3.0)) *
pow(2.0 / (1.0 + sqrt(5)), 1.0 / 3.0)
- (1.0 + iUnit * sqrt(3.0)) *
pow(0.5 * (1.0 + sqrt(5)), 1.0 / 3.0);
pow(2.0 / (1.0 + sqrt(5)), 1.0 / 3.0)
- (1.0 + iUnit * sqrt(3.0)) *
pow(0.5 * (1.0 + sqrt(5)), 1.0 / 3.0);
B = M;
B += Scalar(-dt / gamma) * A;
B2 = M;
......
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