From 9a81610b51224de65f2a3b12a5847bda979536a3 Mon Sep 17 00:00:00 2001
From: Lukas Werner <lks.werner@fau.de>
Date: Sun, 11 Mar 2018 19:54:45 +0100
Subject: [PATCH] Renamed Raytracer::rayTrace() to Raytracer::generateImage()
---
apps/tutorials/pe/01_ConfinedGas.cpp | 6 +++---
apps/tutorials/pe/02_ConfinedGasExtended.cpp | 2 +-
src/pe/raytracing/Raytracer.cpp | 4 ++--
src/pe/raytracing/Raytracer.h | 4 ++--
tests/pe/Raytracing.cpp | 10 +++++-----
5 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/apps/tutorials/pe/01_ConfinedGas.cpp b/apps/tutorials/pe/01_ConfinedGas.cpp
index 996ef3ecb..20e41ea70 100644
--- a/apps/tutorials/pe/01_ConfinedGas.cpp
+++ b/apps/tutorials/pe/01_ConfinedGas.cpp
@@ -60,7 +60,7 @@ void testRayTracing () {
//createSphere(*globalBodyStorage, *forest, storageID, 5, Vec3(1,0,0), real_t(0.1));
//Raytracer raytracer(forest, storageID, uint8_t(640), uint8_t(480), 49.13, Vec3(-5,0,0), Vec3(-1,0,0), Vec3(0,0,1));
- //raytracer.rayTrace<BodyTypeTuple>(0);
+ //raytracer.generateImage<BodyTypeTuple>(0);
}
int main( int argc, char ** argv )
@@ -205,7 +205,7 @@ int main( int argc, char ** argv )
syncNextNeighbors<BodyTypeTuple>(*forest, storageID);
if (i%raytraceSkippedSteps == 0) {
- raytracer.rayTrace<BodyTypeTuple>(i);
+ raytracer.generateImage<BodyTypeTuple>(i);
}
}
//! [GameLoop]
@@ -226,7 +226,7 @@ int main( int argc, char ** argv )
//! [PostProcessing]
//WALBERLA_LOG_INFO_ON_ROOT("*** RAYTRACING - START ***");
- //raytracer.rayTrace<BodyTypeTuple>(0);
+ //raytracer.generateImage<BodyTypeTuple>(0);
//WALBERLA_LOG_INFO_ON_ROOT("*** RAYTRACING - END ***");
// für einzelne sphere vtks: -> SphereVtkOutput.cpp
diff --git a/apps/tutorials/pe/02_ConfinedGasExtended.cpp b/apps/tutorials/pe/02_ConfinedGasExtended.cpp
index b4d166a25..feca8150a 100644
--- a/apps/tutorials/pe/02_ConfinedGasExtended.cpp
+++ b/apps/tutorials/pe/02_ConfinedGasExtended.cpp
@@ -258,7 +258,7 @@ int main( int argc, char ** argv )
if ( i % raytracerSkippedSteps == 0) {
tp["Raytracing"].start();
- raytracer.rayTrace<BodyTuple>(size_t(i), &tt);
+ raytracer.generateImage<BodyTuple>(size_t(i), &tt);
tp["Raytracing"].end();
}
}
diff --git a/src/pe/raytracing/Raytracer.cpp b/src/pe/raytracing/Raytracer.cpp
index 8112b088b..5f2302650 100644
--- a/src/pe/raytracing/Raytracer.cpp
+++ b/src/pe/raytracing/Raytracer.cpp
@@ -180,7 +180,7 @@ std::string Raytracer::getOutputFilename(const std::string& base, size_t timeste
}
/*!\brief Writes the tBuffer to a file in the tBuffer output directory.
- * \param tBuffer Buffer with t values as generated in rayTrace(...).
+ * \param tBuffer Buffer with t values as generated in generateImage(...).
* \param timestep Timestep this image is from.
* \param isGlobalImage Whether this image is the fully stitched together one.
*/
@@ -189,7 +189,7 @@ void Raytracer::writeTBufferToFile(const std::vector<real_t>& tBuffer, size_t ti
}
/*!\brief Writes the tBuffer to a file in the tBuffer output directory.
- * \param tBuffer Buffer with t values as generated in rayTrace(...).
+ * \param tBuffer Buffer with t values as generated in generateImage(...).
* \param fileName Name of the output file.
*/
void Raytracer::writeTBufferToFile(const std::vector<real_t>& tBuffer, const std::string& fileName) const {
diff --git a/src/pe/raytracing/Raytracer.h b/src/pe/raytracing/Raytracer.h
index 58f13c8ac..2e9727287 100644
--- a/src/pe/raytracing/Raytracer.h
+++ b/src/pe/raytracing/Raytracer.h
@@ -160,7 +160,7 @@ public:
/*!\name Functions */
//@{
template <typename BodyTypeTuple>
- void rayTrace(const size_t timestep, WcTimingTree* tt = NULL );
+ void generateImage(const size_t timestep, WcTimingTree* tt = NULL );
void setupView_();
void setupFilenameRankWidth_();
@@ -483,7 +483,7 @@ inline void Raytracer::traceRayInHashGrids(const Ray& ray, BodyID& body_closest,
* same direction. See Raytracer::isPlaneVisible() for further information.
*/
template <typename BodyTypeTuple>
-void Raytracer::rayTrace(const size_t timestep, WcTimingTree* tt) {
+void Raytracer::generateImage(const size_t timestep, WcTimingTree* tt) {
if (tt != NULL) tt->start("Raytracing");
real_t inf = std::numeric_limits<real_t>::max();
diff --git a/tests/pe/Raytracing.cpp b/tests/pe/Raytracing.cpp
index f27345454..dd40130f8 100644
--- a/tests/pe/Raytracing.cpp
+++ b/tests/pe/Raytracing.cpp
@@ -292,7 +292,7 @@ void RaytracerTest(Raytracer::Algorithm raytracingAlgorithm = Raytracer::RAYTRAC
//raytracer.setLocalImageOutputEnabled(true);
raytracer.setRaytracingAlgorithm(raytracingAlgorithm);
- raytracer.rayTrace<BodyTuple>(0);
+ raytracer.generateImage<BodyTuple>(0);
}
ShadingParameters customSpheresBodyToShadingParams(const BodyID body) {
@@ -377,7 +377,7 @@ void RaytracerSpheresTest(Raytracer::Algorithm raytracingAlgorithm = Raytracer::
raytracer.setImageOutputEnabled(true);
raytracer.setRaytracingAlgorithm(raytracingAlgorithm);
- raytracer.rayTrace<BodyTuple>(1);
+ raytracer.generateImage<BodyTuple>(1);
}
ShadingParameters customHashGridsBodyToShadingParams(const BodyID body) {
@@ -554,7 +554,7 @@ void HashGridsTest(Raytracer::Algorithm raytracingAlgorithm,
raytracer.setFilenameTimestepWidth(12);
WALBERLA_LOG_INFO("output #" << i << " to: " << (boxes*100000000 + capsules*10000 + spheres) << " in " << raytracer.getImageOutputDirectory());
raytracer.setRaytracingAlgorithm(raytracingAlgorithm);
- raytracer.rayTrace<BodyTuple>(boxes*100000000 + capsules*10000 + spheres, &tt);
+ raytracer.generateImage<BodyTuple>(boxes*100000000 + capsules*10000 + spheres, &tt);
i++;
}
@@ -609,7 +609,7 @@ void raytraceArtifactsForest(Raytracer::Algorithm raytracingAlgorithm,
raytracer.setFilenameTimestepWidth(timestepWidth);
raytracer.setRaytracingAlgorithm(raytracingAlgorithm);
WALBERLA_LOG_INFO("output to: " << numberOfBoxes << " in " << raytracer.getImageOutputDirectory());
- raytracer.rayTrace<BodyTuple>(numberOfBoxes, &tt);
+ raytracer.generateImage<BodyTuple>(numberOfBoxes, &tt);
auto temp = tt.getReduced();
WALBERLA_ROOT_SECTION() {
@@ -859,7 +859,7 @@ void HashGridsTestScene(Raytracer::Algorithm raytracingAlgorithm = Raytracer::RA
raytracer.setFilenameTimestepWidth(1);
WALBERLA_LOG_INFO("output to: " << i << " in " << raytracer.getImageOutputDirectory());
raytracer.setRaytracingAlgorithm(raytracingAlgorithm);
- raytracer.rayTrace<BodyTuple>(size_t(i), &tt);
+ raytracer.generateImage<BodyTuple>(size_t(i), &tt);
auto temp = tt.getReduced();
WALBERLA_ROOT_SECTION() {
--
GitLab