From b3ff35cc51e5bd6177b2c3cb43d590aa0e4e7287 Mon Sep 17 00:00:00 2001 From: "@leo.rannabauer" Date: Mon, 12 Oct 2020 13:33:09 +0200 Subject: [PATCH] Fixed broken signatures --- .../solvers/ADERDGSolverHeader.template | 4 ++-- .../solvers/ADERDGSolverInCUserCode.template | 22 ++++++------------- 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/Toolkit/exahype/toolkit/templates/solvers/ADERDGSolverHeader.template b/Toolkit/exahype/toolkit/templates/solvers/ADERDGSolverHeader.template index e1af559d7..a75d5bd28 100644 --- a/Toolkit/exahype/toolkit/templates/solvers/ADERDGSolverHeader.template +++ b/Toolkit/exahype/toolkit/templates/solvers/ADERDGSolverHeader.template @@ -236,7 +236,7 @@ class {{project}}::{{solver}} : public {{project}}::{{abstractSolver}} { * @param[inout] BgradQ the nonconservative product (extends nVar), * already allocated. */ - void nonConservativeProduct(const double* const Q,const double* const gradQ,double* const BgradQ) final override; + void nonConservativeProduct(const double* const Q,const double* const * const gradQ,double** const BgradQ) final override; {% else %} /* nonConservativeProduct() function is not included, as requested in the specification file */ {% endif %} @@ -285,7 +285,7 @@ class {{project}}::{{solver}} : public {{project}}::{{abstractSolver}} { * @param[inout] rhs the right-hand side associated with Q; * range: [0,nVar-1], already allocated. */ - void multiplyMaterialParameterMatrix(const double* const Q, double* const rhs) final override; + void multiplyMaterialParameterMatrix(const double* const Q, double** const rhs) final override; {% else %} /* multiplyMaterialParameterMatrix() not included, as requested in the specification file */ {% endif %} diff --git a/Toolkit/exahype/toolkit/templates/solvers/ADERDGSolverInCUserCode.template b/Toolkit/exahype/toolkit/templates/solvers/ADERDGSolverInCUserCode.template index d89cb3b91..f2c079c10 100644 --- a/Toolkit/exahype/toolkit/templates/solvers/ADERDGSolverInCUserCode.template +++ b/Toolkit/exahype/toolkit/templates/solvers/ADERDGSolverInCUserCode.template @@ -34,19 +34,8 @@ void {{project}}::{{solver}}::adjustSolution(double* const luh, const tarch::la: // Tip: See header file "peano/utils/Loop.h" for dimension-agnostic for loops. // @todo Please implement/augment if required - if (tarch::la::equals(t,0.0)) { - //initialise luh - constexpr int sizeOfQ = NumberOfVariables+NumberOfParameters; - dfor(i,Order+1) { - const int iLinearised = dLinearised(i,Order+1); - double* const Q = luh + iLinearised * sizeOfQ; // pointwise state variables (plus parameters) - - {% for i in range_0_nVarParam %} - Q[{{i}}] = 0.0; - {% endfor %} - } - } } + {% else %} void {{project}}::{{solver}}::adjustPointSolution(const double* const x,const double t,const double dt,double* const Q) { // Tip: You find documentation for this method in header file "{{project}}::{{solver}}.h". @@ -176,14 +165,17 @@ void {{project}}::{{solver}}::algebraicSource(const tarch::la::Vector