05.03., 9:00 - 11:00: Due to updates GitLab will be unavailable for some minutes between 09:00 and 11:00.

Commit 2f64b85d authored by Jean-Matthieu's avatar Jean-Matthieu

KernelGen Linear - bugfix only NCP case

parent aef889ca
......@@ -85,7 +85,7 @@ class ConfigurationParametersModel(AbstractModelBaseClass):
# default linear
self.context["lQiSize"] = nDataPad*(nDof**nDim)*(1+nDof)
self.context["lQhiSize"] = nDataPad*(nDof**nDim)
self.context["lFiSize"] = nVarPad*(nDof**(nDim+1))*(2*nDim+1) # Todo JMG see if 2dim+1 or 2dim
self.context["lFiSize"] = nDim*nDof*(nDof**nDim)*nVarPad#nVarPad*(nDof**(nDim+1))*(2*nDim+1) # Todo JMG see if 2dim+1 or 2dim
self.context["lFhiSize"] = nVarPad*(nDof**nDim)*nDim
if self.context["useSource"]:
self.context["lSiSize"] = nVarPad*(nDof**(nDim+1))
......
......@@ -636,7 +636,7 @@ int {{codeNamespace}}::fusedSpaceTimePredictorVolumeIntegral{{nameSuffix}}(
#ifdef __INTEL_COMPILER
{% if useFlux %}
{% if useFlux or useNCP %}
__assume_aligned(lFhi, ALIGNMENT);
{% endif %}{# useFlux #}
__assume_aligned(lduh, ALIGNMENT); //lduh should be aligned, see Solver.h
......@@ -654,7 +654,7 @@ int {{codeNamespace}}::fusedSpaceTimePredictorVolumeIntegral{{nameSuffix}}(
for (int n = 0; n < {{nVarPad}}; n++) {
lduh[xyz*{{nVarPad}}+n] -= weights3[xyz] *
(
{% if useFlux %}
{% if useFlux or useNCP %}
lFhi[xyz*{{nVarPad}}+n+{{0*nVarPad*nDof**nDim}}] //x
+ lFhi[xyz*{{nVarPad}}+n+{{1*nVarPad*nDof**nDim}}] //y
{% if nDim==3 %}
......@@ -662,7 +662,7 @@ int {{codeNamespace}}::fusedSpaceTimePredictorVolumeIntegral{{nameSuffix}}(
{% endif %}
{% endif %}
{% if useSource %}
{{'+' if useFlux}} lShi[xyz*{{nVarPad}}+n] // source
{{'+' if useFlux or useNCP }} lShi[xyz*{{nVarPad}}+n] // source
{% endif %}
);
......
......@@ -181,13 +181,8 @@ int {{project}}::{{abstractSolver}}::fusedSpaceTimePredictorVolumeIntegral(doubl
{% set SPTbufferSignature="lQi, lFi, lSi, lQhi, lFhi, lShi, gradQ, PSi, PSderivatives" %}
double* lQi = memory + {{optNamespace}}::getlQiShift();
double* lQhi = memory + {{optNamespace}}::getlQhiShift();
{% if useFlux %}
double* lFi = memory + {{optNamespace}}::getlFiShift();
double* lFhi = memory + {{optNamespace}}::getlFhiShift();
{% else %}
constexpr double* lFi = nullptr;
constexpr double* lFhi = nullptr;
{% endif %}
{% if useSource %}
double* lSi = memory + {{optNamespace}}::getlSiShift();
double* lShi = memory + {{optNamespace}}::getlShiShift();
......
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