Commit d81aa41d authored by Thomas Witkowski's avatar Thomas Witkowski

And solved all the compilation problems due to the last update.

parent 856b81b9
......@@ -5,7 +5,7 @@
#include "AdaptInfo.h"
#include "DOFVector.h"
#include "ElementFunction.h"
#include "FileWriter.h"
#include "io/FileWriter.h"
#include "FixVec.h"
#include "Flag.h"
#include "Parameters.h"
......
......@@ -4,7 +4,7 @@
#include "AdaptInfo.h"
#include "DOFVector.h"
#include "Element.h"
#include "FileWriter.h"
#include "io/FileWriter.h"
#include "FixVec.h"
using namespace AMDiS;
......
This diff is collapsed.
......@@ -89,6 +89,7 @@
#include "TimedObject.h"
#include "Traverse.h"
#include "Triangle.h"
#include "VertexVector.h"
#include "ZeroOrderTerm.h"
#include "io/ArhReader.h"
......@@ -100,7 +101,6 @@
#include "io/PngWriter.h"
#include "io/PovrayWriter.h"
#include "io/ValueWriter.h"
#include "io/VertexVector.h"
#include "io/VtkWriter.h"
#include "time/RosenbrockAdaptInstationary.h"
......
#include "AdaptInstationary.h"
#include "Parameters.h"
#include "Estimator.h"
#include "TecPlotWriter.h"
#include "ProblemIterationInterface.h"
#include "ProblemTimeInterface.h"
#include "Serializer.h"
......
#include "AdaptStationary.h"
#include "Parameters.h"
#include "Estimator.h"
#include "TecPlotWriter.h"
#include "ProblemIterationInterface.h"
#include <math.h>
......
......@@ -22,7 +22,6 @@
#ifndef AMDIS_PROBLEMIMPLICIT_H
#define AMDIS_PROBLEMIMPLICIT_H
#include "AMDiS.h"
#include "ProblemScal.h"
#include "ProblemVec.h"
......
......@@ -25,7 +25,6 @@
#include "BoundaryCondition.h"
#include "AbstractFunction.h"
#include "DOFMatrix.h"
#include "AMDiS.h"
namespace AMDiS {
......
......@@ -2,7 +2,6 @@
#include "FileWriter.h"
#include "SystemVector.h"
#include "Parameters.h"
#include "TecPlotWriter.h"
#include "ValueWriter.h"
#include "MacroWriter.h"
#include "VtkWriter.h"
......@@ -97,13 +96,11 @@ namespace AMDiS {
void FileWriter::initialize()
{
tecplotExt = ".tec";
amdisMeshExt = ".mesh";
amdisDataExt = ".dat";
paraviewFileExt = ".vtu";
paraviewParallelFileExt = ".pvtu";
periodicFileExt = ".per";
writeTecPlotFormat = 0;
writeAMDiSFormat = 0;
writeParaViewFormat = 0;
writeParaViewAnimation = 0;
......@@ -127,8 +124,6 @@ namespace AMDiS {
FUNCNAME("FileWriter::readParamters()");
GET_PARAMETER(0, name + "->filename", &filename);
GET_PARAMETER(0, name + "->TecPlot format", "%d", &writeTecPlotFormat);
GET_PARAMETER(0, name + "->TecPlot ext", &tecplotExt);
GET_PARAMETER(0, name + "->AMDiS format", "%d", &writeAMDiSFormat);
GET_PARAMETER(0, name + "->AMDiS mesh ext", &amdisMeshExt);
GET_PARAMETER(0, name + "->AMDiS data ext", &amdisDataExt);
......@@ -211,13 +206,6 @@ namespace AMDiS {
#endif
}
if (writeTecPlotFormat) {
TecPlotWriter<DOFVector<double> >::writeValues(solutionVecs[0],
const_cast<char*>((fn + tecplotExt).c_str()),
solutionVecs[0]->getName().c_str());
MSG("TecPlot file written to %s\n", (fn + tecplotExt).c_str());
}
if (writeAMDiSFormat) {
MacroWriter::writeMacro(dataCollectors[0],
const_cast<char*>((fn + amdisMeshExt).c_str()),
......
......@@ -138,9 +138,6 @@ namespace AMDiS {
/// Name of the writer.
std::string name;
/// TecPlot file extension.
std::string tecplotExt;
/// AMDiS mesh-file extension.
std::string amdisMeshExt;
......@@ -156,9 +153,6 @@ namespace AMDiS {
/// Periodic file extension.
std::string periodicFileExt;
/// 0: Don't write TecPlot files; 1: Write TecPlot files.
int writeTecPlotFormat;
/// 0: Don't write AMDiS files; 1: Write AMDiS files.
int writeAMDiSFormat;
......
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