Commit 2b9c796f authored by niklas.baumgarten's avatar niklas.baumgarten
Browse files

added todo and changed order

parent 3c73e012
......@@ -45,22 +45,15 @@ public:
SampleID fineId;
MonteCarlo(int level, int dM, bool onlyFine, bool parallel) :
level(level),
onlyFine(onlyFine),
parallel(parallel),
level(level), onlyFine(onlyFine), parallel(parallel),
pdeSolverCreator(PDESolverCreator()),
meshesCreator(MeshesCreator(pdeSolverCreator.GetMeshName()).
WithCommSplit(aggregate.commSplit). // Todo: Is this correct?
WithPLevel(level - 1).
WithLevel(level)) {
meshesCreator(MeshesCreator(pdeSolverCreator.GetMeshName())) {
Init(dM);
}
MonteCarlo(int level, int dM, bool onlyFine, bool parallel,
MeshesCreator meshesCreator, PDESolverCreator pdeCreator) :
level(level),
onlyFine(onlyFine),
parallel(parallel),
level(level), onlyFine(onlyFine), parallel(parallel),
pdeSolverCreator(pdeCreator),
meshesCreator(meshesCreator) {
Init(dM);
......@@ -71,19 +64,23 @@ public:
config.get("MCVerbose", verbose);
config.get("MCParallel", parallel);
meshes = meshesCreator.Create();
pdeSolver = pdeSolverCreator.Create(*meshes);
fineId.fLevel = level;
fineId.cLevel = level - 1;
fineId.coarse = false;
coarseId.fLevel = level;
coarseId.cLevel = level - 1;
coarseId.coarse = true;
ctr.parallel = parallel;
ctr.UpdateSampleCounter(dM);
ctr.parallel = parallel; // todo rmv
ctr.UpdateSampleCounter(dM); // todo rmv
aggregate.parallel = parallel;
aggregate.UpdateSampleCounter(dM);
meshes = meshesCreator.
WithCommSplit(aggregate.commSplit).
WithPLevel(level - 1).
WithLevel(level).
Create();
pdeSolver = pdeSolverCreator.Create(*meshes);
}
~MonteCarlo() {
......
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