From 91718fb97d2b622ee7d1dab9b815899f444fdb7b Mon Sep 17 00:00:00 2001
From: Thomas Witkowski <thomas.witkowski@gmx.de>
Date: Wed, 13 Aug 2008 06:57:15 +0000
Subject: [PATCH] * Bugfix for file writing of higher order elements
---
AMDiS/src/DataCollector.cc | 4 ++--
AMDiS/src/VtkWriter.cc | 13 +++++++++----
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/AMDiS/src/DataCollector.cc b/AMDiS/src/DataCollector.cc
index 67c460b9..eb4851b4 100644
--- a/AMDiS/src/DataCollector.cc
+++ b/AMDiS/src/DataCollector.cc
@@ -351,9 +351,9 @@ namespace AMDiS {
basisFcts_->getLocalIndices(elInfo->getElement(), localAdmin_, localDOFs_);
- ::std::vector<int> elemInterpPoints(nBasisFcts_);
+ std::vector<int> elemInterpPoints(0);
for (int i = mesh_->getGeo(VERTEX); i < nBasisFcts_; i++) {
- elemInterpPoints[i] = (*interpPointInd_)[localDOFs_[i]];
+ elemInterpPoints.push_back((*interpPointInd_)[localDOFs_[i]]);
}
interpPoints_.push_back(elemInterpPoints);
diff --git a/AMDiS/src/VtkWriter.cc b/AMDiS/src/VtkWriter.cc
index 3bb833e2..0f4f7671 100644
--- a/AMDiS/src/VtkWriter.cc
+++ b/AMDiS/src/VtkWriter.cc
@@ -132,10 +132,15 @@ namespace AMDiS {
void VtkWriter::writeVertexValues(::std::ofstream &file, int componentNo)
{
- DOFVector<int> *interpPointInd;
- DOFVector<double> *values;
- DOFVector< ::std::list<WorldVector<double> > > *dofCoords;
+ // DOFVector<int> *interpPointInd;
+ // DOFVector<double> *values;
+ // DOFVector< ::std::list<WorldVector<double> > > *dofCoords;
+ DOFVector<int> *interpPointInd = (*dc_)[componentNo]->getInterpPointInd();
+ DOFVector<double> *values = (*dc_)[componentNo]->getValues();
+ DOFVector< ::std::list<WorldVector<double> > > *dofCoords = (*dc_)[componentNo]->getDofCoords();
+
+ /*
#ifdef _OPENMP
#pragma omp critical
#endif
@@ -144,7 +149,7 @@ namespace AMDiS {
values = (*dc_)[componentNo]->getValues();
dofCoords = (*dc_)[componentNo]->getDofCoords();
}
-
+ */
DOFVector<int>::Iterator intPointIt(interpPointInd, USED_DOFS);
DOFVector<double>::Iterator valueIt(values, USED_DOFS);
DOFVector< ::std::list<WorldVector<double> > >::Iterator coordIt(dofCoords, USED_DOFS);
--
GitLab