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

removing matrixgraph

parent 43e8d07b
......@@ -4,7 +4,7 @@
void CirculantEmbedding1D::generateFineSample(const SampleID &id,
Vector *&fineSample,
Vector *&coarseSample) {
fineSample = new Vector(cellMGraphs[id.level.fine - id.level.pLevel]);
fineSample = new Vector(disc[id.level.fine]);
if (internalCounter == 0)
fineComplexField = generateField(id);
......@@ -33,7 +33,7 @@ void CirculantEmbedding1D::generateFineSample(const SampleID &id,
void CirculantEmbedding1D::generateCoarseSample(const SampleID &id,
Vector *&fineSample,
Vector *&coarseSample) {
coarseSample = new Vector(cellMGraphs[id.level.coarse - id.level.pLevel]);
coarseSample = new Vector(disc[id.level.coarse]);
(*coarseSample) = 0;
for (cell c = coarseSample->cells(); c != coarseSample->cells_end(); c++) {
......@@ -155,7 +155,7 @@ SqrtEigenValues1D CirculantEmbedding1D::computeSqrtEV() {
void CirculantEmbedding2D::generateFineSample(const SampleID &id,
Vector *&fineSample,
Vector *&coarseSample) {
fineSample = new Vector(cellMGraphs[id.level.fine - id.level.pLevel]);
fineSample = new Vector(disc[id.level.fine]);
if (internalCounter == 0)
fineComplexField = generateField(id);
......@@ -187,7 +187,7 @@ void CirculantEmbedding2D::generateFineSample(const SampleID &id,
void CirculantEmbedding2D::generateCoarseSample(const SampleID &id,
Vector *&fineSample,
Vector *&coarseSample) {
coarseSample = new Vector(cellMGraphs[id.level.coarse - id.level.pLevel]);
coarseSample = new Vector(disc[id.level.coarse]);
*coarseSample = 0;
for (cell c = coarseSample->cells(); c != coarseSample->cells_end(); ++c) {
......
......@@ -2,6 +2,7 @@
#define M_CIRCULANTEMBEDDING_H
#include "CovarianceFunction.hpp"
#include "LagrangeDiscretization.hpp"
#include "basics/Utilities.hpp"
#include "Algebra.hpp"
#include "NormalDistribution.hpp"
......@@ -40,15 +41,13 @@ protected:
double mean = 0.0;
MatrixGraphs cellMGraphs;
LagrangeDiscretization disc;
Meshes &meshes;
public:
explicit CirculantEmbedding(Meshes &meshes) :
meshes(meshes),
normalDist(meshes),
cellMGraphs(meshes, new LagrangeDoF(0)) {
meshes(meshes), normalDist(meshes), disc(meshes, 0) {
config.get("evtol", evtol);
config.get("StochasticField", fieldType);
......@@ -74,7 +73,6 @@ public:
SqrtEigenValues1D sqrtEigenvalues;
int numberOfCellsEmbedded = 0;
int numberOfCells = 0;
......
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