Adaptions necessary due to changes in foam-lib

This commit is contained in:
Dominik Christ 2015-06-19 16:50:25 +01:00
parent 4c23c3f9e8
commit 5d9f39d6f5
7 changed files with 11 additions and 11 deletions

View file

@ -55,7 +55,7 @@ void parseOptions
token nextOption(optionsStream);
// Bug workaround
if (nextOption.type() == token::ERROR)
if (nextOption.type() == token::FATALERROR)
{
break;
}
@ -89,7 +89,7 @@ void parseOptions
token nextOption(optionsStream);
// Bug workaround
if (nextOption.type() == token::ERROR)
if (nextOption.type() == token::FATALERROR)
{
break;
}

View file

@ -44,7 +44,7 @@ SourceFiles
#include "solidBodyMotionFunction.H"
#include "primitiveFields.H"
#include "Vector2D.H"
#include "Vector2DTemplate.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

View file

@ -74,8 +74,8 @@ void Foam::equationReader::parse(label index) const
tl[tl.size() - 1] = token(rawStream);
// Bug fix - equations ending in brackets read an extra token of type
// ERROR at the end, caused by string replace ')' with ' ) ' above
if (tl[tl.size() - 1].type() == token::ERROR)
// FATALERROR at the end, caused by string replace ')' with ' ) ' above
if (tl[tl.size() - 1].type() == token::FATALERROR)
{
tl.setSize(tl.size() - 1);
forceEnd = true;

View file

@ -32,7 +32,7 @@ Description
#ifndef faProcessorTopology_H
#define faProcessorTopology_H
#include "ProcessorTopology.H"
#include "ProcessorTopologyTemplate.H"
#include "processorFaPatch.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

View file

@ -600,7 +600,7 @@ Foam::autoPtr<Foam::amgMatrix> Foam::pamgPolicy::restrictMatrix
{
if (interfaceFields.set(intI))
{
interfaceFields[intI].interface().initInternalFieldTransfer
interfaceFields[intI].coupledInterface().initInternalFieldTransfer
(
Pstream::blocking,
child_
@ -617,7 +617,7 @@ Foam::autoPtr<Foam::amgMatrix> Foam::pamgPolicy::restrictMatrix
if (interfaceFields.set(intI))
{
const lduInterface& fineInterface =
interfaceFields[intI].interface();
interfaceFields[intI].coupledInterface();
fineInterfaceAddr.set
(
@ -640,7 +640,7 @@ Foam::autoPtr<Foam::amgMatrix> Foam::pamgPolicy::restrictMatrix
if (interfaceFields.set(intI))
{
const lduInterface& fineInterface =
interfaceFields[intI].interface();
interfaceFields[intI].coupledInterface();
coarseInterfaces.set
(

View file

@ -43,7 +43,7 @@ SourceFiles
#include "mathematicalConstants.H"
#include "radiationConstants.H"
#include "interpolationTable.H"
#include "Vector2D.H"
#include "Vector2DTemplate.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

View file

@ -37,7 +37,7 @@ Description
#include "autoPtr.H"
#include "runTimeSelectionTables.H"
#include "volFields.H"
#include "Vector2D.H"
#include "Vector2DTemplate.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //