zhyang-dev/OpenFOAM-12
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com-OpenFOAM:OpenFOAM/OpenFOAM-dev

Browse Source
This commit is contained in:
Henry Weller
2017-04-20 11:34:55 +01:00
parent 9801c25788 646a269217
commit 9ef718b265
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/OpenFOAM/matrices/scalarMatrices/SVD/SVD.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -156,7 +156,7 @@ Foam::SVD::SVD(const scalarRectangularMatrix& A, const scalar minCondition)
{ {
if (i < Un-1) if (i < Un-1)
{ {
if (g != 0) if (g*U_(i, l) != 0)
{ {
for (label j=l; j<Un; j++) for (label j=l; j<Un; j++)
{ {
@ -199,7 +199,7 @@ Foam::SVD::SVD(const scalarRectangularMatrix& A, const scalar minCondition)
U_(i, j) = 0; U_(i, j) = 0;
} }
if (g != 0) if (g*U_(i, i) != 0)
{ {
g = 1.0/g; g = 1.0/g;

4
src/mesh/blockMesh/searchableExtrudedCircle/searchableExtrudedCircle.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2016 OpenFOAM Foundation \\ / A nd | Copyright (C) 2016-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -63,7 +63,7 @@ Foam::searchableExtrudedCircle::searchableExtrudedCircle
( (
dict.lookup("file"), // name dict.lookup("file"), // name
io.time().constant(), // instance io.time().constant(), // instance
"triSurface", // local "geometry", // local
io.time(), // registry io.time(), // registry
IOobject::MUST_READ, IOobject::MUST_READ,
IOobject::NO_WRITE, IOobject::NO_WRITE,