Commit d848fed7 authored by Thomas Witkowski's avatar Thomas Witkowski

Some changed due to Rainers ideas.

parent e21bdd07
......@@ -116,12 +116,12 @@ namespace AMDiS {
}
if (firstOrderAssemblerGrdPsi) {
ERROR_EXIT("Not yet implemented for not zero order assembler!\n");
ERROR_EXIT("Not yet implemented for first order assembler!\n");
firstOrderAssemblerGrdPsi->calculateElementMatrix(smallElInfo, mat);
}
if (firstOrderAssemblerGrdPhi) {
ERROR_EXIT("Not yet implemented for not zero order assembler!\n");
ERROR_EXIT("Not yet implemented for first order assembler!\n");
firstOrderAssemblerGrdPhi->calculateElementMatrix(smallElInfo, mat);
}
......
......@@ -22,8 +22,8 @@ namespace AMDiS {
{0.0, 0.5}};
mtl::dense2D<double> ElInfo1d::mat_d1_left(mat_d1_left_val);
double ElInfo1d::mat_d1_right_val[2][2] = {{0.5, 1.0},
{0.5, 0.0}};
double ElInfo1d::mat_d1_right_val[2][2] = {{0.5, 0.0},
{0.5, 1.0}};
mtl::dense2D<double> ElInfo1d::mat_d1_right(mat_d1_right_val);
double ElInfo1d::mat_d2_val[3][3] = {{1.0, 0.0, 0.0},
......
......@@ -54,6 +54,13 @@ namespace AMDiS {
ProblemInstat *adoptProblem = NULL,
Flag adoptFlag = INIT_NOTHING);
virtual void setTime(AdaptInfo* adaptInfo)
{
cTime = adaptInfo->getTime();
tau = adaptInfo->getTimestep();
invTau = 1.0 / tau;
}
virtual void solve(AdaptInfo* adaptInfo) {}
virtual void solve(AdaptInfo *adaptInfo, bool fixedMatrix)
......@@ -96,12 +103,35 @@ namespace AMDiS {
/// Used by \ref problemInitial
virtual void solveInitialProblem(AdaptInfo *adaptInfo);
double* getTime()
{
return &cTime;
}
double* getTau()
{
return &tau;
}
double* getInvTau()
{
return &invTau;
}
protected:
/// Name of the problem.
std::string name;
ProblemStatBase *initialProblem;
/// Time
double cTime;
/// Timestep
double tau;
/// 1 / timestep
double invTau;
};
......
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