diff options
author | Sebastián Barschkis <sebbas@sebbas.org> | 2021-01-13 11:49:11 +0300 |
---|---|---|
committer | Sebastián Barschkis <sebbas@sebbas.org> | 2021-01-13 11:49:38 +0300 |
commit | 0b711e6758b0ba3732b2e6cfceb009aa186e525e (patch) | |
tree | 26cb94d047b04f700880272319a1e900ef5d24bc /extern/mantaflow/preprocessed/conjugategrad.h | |
parent | 3f7c294a950ecdc5491c57c4ee7916bb87de4d6a (diff) |
Fluid: Updated Mantaflow source files
Includes minor fixes / cleanups from the viscosity plugin.
Diffstat (limited to 'extern/mantaflow/preprocessed/conjugategrad.h')
-rw-r--r-- | extern/mantaflow/preprocessed/conjugategrad.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/extern/mantaflow/preprocessed/conjugategrad.h b/extern/mantaflow/preprocessed/conjugategrad.h index 4974aa6a4d6..35cb3960656 100644 --- a/extern/mantaflow/preprocessed/conjugategrad.h +++ b/extern/mantaflow/preprocessed/conjugategrad.h @@ -170,7 +170,7 @@ struct ApplyMatrix : public KernelBase { unusedParameter(vecRhs); // Not needed in this matrix application if (matrixA.size() != 4) - errMsg("ConjugatedGrad: Invalid A matrix in apply matrix step"); + errMsg("ConjugateGrad: Invalid A matrix in apply matrix step"); Grid<Real> &A0 = *matrixA[0]; Grid<Real> &Ai = *matrixA[1]; Grid<Real> &Aj = *matrixA[2]; @@ -256,7 +256,7 @@ struct ApplyMatrix2D : public KernelBase { unusedParameter(vecRhs); // Not needed in this matrix application if (matrixA.size() != 3) - errMsg("ConjugatedGrad: Invalid A matrix in apply matrix step"); + errMsg("ConjugateGrad: Invalid A matrix in apply matrix step"); Grid<Real> &A0 = *matrixA[0]; Grid<Real> &Ai = *matrixA[1]; Grid<Real> &Aj = *matrixA[2]; @@ -338,7 +338,7 @@ struct ApplyMatrixViscosityU : public KernelBase { const std::vector<Grid<Real> *> vecRhs) const { if (matrixA.size() != 15) - errMsg("ConjugatedGrad: Invalid A matrix in apply matrix step"); + errMsg("ConjugateGrad: Invalid A matrix in apply matrix step"); Grid<Real> &A0 = *matrixA[0]; Grid<Real> &Aplusi = *matrixA[1]; Grid<Real> &Aplusj = *matrixA[2]; @@ -348,7 +348,7 @@ struct ApplyMatrixViscosityU : public KernelBase { Grid<Real> &Aminusk = *matrixA[6]; if (vecRhs.size() != 2) - errMsg("ConjugatedGrad: Invalid rhs vector in apply matrix step"); + errMsg("ConjugateGrad: Invalid rhs vector in apply matrix step"); Grid<Real> &srcV = *vecRhs[0]; Grid<Real> &srcW = *vecRhs[1]; @@ -450,7 +450,7 @@ struct ApplyMatrixViscosityV : public KernelBase { const std::vector<Grid<Real> *> vecRhs) const { if (matrixA.size() != 15) - errMsg("ConjugatedGrad: Invalid A matrix in apply matrix step"); + errMsg("ConjugateGrad: Invalid A matrix in apply matrix step"); Grid<Real> &A0 = *matrixA[0]; Grid<Real> &Aplusi = *matrixA[1]; Grid<Real> &Aplusj = *matrixA[2]; @@ -460,7 +460,7 @@ struct ApplyMatrixViscosityV : public KernelBase { Grid<Real> &Aminusk = *matrixA[6]; if (vecRhs.size() != 2) - errMsg("ConjugatedGrad: Invalid rhs vector in apply matrix step"); + errMsg("ConjugateGrad: Invalid rhs vector in apply matrix step"); Grid<Real> &srcU = *vecRhs[0]; Grid<Real> &srcW = *vecRhs[1]; @@ -562,7 +562,7 @@ struct ApplyMatrixViscosityW : public KernelBase { const std::vector<Grid<Real> *> vecRhs) const { if (matrixA.size() != 15) - errMsg("ConjugatedGrad: Invalid A matrix in apply matrix step"); + errMsg("ConjugateGrad: Invalid A matrix in apply matrix step"); Grid<Real> &A0 = *matrixA[0]; Grid<Real> &Aplusi = *matrixA[1]; Grid<Real> &Aplusj = *matrixA[2]; @@ -572,7 +572,7 @@ struct ApplyMatrixViscosityW : public KernelBase { Grid<Real> &Aminusk = *matrixA[6]; if (vecRhs.size() != 2) - errMsg("ConjugatedGrad: Invalid rhs vector in apply matrix step"); + errMsg("ConjugateGrad: Invalid rhs vector in apply matrix step"); Grid<Real> &srcU = *vecRhs[0]; Grid<Real> &srcV = *vecRhs[1]; |