Removing trailing whitespace, tabs and DOS CR & Fixing some indentation

This commit is contained in:
Henrik Rusche 2018-05-29 10:30:29 +02:00
parent 4b4be75c2b
commit fc7de48319
223 changed files with 2687 additions and 2687 deletions

View file

@ -1,10 +1,10 @@
_____________________________________ _____________________________________
*RELEASE NOTES FOR FOAM-EXTEND-4.0* *RELEASE NOTES FOR FOAM-EXTEND-4.0*
_____________________________________ _____________________________________
December 2016 December 2016
Table of Contents Table of Contents

View file

@ -2,7 +2,7 @@
// Solve the enthalpy equation in total enthalpy formulation (see K) // Solve the enthalpy equation in total enthalpy formulation (see K)
T.storePrevIter(); T.storePrevIter();
K = 0.5*(magSqr(U)); K = 0.5*(magSqr(U));
fvScalarMatrix hEqn fvScalarMatrix hEqn

View file

@ -91,7 +91,7 @@ int main(int argc, char *argv[])
// Solving potential flow equation and correcting velocities // Solving potential flow equation and correcting velocities
phi = (fvc::interpolate(U) & mesh.Sf()); phi = (fvc::interpolate(U) & mesh.Sf());
solve solve
( (
tpEqn() tpEqn()
@ -116,7 +116,7 @@ int main(int argc, char *argv[])
+ tpEqn().flux() + tpEqn().flux()
+ tpresSource; + tpresSource;
} }
// Make flux relative in rotating zones // Make flux relative in rotating zones
mrfZones.relativeFlux(phi); mrfZones.relativeFlux(phi);

View file

@ -34,7 +34,7 @@
// Add implicit MRF source as a Hodge dual of the rotational velocity // Add implicit MRF source as a Hodge dual of the rotational velocity
TU += *mrfZones.omega(); TU += *mrfZones.omega();
// Add implicit resistance // Add implicit resistance
pZones.addResistance(UEqn, TU); pZones.addResistance(UEqn, TU);

View file

@ -77,12 +77,12 @@ int main(int argc, char *argv[])
volScalarField field(fieldHeader, mesh); volScalarField field(fieldHeader, mesh);
int nbMesh; int nbMesh;
nbMesh = 0; nbMesh = 0;
forAll(field, cellI) forAll(field, cellI)
{ {
nbMesh++; nbMesh++;
} }
Info<< runTime.timeName()<< " " Info<< runTime.timeName()<< " "
<< sum(field).value()/nbMesh<< " " << sum(field).value()/nbMesh<< " "

View file

@ -1,3 +1,3 @@
icoDyMOversetFoam.C icoDyMOversetFoam.C
EXE = $(FOAM_APPBIN)/icoDyMOversetFoam EXE = $(FOAM_APPBIN)/icoDyMOversetFoam

View file

@ -1,3 +1,3 @@
icoOversetFoam.C icoOversetFoam.C
EXE = $(FOAM_APPBIN)/icoOversetFoam EXE = $(FOAM_APPBIN)/icoOversetFoam

View file

@ -1,3 +1,3 @@
simpleMRFOversetFoam.C simpleMRFOversetFoam.C
EXE = $(FOAM_APPBIN)/simpleMRFOversetFoam EXE = $(FOAM_APPBIN)/simpleMRFOversetFoam

View file

@ -1,3 +1,3 @@
simpleOversetFoam.C simpleOversetFoam.C
EXE = $(FOAM_APPBIN)/simpleOversetFoam EXE = $(FOAM_APPBIN)/simpleOversetFoam

View file

@ -230,7 +230,7 @@ class freeSurface
const vector& axis const vector& axis
) const; ) const;
public: public:
// Declare name of the class and it's debug switch // Declare name of the class and it's debug switch

View file

@ -122,7 +122,7 @@ int main(int argc, char *argv[])
{ {
phi -= pEqn.flux(); phi -= pEqn.flux();
} }
p.relax(); p.relax();
} }

View file

@ -59,7 +59,7 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
scalar minLiveGamma = GREAT; scalar minLiveGamma = GREAT;
label minLiveCell = -1; label minLiveCell = -1;
const scalarField& gammaIn = gamma.internalField(); const scalarField& gammaIn = gamma.internalField();
forAll (mesh.boundary(), patchI) forAll (mesh.boundary(), patchI)
{ {
if (isA<immersedBoundaryFvPatch>(mesh.boundary()[patchI])) if (isA<immersedBoundaryFvPatch>(mesh.boundary()[patchI]))

View file

@ -1,3 +1,3 @@
calcOverset.C calcOverset.C
EXE = $(FOAM_APPBIN)/calcOverset EXE = $(FOAM_APPBIN)/calcOverset

View file

@ -8,7 +8,7 @@
# file extensions and descriptions. # file extensions and descriptions.
# #
# We a little hack here to support cmake and wmake-compiled FOAM # We a little hack here to support cmake and wmake-compiled FOAM
# libraries simultaneously. This uses the same trigger as externally # libraries simultaneously. This uses the same trigger as externally
# compiled applications (FOAM_FOUND) # compiled applications (FOAM_FOUND)
# #

View file

@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
endif() endif()
add_foam_executable(dsmcFieldsCalc add_foam_executable(dsmcFieldsCalc
DEPENDS postCalc utilityFunctionObjects dsmc DEPENDS postCalc utilityFunctionObjects dsmc
SOURCES ${SOURCES} SOURCES ${SOURCES}
) )

View file

@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
endif() endif()
add_foam_executable(applyWallFunctionBoundaryConditions add_foam_executable(applyWallFunctionBoundaryConditions
DEPENDS incompressibleRASModels compressibleRASModels DEPENDS incompressibleRASModels compressibleRASModels
SOURCES ${SOURCES} SOURCES ${SOURCES}
) )

View file

@ -56,7 +56,7 @@ int main(int argc, char *argv[])
# include "createTime.H" # include "createTime.H"
# include "createNamedMesh.H" # include "createNamedMesh.H"
word agglomDictName("faceAgglomerateDict"); word agglomDictName("faceAgglomerateDict");
args.optionReadIfPresent("dict", agglomDictName); args.optionReadIfPresent("dict", agglomDictName);
const polyBoundaryMesh& patches = mesh.boundaryMesh(); const polyBoundaryMesh& patches = mesh.boundaryMesh();

View file

@ -285,8 +285,8 @@ int main(int argc, char *argv[])
<< endl; << endl;
return 0; return 0;
} }
if (Pstream::master()) if (Pstream::master())
{ {
Info << "\nTotal number of coarse faces: "<< totalNCoarseFaces << endl; Info << "\nTotal number of coarse faces: "<< totalNCoarseFaces << endl;

View file

@ -123,7 +123,7 @@ function (libfind_process PREFIX)
set(includeopts ${${PREFIX}_PROCESS_INCLUDES}) set(includeopts ${${PREFIX}_PROCESS_INCLUDES})
set(libraryopts ${${PREFIX}_PROCESS_LIBS}) set(libraryopts ${${PREFIX}_PROCESS_LIBS})
# Process deps to add to # Process deps to add to
foreach (i ${PREFIX} ${${PREFIX}_DEPENDENCIES}) foreach (i ${PREFIX} ${${PREFIX}_DEPENDENCIES})
if (DEFINED ${i}_INCLUDE_OPTS OR DEFINED ${i}_LIBRARY_OPTS) if (DEFINED ${i}_INCLUDE_OPTS OR DEFINED ${i}_LIBRARY_OPTS)
# The package seems to export option lists that we can use, woohoo! # The package seems to export option lists that we can use, woohoo!
@ -146,11 +146,11 @@ function (libfind_process PREFIX)
endif() endif()
endif() endif()
endforeach() endforeach()
if (includeopts) if (includeopts)
list(REMOVE_DUPLICATES includeopts) list(REMOVE_DUPLICATES includeopts)
endif() endif()
if (libraryopts) if (libraryopts)
list(REMOVE_DUPLICATES libraryopts) list(REMOVE_DUPLICATES libraryopts)
endif() endif()
@ -215,7 +215,7 @@ function (libfind_process PREFIX)
set (${PREFIX}_LIBRARIES ${libs} PARENT_SCOPE) set (${PREFIX}_LIBRARIES ${libs} PARENT_SCOPE)
set (${PREFIX}_FOUND TRUE PARENT_SCOPE) set (${PREFIX}_FOUND TRUE PARENT_SCOPE)
endif() endif()
return() return()
endif() endif()
# Format messages for debug info and the type of error # Format messages for debug info and the type of error

View file

@ -164,7 +164,7 @@ endif()
set(FOAM_LABEL_SIZE "32" CACHE STRING "Label size") set(FOAM_LABEL_SIZE "32" CACHE STRING "Label size")
set_property(CACHE FOAM_LABEL_SIZE PROPERTY STRINGS 32 64) set_property(CACHE FOAM_LABEL_SIZE PROPERTY STRINGS 32 64)
target_compile_definitions(OSspecific PUBLIC WM_LABEL_SIZE=${FOAM_LABEL_SIZE}) target_compile_definitions(OSspecific PUBLIC WM_LABEL_SIZE=${FOAM_LABEL_SIZE})
# No Repository # No Repository
target_compile_definitions(OSspecific PUBLIC NoRepository) target_compile_definitions(OSspecific PUBLIC NoRepository)

View file

@ -38,12 +38,12 @@ if(GIT_FOUND)
# Try to get version from from git # Try to get version from from git
execute_process( execute_process(
COMMAND ${GIT_EXECUTABLE} describe --tags --dirty=-dirty COMMAND ${GIT_EXECUTABLE} describe --tags --dirty=-dirty
OUTPUT_VARIABLE GIT_VERSION OUTPUT_VARIABLE GIT_VERSION
ERROR_VARIABLE dummy ERROR_VARIABLE dummy
RESULT_VARIABLE res RESULT_VARIABLE res
OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_STRIP_TRAILING_WHITESPACE
) )
if(res EQUAL 0) if(res EQUAL 0)
string(REPLACE "g" "" GIT_VERSION "${GIT_VERSION}") string(REPLACE "g" "" GIT_VERSION "${GIT_VERSION}")
string(REGEX REPLACE "^v([0-9]+\\.?[0-9]*\\.?([0-9]*)).*" "\\1" FOAM_VERSION "${GIT_VERSION}") string(REGEX REPLACE "^v([0-9]+\\.?[0-9]*\\.?([0-9]*)).*" "\\1" FOAM_VERSION "${GIT_VERSION}")

View file

@ -266,7 +266,7 @@ void getSymbolForRaw
const word& address const word& address
) )
{ {
if if
( (
filename.size() && (filename[0] == '/' || filename[1] == ':') filename.size() && (filename[0] == '/' || filename[1] == ':')
) )
@ -319,7 +319,7 @@ void error::printStack(Ostream& os)
string::size_type space = line.rfind(' ') + 1; string::size_type space = line.rfind(' ') + 1;
fileName libPath = line.substr(space, line.size()-space); fileName libPath = line.substr(space, line.size()-space);
if if
( (
libPath.size() && (libPath[0] == '/' || libPath[1] == ':') libPath.size() && (libPath[0] == '/' || libPath[1] == ':')
) )

View file

@ -71,7 +71,7 @@ class domainDecomposition
//- Global face index //- Global face index
globalProcFaceIndex gfIndex_; globalProcFaceIndex gfIndex_;
//- Processor label for each cell //- Processor label for each cell
labelList cellToProc_; labelList cellToProc_;

View file

@ -56,7 +56,7 @@ class processorMeshData
// Private data // Private data
// Internal mesh data // Internal mesh data
//- Points //- Points
pointField procPoints_; pointField procPoints_;
@ -71,7 +71,7 @@ class processorMeshData
// Boundary data, separated into existing and new patches // Boundary data, separated into existing and new patches
//- Boundary addressing //- Boundary addressing
labelList boundaryAddressing_; labelList boundaryAddressing_;
@ -80,19 +80,19 @@ class processorMeshData
//- Regular patch starts //- Regular patch starts
labelList patchStarts_; labelList patchStarts_;
//- Processor patch sizes //- Processor patch sizes
labelList procPatchSizes_; labelList procPatchSizes_;
//- Processor patch starts //- Processor patch starts
labelList procPatchSizes_; labelList procPatchSizes_;
// Zones // Zones
//- Point zones //- Point zones
labelListList pointZones_; labelListList pointZones_;
//- Face zones //- Face zones
labelListList faceZones_; labelListList faceZones_;
@ -102,7 +102,7 @@ class processorMeshData
//- Cell zones //- Cell zones
labelListList cellZones_; labelListList cellZones_;
// Private Member Functions // Private Member Functions
//- Disallow default bitwise copy construct //- Disallow default bitwise copy construct

View file

@ -113,7 +113,7 @@ public:
//- Destructor //- Destructor
virtual ~faPatchFieldReconstructor() virtual ~faPatchFieldReconstructor()
{} {}
// Member functions // Member functions

View file

@ -109,7 +109,7 @@ public:
//- Destructor //- Destructor
virtual ~fvPatchFieldReconstructor() virtual ~fvPatchFieldReconstructor()
{} {}
// Member functions // Member functions
@ -154,7 +154,7 @@ public:
// Member Functions // Member Functions
// Single field reconstruction // Single field reconstruction
//- Reconstruct volume field data into a given field //- Reconstruct volume field data into a given field
// If a PtrList slot is empty, it is skipped // If a PtrList slot is empty, it is skipped
template<class Type> template<class Type>
@ -177,7 +177,7 @@ public:
// Reconstruct and return a single field // Reconstruct and return a single field
//- Reconstruct volume field //- Reconstruct volume field
template<class Type> template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh> > tmp<GeometricField<Type, fvPatchField, volMesh> >
@ -196,7 +196,7 @@ public:
// Reconstruct and write all/selected fields // Reconstruct and write all/selected fields
//- Reconstruct and write all/selected volume fields //- Reconstruct and write all/selected volume fields
template<class Type> template<class Type>
void reconstructFvVolumeFields void reconstructFvVolumeFields

View file

@ -29,7 +29,7 @@ Description
matching processor boundaries and build a single combined mesh by matching processor boundaries and build a single combined mesh by
matching processor patches to each other. matching processor patches to each other.
In order to In order to
Author Author
Hrvoje Jasak, Wikki Ltd. All rights reserved. Hrvoje Jasak, Wikki Ltd. All rights reserved.

View file

@ -220,7 +220,7 @@ void Foam::sharedPoints::syncMark
curMarkedPoints[patchMpI], curMarkedPoints[patchMpI],
nbrMarkedPoints[nbrMpI] nbrMarkedPoints[nbrMpI]
); );
nbrMarkedPoints[nbrMpI] = maxMark; nbrMarkedPoints[nbrMpI] = maxMark;
curMarkedPoints[patchMpI] = maxMark; curMarkedPoints[patchMpI] = maxMark;

View file

@ -113,7 +113,7 @@ class sharedPoints
const labelListList& patchPairs, const labelListList& patchPairs,
const label fromMesh const label fromMesh
) const; ) const;
//- Calculate shared points //- Calculate shared points
void calcSharedPoints(); void calcSharedPoints();

View file

@ -2499,7 +2499,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::polyTopoChanger::changeMesh()
// Mark the mesh as changing // Mark the mesh as changing
mesh_.changing(true); mesh_.changing(true);
return topoChangeMap; return topoChangeMap;
} }
else else

View file

@ -82,7 +82,7 @@ tetMetric::New
) << "tetMetric table is empty" ) << "tetMetric table is empty"
<< exit(FatalError); << exit(FatalError);
} }
metricPointMemberFunctionTable::iterator mfIter = metricPointMemberFunctionTable::iterator mfIter =
metricPointMemberFunctionTablePtr_->find(metricName); metricPointMemberFunctionTablePtr_->find(metricName);

View file

@ -131,7 +131,7 @@ bool Foam::loadBalanceFvMesh::update()
if (Pstream::parRun()) if (Pstream::parRun())
{ {
// Decide when to balance here // Decide when to balance here
return loadBalance(dict_); return loadBalance(dict_);
} }
else else

View file

@ -54,4 +54,4 @@ list(APPEND SOURCES
add_foam_library(topoChangerFvMesh SHARED ${SOURCES}) add_foam_library(topoChangerFvMesh SHARED ${SOURCES})
target_link_libraries(topoChangerFvMesh PUBLIC dynamicFvMesh decomposeReconstruct) target_link_libraries(topoChangerFvMesh PUBLIC dynamicFvMesh decomposeReconstruct)

View file

@ -131,7 +131,7 @@ public:
//- Is this the first update in the current time-step? //- Is this the first update in the current time-step?
bool firstUpdate() const; bool firstUpdate() const;
//- Update the mesh for topology change //- Update the mesh for topology change
virtual bool update(); virtual bool update();
}; };

View file

@ -623,7 +623,7 @@ bool Foam::topoChangerFvMesh::loadBalance(const dictionary& decompDict)
oldPatchNMeshPoints // oldPatchNMeshPoints oldPatchNMeshPoints // oldPatchNMeshPoints
); );
// Reset fvMesh and patches // Reset fvMesh and patches
resetFvPrimitives resetFvPrimitives
( (

View file

@ -39,7 +39,7 @@ void Foam::topoChangerFvMesh::sendFields
toProc<< geoFields.size() << nl; toProc<< geoFields.size() << nl;
label fI = 0; label fI = 0;
forAllConstIter forAllConstIter
( (
typename HashTable<const GeoField*>, typename HashTable<const GeoField*>,
@ -88,7 +88,7 @@ void Foam::topoChangerFvMesh::insertFields
iter iter
) )
{ {
localFields[fI].set localFields[fI].set
( (
Pstream::myProcNo(), Pstream::myProcNo(),
@ -164,7 +164,7 @@ void Foam::topoChangerFvMesh::rebuildFields
// Make an fvMesh mapper // Make an fvMesh mapper
const fvMeshMapper mapper(*this, meshMap); const fvMeshMapper mapper(*this, meshMap);
forAllConstIter forAllConstIter
( (
typename HashTable<const GeoField*>, typename HashTable<const GeoField*>,

View file

@ -109,7 +109,7 @@ list(APPEND SOURCES
engineTopoChangerMesh/noEngineMesh/noEngineMesh.C engineTopoChangerMesh/noEngineMesh/noEngineMesh.C
) )
# derivedFvPatchFields/engineTimeVaryingUniformFixedValue/engineTimeVaryingUniformFixedValueFvPatchField.C # derivedFvPatchFields/engineTimeVaryingUniformFixedValue/engineTimeVaryingUniformFixedValueFvPatchField.C
list(APPEND SOURCES list(APPEND SOURCES
derivedFvPatchFields/engineTimeVaryingUniformFixedValue/engineTimeVaryingUniformFixedValueFvPatchFields.C derivedFvPatchFields/engineTimeVaryingUniformFixedValue/engineTimeVaryingUniformFixedValueFvPatchFields.C
derivedFvPatchFields/engineMassFlowRateInletVelocity/engineMassFlowRateInletVelocityFvPatchVectorField.C derivedFvPatchFields/engineMassFlowRateInletVelocity/engineMassFlowRateInletVelocityFvPatchVectorField.C

View file

@ -58,7 +58,7 @@ div
const word& name const word& name
); );
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} }

View file

@ -354,7 +354,7 @@ list(APPEND SOURCES
${schemes}/quadraticUpwindFit/quadraticUpwindFit.C ${schemes}/quadraticUpwindFit/quadraticUpwindFit.C
${schemes}/cubicUpwindFit/cubicUpwindFit.C ${schemes}/cubicUpwindFit/cubicUpwindFit.C
) )
# #
# $(schemes)/quadraticLinearPureUpwindFit/quadraticLinearPureUpwindFit.C # $(schemes)/quadraticLinearPureUpwindFit/quadraticLinearPureUpwindFit.C
list(APPEND SOURCES list(APPEND SOURCES
${schemes}/linearPureUpwindFit/linearPureUpwindFit.C ${schemes}/linearPureUpwindFit/linearPureUpwindFit.C
@ -464,7 +464,7 @@ list(APPEND SOURCES
${snGradSchemes}/skewCorrectedSnGrad/skewCorrectedSnGrads.C ${snGradSchemes}/skewCorrectedSnGrad/skewCorrectedSnGrads.C
${snGradSchemes}/fourthSnGrad/fourthSnGrads.C ${snGradSchemes}/fourthSnGrad/fourthSnGrads.C
) )
# #
# $(snGradSchemes)/quadraticFitSnGrad/quadraticFitSnGradData.C # $(snGradSchemes)/quadraticFitSnGrad/quadraticFitSnGradData.C
# $(snGradSchemes)/quadraticFitSnGrad/quadraticFitSnGrads.C # $(snGradSchemes)/quadraticFitSnGrad/quadraticFitSnGrads.C

View file

@ -77,7 +77,7 @@ void processorFvPatchField<scalar>::updateInterfaceMatrix
// Transform according to the transformation tensor // Transform according to the transformation tensor
// No transform for scalar. HJ, 29/Nov/2016 // No transform for scalar. HJ, 29/Nov/2016
// Multiply the field by coefficients and add into the result // Multiply the field by coefficients and add into the result
const unallocLabelList& faceCells = this->patch().faceCells(); const unallocLabelList& faceCells = this->patch().faceCells();

View file

@ -103,7 +103,7 @@ pressureDirectedInletOutletVelocityFvPatchVectorField
<< " and patch " << this->patch().name() << " and patch " << this->patch().name()
<< abort(FatalError); << abort(FatalError);
} }
} }
// Normalise to obtain the flow direction // Normalise to obtain the flow direction
inletDir_ /= (mag(inletDir_) + SMALL); inletDir_ /= (mag(inletDir_) + SMALL);

View file

@ -99,7 +99,7 @@ pressureDirectedInletVelocityFvPatchVectorField
<< " and patch " << this->patch().name() << " and patch " << this->patch().name()
<< abort(FatalError); << abort(FatalError);
} }
} }
// Normalise to obtain the flow direction // Normalise to obtain the flow direction
inletDir_ /= (mag(inletDir_) + SMALL); inletDir_ /= (mag(inletDir_) + SMALL);

View file

@ -1201,7 +1201,7 @@ CrankNicolsonDdtScheme<Type>::fvcDdtConsistentPhiCorr
- offCentre_(faceUDdt0()) - offCentre_(faceUDdt0())
); );
} }
// Calculate old time flux // Calculate old time flux
fluxFieldType oldTimeFlux = fluxFieldType oldTimeFlux =
rAUf*rDtCoef_(faceUDdt0)*(mesh().Sf() & faceU.oldTime()); rAUf*rDtCoef_(faceUDdt0)*(mesh().Sf() & faceU.oldTime());

View file

@ -77,7 +77,7 @@ tmp<volScalarField> steadyInertialDdtScheme<Type>::CorDeltaT() const
<< endl; << endl;
} }
} }
if (cofrDeltaTPtr.empty()) if (cofrDeltaTPtr.empty())
{ {
FatalErrorIn FatalErrorIn

View file

@ -72,7 +72,7 @@ class steadyInertialDdtScheme
//- Name of the flux field used to calculate the local //- Name of the flux field used to calculate the local
// convective time-step // convective time-step
word phiName_; word phiName_;
//- Name of the diffusivity field used to calculate the local //- Name of the diffusivity field used to calculate the local
// diffusive time-step // diffusive time-step

View file

@ -426,7 +426,7 @@ void Foam::fvMesh::resetFvPrimitives
// Clear all mesh data // Clear all mesh data
clearOut(); clearOut();
} }
Foam::polyMesh::readUpdateState Foam::fvMesh::readUpdate() Foam::polyMesh::readUpdateState Foam::fvMesh::readUpdate()

View file

@ -52,7 +52,7 @@ void cyclicFvPatch::makeC(slicedSurfaceVectorField& C) const
); );
} }
// Make patch weighting factors // Make patch weighting factors
void cyclicFvPatch::makeWeights(fvsPatchScalarField& w) const void cyclicFvPatch::makeWeights(fvsPatchScalarField& w) const
{ {

View file

@ -57,7 +57,7 @@ void Foam::cyclicGgiFvPatch::makeC(slicedSurfaceVectorField& C) const
); );
} }
// Make patch weighting factors // Make patch weighting factors
void Foam::cyclicGgiFvPatch::makeWeights(fvsPatchScalarField& w) const void Foam::cyclicGgiFvPatch::makeWeights(fvsPatchScalarField& w) const
{ {

View file

@ -26,7 +26,7 @@ License
#include "dlLibraryTable.H" #include "dlLibraryTable.H"
#include "OSspecific.H" #include "OSspecific.H"
#include "int.H" #include "int.H"
#include <dlfcn.h> #include <dlfcn.h>
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //

View file

@ -166,7 +166,7 @@ public:
//- Reset storage of a field to slice //- Reset storage of a field to slice
void reset(const Field<Type>& completeField); void reset(const Field<Type>& completeField);
//- Reset storage of a field to slice with separate fields for the //- Reset storage of a field to slice with separate fields for the
// internal field and boundary field // internal field and boundary field
void reset void reset
@ -174,7 +174,7 @@ public:
const Field<Type>& completeIField, const Field<Type>& completeIField,
const Field<Type>& completeBField const Field<Type>& completeBField
); );
//- Correct boundary field //- Correct boundary field
void correctBoundaryConditions(); void correctBoundaryConditions();
}; };

View file

@ -1,234 +1,234 @@
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
========= | ========= |
\\ / F ield | foam-extend: Open Source CFD \\ / F ield | foam-extend: Open Source CFD
\\ / O peration | Version: 4.1 \\ / O peration | Version: 4.1
\\ / A nd | Web: http://www.foam-extend.org \\ / A nd | Web: http://www.foam-extend.org
\\/ M anipulation | For copyright notice see file Copyright \\/ M anipulation | For copyright notice see file Copyright
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of foam-extend. This file is part of foam-extend.
foam-extend is free software: you can redistribute it and/or modify it foam-extend is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the under the terms of the GNU General Public License as published by the
Free Software Foundation, either version 3 of the License, or (at your Free Software Foundation, either version 3 of the License, or (at your
option) any later version. option) any later version.
foam-extend is distributed in the hope that it will be useful, but foam-extend is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details. General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with foam-extend. If not, see <http://www.gnu.org/licenses/>. along with foam-extend. If not, see <http://www.gnu.org/licenses/>.
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "WedgePointPatchField.H" #include "WedgePointPatchField.H"
#include "transformField.H" #include "transformField.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam namespace Foam
{ {
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template template
< <
template<class> class PatchField, template<class> class PatchField,
class Mesh, class Mesh,
class PointPatch, class PointPatch,
class WedgePointPatch, class WedgePointPatch,
template<class> class MatrixType, template<class> class MatrixType,
class Type class Type
> >
WedgePointPatchField WedgePointPatchField
<PatchField, Mesh, PointPatch, WedgePointPatch, MatrixType, Type>:: <PatchField, Mesh, PointPatch, WedgePointPatch, MatrixType, Type>::
WedgePointPatchField WedgePointPatchField
( (
const PointPatch& p, const PointPatch& p,
const DimensionedField<Type, Mesh>& iF const DimensionedField<Type, Mesh>& iF
) )
: :
PatchField<Type>(p, iF) PatchField<Type>(p, iF)
{} {}
template template
< <
template<class> class PatchField, template<class> class PatchField,
class Mesh, class Mesh,
class PointPatch, class PointPatch,
class WedgePointPatch, class WedgePointPatch,
template<class> class MatrixType, template<class> class MatrixType,
class Type class Type
> >
WedgePointPatchField WedgePointPatchField
<PatchField, Mesh, PointPatch, WedgePointPatch, MatrixType, Type>:: <PatchField, Mesh, PointPatch, WedgePointPatch, MatrixType, Type>::
WedgePointPatchField WedgePointPatchField
( (
const PointPatch& p, const PointPatch& p,
const DimensionedField<Type, Mesh>& iF, const DimensionedField<Type, Mesh>& iF,
const dictionary& dict const dictionary& dict
) )
: :
PatchField<Type>(p, iF) PatchField<Type>(p, iF)
{ {
if (!isType<WedgePointPatch>(p)) if (!isType<WedgePointPatch>(p))
{ {
FatalIOErrorIn FatalIOErrorIn
( (
"WedgePointPatchField" "WedgePointPatchField"
"<PatchField, Mesh, PointPatch, WedgePointPatch, " "<PatchField, Mesh, PointPatch, WedgePointPatch, "
"MatrixType, Type>::WedgePointPatchField\n" "MatrixType, Type>::WedgePointPatchField\n"
"(\n" "(\n"
" const PointPatch& p,\n" " const PointPatch& p,\n"
" const DimensionedField<Type, Mesh>& field,\n" " const DimensionedField<Type, Mesh>& field,\n"
" const dictionary& dict\n" " const dictionary& dict\n"
")\n", ")\n",
dict dict
) << "patch " << this->patch().index() << " not wedge type. " ) << "patch " << this->patch().index() << " not wedge type. "
<< "Patch type = " << p.type() << "Patch type = " << p.type()
<< exit(FatalIOError); << exit(FatalIOError);
} }
} }
template template
< <
template<class> class PatchField, template<class> class PatchField,
class Mesh, class Mesh,
class PointPatch, class PointPatch,
class WedgePointPatch, class WedgePointPatch,
template<class> class MatrixType, template<class> class MatrixType,
class Type class Type
> >
WedgePointPatchField WedgePointPatchField
<PatchField, Mesh, PointPatch, WedgePointPatch, MatrixType, Type>:: <PatchField, Mesh, PointPatch, WedgePointPatch, MatrixType, Type>::
WedgePointPatchField WedgePointPatchField
( (
const WedgePointPatchField const WedgePointPatchField
<PatchField, Mesh, PointPatch, WedgePointPatch, MatrixType, Type>&, <PatchField, Mesh, PointPatch, WedgePointPatch, MatrixType, Type>&,
const PointPatch& p, const PointPatch& p,
const DimensionedField<Type, Mesh>& iF, const DimensionedField<Type, Mesh>& iF,
const PointPatchFieldMapper& const PointPatchFieldMapper&
) )
: :
PatchField<Type>(p, iF) PatchField<Type>(p, iF)
{ {
if (!isType<WedgePointPatch>(this->patch())) if (!isType<WedgePointPatch>(this->patch()))
{ {
FatalErrorIn FatalErrorIn
( (
"WedgePointPatchField" "WedgePointPatchField"
"<PatchField, Mesh, PointPatch, WedgePointPatch, " "<PatchField, Mesh, PointPatch, WedgePointPatch, "
"MatrixType, Type>::WedgePointPatchField\n" "MatrixType, Type>::WedgePointPatchField\n"
"(\n" "(\n"
" const WedgePointPatchField" " const WedgePointPatchField"
" <PatchField, Mesh, PointPatch, WedgePointPatch, " " <PatchField, Mesh, PointPatch, WedgePointPatch, "
"MatrixType, Type>&,\n" "MatrixType, Type>&,\n"
" const PointPatch& p,\n" " const PointPatch& p,\n"
" const DimensionedField<Type, Mesh>& iF,\n" " const DimensionedField<Type, Mesh>& iF,\n"
" const PointPatchFieldMapper& mapper\n" " const PointPatchFieldMapper& mapper\n"
")\n" ")\n"
) << "Field type does not correspond to patch type for patch " ) << "Field type does not correspond to patch type for patch "
<< this->patch().index() << "." << endl << this->patch().index() << "." << endl
<< "Field type: " << typeName << endl << "Field type: " << typeName << endl
<< "Patch type: " << this->patch().type() << "Patch type: " << this->patch().type()
<< exit(FatalError); << exit(FatalError);
} }
} }
template template
< <
template<class> class PatchField, template<class> class PatchField,
class Mesh, class Mesh,
class PointPatch, class PointPatch,
class WedgePointPatch, class WedgePointPatch,
template<class> class MatrixType, template<class> class MatrixType,
class Type class Type
> >
WedgePointPatchField WedgePointPatchField
<PatchField, Mesh, PointPatch, WedgePointPatch, MatrixType, Type>:: <PatchField, Mesh, PointPatch, WedgePointPatch, MatrixType, Type>::
WedgePointPatchField WedgePointPatchField
( (
const WedgePointPatchField const WedgePointPatchField
<PatchField, Mesh, PointPatch, WedgePointPatch, MatrixType, Type>& ptf <PatchField, Mesh, PointPatch, WedgePointPatch, MatrixType, Type>& ptf
) )
: :
PatchField<Type>(ptf) PatchField<Type>(ptf)
{} {}
template template
< <
template<class> class PatchField, template<class> class PatchField,
class Mesh, class Mesh,
class PointPatch, class PointPatch,
class WedgePointPatch, class WedgePointPatch,
template<class> class MatrixType, template<class> class MatrixType,
class Type class Type
> >
WedgePointPatchField WedgePointPatchField
<PatchField, Mesh, PointPatch, WedgePointPatch, MatrixType, Type>:: <PatchField, Mesh, PointPatch, WedgePointPatch, MatrixType, Type>::
WedgePointPatchField WedgePointPatchField
( (
const WedgePointPatchField const WedgePointPatchField
<PatchField, Mesh, PointPatch, WedgePointPatch, MatrixType, Type>& ptf, <PatchField, Mesh, PointPatch, WedgePointPatch, MatrixType, Type>& ptf,
const DimensionedField<Type, Mesh>& iF const DimensionedField<Type, Mesh>& iF
) )
: :
PatchField<Type>(ptf, iF) PatchField<Type>(ptf, iF)
{} {}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
// Evaluate patch field // Evaluate patch field
template template
< <
template<class> class PatchField, template<class> class PatchField,
class Mesh, class Mesh,
class PointPatch, class PointPatch,
class WedgePointPatch, class WedgePointPatch,
template<class> class MatrixType, template<class> class MatrixType,
class Type class Type
> >
void void
WedgePointPatchField WedgePointPatchField
<PatchField, Mesh, PointPatch, WedgePointPatch, MatrixType, Type>::evaluate <PatchField, Mesh, PointPatch, WedgePointPatch, MatrixType, Type>::evaluate
( (
const Pstream::commsTypes commsType const Pstream::commsTypes commsType
) )
{ {
// ZT, 26/02/2017: Size of the patch could be zero in parallel runs // ZT, 26/02/2017: Size of the patch could be zero in parallel runs
if (!this->patch().meshPoints().empty()) if (!this->patch().meshPoints().empty())
{ {
// In order to ensure that the wedge patch is always flat, take the // In order to ensure that the wedge patch is always flat, take the
// normal vector from the first point // normal vector from the first point
const vector& nHat = this->patch().pointNormals()[0]; const vector& nHat = this->patch().pointNormals()[0];
tmp<Field<Type> > tvalues = tmp<Field<Type> > tvalues =
transform(I - nHat*nHat, this->patchInternalField()); transform(I - nHat*nHat, this->patchInternalField());
const Field<Type>& values = tvalues(); const Field<Type>& values = tvalues();
// Get internal field to insert values into // Get internal field to insert values into
Field<Type>& iF = const_cast<Field<Type>&>(this->internalField()); Field<Type>& iF = const_cast<Field<Type>&>(this->internalField());
// Get addressing // Get addressing
const labelList& meshPoints = this->patch().meshPoints(); const labelList& meshPoints = this->patch().meshPoints();
forAll (meshPoints, pointI) forAll (meshPoints, pointI)
{ {
iF[meshPoints[pointI]] = values[pointI]; iF[meshPoints[pointI]] = values[pointI];
} }
} }
} }
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam } // End namespace Foam
// ************************************************************************* // // ************************************************************************* //

View file

@ -909,7 +909,7 @@ void GGIInterpolation<MasterPatch, SlavePatch>::calcPartiallyCoveredFaces
InfoIn("GGIInterpolation::calcPartiallyCoveredFaces") InfoIn("GGIInterpolation::calcPartiallyCoveredFaces")
<< " : Found " << partiallyUncoveredMasterAddrPtr_->size() << " : Found " << partiallyUncoveredMasterAddrPtr_->size()
<< " partially overlapping faces for master GGI patch" << endl; << " partially overlapping faces for master GGI patch" << endl;
if (partiallyUncoveredMasterAddrPtr_->size()) if (partiallyUncoveredMasterAddrPtr_->size())
{ {
Info<< "Max uncoverage: " Info<< "Max uncoverage: "

View file

@ -633,7 +633,7 @@ void Foam::BlockMatrixClustering<Type>::agglomerateCoeffs
// Reset coefficients to zero. Cannot touch the diagonal // Reset coefficients to zero. Cannot touch the diagonal
activeCoarseUpper = pTraits<ULType>::zero; activeCoarseUpper = pTraits<ULType>::zero;
forAll(coeffRestrictAddr_, fineCoeffI) forAll(coeffRestrictAddr_, fineCoeffI)
{ {
label rmUpperAddr = agglomIndex_[upperAddr[fineCoeffI]]; label rmUpperAddr = agglomIndex_[upperAddr[fineCoeffI]];
@ -686,7 +686,7 @@ void Foam::BlockMatrixClustering<Type>::agglomerateCoeffs
// Reset coefficients to zero. Cannot touch the diagonal // Reset coefficients to zero. Cannot touch the diagonal
activeCoarseUpper = pTraits<ULType>::zero; activeCoarseUpper = pTraits<ULType>::zero;
activeCoarseLower = pTraits<ULType>::zero; activeCoarseLower = pTraits<ULType>::zero;
forAll(coeffRestrictAddr_, fineCoeffI) forAll(coeffRestrictAddr_, fineCoeffI)
{ {
label rmUpperAddr = agglomIndex_[upperAddr[fineCoeffI]]; label rmUpperAddr = agglomIndex_[upperAddr[fineCoeffI]];
@ -1165,7 +1165,7 @@ void Foam::BlockMatrixClustering<Type>::updateMatrix
// Get interfaces from coarse matrix // Get interfaces from coarse matrix
lduInterfacePtrsList coarseInterfaces = coarseMatrix.mesh().interfaces(); lduInterfacePtrsList coarseInterfaces = coarseMatrix.mesh().interfaces();
// Get interfaces fields from coarse matrix // Get interfaces fields from coarse matrix
typename BlockLduInterfaceFieldPtrsList<Type>::Type& typename BlockLduInterfaceFieldPtrsList<Type>::Type&
coarseInterfaceFieldsTransfer = coarseMatrix.interfaces(); coarseInterfaceFieldsTransfer = coarseMatrix.interfaces();

View file

@ -148,7 +148,7 @@ void Foam::lduMatrix::operator+=(const lduMatrix& A)
{ {
return; return;
} }
if (A.diagPtr_) if (A.diagPtr_)
{ {
diag() += A.diag(); diag() += A.diag();
@ -222,7 +222,7 @@ void Foam::lduMatrix::operator-=(const lduMatrix& A)
{ {
return; return;
} }
if (A.diagPtr_) if (A.diagPtr_)
{ {
diag() -= A.diag(); diag() -= A.diag();

View file

@ -81,7 +81,7 @@ void Foam::globalProcFaceIndex::calcFaceIndex()
// Assemble global label list for mesh faces // Assemble global label list for mesh faces
label globalFaceIndex = procFaceOffset_[Pstream::myProcNo()]; label globalFaceIndex = procFaceOffset_[Pstream::myProcNo()];
for (label faceI = 0; faceI < mesh_.nInternalFaces(); faceI++) for (label faceI = 0; faceI < mesh_.nInternalFaces(); faceI++)
{ {
globalLabel_[faceI] = globalFaceIndex; globalLabel_[faceI] = globalFaceIndex;
@ -93,7 +93,7 @@ void Foam::globalProcFaceIndex::calcFaceIndex()
{ {
const label patchSize = patches[patchI].size(); const label patchSize = patches[patchI].size();
const label patchStart = patches[patchI].start(); const label patchStart = patches[patchI].start();
if (isA<processorPolyPatch>(patches[patchI])) if (isA<processorPolyPatch>(patches[patchI]))
{ {
const processorPolyPatch& procPatch = const processorPolyPatch& procPatch =
@ -162,7 +162,7 @@ void Foam::globalProcFaceIndex::calcFaceIndex()
// Insert the data into the list // Insert the data into the list
const label patchStart = patches[patchI].start(); const label patchStart = patches[patchI].start();
forAll (masterFaceLabels, patchFaceI) forAll (masterFaceLabels, patchFaceI)
{ {
globalLabel_[patchStart + patchFaceI] = globalLabel_[patchStart + patchFaceI] =

View file

@ -82,7 +82,7 @@ class globalProcFaceIndex
// Sized to number of live faces in the mesh // Sized to number of live faces in the mesh
labelList globalLabel_; labelList globalLabel_;
// Private Member Functions // Private Member Functions
//- Disallow default bitwise copy construct //- Disallow default bitwise copy construct

View file

@ -192,7 +192,7 @@ Foam::polyMesh::polyMesh
} }
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void Foam::polyMesh::setInstance(const fileName& inst) void Foam::polyMesh::setInstance(const fileName& inst)

View file

@ -587,10 +587,10 @@ void Foam::polyPatch::resetPatch
{ {
// Clear all data // Clear all data
clearAddressing(); clearAddressing();
// Reset start and primitive patch // Reset start and primitive patch
start_ = newStart; start_ = newStart;
primitivePatch::operator= primitivePatch::operator=
( (
primitivePatch primitivePatch

View file

@ -166,7 +166,7 @@ bool Foam::primitiveMesh::checkClosedCells
} }
reduce(nErrorClosed, sumOp<label>()); reduce(nErrorClosed, sumOp<label>());
if (nErrorClosed > 0) if (nErrorClosed > 0)
{ {
if (debug || report) if (debug || report)

View file

@ -2,7 +2,7 @@ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \ -I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/sampling/lnInclude -I$(LIB_SRC)/sampling/lnInclude
LIB_LIBS = \ LIB_LIBS = \
-lfiniteVolume \ -lfiniteVolume \

View file

@ -176,7 +176,7 @@ void Foam::immersedBoundaryFvPatch::updatePhi
// Calculate IB flux from new and old volumes // Calculate IB flux from new and old volumes
scalarField ibFlux(fc.size()); scalarField ibFlux(fc.size());
forAll (fc, faceI) forAll (fc, faceI)
{ {
ibFlux[faceI] = ibFlux[faceI] =
@ -185,7 +185,7 @@ void Foam::immersedBoundaryFvPatch::updatePhi
// Add the flux to divPhi for the cell for later use // Add the flux to divPhi for the cell for later use
divPhi[fc[faceI]] += ibFlux[faceI]; divPhi[fc[faceI]] += ibFlux[faceI];
} }
phi.boundaryField()[index()] = ibFlux; phi.boundaryField()[index()] = ibFlux;
// Check and adjust the immersed boundary space conservation law // Check and adjust the immersed boundary space conservation law

View file

@ -43,7 +43,7 @@ void immersedBoundaryFvsPatchField<Type>::updateSize()
} }
} }
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Type> template<class Type>

View file

@ -514,7 +514,7 @@ void Foam::immersedBoundaryPolyPatch::calcImmersedBoundary() const
{ {
const processorPolyPatch& curProcPatch = const processorPolyPatch& curProcPatch =
refCast<const processorPolyPatch>(bMesh[patchI]); refCast<const processorPolyPatch>(bMesh[patchI]);
// Send internal cut // Send internal cut
coupledPatchOwnCut[patchI] = labelList coupledPatchOwnCut[patchI] = labelList
( (
@ -580,7 +580,7 @@ void Foam::immersedBoundaryPolyPatch::calcImmersedBoundary() const
const labelList& curNbrCut = coupledPatchNbrCut[patchI]; const labelList& curNbrCut = coupledPatchNbrCut[patchI];
const labelList& fc = bMesh[patchI].faceCells(); const labelList& fc = bMesh[patchI].faceCells();
forAll (curOwnCut, patchFaceI) forAll (curOwnCut, patchFaceI)
{ {
if if
@ -631,7 +631,7 @@ void Foam::immersedBoundaryPolyPatch::calcImmersedBoundary() const
} }
} }
} }
// Reset the cell lists // Reset the cell lists
Info<< "nIbCells: " << nIbCells << endl; Info<< "nIbCells: " << nIbCells << endl;
unmergedFaces.setSize(nIbCells); unmergedFaces.setSize(nIbCells);
@ -870,7 +870,7 @@ void Foam::immersedBoundaryPolyPatch::calcImmersedBoundary() const
{ {
// Regular patch: one-sided check // Regular patch: one-sided check
const labelList& fc = bMesh[patchI].faceCells(); const labelList& fc = bMesh[patchI].faceCells();
forAll (fc, patchFaceI) forAll (fc, patchFaceI)
{ {
if if

View file

@ -351,7 +351,7 @@ public:
// Corrected immersed patch geometry // Corrected immersed patch geometry
//- Corrected ib patch face areas //- Corrected ib patch face areas
const vectorField& correctedIbPatchFaceAreas() const; const vectorField& correctedIbPatchFaceAreas() const;

View file

@ -106,7 +106,7 @@ class ImmersedCell
//- Depth to immersed surface for cell points and intersections //- Depth to immersed surface for cell points and intersections
// Note: positive depth is dry // Note: positive depth is dry
scalarField depth_; scalarField depth_;
// Private member functions // Private member functions

View file

@ -72,7 +72,7 @@ class triSurfaceDistance
//- Return immersed boundary cell span //- Return immersed boundary cell span
vector cellSpan(const label cellID) const; vector cellSpan(const label cellID) const;
public: public:
// Constructors // Constructors

View file

@ -66,7 +66,7 @@
if (!isA<emptyFvPatch>(mesh.boundary()[pI])) if (!isA<emptyFvPatch>(mesh.boundary()[pI]))
{ {
const label fI = const label fI =
mesh.boundaryMesh()[pI].whichFace(deadFaces[dfI]); mesh.boundaryMesh()[pI].whichFace(deadFaces[dfI]);
sGamma.boundaryField()[pI][fI] = 0; sGamma.boundaryField()[pI][fI] = 0;

View file

@ -245,7 +245,7 @@ selectRefineCells
} }
Info<< "Cell distance: " << min(cellDistance) << " " << max(cellDistance) << endl; Info<< "Cell distance: " << min(cellDistance) << " " << max(cellDistance) << endl;
// Select cells for refinement // Select cells for refinement
forAll (cellDistance, cellI) forAll (cellDistance, cellI)
{ {
@ -340,7 +340,7 @@ Foam::immersedBoundaryDynamicRefineSolidBodyMotionFvMesh::selectUnrefinePoints
// Get split points from all points // Get split points from all points
pointField splitPoints(points(), splitPointLabels); pointField splitPoints(points(), splitPointLabels);
// Calculate distance to immersed boundary // Calculate distance to immersed boundary
// Note: minimum distance is inside (WET) and implies a live cell // Note: minimum distance is inside (WET) and implies a live cell
scalarField splitPointDistance(splitPoints.size(), -GREAT); scalarField splitPointDistance(splitPoints.size(), -GREAT);
@ -376,7 +376,7 @@ Foam::immersedBoundaryDynamicRefineSolidBodyMotionFvMesh::selectUnrefinePoints
} }
Info<< "Split point distance: " << min(splitPointDistance) << " " << max(splitPointDistance) << endl; Info<< "Split point distance: " << min(splitPointDistance) << " " << max(splitPointDistance) << endl;
dynamicLabelList newSplitPoints(splitPointLabels.size()); dynamicLabelList newSplitPoints(splitPointLabels.size());
const labelListList& pc = pointCells(); const labelListList& pc = pointCells();
@ -454,7 +454,7 @@ void Foam::immersedBoundaryDynamicRefineSolidBodyMotionFvMesh::extendMarkedCells
const labelList& own = faceOwner(); const labelList& own = faceOwner();
const labelList& nei = faceNeighbour(); const labelList& nei = faceNeighbour();
// Update cells using any markedFace // Update cells using any markedFace
for (label faceI = 0; faceI < nInternalFaces(); faceI++) for (label faceI = 0; faceI < nInternalFaces(); faceI++)
{ {
@ -635,7 +635,7 @@ bool immersedBoundaryDynamicRefineSolidBodyMotionFvMesh::update()
// Negative cell distance implies live cell // Negative cell distance implies live cell
// For negative distance greater than -refinementDistance, refine // For negative distance greater than -refinementDistance, refine
// For neegative distance smaller than -coarseningDistance, coarsen // For neegative distance smaller than -coarseningDistance, coarsen
// Cells marked for refinement or otherwise protected from unrefinement. // Cells marked for refinement or otherwise protected from unrefinement.
PackedBoolList refineCell(nCells()); PackedBoolList refineCell(nCells());

View file

@ -245,7 +245,7 @@ selectRefineCells
} }
Info<< "Cell distance: " << min(cellDistance) << " " << max(cellDistance) << endl; Info<< "Cell distance: " << min(cellDistance) << " " << max(cellDistance) << endl;
// Create a sorting criterion // Create a sorting criterion
forAll (cellDistance, cellI) forAll (cellDistance, cellI)
{ {
@ -344,7 +344,7 @@ Foam::immersedBoundaryDynamicRefineSolidBodyMotionFvMesh::selectUnrefinePoints
// Get split points from all points // Get split points from all points
pointField splitPoints(points(), splitPointLabels); pointField splitPoints(points(), splitPointLabels);
// Calculate distance to immersed boundary // Calculate distance to immersed boundary
// Note: minimum distance is inside (WET) and implies a live cell // Note: minimum distance is inside (WET) and implies a live cell
scalarField splitPointDistance(splitPoints.size(), -GREAT); scalarField splitPointDistance(splitPoints.size(), -GREAT);
@ -380,7 +380,7 @@ Foam::immersedBoundaryDynamicRefineSolidBodyMotionFvMesh::selectUnrefinePoints
} }
Info<< "Split point distance: " << min(splitPointDistance) << " " << max(splitPointDistance) << endl; Info<< "Split point distance: " << min(splitPointDistance) << " " << max(splitPointDistance) << endl;
dynamicLabelList newSplitPoints(splitPointLabels.size()); dynamicLabelList newSplitPoints(splitPointLabels.size());
const labelListList& pc = pointCells(); const labelListList& pc = pointCells();
@ -462,7 +462,7 @@ void Foam::immersedBoundaryDynamicRefineSolidBodyMotionFvMesh::extendMarkedCells
const labelList& own = faceOwner(); const labelList& own = faceOwner();
const labelList& nei = faceNeighbour(); const labelList& nei = faceNeighbour();
// Update cells using any markedFace // Update cells using any markedFace
for (label faceI = 0; faceI < nInternalFaces(); faceI++) for (label faceI = 0; faceI < nInternalFaces(); faceI++)
{ {
@ -643,7 +643,7 @@ bool immersedBoundaryDynamicRefineSolidBodyMotionFvMesh::update()
// Negative cell distance implies live cell // Negative cell distance implies live cell
// For negative distance greater than -refinementDistance, refine // For negative distance greater than -refinementDistance, refine
// For neegative distance smaller than -coarseningDistance, coarsen // For neegative distance smaller than -coarseningDistance, coarsen
// Cells marked for refinement or otherwise protected from unrefinement. // Cells marked for refinement or otherwise protected from unrefinement.
PackedBoolList refineCell(nCells()); PackedBoolList refineCell(nCells());

View file

@ -83,7 +83,7 @@ Foam::immersedBoundaryRefinement::refinementCellCandidates() const
scalarField cellDistance(mesh().nCells(), -GREAT); scalarField cellDistance(mesh().nCells(), -GREAT);
const polyBoundaryMesh& bMesh = mesh().boundaryMesh(); const polyBoundaryMesh& bMesh = mesh().boundaryMesh();
const vector span(GREAT, GREAT, GREAT); const vector span(GREAT, GREAT, GREAT);
forAll (bMesh, patchI) forAll (bMesh, patchI)
@ -116,7 +116,7 @@ Foam::immersedBoundaryRefinement::refinementCellCandidates() const
Info<< "Cell distance (min, max): (" << min(cellDistance) Info<< "Cell distance (min, max): (" << min(cellDistance)
<< ", " << max(cellDistance) << ")" << endl; << ", " << max(cellDistance) << ")" << endl;
// Create storage for collection of cells. Assume that almost all of the // Create storage for collection of cells. Assume that almost all of the
// cells will be marked to prevent excessive resizing. // cells will be marked to prevent excessive resizing.
dynamicLabelList refinementCandidates(mesh().nCells()); dynamicLabelList refinementCandidates(mesh().nCells());
@ -158,7 +158,7 @@ Foam::immersedBoundaryRefinement::unrefinementPointCandidates() const
scalarField pointDistance(mesh().nPoints(), -GREAT); scalarField pointDistance(mesh().nPoints(), -GREAT);
const polyBoundaryMesh& bMesh = mesh().boundaryMesh(); const polyBoundaryMesh& bMesh = mesh().boundaryMesh();
const vector span(GREAT, GREAT, GREAT); const vector span(GREAT, GREAT, GREAT);
forAll (bMesh, patchI) forAll (bMesh, patchI)

View file

@ -106,7 +106,7 @@ void Foam::refineImmersedBoundaryMesh::addIbCellCells
// Get mesh cellCells // Get mesh cellCells
const labelListList& cellCells = mesh_.cellCells(); const labelListList& cellCells = mesh_.cellCells();
const labelList& c = ibPatch.ibCells(); const labelList& c = ibPatch.ibCells();
forAll (c, cellI) forAll (c, cellI)

View file

@ -30,7 +30,7 @@
# #
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
# Coal parcel and sub-models # Coal parcel and sub-models
list(APPEND SOURCES list(APPEND SOURCES
CoalParcel/defineCoalParcel.C CoalParcel/defineCoalParcel.C
CoalParcel/makeCoalParcelSubmodels.C CoalParcel/makeCoalParcelSubmodels.C

View file

@ -30,17 +30,17 @@
# #
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
# Parcels # Parcels
list(APPEND SOURCES list(APPEND SOURCES
parcels/derived/dsmcParcel/dsmcParcel.C parcels/derived/dsmcParcel/dsmcParcel.C
) )
# Cloud base classes # Cloud base classes
list(APPEND SOURCES list(APPEND SOURCES
clouds/baseClasses/DsmcBaseCloud/DsmcBaseCloud.C clouds/baseClasses/DsmcBaseCloud/DsmcBaseCloud.C
) )
# submodels # submodels
list(APPEND SOURCES list(APPEND SOURCES
parcels/derived/dsmcParcel/defineDsmcParcel.C parcels/derived/dsmcParcel/defineDsmcParcel.C
parcels/derived/dsmcParcel/makeDsmcParcelBinaryCollisionModels.C parcels/derived/dsmcParcel/makeDsmcParcelBinaryCollisionModels.C

View file

@ -39,13 +39,13 @@ set(BASECLOUDS ${CLOUDS}/baseClasses)
set(DERIVEDCLOUDS ${CLOUDS}/derived) set(DERIVEDCLOUDS ${CLOUDS}/derived)
# Parcels # Parcels
list(APPEND SOURCES list(APPEND SOURCES
${BASEPARCELS}/reactingParcel/reactingParcel.C ${BASEPARCELS}/reactingParcel/reactingParcel.C
) )
# Cloud base classes # Cloud base classes
list(APPEND SOURCES list(APPEND SOURCES
${BASECLOUDS}/kinematicCloud/kinematicCloud.C ${BASECLOUDS}/kinematicCloud/kinematicCloud.C
${BASECLOUDS}/thermoCloud/thermoCloud.C ${BASECLOUDS}/thermoCloud/thermoCloud.C
@ -54,7 +54,7 @@ list(APPEND SOURCES
) )
# kinematic parcel sub-models # kinematic parcel sub-models
set(KINEMATICPARCEL ${DERIVEDPARCELS}/basicKinematicParcel) set(KINEMATICPARCEL ${DERIVEDPARCELS}/basicKinematicParcel)
list(APPEND SOURCES list(APPEND SOURCES
${KINEMATICPARCEL}/basicKinematicParcel.C ${KINEMATICPARCEL}/basicKinematicParcel.C
@ -63,7 +63,7 @@ list(APPEND SOURCES
) )
# thermo parcel sub-models # thermo parcel sub-models
set(THERMOPARCEL ${DERIVEDPARCELS}/basicThermoParcel) set(THERMOPARCEL ${DERIVEDPARCELS}/basicThermoParcel)
list(APPEND SOURCES list(APPEND SOURCES
${THERMOPARCEL}/basicThermoParcel.C ${THERMOPARCEL}/basicThermoParcel.C
@ -72,7 +72,7 @@ list(APPEND SOURCES
) )
# reacting parcel sub-models # reacting parcel sub-models
set(REACTINGPARCEL ${DERIVEDPARCELS}/BasicReactingParcel) set(REACTINGPARCEL ${DERIVEDPARCELS}/BasicReactingParcel)
list(APPEND SOURCES list(APPEND SOURCES
${REACTINGPARCEL}/defineBasicReactingParcel.C ${REACTINGPARCEL}/defineBasicReactingParcel.C
@ -80,7 +80,7 @@ list(APPEND SOURCES
) )
# reacting multiphase parcel sub-models # reacting multiphase parcel sub-models
set(REACTINGMPPARCEL ${DERIVEDPARCELS}/BasicReactingMultiphaseParcel) set(REACTINGMPPARCEL ${DERIVEDPARCELS}/BasicReactingMultiphaseParcel)
list(APPEND SOURCES list(APPEND SOURCES
${REACTINGMPPARCEL}/defineBasicReactingMultiphaseParcel.C ${REACTINGMPPARCEL}/defineBasicReactingMultiphaseParcel.C
@ -88,7 +88,7 @@ list(APPEND SOURCES
) )
# bolt-on models # bolt-on models
set(RADIATION submodels/addOns/radiation) set(RADIATION submodels/addOns/radiation)
list(APPEND SOURCES list(APPEND SOURCES
${RADIATION}/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.C ${RADIATION}/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.C
@ -125,7 +125,7 @@ list(APPEND SOURCES
) )
# data entries # data entries
list(APPEND SOURCES list(APPEND SOURCES
submodels/IO/DataEntry/makeDataEntries.C submodels/IO/DataEntry/makeDataEntries.C
submodels/IO/DataEntry/polynomial/polynomial.C submodels/IO/DataEntry/polynomial/polynomial.C
@ -133,19 +133,19 @@ list(APPEND SOURCES
) )
# integration schemes # integration schemes
list(APPEND SOURCES list(APPEND SOURCES
IntegrationScheme/makeIntegrationSchemes.C IntegrationScheme/makeIntegrationSchemes.C
) )
# particle forces # particle forces
list(APPEND SOURCES list(APPEND SOURCES
particleForces/particleForces.C particleForces/particleForces.C
) )
# phase properties # phase properties
list(APPEND SOURCES list(APPEND SOURCES
phaseProperties/phaseProperties/phaseProperties.C phaseProperties/phaseProperties/phaseProperties.C
phaseProperties/phaseProperties/phasePropertiesIO.C phaseProperties/phaseProperties/phasePropertiesIO.C

File diff suppressed because it is too large Load diff

View file

@ -152,7 +152,7 @@ void Foam::CholeskyPrecon::precondition
// Note: coupled boundary updated is not needed because x is zero // Note: coupled boundary updated is not needed because x is zero
// HJ and VV, 19/Jun/2017 // HJ and VV, 19/Jun/2017
// Diagonal block // Diagonal block
{ {
scalar* __restrict__ xPtr = x.begin(); scalar* __restrict__ xPtr = x.begin();

View file

@ -189,7 +189,7 @@ void Foam::ILU0::precondition
// Note: coupled boundary updated is not needed because x is zero // Note: coupled boundary updated is not needed because x is zero
// HJ and VV, 19/Jun/2017 // HJ and VV, 19/Jun/2017
// Diagonal block // Diagonal block
{ {
scalar* __restrict__ xPtr = x.begin(); scalar* __restrict__ xPtr = x.begin();
@ -295,7 +295,7 @@ void Foam::ILU0::preconditionT
// Note: coupled boundary updated is not needed because x is zero // Note: coupled boundary updated is not needed because x is zero
// HJ and VV, 19/Jun/2017 // HJ and VV, 19/Jun/2017
// Diagonal block // Diagonal block
{ {
scalar* __restrict__ xPtr = x.begin(); scalar* __restrict__ xPtr = x.begin();

View file

@ -82,7 +82,7 @@ oversetEulerDdtScheme<Type>::fvcDdt
} }
// Correct for overset "mesh motion" due to change in acceptor/live cells // Correct for overset "mesh motion" due to change in acceptor/live cells
// Get overset mesh // Get overset mesh
const oversetMesh& om = oversetMesh::New(mesh); const oversetMesh& om = oversetMesh::New(mesh);

View file

@ -219,33 +219,33 @@ void Foam::regionWiseOversetAdjustPhi
if (curFlip) if (curFlip)
{ {
if (curPhi > 0.0) if (curPhi > 0.0)
{ {
// Flux going into the region (out of the fringe). // Flux going into the region (out of the fringe).
// Note that positive sign is kept. // Note that positive sign is kept.
regionFringeIn[curRegion] += curPhi; regionFringeIn[curRegion] += curPhi;
} }
else else
{ {
// Flux coming out of the region (into the fringe). // Flux coming out of the region (into the fringe).
// Note reverted sign. // Note reverted sign.
regionFringeOut[curRegion] -= curPhi; regionFringeOut[curRegion] -= curPhi;
} }
} }
else else
{ {
if (curPhi > 0.0) if (curPhi > 0.0)
{ {
// Flux going out of the region (into the fringe). // Flux going out of the region (into the fringe).
// Note that positive sign is kept. // Note that positive sign is kept.
regionFringeOut[curRegion] += curPhi; regionFringeOut[curRegion] += curPhi;
} }
else else
{ {
// Flux going into the region (out of the fringe). // Flux going into the region (out of the fringe).
// Note reverted sign. // Note reverted sign.
regionFringeIn[curRegion] -= curPhi; regionFringeIn[curRegion] -= curPhi;
} }
} }
} }
} }

View file

@ -938,9 +938,9 @@ void Foam::oversetMesh::calcInterpolationMap() const
/* /*
Procs sending to me | Number of items being sent Procs sending to me | Number of items being sent
-------------------------------------------------- --------------------------------------------------
P0 | 1 P0 | 1
P1 | 7 P1 | 7
P5 | 2 P5 | 2
. | . . | .
. | . . | .
. | . . | .

View file

@ -78,7 +78,7 @@ Where:
region | name of region for multi-region cases | no | region | name of region for multi-region cases | no |
enabled | on/off switch | no | yes enabled | on/off switch | no | yes
timeStart| start time | no | timeStart| start time | no |
timeEnd | end time | no | timeEnd | end time | no |
outputControl | when to output: either 'outputTime' or 'timeStep'| no | timeStep outputControl | when to output: either 'outputTime' or 'timeStep'| no | timeStep
outputInterval| steps between output when outputControl=timeStep | no | 1 outputInterval| steps between output when outputControl=timeStep | no | 1
\endtable \endtable
@ -88,7 +88,7 @@ typically used as the name of the output directory for any derived data. The
\c type entry defines the type of function object properties that follow. \c type entry defines the type of function object properties that follow.
Since the function objects are packaged into separate libraries, the user must Since the function objects are packaged into separate libraries, the user must
tell the code where to find the function object implementation, identified tell the code where to find the function object implementation, identified
using the \c libs entry. using the \c libs entry.
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/

View file

@ -111,7 +111,7 @@ void Foam::nastranSurfaceWriter::writeCoord
os.unsetf(ios_base::left); os.unsetf(ios_base::left);
os.setf(ios_base::right); os.setf(ios_base::right);
os << setw(8) << pointI + 1 os << setw(8) << pointI + 1
<< " " << " "
<< setw(8) << p.x() << setw(8) << p.x()
<< setw(8) << p.y() << setw(8) << p.y()
<< setw(8) << p.z() << setw(8) << p.z()

View file

@ -147,7 +147,7 @@ namespace Foam
os << endl; os << endl;
} }
template<> template<>
void Foam::rawSurfaceWriter::writeHeader void Foam::rawSurfaceWriter::writeHeader
( (

View file

@ -177,9 +177,9 @@ void Foam::isentropicTotalPressureFvPatchScalarField::updateCoeffs()
const surfaceScalarField& phi = const surfaceScalarField& phi =
db().lookupObject<surfaceScalarField>(phiName_); db().lookupObject<surfaceScalarField>(phiName_);
const scalarField& phip = const scalarField& phip =
patch().patchField<surfaceScalarField, scalar>(phi); patch().patchField<surfaceScalarField, scalar>(phi);
// Get velocity // Get velocity
// const fvPatchVectorField& U = // const fvPatchVectorField& U =
// patch().lookupPatchField<volVectorField, scalar>(UName_); // patch().lookupPatchField<volVectorField, scalar>(UName_);

View file

@ -142,7 +142,7 @@ public:
} }
//- Return the "jump" across the patch as a "half" field //- Return the "jump" across the patch as a "half" field
virtual tmp<Field<Type> > jump() const virtual tmp<Field<Type> > jump() const
{ {
return jump_; return jump_;
} }

View file

@ -93,7 +93,7 @@ public:
return New(mesh, mesh); return New(mesh, mesh);
} }
//- Destructor //- Destructor
virtual ~basicPsiThermo(); virtual ~basicPsiThermo();

View file

@ -30,12 +30,12 @@
# #
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
# Radiation constants # Radiation constants
list(APPEND SOURCES list(APPEND SOURCES
radiationConstants/radiationConstants.C radiationConstants/radiationConstants.C
) )
# Radiation model # Radiation model
list(APPEND SOURCES list(APPEND SOURCES
radiationModel/radiationModel/radiationModel.C radiationModel/radiationModel/radiationModel.C
radiationModel/radiationModel/newRadiationModel.C radiationModel/radiationModel/newRadiationModel.C
@ -48,7 +48,7 @@ list(APPEND SOURCES
radiationModel/viewFactor/viewFactor.C radiationModel/viewFactor/viewFactor.C
) )
# Scatter model # Scatter model
list(APPEND SOURCES list(APPEND SOURCES
submodels/scatterModel/scatterModel/scatterModel.C submodels/scatterModel/scatterModel/scatterModel.C
submodels/scatterModel/scatterModel/newScatterModel.C submodels/scatterModel/scatterModel/newScatterModel.C
@ -56,7 +56,7 @@ list(APPEND SOURCES
) )
# Absorption/Emission model # Absorption/Emission model
list(APPEND SOURCES list(APPEND SOURCES
submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.C submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.C
submodels/absorptionEmissionModel/absorptionEmissionModel/newAbsorptionEmissionModel.C submodels/absorptionEmissionModel/absorptionEmissionModel/newAbsorptionEmissionModel.C
@ -68,7 +68,7 @@ list(APPEND SOURCES
) )
# Boundary conditions # Boundary conditions
list(APPEND SOURCES list(APPEND SOURCES
derivedFvPatchFields/MarshakRadiation/MarshakRadiationMixedFvPatchScalarField.C derivedFvPatchFields/MarshakRadiation/MarshakRadiationMixedFvPatchScalarField.C
derivedFvPatchFields/MarshakRadiationFixedT/MarshakRadiationFixedTMixedFvPatchScalarField.C derivedFvPatchFields/MarshakRadiationFixedT/MarshakRadiationFixedTMixedFvPatchScalarField.C

View file

@ -73,21 +73,21 @@ Foam::tmp<Foam::fvVectorMatrix> Foam::UCM::divTau(volVectorField& U) const
{ {
dimensionedScalar etaPEff = etaP_; dimensionedScalar etaPEff = etaP_;
return return
( (
fvc::div(tau_/rho_, "div(tau)") fvc::div(tau_/rho_, "div(tau)")
- fvc::laplacian(etaPEff/rho_, U, "laplacian(etaPEff,U)") - fvc::laplacian(etaPEff/rho_, U, "laplacian(etaPEff,U)")
+ fvm::laplacian( (etaPEff)/rho_, U, "laplacian(etaPEff+etaS,U)") + fvm::laplacian( (etaPEff)/rho_, U, "laplacian(etaPEff+etaS,U)")
); );
} }
else else
{ {
return return
( (
fvc::div(tau_/rho_, "div(tau)") fvc::div(tau_/rho_, "div(tau)")
- fvc::div((etaStab_/rho_)*fvc::grad(U), "div(tau)") - fvc::div((etaStab_/rho_)*fvc::grad(U), "div(tau)")
+ fvm::laplacian( (etaStab_)/rho_, U, "laplacian(etaPEff+etaS,U)") + fvm::laplacian( (etaStab_)/rho_, U, "laplacian(etaPEff+etaS,U)")
); );
} }
} }

View file

@ -28,7 +28,7 @@ Description
UCM non linear viscoelastic fluid model (BIRD et al., 1987). UCM non linear viscoelastic fluid model (BIRD et al., 1987).
Author Author
Miguel Nóbrega, Silvino Araújo, Célio Fernandes, Luís Ferrás. Miguel Nóbrega, Silvino Araújo, Célio Fernandes, Luís Ferrás.
All rights reserved All rights reserved
SourceFiles SourceFiles

View file

@ -43,7 +43,7 @@ list(APPEND SOURCES
vanDriestDelta/vanDriestDelta.C vanDriestDelta/vanDriestDelta.C
) )
# Wall functions # Wall functions
set(wallFunctions derivedFvPatchFields/wallFunctions) set(wallFunctions derivedFvPatchFields/wallFunctions)
set(muSgsWallFunctions ${wallFunctions}/muSgsWallFunctions) set(muSgsWallFunctions ${wallFunctions}/muSgsWallFunctions)

View file

@ -30,7 +30,7 @@
# #
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
# RAS turbulence models # RAS turbulence models
list(APPEND SOURCES list(APPEND SOURCES
RASModel/RASModel.C RASModel/RASModel.C
laminar/laminar.C laminar/laminar.C
@ -44,7 +44,7 @@ list(APPEND SOURCES
kOmegaSST/kOmegaSST.C kOmegaSST/kOmegaSST.C
) )
# Wall functions # Wall functions
set(wallFunctions derivedFvPatchFields/wallFunctions) set(wallFunctions derivedFvPatchFields/wallFunctions)
set(alphatWallFunctions ${wallFunctions}/alphatWallFunctions) set(alphatWallFunctions ${wallFunctions}/alphatWallFunctions)
@ -78,7 +78,7 @@ list(APPEND SOURCES
${kqRWallFunctions}/kqRWallFunction/kqRWallFunctionFvPatchFields.C ${kqRWallFunctions}/kqRWallFunction/kqRWallFunctionFvPatchFields.C
) )
# Patch fields # Patch fields
list(APPEND SOURCES list(APPEND SOURCES
derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C
derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C

View file

@ -59,7 +59,7 @@ list(APPEND SOURCES
kOmegaSSTSAS/kOmegaSSTSAS.C kOmegaSSTSAS/kOmegaSSTSAS.C
) )
# Wall functions # Wall functions
set(wallFunctions derivedFvPatchFields/wallFunctions) set(wallFunctions derivedFvPatchFields/wallFunctions)
list(APPEND SOURCES list(APPEND SOURCES

View file

@ -30,7 +30,7 @@
# #
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
# RAS turbulence models # RAS turbulence models
list(APPEND SOURCES list(APPEND SOURCES
RASModel/RASModel.C RASModel/RASModel.C
laminar/laminar.C laminar/laminar.C
@ -53,7 +53,7 @@ list(APPEND SOURCES
coupledKOmegaSST/coupledKOmegaSST.C coupledKOmegaSST/coupledKOmegaSST.C
) )
# Wall functions # Wall functions
set(wallFunctions derivedFvPatchFields/wallFunctions) set(wallFunctions derivedFvPatchFields/wallFunctions)
set(nutWallFunctions ${wallFunctions}/nutWallFunctions) set(nutWallFunctions ${wallFunctions}/nutWallFunctions)
@ -99,7 +99,7 @@ list(APPEND SOURCES
${wallFunctionFunctionObjects}/velocityConvection/velocityConvectionFunctionObject.C ${wallFunctionFunctionObjects}/velocityConvection/velocityConvectionFunctionObject.C
) )
# Patch fields # Patch fields
list(APPEND SOURCES list(APPEND SOURCES
derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C
derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C

View file

@ -181,7 +181,7 @@ tmp<scalarField> nutCWTWallFunctionFvPatchScalarField::calcNut() const
const label faceCellI = fc[faceI]; const label faceCellI = fc[faceI];
const scalar uStar = Cmu25*sqrt(k[faceCellI]); const scalar uStar = Cmu25*sqrt(k[faceCellI]);
// Note: here yPlus is actually yStar // Note: here yPlus is actually yStar
const scalar yPlus = uStar*y[faceI]/nuw[faceI]; const scalar yPlus = uStar*y[faceI]/nuw[faceI];
// Relative tangential velocity // Relative tangential velocity

View file

@ -308,7 +308,7 @@ void omegaMEWTWallFunctionFvPatchScalarField::updateCoeffs()
const scalar yPlus = sqrt(tauw)*y[faceI]/nuw[faceI]; const scalar yPlus = sqrt(tauw)*y[faceI]/nuw[faceI];
// Velocity gradient for viscous sublayer // Velocity gradient for viscous sublayer
const scalar dudyVis= magGradUw[faceI]; const scalar dudyVis= magGradUw[faceI];
// Velocity gradient for log layer // Velocity gradient for log layer
const scalar dudyLog = const scalar dudyLog =

View file

@ -139,56 +139,56 @@ convertToMeters 1;
vertices //(radial [m], tangential [radians], axial [m]) vertices //(radial [m], tangential [radians], axial [m])
( (
//Guide vane hub: //Guide vane hub:
(0.05 -0.0691150383 0.07) // Vertex GV0lb = 0 (0.05 -0.0691150383 0.07) // Vertex GV0lb = 0
(0.05 -0.00628318530000001 0.07) // Vertex GV0rb = 1 (0.05 -0.00628318530000001 0.07) // Vertex GV0rb = 1
(0.05 -0.062831853 0.09) // Vertex GV1lb = 2 (0.05 -0.062831853 0.09) // Vertex GV1lb = 2
(0.05 0 0.09) // Vertex GV1rb = 3 (0.05 0 0.09) // Vertex GV1rb = 3
(0.05 -0.0314159265 0.19) // Vertex GV2lb = 4 (0.05 -0.0314159265 0.19) // Vertex GV2lb = 4
(0.05 0.0314159265 0.19) // Vertex GV2rb = 5 (0.05 0.0314159265 0.19) // Vertex GV2rb = 5
(0.05 -0.0314159265 0.29) // Vertex GV3lb = 6 (0.05 -0.0314159265 0.29) // Vertex GV3lb = 6
(0.05 0.0314159265 0.29) // Vertex GV3rb = 7 (0.05 0.0314159265 0.29) // Vertex GV3rb = 7
//Guide vane shroud: //Guide vane shroud:
(0.1 -0.0691150383 0.07) // Vertex GV0lt = 8 (0.1 -0.0691150383 0.07) // Vertex GV0lt = 8
(0.1 -0.00628318530000001 0.07) // Vertex GV0rt = 9 (0.1 -0.00628318530000001 0.07) // Vertex GV0rt = 9
(0.1 -0.062831853 0.09) // Vertex GV1lt = 10 (0.1 -0.062831853 0.09) // Vertex GV1lt = 10
(0.1 0 0.09) // Vertex GV1rt = 11 (0.1 0 0.09) // Vertex GV1rt = 11
(0.1 -0.0314159265 0.19) // Vertex GV2lt = 12 (0.1 -0.0314159265 0.19) // Vertex GV2lt = 12
(0.1 0.0314159265 0.19) // Vertex GV2rt = 13 (0.1 0.0314159265 0.19) // Vertex GV2rt = 13
(0.1 -0.0314159265 0.29) // Vertex GV3lt = 14 (0.1 -0.0314159265 0.29) // Vertex GV3lt = 14
(0.1 0.0314159265 0.29) // Vertex GV3rt = 15 (0.1 0.0314159265 0.29) // Vertex GV3rt = 15
//Runner hub: //Runner hub:
(0.05 -0.0062831853 -0.07) // Vertex RU0lb = 16 (0.05 -0.0062831853 -0.07) // Vertex RU0lb = 16
(0.05 0.0565486677 -0.07) // Vertex RU0rb = 17 (0.05 0.0565486677 -0.07) // Vertex RU0rb = 17
(0.05 -0.0125663706 -0.05) // Vertex RU1lb = 18 (0.05 -0.0125663706 -0.05) // Vertex RU1lb = 18
(0.05 0.0502654824 -0.05) // Vertex RU1rb = 19 (0.05 0.0502654824 -0.05) // Vertex RU1rb = 19
(0.05 -0.062831853 0.05) // Vertex RU2lb = 20 (0.05 -0.062831853 0.05) // Vertex RU2lb = 20
(0.05 0 0.05) // Vertex RU2rb = 21 (0.05 0 0.05) // Vertex RU2rb = 21
(0.05 -0.0691150383 0.07) // Vertex RU3lb = 22 (0.05 -0.0691150383 0.07) // Vertex RU3lb = 22
(0.05 -0.00628318530000001 0.07) // Vertex RU3rb = 23 (0.05 -0.00628318530000001 0.07) // Vertex RU3rb = 23
//Runner shroud: //Runner shroud:
(0.1 -0.0062831853 -0.07) // Vertex RU0lt = 24 (0.1 -0.0062831853 -0.07) // Vertex RU0lt = 24
(0.1 0.0565486677 -0.07) // Vertex RU0rt = 25 (0.1 0.0565486677 -0.07) // Vertex RU0rt = 25
(0.1 -0.0125663706 -0.05) // Vertex RU1lt = 26 (0.1 -0.0125663706 -0.05) // Vertex RU1lt = 26
(0.1 0.0502654824 -0.05) // Vertex RU1rt = 27 (0.1 0.0502654824 -0.05) // Vertex RU1rt = 27
(0.1 -0.062831853 0.05) // Vertex RU2lt = 28 (0.1 -0.062831853 0.05) // Vertex RU2lt = 28
(0.1 0 0.05) // Vertex RU2rt = 29 (0.1 0 0.05) // Vertex RU2rt = 29
(0.1 -0.0691150383 0.07) // Vertex RU3lt = 30 (0.1 -0.0691150383 0.07) // Vertex RU3lt = 30
(0.1 -0.00628318530000001 0.07) // Vertex RU3rt = 31 (0.1 -0.00628318530000001 0.07) // Vertex RU3rt = 31
//Draft tube hub: //Draft tube hub:
(0.05 -0.0062831853 -0.14) // Vertex DT0lb = 32 (0.05 -0.0062831853 -0.14) // Vertex DT0lb = 32
(0.05 0.0565486677 -0.14) // Vertex DT0rb = 33 (0.05 0.0565486677 -0.14) // Vertex DT0rb = 33
(0.05 -0.0062831853 -0.07) // Vertex DT1lb = 34 (0.05 -0.0062831853 -0.07) // Vertex DT1lb = 34
(0.05 0.0565486677 -0.07) // Vertex DT1rb = 35 (0.05 0.0565486677 -0.07) // Vertex DT1rb = 35
//Draft tube shroud: //Draft tube shroud:
(0.1 -0.0062831853 -0.14) // Vertex DT0lt = 36 (0.1 -0.0062831853 -0.14) // Vertex DT0lt = 36
(0.1 0.0565486677 -0.14) // Vertex DT0rt = 37 (0.1 0.0565486677 -0.14) // Vertex DT0rt = 37
(0.1 -0.0062831853 -0.07) // Vertex DT1lt = 38 (0.1 -0.0062831853 -0.07) // Vertex DT1lt = 38
(0.1 0.0565486677 -0.07) // Vertex DT1rt = 39 (0.1 0.0565486677 -0.07) // Vertex DT1rt = 39
); );
blocks blocks

View file

@ -30,7 +30,7 @@ FoamFile
startFace 11840; startFace 11840;
shadowPatch RUINLET; shadowPatch RUINLET;
zone GVOUTLETZone; zone GVOUTLETZone;
coordinateSystem coordinateSystem
{ {
type cylindrical; type cylindrical;
name mixingCS; name mixingCS;
@ -39,7 +39,7 @@ FoamFile
e3 (0 0 1); e3 (0 0 1);
inDegrees true; inDegrees true;
} }
ribbonPatch ribbonPatch
{ {
sweepAxis Theta; sweepAxis Theta;
stackAxis R; stackAxis R;
@ -91,7 +91,7 @@ FoamFile
startFace 12920; startFace 12920;
shadowPatch DTINLET; shadowPatch DTINLET;
zone RUOUTLETZone; zone RUOUTLETZone;
coordinateSystem coordinateSystem
{ {
type cylindrical; type cylindrical;
name mixingCS; name mixingCS;
@ -100,7 +100,7 @@ FoamFile
e3 (0 0 1); e3 (0 0 1);
inDegrees true; inDegrees true;
} }
ribbonPatch ribbonPatch
{ {
sweepAxis Theta; sweepAxis Theta;
stackAxis R; stackAxis R;

View file

@ -20,7 +20,7 @@ thermal
rho rho [1 -3 0 0 0] 10; rho rho [1 -3 0 0 0] 10;
C C [0 2 -2 -1 0] 100; C C [0 2 -2 -1 0] 100;
k k [1 1 -3 -1 0] 10; k k [1 1 -3 -1 0] 10;
// Values not used // Values not used
alpha alpha [0 0 0 -1 0 0 0] 0.0; alpha alpha [0 0 0 -1 0 0 0] 0.0;
T0 T0 [0 0 0 1 0 0 0] 0.0; T0 T0 [0 0 0 1 0 0 0] 0.0;

View file

@ -20,7 +20,7 @@ FoamFile
inlet inlet
{ {
type patch; type patch;
edgeLabels List<label> edgeLabels List<label>
30 30
( (
4020 4020
@ -60,7 +60,7 @@ FoamFile
outlet outlet
{ {
type patch; type patch;
edgeLabels List<label> edgeLabels List<label>
30 30
( (
3929 3929
@ -100,7 +100,7 @@ FoamFile
side side
{ {
type patch; type patch;
edgeLabels List<label> edgeLabels List<label>
60 60
( (
3940 3940
@ -170,7 +170,7 @@ FoamFile
symmetry symmetry
{ {
type symmetryPlane; type symmetryPlane;
edgeLabels List<label> edgeLabels List<label>
60 60
( (
3891 3891
@ -240,7 +240,7 @@ FoamFile
cylinder cylinder
{ {
type patch; type patch;
edgeLabels List<label> edgeLabels List<label>
40 40
( (
3890 3890

View file

@ -20,7 +20,7 @@ FoamFile
inlet inlet
{ {
type patch; type patch;
edgeLabels List<label> edgeLabels List<label>
20 20
( (
2321 2321
@ -50,7 +50,7 @@ FoamFile
outlet outlet
{ {
type patch; type patch;
edgeLabels List<label> edgeLabels List<label>
20 20
( (
2459 2459
@ -80,7 +80,7 @@ FoamFile
bound bound
{ {
type symmetryPlane; type symmetryPlane;
edgeLabels List<label> edgeLabels List<label>
120 120
( (
2320 2320

Some files were not shown because too many files have changed in this diff Show more