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

Merge branch 'merge-foundation' of...

Merge branch 'merge-foundation' of develop.openfoam.com:Development/OpenFOAM-plus into merge-foundation
parents 60d7a71e 3c790e23
......@@ -65,7 +65,7 @@ bool Foam::radiation::solarLoad::updateHitFaces()
return false;
break;
}
case solarCalculator::mSunDirTraking:
case solarCalculator::mSunDirTracking:
{
label updateIndex = label
(
......
......@@ -41,7 +41,7 @@ namespace Foam
>::names[] =
{
"sunDirConstant",
"sunDirTraking"
"sunDirTracking"
};
template<>
......@@ -70,7 +70,7 @@ void Foam::solarCalculator::calculateBetaTetha()
scalar runTime = 0.0;
switch (sunDirectionModel_)
{
case mSunDirTraking:
case mSunDirTracking:
{
runTime = mesh_.time().value();
break;
......@@ -165,7 +165,7 @@ void Foam::solarCalculator::init()
break;
}
case mSunDirTraking:
case mSunDirTracking:
{
if (word(mesh_.ddtScheme("default")) == "steadyState")
{
......@@ -278,7 +278,7 @@ void Foam::solarCalculator::correctSunDirection()
{
break;
}
case mSunDirTraking:
case mSunDirTracking:
{
calculateBetaTetha();
calculateSunDirection();
......
......@@ -30,7 +30,7 @@ Description
For the Sun direction:
1) SunDirConstant : the direction is given in 'sunDirection'
2) SunDirTraking : the direction is calculated from the following
2) SunDirTracking : the direction is calculated from the following
parameters:
localStandardMeridian : GMT (Local Zone Meridian) in hours
startDay : day from 1 to 365)
......@@ -109,7 +109,7 @@ public:
enum sunDirModel
{
mSunDirConstant,
mSunDirTraking
mSunDirTracking
};
//- Direct sun load models
......@@ -182,7 +182,7 @@ private:
//- Up grid orientation
vector gridUp_;
//- Interval in decimal hours to update Sun direction for SunDirTraking
//- Interval in decimal hours to update Sun direction for SunDirTracking
scalar sunTrackingUpdateInterval_;
//- Start time for the Sun position (decimal hours)
......
......@@ -26,7 +26,7 @@ solarLoadCoeffs
// Sun direction ray model. Give the sunDirection or calculated using the
// (solar calculator)
sunDirectionModel sunDirTraking;//sunDirConstant;
sunDirectionModel sunDirTracking;//sunDirConstant;
// Time interval to update Sun position (sec)
sunTrackingUpdateInterval 800;
......
Supports Markdown
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