exaFOAM/foam-extend4.1-coherent-io
Archived
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Adaptions necessary due to changes in foam-lib

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

4
applications/utilities/postProcessing/multiSolver/multiSolver.C
View file

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

2
src/dynamicMesh/meshMotion/solidBodyMotion/SKA/SKA.H
View file

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

4
src/equationReader/equationReader/equationReaderParse.C
View file

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

2
src/finiteArea/faMesh/faGlobalMeshData/faProcessorTopology.H
View file

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

6
src/lduSolvers/amg/amgPolicy/pamgPolicy.C
View file

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

2
src/thermophysicalModels/radiation/radiationModel/fvDOM/blackBodyEmission/blackBodyEmission.H
View file

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

2
src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.H
View file

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