zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Matrix: Improved readability of the code

Browse Source
This commit is contained in:
Henry Weller
2016-03-06 19:04:53 +00:00
parent 0f5059927c
commit e18ac8ff50
4 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/OpenFOAM/matrices/Matrix/MatrixIO.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -34,8 +34,8 @@ License
template<class Form, class Type>
Foam::Matrix<Form, Type>::Matrix(Istream& is)
:
n_(0),
m_(0),
nRows_(0),
nCols_(0),
v_(NULL)
{
operator>>(is, *this);
@ -59,10 +59,10 @@ Foam::Istream& Foam::operator>>(Istream& is, Matrix<Form, Type>& M)
if (firstToken.isLabel())
{
M.n_ = firstToken.labelToken();
M.m_ = readLabel(is);
M.nRows_ = firstToken.labelToken();
M.nCols_ = readLabel(is);
label nm = M.n_*M.m_;
label nm = M.nRows_*M.nCols_;
// Read list contents depending on data format
if (is.format() == IOstream::ASCII || !contiguous<Type>())
@ -151,7 +151,7 @@ Foam::Istream& Foam::operator>>(Istream& is, Matrix<Form, Type>& M)
template<class Form, class Type>
Foam::Ostream& Foam::operator<<(Ostream& os, const Matrix<Form, Type>& M)
{
label nm = M.n_*M.m_;
label nm = M.nRows_*M.nCols_;
os << M.n() << token::SPACE << M.m();