From 9355f49cb3c0ba7d747729b8ef6ffe34fbb6b6cb Mon Sep 17 00:00:00 2001
From: Thomas Witkowski <thomas.witkowski@gmx.de>
Date: Thu, 24 Jun 2010 15:18:51 +0000
Subject: [PATCH] Just to merge two AMDiS version.
---
AMDiS/src/MacroReader.cc | 10 +++++++---
AMDiS/src/PeriodicBC.cc | 8 ++++++++
AMDiS/src/time/RosenbrockStationary.h | 2 ++
3 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/AMDiS/src/MacroReader.cc b/AMDiS/src/MacroReader.cc
index 7233ee55..0a138ec1 100644
--- a/AMDiS/src/MacroReader.cc
+++ b/AMDiS/src/MacroReader.cc
@@ -126,8 +126,10 @@ namespace AMDiS {
ElementData *ld1 = element1->getElementData();
ElementData *ld2 = element2->getElementData();
- LeafDataPeriodic *ldp1 = dynamic_cast<LeafDataPeriodic*>(ld1->getElementData(PERIODIC));
- LeafDataPeriodic *ldp2 = dynamic_cast<LeafDataPeriodic*>(ld2->getElementData(PERIODIC));
+ LeafDataPeriodic *ldp1 =
+ dynamic_cast<LeafDataPeriodic*>(ld1->getElementData(PERIODIC));
+ LeafDataPeriodic *ldp2 =
+ dynamic_cast<LeafDataPeriodic*>(ld2->getElementData(PERIODIC));
if (!ldp1) {
ldp1 = new LeafDataPeriodic(ld1);
@@ -201,7 +203,9 @@ namespace AMDiS {
if (periodicMap.getEntry(i) != -1)
MSG("identification : vertex %d is now vertex %d\n",
i, periodicMap.getEntry(i));
- }
+
+ } // periodicFile
+
// =========================================================
diff --git a/AMDiS/src/PeriodicBC.cc b/AMDiS/src/PeriodicBC.cc
index 239e5d7f..d4e13ec1 100644
--- a/AMDiS/src/PeriodicBC.cc
+++ b/AMDiS/src/PeriodicBC.cc
@@ -11,6 +11,7 @@ namespace AMDiS {
std::vector<PeriodicDOFMapping*> PeriodicDOFMapping::mappings;
+
PeriodicDOFMapping*
PeriodicDOFMapping::providePeriodicDOFMapping(const BasisFunction *fcts)
{
@@ -38,6 +39,7 @@ namespace AMDiS {
}
}
+
PeriodicDOFMapping::~PeriodicDOFMapping()
{
std::map<DimVec<int>, DegreeOfFreedom*, DimVecLess<int> >::iterator it;
@@ -46,6 +48,7 @@ namespace AMDiS {
delete [] it->second;
}
+
const DegreeOfFreedom *PeriodicDOFMapping::getDOFPermutation(const DimVec<int> &vertexPermutation)
{
FUNCNAME("PeriodicDOFMapping::getDOFPermutation()");
@@ -93,9 +96,11 @@ namespace AMDiS {
periodicDOFMapping = NULL;
}
+
PeriodicBC::~PeriodicBC()
{}
+
void PeriodicBC::initMatrix(DOFMatrix* matrix)
{
FUNCNAME("PeriodicBC::initMatrix()");
@@ -110,6 +115,7 @@ namespace AMDiS {
}
}
+
void PeriodicBC::fillBoundaryCondition(DOFMatrix *matrix,
ElInfo *elInfo,
const DegreeOfFreedom *dofIndices,
@@ -181,6 +187,7 @@ namespace AMDiS {
}
}
+
void PeriodicBC::exitMatrix(DOFMatrix* matrix)
{
FUNCNAME("PeriodicBC::exitMatrix()");
@@ -205,6 +212,7 @@ namespace AMDiS {
A = 0.5 * C;
}
+
void PeriodicBC::exitVector(DOFVectorBase<double>* vector)
{
FUNCNAME("PeriodicBC::exitVector()");
diff --git a/AMDiS/src/time/RosenbrockStationary.h b/AMDiS/src/time/RosenbrockStationary.h
index d2016203..254551a7 100644
--- a/AMDiS/src/time/RosenbrockStationary.h
+++ b/AMDiS/src/time/RosenbrockStationary.h
@@ -152,6 +152,7 @@ namespace AMDiS {
ERROR_EXIT("Not yet supported!\n");
}
+#if 0
/// Adds a periodic boundary condition.
void addPeriodicBC(BoundaryType type, int row, int col)
{
@@ -159,6 +160,7 @@ namespace AMDiS {
ERROR_EXIT("Not yet supported!\n");
}
+#endif
protected:
void init();
--
GitLab