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

ENH: Code tidying

Browse Source
This commit is contained in:
andy
2013-01-30 17:05:37 +00:00
parent 5d1f684346
commit 6129a9350a
2 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.C
View File

@ -52,6 +52,13 @@ Foam::fileName Foam::externalCoupledMixedFvPatchField<Type>::baseDir() const
}
template<class Type>
Foam::fileName Foam::externalCoupledMixedFvPatchField<Type>::lockFile() const
{
return fileName(baseDir()/(lockName + ".lock"));
}
template<class Type>
void Foam::externalCoupledMixedFvPatchField<Type>::createLockFile() const
{
@ -65,7 +72,7 @@ void Foam::externalCoupledMixedFvPatchField<Type>::createLockFile() const
Info<< type() << ": creating lock file" << endl;
}
OFstream os(baseDir()/(lockName + ".lock"));
OFstream os(lockFile());
os << "waiting";
os.flush();
}
@ -84,7 +91,7 @@ void Foam::externalCoupledMixedFvPatchField<Type>::removeLockFile() const
Info<< type() << ": removing lock file" << endl;
}
rm(baseDir()/(lockName + ".lock"));
rm(lockFile());
}
@ -153,15 +160,13 @@ void Foam::externalCoupledMixedFvPatchField<Type>::writeAndWait
os.flush();
}
const fileName lockFile(baseDir()/(lockName + ".lock"));
// remove lock file, signalling external source to execute
removeLockFile();
if (log_)
{
Info<< type() << ": beginning wait for lock file " << lockFile
Info<< type() << ": beginning wait for lock file " << lockFile()
<< endl;
}
@ -189,13 +194,13 @@ void Foam::externalCoupledMixedFvPatchField<Type>::writeAndWait
<< " s" << abort(FatalError);
}
IFstream is(lockFile);
IFstream is(lockFile());
if (is.good())
{
if (log_)
{
Info<< type() << ": found lock file " << lockFile << endl;
Info<< type() << ": found lock file " << lockFile() << endl;
}
found = true;
@ -438,8 +443,7 @@ void Foam::externalCoupledMixedFvPatchField<Type>::write(Ostream& os) const
os.writeKeyword("fileName") << fName_ << token::END_STATEMENT << nl;
os.writeKeyword("waitInterval") << waitInterval_ << token::END_STATEMENT
<< nl;
os.writeKeyword("timeOut") << timeOut_ << token::END_STATEMENT
<< nl;
os.writeKeyword("timeOut") << timeOut_ << token::END_STATEMENT << nl;
os.writeKeyword("calcFrequency") << calcFrequency_ << token::END_STATEMENT
<< nl;
os.writeKeyword("log") << log_ << token::END_STATEMENT << nl;

3
src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.H
View File

@ -137,6 +137,9 @@ protected:
//- Return the file path to the base communications folder
fileName baseDir() const;
//- Return the file path to the lock file
fileName lockFile() const;
//- Create lock file
void createLockFile() const;