change of namespace from pFlow to pFlow::postprocessData

This commit is contained in:
Hamidreza
2025-04-24 23:31:43 +03:30
parent d5ea338ab3
commit be807e4a71
49 changed files with 317 additions and 177 deletions

View File

@ -1,6 +1,9 @@
#include "PostprocessOperationAvMassVelocity.hpp"
pFlow::PostprocessOperationAvMassVelocity::PostprocessOperationAvMassVelocity
namespace pFlow::postprocessData
{
PostprocessOperationAvMassVelocity::PostprocessOperationAvMassVelocity
(
const dictionary &opDict,
const regionPoints &regPoints,
@ -17,4 +20,6 @@ pFlow::PostprocessOperationAvMassVelocity::PostprocessOperationAvMassVelocity
fieldsDB
)
{
}
}

View File

@ -132,7 +132,7 @@ Licence:
#include "regionField.hpp"
#include "includeMask.hpp"
namespace pFlow
namespace pFlow::postprocessData
{

View File

@ -3,8 +3,11 @@
#include "fieldsDataBase.hpp"
#include "operationFunctions.hpp"
namespace pFlow::postprocessData
{
/// Constructs average processor and initializes result field based on input field type
pFlow::PostprocessOperationAverage::PostprocessOperationAverage
PostprocessOperationAverage::PostprocessOperationAverage
(
const dictionary &opDict,
const regionPoints &regPoints,
@ -39,7 +42,7 @@ pFlow::PostprocessOperationAverage::PostprocessOperationAverage
}
}
pFlow::PostprocessOperationAverage::PostprocessOperationAverage
PostprocessOperationAverage::PostprocessOperationAverage
(
const dictionary &opDict,
const word &fieldName,
@ -79,7 +82,7 @@ pFlow::PostprocessOperationAverage::PostprocessOperationAverage
/// Performs weighted average of field values within each region
bool pFlow::PostprocessOperationAverage::execute
bool PostprocessOperationAverage::execute
(
const std::vector<span<real>>& weights,
const regionField<real>& volFactor
@ -140,7 +143,7 @@ bool pFlow::PostprocessOperationAverage::execute
return true;
}
bool pFlow::PostprocessOperationAverage::write(const fileSystem &parDir) const
bool PostprocessOperationAverage::write(const fileSystem &parDir) const
{
if(! postprocessOperation::write(parDir))
{
@ -173,4 +176,6 @@ bool pFlow::PostprocessOperationAverage::write(const fileSystem &parDir) const
);
return true;
}
}
} // namespace pFlow::postprocessData

View File

@ -132,10 +132,9 @@ Licence:
#include "regionField.hpp"
#include "includeMask.hpp"
namespace pFlow
namespace pFlow::postprocessData
{
class PostprocessOperationAverage
:
public postprocessOperation
@ -207,6 +206,6 @@ public:
};
}
} // namespace pFlow::postprocessData
#endif //__PostprocessOperationAverage_hpp__

View File

@ -3,8 +3,11 @@
#include "fieldsDataBase.hpp"
#include "operationFunctions.hpp"
namespace pFlow::postprocessData
{
/// Constructs sum processor and initializes result field based on input field type
pFlow::PostprocessOperationSum::PostprocessOperationSum
PostprocessOperationSum::PostprocessOperationSum
(
const dictionary &opDict,
const regionPoints &regPoints,
@ -39,7 +42,7 @@ pFlow::PostprocessOperationSum::PostprocessOperationSum
}
/// Performs weighted sum of field values within each region
bool pFlow::PostprocessOperationSum::execute
bool PostprocessOperationSum::execute
(
const std::vector<span<real>>& weights,
const regionField<real>& volFactor
@ -72,3 +75,6 @@ bool pFlow::PostprocessOperationSum::execute
return true;
}
}

View File

@ -129,7 +129,7 @@ Licence:
#include "regionField.hpp"
#include "includeMask.hpp"
namespace pFlow
namespace pFlow::postprocessData
{
@ -182,6 +182,6 @@ public:
};
}
} // namespace pFlow::postprocessData
#endif //__PostprocessOperationSum_hpp__

View File

@ -28,7 +28,7 @@ Licence:
#include "regionField.hpp"
#include "includeMask.hpp"
namespace pFlow
namespace pFlow::postprocessData
{
template<typename T>
@ -190,6 +190,6 @@ regionField<T> executeFluctuation2Operation
return processedField;
}
} // namespace pFlow
} // namespace pFlow::postprocessData
#endif //__operationFunctions_hpp__

View File

@ -61,7 +61,7 @@ Licence:
#include "Time.hpp"
namespace pFlow
namespace pFlow::postprocessData
{
template<typename T, typename Operator>
@ -270,7 +270,7 @@ public:
};
} // pFlow
} // pFlow::postprocessData
#endif //__IncludeMask_hpp__

View File

@ -20,31 +20,34 @@ Licence:
#include "IncludeMask.hpp"
namespace pFlow::postprocessData
{
// real
template class pFlow::IncludeMask<pFlow::real, pFlow::compareOne<pFlow::real, pFlow::lessThanOp> >;
template class pFlow::IncludeMask<pFlow::real, pFlow::compareOne<pFlow::real, pFlow::lessThanEqOp> >;
template class IncludeMask<real, compareOne<real, lessThanOp> >;
template class IncludeMask<real, compareOne<real, lessThanEqOp> >;
template class pFlow::IncludeMask<pFlow::real, pFlow::compareOne<pFlow::real, pFlow::greaterThanOp> >;
template class pFlow::IncludeMask<pFlow::real, pFlow::compareOne<pFlow::real, pFlow::greaterThanEqOp> >;
template class IncludeMask<real, compareOne<real, greaterThanOp> >;
template class IncludeMask<real, compareOne<real, greaterThanEqOp> >;
template class pFlow::IncludeMask<pFlow::real, pFlow::compareOne<pFlow::real, pFlow::equalOp> >;
template class IncludeMask<real, compareOne<real, equalOp> >;
template class pFlow::IncludeMask<pFlow::real, pFlow::compareTwo<pFlow::real, pFlow::betweenOp> >;
template class pFlow::IncludeMask<pFlow::real, pFlow::compareTwo<pFlow::real, pFlow::betweenEqOp> >;
template class IncludeMask<real, compareTwo<real, betweenOp> >;
template class IncludeMask<real, compareTwo<real, betweenEqOp> >;
template class pFlow::IncludeMask<pFlow::real, pFlow::allOp<pFlow::real>>;
template class IncludeMask<real, allOp<real>>;
// realx3
template class pFlow::IncludeMask<pFlow::realx3, pFlow::compareOne<pFlow::realx3, pFlow::lessThanOp> >;
template class pFlow::IncludeMask<pFlow::realx3, pFlow::compareOne<pFlow::realx3, pFlow::lessThanEqOp> >;
template class IncludeMask<realx3, compareOne<realx3, lessThanOp> >;
template class IncludeMask<realx3, compareOne<realx3, lessThanEqOp> >;
template class pFlow::IncludeMask<pFlow::realx3, pFlow::compareOne<pFlow::realx3, pFlow::greaterThanOp> >;
template class pFlow::IncludeMask<pFlow::realx3, pFlow::compareOne<pFlow::realx3, pFlow::greaterThanEqOp> >;
template class IncludeMask<realx3, compareOne<realx3, greaterThanOp> >;
template class IncludeMask<realx3, compareOne<realx3, greaterThanEqOp> >;
template class pFlow::IncludeMask<pFlow::realx3, pFlow::compareOne<pFlow::realx3, pFlow::equalOp> >;
template class IncludeMask<realx3, compareOne<realx3, equalOp> >;
template class pFlow::IncludeMask<pFlow::realx3, pFlow::compareTwo<pFlow::realx3, pFlow::betweenOp> >;
template class pFlow::IncludeMask<pFlow::realx3, pFlow::compareTwo<pFlow::realx3, pFlow::betweenEqOp> >;
template class IncludeMask<realx3, compareTwo<realx3, betweenOp> >;
template class IncludeMask<realx3, compareTwo<realx3, betweenEqOp> >;
// realx4
} // postprocessData

View File

@ -24,7 +24,10 @@ Licence:
#include "fieldsDataBase.hpp"
pFlow::includeMask::includeMask
namespace pFlow::postprocessData
{
includeMask::includeMask
(
const dictionary& dict,
fieldsDataBase& fieldDB
@ -33,7 +36,7 @@ pFlow::includeMask::includeMask
database_(fieldDB)
{}
pFlow::includeMask::includeMask
includeMask::includeMask
(
const word &type,
const dictionary &opDict,
@ -44,7 +47,7 @@ pFlow::includeMask::includeMask
{
}
pFlow::uniquePtr<pFlow::includeMask> pFlow::includeMask::create
uniquePtr<includeMask> includeMask::create
(
const dictionary& opDict,
fieldsDataBase& fieldsDB
@ -97,8 +100,7 @@ pFlow::uniquePtr<pFlow::includeMask> pFlow::includeMask::create
return nullptr;
}
pFlow::uniquePtr<pFlow::includeMask>
pFlow::includeMask::create
uniquePtr<includeMask> includeMask::create
(
const word &type,
const dictionary &opDict,
@ -150,3 +152,5 @@ pFlow::uniquePtr<pFlow::includeMask>
}
return nullptr;
}
}

View File

@ -47,11 +47,15 @@ Licence:
#include "virtualConstructor.hpp"
namespace pFlow
{
class dictionary;
}
namespace pFlow::postprocessData
{
// forward declaration
class fieldsDataBase;
class dictionary;
class includeMask
@ -188,7 +192,7 @@ public:
} // pFlow
} // pFlow::postprocessData
#endif //__IncludeMask_hpp__

View File

@ -24,7 +24,7 @@ Licence:
#include "types.hpp"
#include "dictionary.hpp"
namespace pFlow
namespace pFlow::postprocessData
{
template<typename T>
@ -176,6 +176,6 @@ public:
}
};
}
} // namespace pFlow::postprocessData
#endif //__maskOperation_hpp__

View File

@ -24,7 +24,10 @@ Licence:
#include "fieldsDataBase.hpp"
pFlow::postprocessOperation::postprocessOperation
namespace pFlow::postprocessData
{
postprocessOperation::postprocessOperation
(
const dictionary &opDict,
const regionPoints& regPoints,
@ -42,7 +45,7 @@ pFlow::postprocessOperation::postprocessOperation
)
{}
pFlow::postprocessOperation::postprocessOperation
postprocessOperation::postprocessOperation
(
const dictionary &opDict,
const word &fieldName,
@ -89,12 +92,12 @@ pFlow::postprocessOperation::postprocessOperation
fatalExit;
}
}
const pFlow::Time& pFlow::postprocessOperation::time() const
const Time& postprocessOperation::time() const
{
return database_.time();
}
bool pFlow::postprocessOperation::write(const fileSystem &parDir) const
bool postprocessOperation::write(const fileSystem &parDir) const
{
auto ti = time().TimeInfo();
@ -121,11 +124,12 @@ bool pFlow::postprocessOperation::write(const fileSystem &parDir) const
return true;
}
pFlow::uniquePtr<pFlow::postprocessOperation>
pFlow::postprocessOperation::create(
uniquePtr<postprocessOperation> postprocessOperation::create
(
const dictionary &opDict,
const regionPoints &regPoints,
fieldsDataBase &fieldsDB)
fieldsDataBase &fieldsDB
)
{
word func = opDict.getVal<word>("function");
word method = angleBracketsNames("PostprocessOperation", func);
@ -151,3 +155,5 @@ pFlow::postprocessOperation::create(
return nullptr;
}
}
}

View File

@ -80,12 +80,15 @@ Licence:
namespace pFlow
{
class Time;
}
namespace pFlow::postprocessData
{
/// - forward declaration
class fieldsDataBase;
class Time;
class postprocessOperation
{
@ -96,7 +99,7 @@ public:
private:
/// Dictionary containing operation-specific parameters.
dictionary operationDict_;
pFlow::dictionary operationDict_;
/// This Threshold is used to exclude the regions which contain
/// fewer than this value.
@ -266,6 +269,6 @@ public:
};
}
} // namespace pFlow::postprocessData
#endif //__postprocessOperation_hpp__

View File

@ -27,7 +27,7 @@ Licence:
#include "iOstream.hpp"
#include "regionField.hpp"
namespace pFlow
namespace pFlow::postprocessData
{
/// Type alias for processed region field types.
@ -95,6 +95,6 @@ bool writeField
return true;
}
} // namespace pFlow
} // namespace pFlow::postprocessData
#endif //__postprocessOperationFunctions_hpp__