Commit ad1e7982 authored by Andrew Heather's avatar Andrew Heather
Browse files

ENH: Initial testing updates

parent 1fbcb686
......@@ -96,10 +96,8 @@ timeVaryingMappedFixedValueFvPatchField
&& mapMethod_ != "nearest"
)
{
FatalIOErrorInFunction
(
dict
) << "mapMethod should be one of 'planarInterpolation'"
FatalIOErrorInFunction(dict)
<< "mapMethod should be one of 'planarInterpolation'"
<< ", 'nearest'" << exit(FatalIOError);
}
......@@ -248,7 +246,8 @@ void Foam::timeVaryingMappedFixedValueFvPatchField<Type>::checkTable()
// Reread values and interpolate
fileName samplePointsFile
(
this->db().time().caseConstant()
this->db().time().path()
/this->db().time().caseConstant()
/"boundaryData"
/this->patch().name()
/"points"
......@@ -356,7 +355,8 @@ void Foam::timeVaryingMappedFixedValueFvPatchField<Type>::checkTable()
// Reread values and interpolate
fileName valsFile
(
this->db().time().caseConstant()
this->db().time().path()
/this->db().time().caseConstant()
/"boundaryData"
/this->patch().name()
/sampleTimes_[startSampleTime_].name()
......
......@@ -72,7 +72,8 @@ Foam::turbulentDFSEMInletFvPatchVectorField::interpolateBoundaryData
fileName valsFile
(
this->db().time().caseConstant()
this->db().time().path()
/this->db().time().caseConstant()
/"boundaryData"
/patchName
/"0"
......
......@@ -137,12 +137,10 @@ bool Foam::functionObjects::yPlus::execute()
const volScalarField::Boundary& d = nwd.y();
// nut needed for wall function patches
const volScalarField::Boundary& nutBf = model.nut()().boundaryField();
tmp<volScalarField> tnut = model.nut();
const volScalarField::Boundary& nutBf = tnut().boundaryField();
// nuEff nu and U needed for plain wall patches
const volScalarField::Boundary& nuEffBf =
model.nuEff()().boundaryField();
const volScalarField::Boundary& nuBf = model.nu()().boundaryField();
// U needed for plain wall patches
const volVectorField::Boundary& UBf = model.U().boundaryField();
const fvPatchList& patches = mesh_.boundary();
......@@ -167,9 +165,9 @@ bool Foam::functionObjects::yPlus::execute()
d[patchi]
*sqrt
(
nuEffBf[patchi]
model.nuEff(patchi)
*mag(UBf[patchi].snGrad())
)/nuBf[patchi];
)/model.nu(patchi);
}
}
}
......
......@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2015-2016 OpenFOAM Foundation
\\/ M anipulation |
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
......@@ -25,7 +25,7 @@ Class
Foam::functionObjects::runTimeControl
Group
grpJobControlFunctionObjects
grpUtilitiesFunctionObjects
Description
Controls when the calculation is terminated based on satisfying
......@@ -120,9 +120,6 @@ public:
//- Execute, currently does nothing
virtual bool execute();
//- Called when time was set at the end of the Time::operator++
virtual void timeSet();
//- Calculate the runTimeControl and write
virtual bool write();
};
......
......@@ -56,10 +56,11 @@ functions
{
sensitivityAnalysis
{
functionObjectLibs ( "libutilityFunctionObjects.so" );
functionObjectLibs ("libfieldFunctionObjects.so");
type psiReactionsSensitivityAnalysis;
outputControl outputTime;
enabled true;
writeControl writeTime;
}
}
// ************************************************************************* //
......@@ -55,9 +55,9 @@ functions
{
timeStep
{
type coded;
type coded;
libs ("libutilityFunctionObjects.so");
name setDeltaT;
name setDeltaT;
code
#{
......
......@@ -57,8 +57,8 @@ functions
fieldAverage
{
type fieldAverage;
functionObjectLibs ("libfieldFunctionObjects.so");
outputControl outputTime;
libs ("libfieldFunctionObjects.so");
writeControl writeTime;
fields
(
U
......
......@@ -59,7 +59,7 @@ functions
externalCoupled
{
// Where to load it from (if not already in solver)
functionObjectLibs ("libjobControl.so");
libs ("libfieldControl.so");
type externalCoupled;
......
......@@ -56,19 +56,10 @@ functions
H2O
{
type scalarTransport;
functionObjectLibs ("libutilityFunctionObjects.so");
libs ("libsolverFunctionObjects.so");
resetOnStartUp no;
region cabin;
// employ schemes used by U to the scalar transport equation
// note: field name is given by the name of the function, in this case
// 'scalar1'
autoSchemes no;
fvOptions
{
}
......@@ -77,9 +68,9 @@ functions
fileUpdate
{
type timeActivatedFileUpdate;
functionObjectLibs ("libutilityFunctionObjects.so");
outputControl timeStep;
outputInterval 1;
libs ("libutilityFunctionObjects.so");
writeControl timeStep;
writeInterval 1;
region cabin;
fileToUpdate "$FOAM_CASE/system/solverControls";
......
......@@ -56,10 +56,10 @@ functions
massFlux
{
type faceSource;
functionObjectLibs ("libfieldFunctionObjects.so");
libs ("libfieldFunctionObjects.so");
enabled yes;
outputControl timeStep; //outputTime;
outputInterval 1;
writeControl timeStep; //writeTime;
writeInterval 1;
log yes;
valueOutput no;
source patch;
......
......@@ -50,26 +50,26 @@ functions
Q1
{
type Q;
functionObjectLibs ("libutilityFunctionObjects.so");
outputControl outputTime;
functionObjectLibs ("libfieldFunctionObjects.so");
writeControl writeTime;
}
vorticity1
{
type vorticity;
functionObjectLibs ("libutilityFunctionObjects.so");
outputControl outputTime;
functionObjectLibs ("libfieldFunctionObjects.so");
writeControl writeTime;
}
yPlus
{
type yPlus;
functionObjectLibs ("libutilityFunctionObjects.so");
outputControl outputTime;
functionObjectLibs ("libfieldFunctionObjects.so");
writeControl writeTime;
}
fieldAverage1
{
type fieldAverage;
functionObjectLibs ( "libfieldFunctionObjects.so" );
outputControl outputTime;
writeControl writeTime;
timeStart 8.5;
fields
......
postPro1
{
type runTimePostProcessing;
functionObjectLibs ("librunTimePostProcessing.so");
outputControl outputTime;
libs ("librunTimePostProcessing.so");
writeControl writeTime;
output
{
name image;
......
......@@ -14,6 +14,7 @@ nLines 10;
start (-0.0205 0.001 0.00001);
end (-0.0205 0.0251 0.00001);
fields (p k U);
U U;
// Must be last entry
#includeEtc "caseDicts/postProcessing/visualization/streamlines.cfg"
......
......@@ -49,32 +49,31 @@ functions
{
forceCoeffs1
{
type forceCoeffs;
functionObjectLibs ( "libforces.so" );
outputControl outputTime;
writeFields true;
patches (body);
pName p;
UName U;
rhoName rhoInf; // Indicates incompressible
log true;
rhoInf 1; // Redundant for incompressible
liftDir (0 1 0);
dragDir (1 0 0);
CofR (3.5 0 0); // Axle midpoint on ground
pitchAxis (0 0 1);
magUInf 10;
lRef 4; // Wheelbase length
Aref 1; // Estimated
porosity on;
type forceCoeffs;
libs ("libforces.so" );
writeControl writeTime;
writeFields true;
patches (body);
p p;
U U;
rho rhoInf; // Indicates incompressible
log true;
rhoInf 1; // Redundant for incompressible
liftDir (0 1 0);
dragDir (1 0 0);
CofR (3.5 0 0); // Axle midpoint on ground
pitchAxis (0 0 1);
magUInf 10;
lRef 4; // Wheelbase length
Aref 1; // Estimated
porosity on;
binData
{
nBin 20; // output data into 20 bins
direction (1 0 0); // bin direction
cumulative yes;
nBin 20; // output data into 20 bins
direction (1 0 0); // bin direction
cumulative yes;
}
}
}
......
......@@ -8,34 +8,31 @@
forceCoeffs1
{
type forceCoeffs;
functionObjectLibs ( "libforces.so" );
outputControl outputTime;
writeFields true;
patches (body);
pName p;
UName U;
rhoName rhoInf; // Indicates incompressible
log true;
rhoInf 1; // Redundant for incompressible
liftDir (0 1 0);
dragDir (1 0 0);
CofR (3.5 0 0); // Axle midpoint on ground
pitchAxis (0 0 1);
magUInf 10;
lRef 4; // Wheelbase length
Aref 1; // Estimated
porosity on;
type forceCoeffs;
libs ("libforces.so");
writeControl writeTime;
writeFields true;
patches (body);
p p;
U U;
rho rhoInf; // Indicates incompressible
log true;
rhoInf 1; // Redundant for incompressible
liftDir (0 1 0);
dragDir (1 0 0);
CofR (3.5 0 0); // Axle midpoint on ground
pitchAxis (0 0 1);
magUInf 10;
lRef 4; // Wheelbase length
Aref 1; // Estimated
porosity on;
binData
{
nBin 20; // output data into 20 bins
direction (1 0 0); // bin direction
cumulative yes;
nBin 20; // output data into 20 bins
direction (1 0 0); // bin direction
cumulative yes;
}
}
......
......@@ -57,11 +57,12 @@ functions
minMax
{
type fieldMinMax;
functionObjectLibs ("libfieldFunctionObjects.so");
outputControl timeStep; //outputTime;
fields (U);
type fieldMinMax;
libs ("libfieldFunctionObjects.so");
writeControl timeStep; //writeTime;
fields (U);
}
}
// ************************************************************************* //
......@@ -21,7 +21,7 @@ minMax
type fieldMinMax;
// Where to load it from (if not already in solver)
functionObjectLibs ("libfieldFunctionObjects.so");
libs ("libfieldFunctionObjects.so");
// Log to output (default: false)
log true;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment