From e0d9f8a08d921a8d01a766658b7f82d389c4a901 Mon Sep 17 00:00:00 2001
From: Simon Praetorius <simon.praetorius@tu-dresden.de>
Date: Tue, 26 Feb 2013 14:49:47 +0000
Subject: [PATCH] small correction after AMDiS-Windows-Version
---
AMDiS/src/Functors.h | 18 ++++++++++++++++++
AMDiS/src/ProblemStat.cc | 2 --
2 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/AMDiS/src/Functors.h b/AMDiS/src/Functors.h
index d2f764cf..6855d154 100644
--- a/AMDiS/src/Functors.h
+++ b/AMDiS/src/Functors.h
@@ -261,6 +261,24 @@ struct FadeOut : public TertiaryAbstractFunction<double, double, double ,double>
return dist*mean+(1.0-dist)*v;
}
};
+
+struct Random : public AbstractFunction<double, WorldVector<double> >
+{
+ Random(double mean_, double amplitude_) : mean(mean_), amplitude(amplitude_)
+ {
+ std::srand(time(NULL));
+ }
+
+ double operator()(const WorldVector<double> &x) const
+ {
+ return mean + amplitude * ((std::rand() / static_cast<double>(RAND_MAX)) - 0.5);
+ }
+
+private:
+ double mean;
+ double amplitude;
+};
+
}
#endif // AMDIS_FUNCTORS_H
diff --git a/AMDiS/src/ProblemStat.cc b/AMDiS/src/ProblemStat.cc
index 90bba929..92e71c17 100644
--- a/AMDiS/src/ProblemStat.cc
+++ b/AMDiS/src/ProblemStat.cc
@@ -746,9 +746,7 @@ namespace AMDiS {
void ProblemStatSeq::buildAfterCoarsen(AdaptInfo *adaptInfo, Flag flag,
bool asmMatrix, bool asmVector)
{
-#ifdef HAVE_PARALLEL_DOMAIN_AMDIS
FUNCNAME("ProblemStat::buildAfterCoarsen()");
-#endif
if (dualMeshTraverseRequired()) {
#ifdef HAVE_PARALLEL_DOMAIN_AMDIS
--
GitLab