Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • irmb/VirtualFluids
1 result
Show changes
Commits on Source (34)
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 229 additions and 228 deletions
apps/cpu/GyroidsRow/GyroidsRow.cpp
View file @ dd8a8dbf
......@@ -81,7 +81,7 @@ void run(const vf::basics::ConfigurationFile& config)
if (myid == 0) {
stringstream logFilename;
logFilename << pathname + "/logfile" + UbSystem::toString(UbSystem::getTimeStamp()) + ".txt";
logFilename << pathname + "/logfile" + ub_system::toString(ub_system::getTimeStamp()) + ".txt";
UbLog::output_policy::setStream(logFilename.str());
}
}
......@@ -150,14 +150,14 @@ void run(const vf::basics::ConfigurationFile& config)
SPtr<GbObject3D> gridCube(new GbCuboid3D(g_minX1, g_minX2, g_minX3, g_maxX1, g_maxX2, g_maxX3));
if (myid == 0)
GbSystem3D::writeGeoObject(gridCube.get(), pathname + "/geo/gridCube",
gb_system_3d::writeGeoObject(gridCube.get(), pathname + "/geo/gridCube",
WbWriterVtkXmlBinary::getInstance());
SPtr<GbCuboid3D> spongecube(new GbCuboid3D(TPMSOrigin[0] + TPMSL[0], g_minX2 - dx, g_minX3 - dx,
g_maxX1 + dx, g_maxX2 + dx, g_maxX3 + dx));
if (myid == 0)
GbSystem3D::writeGeoObject(spongecube.get(), pathname + "/geo/spongecube",
gb_system_3d::writeGeoObject(spongecube.get(), pathname + "/geo/spongecube",
WbWriterVtkXmlBinary::getInstance());
if (myid == 0) {
// UBLOG(logINFO,"rho = " << rhoLB );
......@@ -189,13 +189,13 @@ void run(const vf::basics::ConfigurationFile& config)
GbCuboid3DPtr zMax(new GbCuboid3D(g_minX1 - dx, g_minX2 - dx, g_maxX3, g_maxX1 + dx, g_maxX2 + dx, g_maxX3 + dx));
if (myid == 0)
GbSystem3D::writeGeoObject(xMin.get(), pathname + "/geo/xMin", WbWriterVtkXmlBinary::getInstance());
gb_system_3d::writeGeoObject(xMin.get(), pathname + "/geo/xMin", WbWriterVtkXmlBinary::getInstance());
if (myid == 0)
GbSystem3D::writeGeoObject(xMax.get(), pathname + "/geo/xMax", WbWriterVtkXmlBinary::getInstance());
gb_system_3d::writeGeoObject(xMax.get(), pathname + "/geo/xMax", WbWriterVtkXmlBinary::getInstance());
if (myid == 0)
GbSystem3D::writeGeoObject(zMin.get(), pathname + "/geo/zMin", WbWriterVtkXmlBinary::getInstance());
gb_system_3d::writeGeoObject(zMin.get(), pathname + "/geo/zMin", WbWriterVtkXmlBinary::getInstance());
if (myid == 0)
GbSystem3D::writeGeoObject(zMax.get(), pathname + "/geo/zMax", WbWriterVtkXmlBinary::getInstance());
gb_system_3d::writeGeoObject(zMax.get(), pathname + "/geo/zMax", WbWriterVtkXmlBinary::getInstance());
SPtr<D3Q27Interactor> tpmsInt = SPtr<D3Q27Interactor>(new D3Q27Interactor(tpms, grid, tpmsNoslipAdapter, Interactor3D::SOLID, Interactor3D::POINTS));
SPtr<D3Q27Interactor> xMinInt = SPtr<D3Q27Interactor>(new D3Q27Interactor(xMin, grid, xMinApr, Interactor3D::SOLID, Interactor3D::POINTS));
......
apps/cpu/LaminarPipeFlow/LaminarPipeFlow.cpp
View file @ dd8a8dbf
......@@ -132,11 +132,11 @@ void run(const vf::basics::ConfigurationFile& config)
real g_maxX3 = length[2] / 2.0;
SPtr<GbObject3D> cylinder(new GbCylinder3D(g_minX1 - 2.0 * dx, 0.0, 0.0, g_maxX1 + 2.0 * dx, 0.0, 0.0, dLB / 2.0));
GbSystem3D::writeGeoObject(cylinder.get(), pathname + "/geo/cylinder", WbWriterVtkXmlBinary::getInstance());
gb_system_3d::writeGeoObject(cylinder.get(), pathname + "/geo/cylinder", WbWriterVtkXmlBinary::getInstance());
SPtr<GbObject3D> gridCube(new GbCuboid3D(g_minX1, g_minX2, g_minX3, g_maxX1, g_maxX2, g_maxX3));
if (myid == 0)
GbSystem3D::writeGeoObject(gridCube.get(), pathname + "/geo/gridCube", WbWriterVtkXmlBinary::getInstance());
gb_system_3d::writeGeoObject(gridCube.get(), pathname + "/geo/gridCube", WbWriterVtkXmlBinary::getInstance());
real blockLength = 3. * dx;
......@@ -147,29 +147,29 @@ void run(const vf::basics::ConfigurationFile& config)
grid->setPeriodicX3(false);
if (myid == 0)
GbSystem3D::writeGeoObject(gridCube.get(), pathname + "/geo/gridCube", WbWriterVtkXmlBinary::getInstance());
gb_system_3d::writeGeoObject(gridCube.get(), pathname + "/geo/gridCube", WbWriterVtkXmlBinary::getInstance());
GenBlocksGridVisitor genBlocks(gridCube);
grid->accept(genBlocks);
SPtr<GbObject3D> refineCube1_1(new GbCuboid3D(g_minX1, g_minX2, g_minX3, g_maxX1, g_minX2 + blockLength, g_maxX3));
if (myid == 0)
GbSystem3D::writeGeoObject(refineCube1_1.get(), pathname + "/geo/refineCube1_1",
gb_system_3d::writeGeoObject(refineCube1_1.get(), pathname + "/geo/refineCube1_1",
WbWriterVtkXmlBinary::getInstance());
SPtr<GbObject3D> refineCube1_2(new GbCuboid3D(g_minX1, g_maxX2 - blockLength, g_minX3, g_maxX1, g_maxX2, g_maxX3));
if (myid == 0)
GbSystem3D::writeGeoObject(refineCube1_2.get(), pathname + "/geo/refineCube1_2",
gb_system_3d::writeGeoObject(refineCube1_2.get(), pathname + "/geo/refineCube1_2",
WbWriterVtkXmlBinary::getInstance());
SPtr<GbObject3D> refineCube1_3(new GbCuboid3D(g_minX1, g_minX2, g_minX3, g_maxX1, g_maxX2, g_minX3 + blockLength));
if (myid == 0)
GbSystem3D::writeGeoObject(refineCube1_3.get(), pathname + "/geo/refineCube1_3",
gb_system_3d::writeGeoObject(refineCube1_3.get(), pathname + "/geo/refineCube1_3",
WbWriterVtkXmlBinary::getInstance());
SPtr<GbObject3D> refineCube1_4(new GbCuboid3D(g_minX1, g_minX2, g_maxX3 - blockLength, g_maxX1, g_maxX2, g_maxX3));
if (myid == 0)
GbSystem3D::writeGeoObject(refineCube1_4.get(), pathname + "/geo/refineCube1_4",
gb_system_3d::writeGeoObject(refineCube1_4.get(), pathname + "/geo/refineCube1_4",
WbWriterVtkXmlBinary::getInstance());
if (refineLevel > 0) {
......@@ -189,13 +189,13 @@ void run(const vf::basics::ConfigurationFile& config)
GbCuboid3DPtr geoInflow(new GbCuboid3D(g_minX1 - blockLength, g_minX2 - blockLength, g_minX3 - blockLength, g_minX1,
g_maxX2 + blockLength, g_maxX3 + blockLength));
if (myid == 0)
GbSystem3D::writeGeoObject(geoInflow.get(), pathname + "/geo/geoInflow", WbWriterVtkXmlASCII::getInstance());
gb_system_3d::writeGeoObject(geoInflow.get(), pathname + "/geo/geoInflow", WbWriterVtkXmlASCII::getInstance());
// outflow
GbCuboid3DPtr geoOutflow(new GbCuboid3D(g_maxX1, g_minX2 - blockLength, g_minX3 - blockLength, g_maxX1 + blockLength,
g_maxX2 + blockLength, g_maxX3 + blockLength));
if (myid == 0)
GbSystem3D::writeGeoObject(geoOutflow.get(), pathname + "/geo/geoOutflow", WbWriterVtkXmlASCII::getInstance());
gb_system_3d::writeGeoObject(geoOutflow.get(), pathname + "/geo/geoOutflow", WbWriterVtkXmlASCII::getInstance());
SPtr<D3Q27Interactor> cylinderInt(new D3Q27Interactor(cylinder, grid, noSlipBC, Interactor3D::INVERSESOLID));
......@@ -221,7 +221,7 @@ void run(const vf::basics::ConfigurationFile& config)
ppblocks.reset();
if (myid == 0)
VF_LOG_INFO("{}", Utilities::toString(grid, comm->getNumberOfProcesses()));
VF_LOG_INFO("{}", utilities::toString(grid, comm->getNumberOfProcesses()));
SetKernelBlockVisitor kernelVisitor(kernel, nuLB, comm->getNumberOfProcesses());
grid->accept(kernelVisitor);
......
apps/cpu/LaminarPlaneFlow/LaminarPlaneFlow.cpp
View file @ dd8a8dbf
......@@ -104,19 +104,19 @@ void run(const vf::basics::ConfigurationFile& config)
SPtr<GbObject3D> gridCube(new GbCuboid3D(g_minX1, g_minX2, g_minX3, g_maxX1, g_maxX2, g_maxX3));
if (myid == 0)
GbSystem3D::writeGeoObject(gridCube.get(), pathname + "/geo/gridCube", WbWriterVtkXmlBinary::getInstance());
gb_system_3d::writeGeoObject(gridCube.get(), pathname + "/geo/gridCube", WbWriterVtkXmlBinary::getInstance());
real k1 = 4;
SPtr<GbObject3D> refineCube1_1(new GbCuboid3D(g_minX1, g_minX2, g_minX3, g_maxX1, g_maxX2 / k1 - 1.0, g_maxX3));
if (myid == 0)
GbSystem3D::writeGeoObject(refineCube1_1.get(), pathname + "/geo/refineCube1_1",
gb_system_3d::writeGeoObject(refineCube1_1.get(), pathname + "/geo/refineCube1_1",
WbWriterVtkXmlBinary::getInstance());
SPtr<GbObject3D> refineCube1_2(
new GbCuboid3D(g_minX1, g_maxX2 - g_maxX2 / k1 + 1.0, g_minX3, g_maxX1, g_maxX2, g_maxX3));
if (myid == 0)
GbSystem3D::writeGeoObject(refineCube1_2.get(), pathname + "/geo/refineCube1_2",
gb_system_3d::writeGeoObject(refineCube1_2.get(), pathname + "/geo/refineCube1_2",
WbWriterVtkXmlBinary::getInstance());
SPtr<LBMKernel> kernel;
......@@ -159,24 +159,24 @@ void run(const vf::basics::ConfigurationFile& config)
GbCuboid3DPtr addWallYmin(new GbCuboid3D(g_minX1 - blockLength, g_minX2 - blockLength, g_minX3 - blockLength,
g_maxX1 + blockLength, g_minX2, g_maxX3 + blockLength));
if (myid == 0)
GbSystem3D::writeGeoObject(addWallYmin.get(), pathname + "/geo/addWallYmin", WbWriterVtkXmlASCII::getInstance());
gb_system_3d::writeGeoObject(addWallYmin.get(), pathname + "/geo/addWallYmin", WbWriterVtkXmlASCII::getInstance());
GbCuboid3DPtr addWallYmax(new GbCuboid3D(g_minX1 - blockLength, g_maxX2, g_minX3 - blockLength,
g_maxX1 + blockLength, g_maxX2 + blockLength, g_maxX3 + blockLength));
if (myid == 0)
GbSystem3D::writeGeoObject(addWallYmax.get(), pathname + "/geo/addWallYmax", WbWriterVtkXmlASCII::getInstance());
gb_system_3d::writeGeoObject(addWallYmax.get(), pathname + "/geo/addWallYmax", WbWriterVtkXmlASCII::getInstance());
// inflow
GbCuboid3DPtr geoInflow(new GbCuboid3D(g_minX1 - blockLength, g_minX2 - blockLength, g_minX3 - blockLength, g_minX1,
g_maxX2 + blockLength, g_maxX3 + blockLength));
if (myid == 0)
GbSystem3D::writeGeoObject(geoInflow.get(), pathname + "/geo/geoInflow", WbWriterVtkXmlASCII::getInstance());
gb_system_3d::writeGeoObject(geoInflow.get(), pathname + "/geo/geoInflow", WbWriterVtkXmlASCII::getInstance());
// outflow
GbCuboid3DPtr geoOutflow(new GbCuboid3D(g_maxX1, g_minX2 - blockLength, g_minX3 - blockLength, g_maxX1 + blockLength,
g_maxX2 + blockLength, g_maxX3 + blockLength));
if (myid == 0)
GbSystem3D::writeGeoObject(geoOutflow.get(), pathname + "/geo/geoOutflow", WbWriterVtkXmlASCII::getInstance());
gb_system_3d::writeGeoObject(geoOutflow.get(), pathname + "/geo/geoOutflow", WbWriterVtkXmlASCII::getInstance());
SPtr<SimulationObserver> ppblocks(new WriteBlocksSimulationObserver(
grid, SPtr<UbScheduler>(new UbScheduler(1)), pathname, WbWriterVtkXmlBinary::getInstance(), comm));
......@@ -232,7 +232,7 @@ void run(const vf::basics::ConfigurationFile& config)
ppblocks.reset();
if (myid == 0)
VF_LOG_INFO("{}", Utilities::toString(grid, comm->getNumberOfProcesses()));
VF_LOG_INFO("{}", utilities::toString(grid, comm->getNumberOfProcesses()));
SetKernelBlockVisitor kernelVisitor(kernel, nu);
grid->accept(kernelVisitor);
......
apps/cpu/LidDrivenCavity/LidDrivenCavity.cpp
View file @ dd8a8dbf
......@@ -91,7 +91,7 @@ int main(int argc, char* argv[])
// Create simulation bounding box
SPtr<GbObject3D> gridCube(new GbCuboid3D(g_minX1, g_minX2, g_minX3, g_maxX1, g_maxX2, g_maxX3));
GbSystem3D::writeGeoObject(gridCube.get(), path + "/geo/gridCube", WbWriterVtkXmlBinary::getInstance());
gb_system_3d::writeGeoObject(gridCube.get(), path + "/geo/gridCube", WbWriterVtkXmlBinary::getInstance());
UBLOG(logINFO, "Lid Driven Cavity:");
UBLOG(logINFO, "Domain size = " << nx << " x " << nx << " x " << nx);
......@@ -143,19 +143,19 @@ int main(int argc, char* argv[])
// Create boundary conditions geometry
GbCuboid3DPtr wallXmin(new GbCuboid3D(g_minX1 - dx, g_minX2 - dx, g_minX3 - dx, g_minX1, g_maxX2 + dx, g_maxX3));
GbSystem3D::writeGeoObject(wallXmin.get(), path + "/geo/wallXmin", WbWriterVtkXmlASCII::getInstance());
gb_system_3d::writeGeoObject(wallXmin.get(), path + "/geo/wallXmin", WbWriterVtkXmlASCII::getInstance());
GbCuboid3DPtr wallXmax(new GbCuboid3D(g_maxX1, g_minX2 - dx, g_minX3 - dx, g_maxX1 + dx, g_maxX2 + dx, g_maxX3));
GbSystem3D::writeGeoObject(wallXmax.get(), path + "/geo/wallXmax", WbWriterVtkXmlASCII::getInstance());
gb_system_3d::writeGeoObject(wallXmax.get(), path + "/geo/wallXmax", WbWriterVtkXmlASCII::getInstance());
GbCuboid3DPtr wallYmin(new GbCuboid3D(g_minX1 - dx, g_minX2 - dx, g_minX3 - dx, g_maxX1 + dx, g_minX2, g_maxX3));
GbSystem3D::writeGeoObject(wallYmin.get(), path + "/geo/wallYmin", WbWriterVtkXmlASCII::getInstance());
gb_system_3d::writeGeoObject(wallYmin.get(), path + "/geo/wallYmin", WbWriterVtkXmlASCII::getInstance());
GbCuboid3DPtr wallYmax(new GbCuboid3D(g_minX1 - dx, g_maxX2, g_minX3 - dx, g_maxX1 + dx, g_maxX2 + dx, g_maxX3));
GbSystem3D::writeGeoObject(wallYmax.get(), path + "/geo/wallYmax", WbWriterVtkXmlASCII::getInstance());
gb_system_3d::writeGeoObject(wallYmax.get(), path + "/geo/wallYmax", WbWriterVtkXmlASCII::getInstance());
GbCuboid3DPtr wallZmin(
new GbCuboid3D(g_minX1 - dx, g_minX2 - dx, g_minX3 - dx, g_maxX1 + dx, g_maxX2 + dx, g_minX3));
GbSystem3D::writeGeoObject(wallZmin.get(), path + "/geo/wallZmin", WbWriterVtkXmlASCII::getInstance());
gb_system_3d::writeGeoObject(wallZmin.get(), path + "/geo/wallZmin", WbWriterVtkXmlASCII::getInstance());
GbCuboid3DPtr wallZmax(
new GbCuboid3D(g_minX1 - dx, g_minX2 - dx, g_maxX3, g_maxX1 + dx, g_maxX2 + dx, g_maxX3 + dx));
GbSystem3D::writeGeoObject(wallZmax.get(), path + "/geo/wallZmax", WbWriterVtkXmlASCII::getInstance());
gb_system_3d::writeGeoObject(wallZmax.get(), path + "/geo/wallZmax", WbWriterVtkXmlASCII::getInstance());
// Add boundary conditions to grid generator
SPtr<D3Q27Interactor> wallXminInt(new D3Q27Interactor(wallXmin, grid, noSlipBC, Interactor3D::SOLID));
......@@ -178,7 +178,7 @@ int main(int argc, char* argv[])
intHelper.selectBlocks();
if (myid == 0)
VF_LOG_INFO("{}", Utilities::toString(grid, comm->getNumberOfProcesses()));
VF_LOG_INFO("{}", utilities::toString(grid, comm->getNumberOfProcesses()));
// Generate grid
SetKernelBlockVisitor kernelVisitor(kernel, viscosityLB);
......@@ -204,10 +204,10 @@ int main(int argc, char* argv[])
UBLOG(logINFO, "Preprocess - end");
UBLOG(logINFO, "Total Physical Memory (RAM): " << Utilities::getTotalPhysMem() / 1e9 << " GB");
UBLOG(logINFO, "Physical Memory currently used: " << Utilities::getPhysMemUsed() / 1e9 << " GB");
UBLOG(logINFO, "Total Physical Memory (RAM): " << utilities::getTotalPhysMem() / 1e9 << " GB");
UBLOG(logINFO, "Physical Memory currently used: " << utilities::getPhysMemUsed() / 1e9 << " GB");
UBLOG(logINFO,
"Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1e9 << " GB");
"Physical Memory currently used by current process: " << utilities::getPhysMemUsedByMe() / 1e9 << " GB");
// Create coprocessor object for writing macroscopic quantities to VTK-file
SPtr<UbScheduler> visSch(new UbScheduler(timeStepOut));
......
apps/gpu/AtmosphericBoundaryLayer/AtmosphericBoundaryLayer.cpp
View file @ dd8a8dbf
......@@ -281,23 +281,23 @@ void run(const vf::basics::ConfigurationFile& config)
if (numberOfProcesses > 1) {
if (isFirstSubDomain || isMidSubDomain) {
gridBuilder->findCommunicationIndices(CommunicationDirections::PX);
gridBuilder->setCommunicationProcess(CommunicationDirections::PX, processID + 1);
gridBuilder->findCommunicationIndices(communication_directions::PX);
gridBuilder->setCommunicationProcess(communication_directions::PX, processID + 1);
}
if (isLastSubDomain || isMidSubDomain) {
gridBuilder->findCommunicationIndices(CommunicationDirections::MX, true);
gridBuilder->setCommunicationProcess(CommunicationDirections::MX, processID - 1);
gridBuilder->findCommunicationIndices(communication_directions::MX, true);
gridBuilder->setCommunicationProcess(communication_directions::MX, processID - 1);
}
if (isFirstSubDomain && !usePrecursorInflow) {
gridBuilder->findCommunicationIndices(CommunicationDirections::MX);
gridBuilder->setCommunicationProcess(CommunicationDirections::MX, numberOfProcesses - 1);
gridBuilder->findCommunicationIndices(communication_directions::MX);
gridBuilder->setCommunicationProcess(communication_directions::MX, numberOfProcesses - 1);
}
if (isLastSubDomain && !usePrecursorInflow) {
gridBuilder->findCommunicationIndices(CommunicationDirections::PX);
gridBuilder->setCommunicationProcess(CommunicationDirections::PX, 0);
gridBuilder->findCommunicationIndices(communication_directions::PX);
gridBuilder->setCommunicationProcess(communication_directions::PX, 0);
}
}
......
pythonbindings/src/basics/submodules/configuration_file.cpp
View file @ dd8a8dbf
......@@ -30,6 +30,7 @@
//=======================================================================================
#include <pybind11/pybind11.h>
#include "basics/config/ConfigurationFile.h"
#include "basics/DataTypes.h"
namespace configuration
{
......
src/basics/container/CbVector.h
View file @ dd8a8dbf
......@@ -185,8 +185,8 @@ public:
{
#if !defined(VF_NO_RANGECHECK) && (defined(VF_DEBUG) || defined(VF_RANGECHECK))
if (i >= dataSize)
UB_THROW(UbException(UB_EXARGS, "T=" + (std::string) typeid(*this).name() + UbSystem::toString(i) +
" out of range (size=" + UbSystem::toString(dataSize) + ")"));
UB_THROW(UbException(UB_EXARGS, "T=" + (std::string) typeid(*this).name() + ub_system::toString(i) +
" out of range (size=" + ub_system::toString(dataSize) + ")"));
#endif // VF_DEBUG
return ptrData[i];
......@@ -196,8 +196,8 @@ public:
{
#if !defined(VF_NO_RANGECHECK) && (defined(VF_DEBUG) || defined(VF_RANGECHECK))
if (i >= dataSize)
UB_THROW(UbException(UB_EXARGS, "T=" + (std::string) typeid(*this).name() + UbSystem::toString(i) +
" out of range (size=" + UbSystem::toString(dataSize) + ")"));
UB_THROW(UbException(UB_EXARGS, "T=" + (std::string) typeid(*this).name() + ub_system::toString(i) +
" out of range (size=" + ub_system::toString(dataSize) + ")"));
#endif // VF_DEBUG
return ptrData[i];
......
src/basics/container/CbVectorPool.h
View file @ dd8a8dbf
......@@ -145,7 +145,7 @@ public:
return this->allocData(allocator, vec, dataSize, value);
}
UB_THROW(UbException(UB_EXARGS, "vector-key=" + UbSystem::toString(allocator.key) + " already taken! (e.g. SetConnectorBlockVisitor was called several times"));
UB_THROW(UbException(UB_EXARGS, "vector-key=" + ub_system::toString(allocator.key) + " already taken! (e.g. SetConnectorBlockVisitor was called several times"));
}
/*==================================================================*/
bool resizeVectorData(CbVector<value_type> &vec, const size_type &dataSize, const value_type &value = value_type())
......
src/basics/geometry3d/CoordinateTransformation3D.cpp
View file @ dd8a8dbf
......@@ -102,7 +102,7 @@ void CoordinateTransformation3D::setTransformationValues(const double &originX1,
const double &dx3, const double &alpha, const double &beta,
const double &gamma)
{
if (UbMath::zero(dx1) || UbMath::zero(dx2) || UbMath::zero(dx3))
if (ub_math::zero(dx1) || ub_math::zero(dx2) || ub_math::zero(dx3))
throw UbException(UB_EXARGS, "error: at least one delta==0.0");
this->Tx1 = originX1;
......@@ -115,13 +115,13 @@ void CoordinateTransformation3D::setTransformationValues(const double &originX1,
this->beta = beta;
this->gamma = gamma;
double ra = UbMath::PI * alpha / 180.0;
double ra = ub_math::PI * alpha / 180.0;
double cosA = cos(ra);
double sinA = sin(ra);
double rb = UbMath::PI * beta / 180.0;
double rb = ub_math::PI * beta / 180.0;
double cosB = cos(rb);
double sinB = sin(rb);
double rg = UbMath::PI * gamma / 180.0;
double rg = ub_math::PI * gamma / 180.0;
double cosG = cos(rg);
double sinG = sin(rg);
......
src/basics/geometry3d/GbCuboid3D.cpp
View file @ dd8a8dbf
......@@ -177,17 +177,17 @@ double GbCuboid3D::getLengthX3() { return (this->getX3Maximum() - this->getX3Min
bool GbCuboid3D::isPointInGbObject3D(const double &x1p, const double &x2p, const double &x3p)
{
// true, wenn 'in Object' oder 'auf Boundary'!
if (UbMath::less(x1p, this->getX1Minimum()))
if (ub_math::less(x1p, this->getX1Minimum()))
return false;
else if (UbMath::less(x2p, this->getX2Minimum()))
else if (ub_math::less(x2p, this->getX2Minimum()))
return false;
else if (UbMath::less(x3p, this->getX3Minimum()))
else if (ub_math::less(x3p, this->getX3Minimum()))
return false;
else if (UbMath::greater(x1p, this->getX1Maximum()))
else if (ub_math::greater(x1p, this->getX1Maximum()))
return false;
else if (UbMath::greater(x2p, this->getX2Maximum()))
else if (ub_math::greater(x2p, this->getX2Maximum()))
return false;
else if (UbMath::greater(x3p, this->getX3Maximum()))
else if (ub_math::greater(x3p, this->getX3Maximum()))
return false;
return true;
......@@ -198,30 +198,30 @@ bool GbCuboid3D::isPointInGbObject3D(const double &x1p, const double &x2p, const
pointIsOnBoundary = false;
// true, wenn 'in Object' oder 'auf Boundary'!
if (UbMath::less(x1p, this->getX1Minimum()))
if (ub_math::less(x1p, this->getX1Minimum()))
return false;
else if (UbMath::less(x2p, this->getX2Minimum()))
else if (ub_math::less(x2p, this->getX2Minimum()))
return false;
else if (UbMath::less(x3p, this->getX3Minimum()))
else if (ub_math::less(x3p, this->getX3Minimum()))
return false;
else if (UbMath::greater(x1p, this->getX1Maximum()))
else if (ub_math::greater(x1p, this->getX1Maximum()))
return false;
else if (UbMath::greater(x2p, this->getX2Maximum()))
else if (ub_math::greater(x2p, this->getX2Maximum()))
return false;
else if (UbMath::greater(x3p, this->getX3Maximum()))
else if (ub_math::greater(x3p, this->getX3Maximum()))
return false;
if (UbMath::equal(x1p, this->getX1Minimum()))
if (ub_math::equal(x1p, this->getX1Minimum()))
pointIsOnBoundary = true;
else if (UbMath::equal(x2p, this->getX2Minimum()))
else if (ub_math::equal(x2p, this->getX2Minimum()))
pointIsOnBoundary = true;
else if (UbMath::equal(x3p, this->getX3Minimum()))
else if (ub_math::equal(x3p, this->getX3Minimum()))
pointIsOnBoundary = true;
else if (UbMath::equal(x1p, this->getX1Maximum()))
else if (ub_math::equal(x1p, this->getX1Maximum()))
pointIsOnBoundary = true;
else if (UbMath::equal(x2p, this->getX2Maximum()))
else if (ub_math::equal(x2p, this->getX2Maximum()))
pointIsOnBoundary = true;
else if (UbMath::equal(x3p, this->getX3Maximum()))
else if (ub_math::equal(x3p, this->getX3Maximum()))
pointIsOnBoundary = true;
return true;
......@@ -230,17 +230,17 @@ bool GbCuboid3D::isPointInGbObject3D(const double &x1p, const double &x2p, const
bool GbCuboid3D::isCellInsideGbObject3D(const double &x1p1, const double &x2p1, const double &x3p1, const double &x1p2,
const double &x2p2, const double &x3p2)
{
if (UbMath::less(x1p1, this->getX1Minimum()))
if (ub_math::less(x1p1, this->getX1Minimum()))
return false;
else if (UbMath::less(x2p1, this->getX2Minimum()))
else if (ub_math::less(x2p1, this->getX2Minimum()))
return false;
else if (UbMath::less(x3p1, this->getX3Minimum()))
else if (ub_math::less(x3p1, this->getX3Minimum()))
return false;
else if (UbMath::greater(x1p2, this->getX1Maximum()))
else if (ub_math::greater(x1p2, this->getX1Maximum()))
return false;
else if (UbMath::greater(x2p2, this->getX2Maximum()))
else if (ub_math::greater(x2p2, this->getX2Maximum()))
return false;
else if (UbMath::greater(x3p2, this->getX3Maximum()))
else if (ub_math::greater(x3p2, this->getX3Maximum()))
return false;
return true;
......@@ -264,7 +264,7 @@ bool GbCuboid3D::isCellCuttingGbObject3D(const double &x1a, const double &x2a, c
return false;
// GbCuboid3D* cube = GbSystem3D::clipRectangle3D(*this->p1, *this->p2, x1a,x2a,x3a,x1b,x2b,x3b);
// GbCuboid3D* cube = gb_system_3d::clipRectangle3D(*this->p1, *this->p2, x1a,x2a,x3a,x1b,x2b,x3b);
// if(cube)
//{
// cube->finalize();
......@@ -290,13 +290,13 @@ bool GbCuboid3D::isCellInsideOrCuttingGbObject3D(const double &x1a, const double
// |<----------------- T --------------->|
// ist |T| <= dxA + dxB -> overlap!
if (UbMath::lessEqual(std::fabs(this->getX1Centroid() - 0.5 * (x1b + x1a) /*Tx1*/),
if (ub_math::lessEqual(std::fabs(this->getX1Centroid() - 0.5 * (x1b + x1a) /*Tx1*/),
0.5 * (this->getLengthX1() + std::fabs(x1b - x1a) /*dx1A+dx1B*/))
&& UbMath::lessEqual(std::fabs(this->getX2Centroid() - 0.5 * (x2b + x2a) /*Tx2*/),
&& ub_math::lessEqual(std::fabs(this->getX2Centroid() - 0.5 * (x2b + x2a) /*Tx2*/),
0.5 * (this->getLengthX2() + std::fabs(x2b - x2a) /*dx2A+dx2B*/))
&& UbMath::lessEqual(std::fabs(this->getX3Centroid() - 0.5 * (x3b + x3a) /*Tx3*/),
&& ub_math::lessEqual(std::fabs(this->getX3Centroid() - 0.5 * (x3b + x3a) /*Tx3*/),
0.5 * (this->getLengthX3() + std::fabs(x3b - x3a) /*dx3A+dx3B*/))) {
return true;
}
......@@ -410,7 +410,7 @@ GbPoint3D *GbCuboid3D::calculateInterSectionPoint3D(GbPoint3D & /*point1*/, GbPo
/*=======================================================*/
GbLine3D *GbCuboid3D::createClippedLine3D(GbPoint3D &point1, GbPoint3D &point2)
{
return GbSystem3D::createClipLine3D(point1, point2, p1->getX1Coordinate(), p1->getX2Coordinate(),
return gb_system_3d::createClipLine3D(point1, point2, p1->getX1Coordinate(), p1->getX2Coordinate(),
p1->getX3Coordinate(), p2->getX1Coordinate(), p2->getX2Coordinate(),
p2->getX3Coordinate());
}
......@@ -479,7 +479,7 @@ double GbCuboid3D::getCellVolumeInsideGbObject3D(const double &x1a, const double
if (!(this->isCellCuttingGbObject3D(x1a, x2a, x3a, x1b, x2b, x3b)))
return 0.0;
GbCuboid3D *cube = GbSystem3D::clipRectangle3D(*this->p1, *this->p2, x1a, x2a, x3a, x1b, x2b, x3b);
GbCuboid3D *cube = gb_system_3d::clipRectangle3D(*this->p1, *this->p2, x1a, x2a, x3a, x1b, x2b, x3b);
if (cube) {
double eps;
......
src/basics/geometry3d/GbCuboid3D.h
View file @ dd8a8dbf
......@@ -126,11 +126,11 @@ public:
// falls punkt innerhalt ist: minimalen abstand ausrechnen
if (this->isPointInGbObject3D(x1p, x2p, x3p)) {
double x1Dist = UbMath::min(std::abs(x1p - this->getX1Minimum()), std::abs(x1p - this->getX1Maximum()));
double x2Dist = UbMath::min(std::abs(x2p - this->getX2Minimum()), std::abs(x2p - this->getX2Maximum()));
double x3Dist = UbMath::min(std::abs(x3p - this->getX3Minimum()), std::abs(x3p - this->getX3Maximum()));
double x1Dist = ub_math::min(std::abs(x1p - this->getX1Minimum()), std::abs(x1p - this->getX1Maximum()));
double x2Dist = ub_math::min(std::abs(x2p - this->getX2Minimum()), std::abs(x2p - this->getX2Maximum()));
double x3Dist = ub_math::min(std::abs(x3p - this->getX3Minimum()), std::abs(x3p - this->getX3Maximum()));
return UbMath::min(x1Dist, x2Dist, x3Dist);
return ub_math::min(x1Dist, x2Dist, x3Dist);
} else {
}
}
......
src/basics/geometry3d/GbCylinder3D.cpp
View file @ dd8a8dbf
This diff is collapsed.
src/basics/geometry3d/GbGyroidThirdOrder.cpp
View file @ dd8a8dbf
......@@ -209,7 +209,7 @@ bool GbGyroidThirdOrder::isPointInGbObject3D(const double& x1, const double& x2,
//evaluateImplicitFunction(x1,x2,x3, 0., 0., 0.)
double f1 = evaluateImplicitFunction(x1, x2, x3, 1.);
double f2 = evaluateImplicitFunction(x1, x2, x3, -1.);
return UbMath::lessEqual(f1,0.) && UbMath::greaterEqual(f2,0.);
return ub_math::lessEqual(f1,0.) && ub_math::greaterEqual(f2,0.);
}
......
src/basics/geometry3d/GbGyroidThirdOrderLong.cpp
View file @ dd8a8dbf
......@@ -198,7 +198,7 @@ bool GbGyroidThirdOrderLong::isPointInGbObject3D(const double& x1, const double&
//evaluateImplicitFunction(x1,x2,x3, 0., 0., 0.)
double f1 = evaluateImplicitFunction(x1, x2, x3, 1.);
double f2 = evaluateImplicitFunction(x1, x2, x3, -1.);
return UbMath::lessEqual(f1,0.) && UbMath::greaterEqual(f2,0.);
return ub_math::lessEqual(f1,0.) && ub_math::greaterEqual(f2,0.);
}
/*==========================================================*/
......
src/basics/geometry3d/GbHalfSpace3D.h
View file @ dd8a8dbf
......@@ -71,20 +71,20 @@ public:
/*=============================================*/
bool ptInside(const double &x, const double &y, const double &z)
{
return UbMath::greaterEqual(normalX * x + normalY * y + normalZ * z, this->d);
return ub_math::greaterEqual(normalX * x + normalY * y + normalZ * z, this->d);
}
/*=============================================*/
bool ptInside(GbPoint3D *pointX)
{
// GbVector3D X(PointX->x1, PointX->x2, PointX->x3 );
// return UbMath::greaterEqual(this->Normal.Dot(X), this->d);
return UbMath::greaterEqual(normalX * pointX->x1 + normalY * pointX->x2 + normalZ * pointX->x3, this->d);
// return ub_math::greaterEqual(this->Normal.Dot(X), this->d);
return ub_math::greaterEqual(normalX * pointX->x1 + normalY * pointX->x2 + normalZ * pointX->x3, this->d);
}
/*=============================================*/
bool ptInside(GbVector3D &x)
{
// return UbMath::greaterEqual(this->Normal.Dot(X), this->d);
return UbMath::greaterEqual(normalX * x[0] + normalY * x[1] + normalZ * x[2], this->d);
// return ub_math::greaterEqual(this->Normal.Dot(X), this->d);
return ub_math::greaterEqual(normalX * x[0] + normalY * x[1] + normalZ * x[2], this->d);
}
/*=============================================*/
double getDistance(const double &x1p, const double &x2p, const double &x3p)
......
src/basics/geometry3d/GbHalfSpaceKrischan3D.cpp
View file @ dd8a8dbf
......@@ -124,7 +124,7 @@ double GbHalfSpaceKrischan3D::getCellVolumeInsideGbObject3D(const double &x1a, c
// if point is INSIDE the halfspace, distance is smaller than zero
// --> loop determines the minimum alpha...i.e. the alpha with maximum absolute value for all points
// INSIDE the halfspace
if (UbMath::lessEqual(this->getDistance(internX1, internX2, internX3), alpha))
if (ub_math::lessEqual(this->getDistance(internX1, internX2, internX3), alpha))
alpha = this->getDistance(internX1, internX2, internX3);
// cout<<zelltyp<<" "<<kugel->getDistance(internX1,internX2,internX3)<<" "<<alpha<<endl;
} // end first for
......@@ -153,27 +153,27 @@ double GbHalfSpaceKrischan3D::getCellVolumeInsideGbObject3D(const double &x1a, c
n[1] /= normLength;
n[2] /= normLength;
if (UbMath::less(n[0], 0.0))
if (ub_math::less(n[0], 0.0))
n[0] = -n[0];
if (UbMath::less(n[1], 0.0))
if (ub_math::less(n[1], 0.0))
n[1] = -n[1];
if (UbMath::less(n[2], 0.0))
if (ub_math::less(n[2], 0.0))
n[2] = -n[2];
// cout<<"Normals: "<<n[0]<<" "<<n[1]<<" "<<n[2]<<endl;
double dummy;
if (UbMath::greater(n[0], n[1])) {
if (ub_math::greater(n[0], n[1])) {
dummy = n[1];
n[1] = n[0];
n[0] = dummy;
}
if (UbMath::greater(n[1], n[2])) {
if (ub_math::greater(n[1], n[2])) {
dummy = n[2];
n[2] = n[1];
n[1] = dummy;
}
if (UbMath::greater(n[0], n[1])) {
if (ub_math::greater(n[0], n[1])) {
dummy = n[1];
n[1] = n[0];
n[0] = dummy;
......@@ -189,21 +189,21 @@ double GbHalfSpaceKrischan3D::getCellVolumeInsideGbObject3D(const double &x1a, c
double preresult = 0.0, result = 0.0;
// 1D Check
if (UbMath::lessEqual(n1, 0.00001) && UbMath::lessEqual(n2, 0.00001)) {
if (ub_math::lessEqual(n1, 0.00001) && ub_math::lessEqual(n2, 0.00001)) {
result = alpha * x1 * x2;
}
// 2D Check
else if (UbMath::lessEqual(n1, 0.00001)) {
else if (ub_math::lessEqual(n1, 0.00001)) {
preresult = (2 * n2 * n3);
result = (alpha * alpha) / preresult;
if (UbMath::greater(alpha, n2 * x2)) {
if (ub_math::greater(alpha, n2 * x2)) {
result += -(alpha - n2 * x2) * (alpha - n2 * x2) / preresult;
}
if (UbMath::greater(alpha, n3 * x3)) {
if (ub_math::greater(alpha, n3 * x3)) {
result += -(alpha - n3 * x3) * (alpha - n3 * x3) / preresult;
}
if (UbMath::greater(alpha, n2 * x2 + n3 * x3)) {
if (ub_math::greater(alpha, n2 * x2 + n3 * x3)) {
result += (alpha - n2 * x2 - n3 * x3) * (alpha - n2 * x2 - n3 * x3) / preresult;
}
......@@ -216,37 +216,37 @@ double GbHalfSpaceKrischan3D::getCellVolumeInsideGbObject3D(const double &x1a, c
result = alpha * alpha * alpha / preresult;
if (UbMath::greater(alpha, n1 * x1)) {
if (ub_math::greater(alpha, n1 * x1)) {
result += -((alpha - n1 * x1) * (alpha - n1 * x1) * (alpha - n1 * x1)) / preresult;
}
if (UbMath::greater(alpha, n2 * x2)) {
if (ub_math::greater(alpha, n2 * x2)) {
result += -((alpha - n2 * x2) * (alpha - n2 * x2) * (alpha - n2 * x2)) / preresult;
}
if (UbMath::greater(alpha, n3 * x3)) {
if (ub_math::greater(alpha, n3 * x3)) {
result += -((alpha - n3 * x3) * (alpha - n3 * x3) * (alpha - n3 * x3)) / preresult;
}
if (UbMath::greater(alpha, (n1 * x1 + n2 * x2))) {
if (ub_math::greater(alpha, (n1 * x1 + n2 * x2))) {
result += ((alpha - (n1 * x1 + n2 * x2)) * (alpha - (n1 * x1 + n2 * x2)) * (alpha - (n1 * x1 + n2 * x2))) /
preresult;
}
if (UbMath::greater(alpha, (n1 * x1 + n3 * x3))) {
if (ub_math::greater(alpha, (n1 * x1 + n3 * x3))) {
result += ((alpha - (n1 * x1 + n3 * x3)) * (alpha - (n1 * x1 + n3 * x3)) * (alpha - (n1 * x1 + n3 * x3))) /
preresult;
}
if (UbMath::greater(alpha, (n2 * x2 + n3 * x3))) {
if (ub_math::greater(alpha, (n2 * x2 + n3 * x3))) {
result += ((alpha - (n2 * x2 + n3 * x3)) * (alpha - (n2 * x2 + n3 * x3)) * (alpha - (n2 * x2 + n3 * x3))) /
preresult;
}
// NEW
if (UbMath::greater(alpha, (n1 * x1 + n2 * x2 + n3 * x3))) {
if (ub_math::greater(alpha, (n1 * x1 + n2 * x2 + n3 * x3))) {
result += -((alpha - (n1 * x1 + n2 * x2 + n3 * x3)) * (alpha - (n1 * x1 + n2 * x2 + n3 * x3)) *
(alpha - (n1 * x1 + n2 * x2 + n3 * x3))) /
preresult;
}
}
if (!UbMath::inClosedInterval(result / (x1 * x2 * x3), -0.01, 1.01)) {
if (!ub_math::inClosedInterval(result / (x1 * x2 * x3), -0.01, 1.01)) {
stringstream errMsg;
errMsg << "Danger...Fuellstand " << result << " nicht im Interfall [0.0..1.0]" << endl;
......@@ -260,35 +260,35 @@ double GbHalfSpaceKrischan3D::getCellVolumeInsideGbObject3D(const double &x1a, c
return result;
// double eps=0.0;
// if( UbMath::equal(n1,0.0) && UbMath::equal(n2,0.0) )
// if( ub_math::equal(n1,0.0) && ub_math::equal(n2,0.0) )
//{
// eps = alpha/n3;
//}
// else if( UbMath::equal(n1,0.0) )
// else if( ub_math::equal(n1,0.0) )
//{
// double dim1,dim2;
// dim1 = alpha/n2;
// dim2 = alpha/n3;
// eps = 0.5*dim1*dim2;
// if( UbMath::greater(dim1,1.0) ) eps -= 0.5*(dim1-1.0)*dim2/dim1*(dim1-1.0);
// if( UbMath::greater(dim2,1.0) ) eps -= 0.5*(dim2-1.0)*dim1/dim2*(dim2-1.0);
// if( ub_math::greater(dim1,1.0) ) eps -= 0.5*(dim1-1.0)*dim2/dim1*(dim1-1.0);
// if( ub_math::greater(dim2,1.0) ) eps -= 0.5*(dim2-1.0)*dim1/dim2*(dim2-1.0);
//}
// else
//{
// eps = alpha*alpha*alpha;
// if( UbMath::greater(alpha,n1) )
// if( ub_math::greater(alpha,n1) )
// eps -= (alpha-n1)*(alpha-n1)*(alpha-n1);
// if( UbMath::greater(alpha,n2) )
// if( ub_math::greater(alpha,n2) )
// eps -= (alpha-n2)*(alpha-n2)*(alpha-n2);
// if( UbMath::greater(alpha,n3) )
// if( ub_math::greater(alpha,n3) )
// eps -= (alpha-n3)*(alpha-n3)*(alpha-n3);
// if( UbMath::greater(alpha,n1+n2) )
// if( ub_math::greater(alpha,n1+n2) )
// eps += (alpha-n1-n2)*(alpha-n1-n2)*(alpha-n1-n2);
// if( UbMath::greater(alpha,n1+n3) )
// if( ub_math::greater(alpha,n1+n3) )
// eps += (alpha-n1-n3)*(alpha-n1-n3)*(alpha-n1-n3);
// if( UbMath::greater(alpha,n2+n3) )
// if( ub_math::greater(alpha,n2+n3) )
// eps += (alpha-n2-n3)*(alpha-n2-n3)*(alpha-n2-n3);
// //attention: use without delta_i
......
src/basics/geometry3d/GbHalfSpaceKrischan3D.h
View file @ dd8a8dbf
......@@ -72,16 +72,16 @@ public:
/*=============================================*/
bool ptInside(const double &x, const double &y, const double &z)
{
return UbMath::lessEqual(Normal[0] * x + Normal[1] * y + Normal[2] * z, this->d);
return ub_math::lessEqual(Normal[0] * x + Normal[1] * y + Normal[2] * z, this->d);
}
/*=============================================*/
bool ptInside(GbPoint3D *PointX)
{
GbVector3D X(PointX->x1, PointX->x2, PointX->x3);
return UbMath::lessEqual(this->Normal.Dot(X), this->d);
return ub_math::lessEqual(this->Normal.Dot(X), this->d);
}
/*=============================================*/
bool ptInside(GbVector3D &X) { return UbMath::lessEqual(this->Normal.Dot(X), this->d); }
bool ptInside(GbVector3D &X) { return ub_math::lessEqual(this->Normal.Dot(X), this->d); }
/*=====================================================*/
// true, wenn 'in Object' oder 'auf Boundary'!
......@@ -127,7 +127,7 @@ public:
return NULL;
// distance ausrechnen (groesser null)
if (UbMath::less(dist1, 0.0))
if (ub_math::less(dist1, 0.0))
throw UbException(UB_EXARGS, "Punkt ausserhalb, aber Distanz kleiner null???");
p1->x1 = p1->x1 + dist1 / totalDist * p1p2[0];
......@@ -140,7 +140,7 @@ public:
return NULL;
// distance ausrechnen (groesser null)
if (UbMath::less(dist2, 0.0))
if (ub_math::less(dist2, 0.0))
throw UbException(UB_EXARGS, "Punkt ausserhalb, aber Distanz kleiner null???");
p2->x1 = p2->x1 - dist2 / totalDist * p1p2[0];
......
src/basics/geometry3d/GbLine3D.cpp
View file @ dd8a8dbf
......@@ -154,14 +154,14 @@ GbPoint3D *GbLine3D::calculateIntersectionPoint3D(GbLine3D * /*line*/)
/*======================================================================*/
GbLine3D *GbLine3D::createClippedLine3D(GbCuboid3D *cuboid)
{
return GbSystem3D::createClipLine3D(*this->p1, *this->p2, cuboid->getPoint1()->x1, cuboid->getPoint1()->x2,
return gb_system_3d::createClipLine3D(*this->p1, *this->p2, cuboid->getPoint1()->x1, cuboid->getPoint1()->x2,
cuboid->getPoint1()->x3, cuboid->getPoint2()->x1, cuboid->getPoint2()->x2,
cuboid->getPoint2()->x3);
}
/*======================================================================*/
GbLine3D *GbLine3D::createClippedLine3D(GbPoint3D *pA, GbPoint3D *pE)
{
return GbSystem3D::createClipLine3D(*this->p1, *this->p2, pA->x1, pA->x2, pA->x3, pE->x1, pE->x2, pE->x3);
return gb_system_3d::createClipLine3D(*this->p1, *this->p2, pA->x1, pA->x2, pA->x3, pE->x1, pE->x2, pE->x3);
}
/*======================================================================*/
double GbLine3D::getDistance(const GbPoint3D &point) { return this->getDistance(point.x1, point.x2, point.x3); }
......
src/basics/geometry3d/GbMeshTools3D.h
View file @ dd8a8dbf
......@@ -40,7 +40,7 @@
#include <basics/utilities/UbMath.h>
namespace GbMeshTools3D
namespace gb_mesh_tools_3d
{
inline int planeBoxOverlap(float normal[3], float vert[3], float maxbox[3]) // -NJMP-
{
......@@ -279,22 +279,22 @@ inline int triBoxOverlap(float boxcenter[3], float boxhalfsize[3], float trivert
/* the triangle against the AABB */
/* test in X-direction */
// FINDMINMAX(v0[0],v1[0],v2[0],min,max);
min = (float)UbMath::min(v0[0], v1[0], v2[0]);
max = (float)UbMath::max(v0[0], v1[0], v2[0]);
min = (float)ub_math::min(v0[0], v1[0], v2[0]);
max = (float)ub_math::max(v0[0], v1[0], v2[0]);
if (min > boxhalfsize[0] || max < -boxhalfsize[0])
return 0;
/* test in Y-direction */
// FINDMINMAX(v0[1],v1[1],v2[1],min,max);
min = (float)UbMath::min(v0[1], v1[1], v2[1]);
max = (float)UbMath::max(v0[1], v1[1], v2[1]);
min = (float)ub_math::min(v0[1], v1[1], v2[1]);
max = (float)ub_math::max(v0[1], v1[1], v2[1]);
if (min > boxhalfsize[1] || max < -boxhalfsize[1])
return 0;
/* test in Z-direction */
// FINDMINMAX(v0[2],v1[2],v2[2],min,max);
min = (float)UbMath::min(v0[2], v1[2], v2[2]);
max = (float)UbMath::max(v0[2], v1[2], v2[2]);
min = (float)ub_math::min(v0[2], v1[2], v2[2]);
max = (float)ub_math::max(v0[2], v1[2], v2[2]);
if (min > boxhalfsize[2] || max < -boxhalfsize[2])
return 0;
......@@ -314,7 +314,7 @@ inline int triBoxOverlap(float boxcenter[3], float boxhalfsize[3], float trivert
return 1; /* box and triangle overlaps */
}
} // namespace GbMeshTools3D
} // namespace gb_mesh_tools_3d
#endif
......
src/basics/geometry3d/GbObject3D.cpp
View file @ dd8a8dbf
......@@ -89,9 +89,9 @@ bool GbObject3D::isCellInsideOrCuttingGbObject3D(const double &x1a, const double
bool GbObject3D::isInsideCell(const double &minX1, const double &minX2, const double &minX3, const double &maxX1,
const double &maxX2, const double &maxX3)
{
if (UbMath::greaterEqual(this->getX1Minimum(), minX1) && UbMath::greaterEqual(this->getX2Minimum(), minX2) &&
UbMath::greaterEqual(this->getX3Minimum(), minX3) && UbMath::lessEqual(this->getX1Maximum(), maxX1) &&
UbMath::lessEqual(this->getX2Maximum(), maxX2) && UbMath::lessEqual(this->getX2Maximum(), maxX3))
if (ub_math::greaterEqual(this->getX1Minimum(), minX1) && ub_math::greaterEqual(this->getX2Minimum(), minX2) &&
ub_math::greaterEqual(this->getX3Minimum(), minX3) && ub_math::lessEqual(this->getX1Maximum(), maxX1) &&
ub_math::lessEqual(this->getX2Maximum(), maxX2) && ub_math::lessEqual(this->getX2Maximum(), maxX3))
return true;
return false;
......