From 4ce5b65b648f52d68c3fa2e6963cd081a16fcd71 Mon Sep 17 00:00:00 2001
From: Thomas Witkowski <thomas.witkowski@gmx.de>
Date: Fri, 15 Aug 2008 12:10:48 +0000
Subject: [PATCH] * removed axpy from ProblemVec
---
AMDiS/src/AMDiS.h | 2 ++
AMDiS/src/ProblemVec.cc | 27 ---------------------------
AMDiS/src/ProblemVec.h | 6 ------
3 files changed, 2 insertions(+), 33 deletions(-)
diff --git a/AMDiS/src/AMDiS.h b/AMDiS/src/AMDiS.h
index 54f170a7..8af56d6f 100644
--- a/AMDiS/src/AMDiS.h
+++ b/AMDiS/src/AMDiS.h
@@ -95,4 +95,6 @@
#include "Triangle.h"
#include "ValueWriter.h"
#include "demangle.h"
+#include "parareal/ProblemBase.h"
+#include "parareal/AdaptParaReal.h"
#endif
diff --git a/AMDiS/src/ProblemVec.cc b/AMDiS/src/ProblemVec.cc
index 74618453..8ad3d0e6 100644
--- a/AMDiS/src/ProblemVec.cc
+++ b/AMDiS/src/ProblemVec.cc
@@ -1014,32 +1014,5 @@ namespace AMDiS {
solution_->deserialize(in);
}
-
- void axpy(double a,
- const Matrix<DOFMatrix*> &x,
- Matrix<DOFMatrix*> &y)
- {
- FUNCNAME("ProblemVec::axpy()");
-
- int numRows = x.getNumRows(), numCols = x.getNumCols();
- int i, j;
- const DOFMatrix *xMatrix;
- DOFMatrix *yMatrix;
-
- for(i = 0; i < numRows; i++) {
- for(j = 0; j < numCols; j++) {
- xMatrix = x[i][j];
- yMatrix = y[i][j];
- if(!xMatrix) continue;
- if(!yMatrix) {
- yMatrix = NEW DOFMatrix(xMatrix->getRowFESpace(),
- xMatrix->getColFESpace(), "");
- y[i][j] = yMatrix;
- }
- yMatrix->axpy(a, *xMatrix, *yMatrix);
- }
- }
- }
-
}
diff --git a/AMDiS/src/ProblemVec.h b/AMDiS/src/ProblemVec.h
index a3a8ae84..97104936 100644
--- a/AMDiS/src/ProblemVec.h
+++ b/AMDiS/src/ProblemVec.h
@@ -641,12 +641,6 @@ namespace AMDiS {
*/
static ProblemVec *traversePtr_;
};
-
-
- void axpy(double a,
- const Matrix<DOFMatrix*> &x,
- Matrix<DOFMatrix*> &y);
-
}
#endif
--
GitLab