[Bf-blender-cvs] [b77f938] fluid-mantaflow: removed chrono calls in mantaflow file. they caused some trouble with the blender build and are not needed anyways.
Sebastián Barschkis
noreply at git.blender.org
Sun Aug 21 11:41:27 CEST 2016
Commit: b77f9388a4766a324a319e3f62b0898eef1469d1
Author: Sebastián Barschkis
Date: Sun Aug 21 01:04:57 2016 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rBb77f9388a4766a324a319e3f62b0898eef1469d1
removed chrono calls in mantaflow file. they caused some trouble with the blender build and are not needed anyways.
===================================================================
M intern/mantaflow/intern/manta_pp/plugin/surfaceturbulence.cpp
===================================================================
diff --git a/intern/mantaflow/intern/manta_pp/plugin/surfaceturbulence.cpp b/intern/mantaflow/intern/manta_pp/plugin/surfaceturbulence.cpp
index 237dc53..c0eed5b 100644
--- a/intern/mantaflow/intern/manta_pp/plugin/surfaceturbulence.cpp
+++ b/intern/mantaflow/intern/manta_pp/plugin/surfaceturbulence.cpp
@@ -27,21 +27,7 @@
*
******************************************************************************/
-// check whether chrono is available
-#ifdef __GNUC__
-#if __GNUC__<5
-#define USE_CHRONO 0
-#endif
-#endif
-
-#ifndef USE_CHRONO
-#define USE_CHRONO 1
-#endif
-
#include <iomanip>
-#if USE_CHRONO==1
-#include <chrono>
-#endif
#include "particle.h"
using namespace std;
@@ -443,7 +429,7 @@ void initFines(
{
#pragma omp for
for (IndexInt i = 0; i < _sz; i++) op(i,surfacePoints,coarseParticles,coarseParticlesPrevPos); } } BasicParticleSystemWrapper& surfacePoints; BasicParticleSystemWrapper& coarseParticles; ParticleDataImplVec3Wrapper& coarseParticlesPrevPos; };
-#line 410 "plugin/surfaceturbulence.cpp"
+#line 396 "plugin/surfaceturbulence.cpp"
@@ -536,7 +522,7 @@ Vec3 computeConstraintGradient(
{
#pragma omp for
for (IndexInt i = 0; i < _sz; i++) op(i,surfacePoints,coarseParticles,surfaceNormals); } } BasicParticleSystemWrapper& surfacePoints; BasicParticleSystemWrapper& coarseParticles; ParticleDataImpl<Vec3>& surfaceNormals; };
-#line 469 "plugin/surfaceturbulence.cpp"
+#line 455 "plugin/surfaceturbulence.cpp"
@@ -562,7 +548,7 @@ Vec3 computeConstraintGradient(
{
#pragma omp for
for (IndexInt i = 0; i < _sz; i++) op(i,surfacePoints,surfaceNormals); } } BasicParticleSystemWrapper& surfacePoints; ParticleDataImpl<Vec3>& surfaceNormals; };
-#line 526 "plugin/surfaceturbulence.cpp"
+#line 512 "plugin/surfaceturbulence.cpp"
@@ -577,7 +563,7 @@ Vec3 computeConstraintGradient(
{
#pragma omp for
for (IndexInt i = 0; i < _sz; i++) op(i,surfacePoints,surfaceNormals); } } BasicParticleSystemWrapper& surfacePoints; ParticleDataImpl<Vec3>& surfaceNormals; };
-#line 540 "plugin/surfaceturbulence.cpp"
+#line 526 "plugin/surfaceturbulence.cpp"
@@ -700,7 +686,7 @@ void addDeleteSurfacePoints(
{
#pragma omp for
for (IndexInt i = 0; i < _sz; i++) op(i,surfacePoints,dummy); } } BasicParticleSystemWrapper& surfacePoints; void* dummy; };
-#line 649 "plugin/surfaceturbulence.cpp"
+#line 635 "plugin/surfaceturbulence.cpp"
@@ -748,7 +734,7 @@ void addDeleteSurfacePoints(
{
#pragma omp for
for (IndexInt i = 0; i < _sz; i++) op(i,surfacePoints,surfaceNormals); } } BasicParticleSystemWrapper& surfacePoints; ParticleDataImpl<Vec3>& surfaceNormals; };
-#line 664 "plugin/surfaceturbulence.cpp"
+#line 650 "plugin/surfaceturbulence.cpp"
@@ -763,7 +749,7 @@ void addDeleteSurfacePoints(
{
#pragma omp for
for (IndexInt i = 0; i < _sz; i++) op(i,surfacePoints,dummy); } } BasicParticleSystemWrapper& surfacePoints; void* dummy; };
-#line 705 "plugin/surfaceturbulence.cpp"
+#line 691 "plugin/surfaceturbulence.cpp"
@@ -798,7 +784,7 @@ void regularizeSurfacePoints(
{
#pragma omp for
for (IndexInt i = 0; i < _sz; i++) op(i,surfacePoints,coarseParticles); } } BasicParticleSystemWrapper& surfacePoints; BasicParticleSystemWrapper& coarseParticles; };
-#line 727 "plugin/surfaceturbulence.cpp"
+#line 713 "plugin/surfaceturbulence.cpp"
@@ -838,7 +824,7 @@ void regularizeSurfacePoints(
{
#pragma omp for
for (IndexInt i = 0; i < _sz; i++) op(i,surfacePoints,surfaceWaveH,surfaceWaveDtH,surfaceWaveSeed,surfaceWaveSeedAmplitude); } } BasicParticleSystemWrapper& surfacePoints; ParticleDataImpl<Real>& surfaceWaveH; ParticleDataImpl<Real>& surfaceWaveDtH; ParticleDataImpl<Real>& surfaceWaveSeed; ParticleDataImpl<Real>& surfaceWaveSeedAmplitude; };
-#line 745 "plugin/surfaceturbulence.cpp"
+#line 731 "plugin/surfaceturbulence.cpp"
@@ -891,7 +877,7 @@ void surfaceMaintenance(
{
#pragma omp for
for (IndexInt i = 0; i < _sz; i++) op(i,surfacePoints,surfaceWaveH,surfaceWaveSeed); } } BasicParticleSystemWrapper& surfacePoints; ParticleDataImpl<Real>& surfaceWaveH; ParticleDataImpl<Real>& surfaceWaveSeed; };
-#line 812 "plugin/surfaceturbulence.cpp"
+#line 798 "plugin/surfaceturbulence.cpp"
@@ -948,7 +934,7 @@ void surfaceMaintenance(
{
#pragma omp for
for (IndexInt i = 0; i < _sz; i++) op(i,surfacePoints,surfaceNormals,surfaceWaveH); } } BasicParticleSystemWrapper& surfacePoints; ParticleDataImpl<Vec3>& surfaceNormals; ParticleDataImpl<Real>& surfaceWaveH; };
-#line 822 "plugin/surfaceturbulence.cpp"
+#line 808 "plugin/surfaceturbulence.cpp"
@@ -998,7 +984,7 @@ void surfaceMaintenance(
{
#pragma omp for
for (IndexInt i = 0; i < _sz; i++) op(i,surfacePoints,surfaceNormals,surfaceWaveH); } } BasicParticleSystemWrapper& surfacePoints; ParticleDataImpl<Vec3>& surfaceNormals; ParticleDataImpl<Real>& surfaceWaveH; };
-#line 871 "plugin/surfaceturbulence.cpp"
+#line 857 "plugin/surfaceturbulence.cpp"
@@ -1024,7 +1010,7 @@ void surfaceMaintenance(
{
#pragma omp for
for (IndexInt i = 0; i < _sz; i++) op(i,surfacePoints,surfaceWaveH,surfaceWaveDtH,surfaceWaveSeed); } } BasicParticleSystemWrapper& surfacePoints; ParticleDataImpl<Real>& surfaceWaveH; ParticleDataImpl<Real>& surfaceWaveDtH; ParticleDataImpl<Real>& surfaceWaveSeed; };
-#line 916 "plugin/surfaceturbulence.cpp"
+#line 902 "plugin/surfaceturbulence.cpp"
@@ -1060,7 +1046,7 @@ void surfaceMaintenance(
{
#pragma omp for
for (IndexInt i = 0; i < _sz; i++) op(i,surfacePoints,surfaceNormals); } } BasicParticleSystemWrapper& surfacePoints; ParticleDataImpl<Vec3>& surfaceNormals; };
-#line 933 "plugin/surfaceturbulence.cpp"
+#line 919 "plugin/surfaceturbulence.cpp"
@@ -1086,7 +1072,7 @@ void surfaceMaintenance(
{
#pragma omp for
for (IndexInt i = 0; i < _sz; i++) op(i,surfacePoints,surfaceWaveSource); } } BasicParticleSystemWrapper& surfacePoints; ParticleDataImpl<Real>& surfaceWaveSource; };
-#line 962 "plugin/surfaceturbulence.cpp"
+#line 948 "plugin/surfaceturbulence.cpp"
@@ -1114,7 +1100,7 @@ void surfaceMaintenance(
{
#pragma omp for
for (IndexInt i = 0; i < _sz; i++) op(i,surfacePoints,surfaceWaveSeed,surfaceWaveSeedAmplitude,surfaceWaveSource); } } BasicParticleSystemWrapper& surfacePoints; ParticleDataImpl<Real>& surfaceWaveSeed; ParticleDataImpl<Real>& surfaceWaveSeedAmplitude; ParticleDataImpl<Real>& surfaceWaveSource; };
-#line 983 "plugin/surfaceturbulence.cpp"
+#line 969 "plugin/surfaceturbulence.cpp"
@@ -1174,14 +1160,7 @@ void surfaceWaves(
-void particleSurfaceTurbulence( FlagGrid& flags, BasicParticleSystem& coarseParts, ParticleDataImpl<Vec3>& coarsePartsPrevPos, BasicParticleSystem& surfPoints, ParticleDataImpl<Vec3>& surfaceNormals, ParticleDataImpl<Real>& surfaceWaveH, ParticleDataImpl<Real>& surfaceWaveDtH, BasicParticleSystem& surfacePointsDisplaced, ParticleDataImpl<Real>& surfaceWaveSource, ParticleDataImpl<Real>& surfaceWaveSeed, ParticleDataImpl<Real>& surfaceWaveSeedAmplitude, int res, Real outerRadius = 1.0f, i [...]
-# if USE_CHRONO==1
- static std::chrono::high_resolution_clock::time_point begin, end;
- end = std::chrono::high_resolution_clock::now();
- cout << std::chrono::duration_cast<std::chrono::nanoseconds>(end-begin).count()/1000000000.f << " : time sim" << endl;
- begin = std::chrono::high_resolution_clock::now();
-# endif
-
+void particleSurfaceTurbulence( FlagGrid& flags, BasicParticleSystem& coarseParts, ParticleDataImpl<Vec3>& coarsePartsPrevPos, BasicParticleSystem& surfPoints, ParticleDataImpl<Vec3>& surfaceNormals, ParticleDataImpl<Real>& surfaceWaveH, ParticleDataImpl<Real>& surfaceWaveDtH, BasicParticleSystem& surfacePointsDisplaced, ParticleDataImpl<Real>& surfaceWaveSource, ParticleDataImpl<Real>& surfaceWaveSeed, ParticleDataImpl<Real>& surfaceWaveSeedAmplitude, int res, Real outerRadius = 1.0f, i [...]
// wrap data
coarseParticles.points = &coarseParts;
coarseParticlesPrevPos.points = &coarsePartsPrevPos;
@@ -1271,12 +1250,6 @@ void particleSurfaceTurbulence( FlagGrid& flags, BasicParticleSystem& coarsePart
surfacePointsDisplaced.addParticle(surfacePoints.getPos(idx) + surfaceNormals[idx]*surfaceWaveH[idx]);
}
}
-
-# if USE_CHRONO==1
- end = std::chrono::high_resolution_clock::now();
- cout << std::chrono::duration_cast<std::chrono::nanoseconds>(end-begin).count()/1000000000.f << " : time upres" << endl;
- begin = std::chrono::high_resolution_clock::now();
-# endif
} static PyObject* _W_0 (PyObject* _self, PyObject* _linargs, PyObject* _kwds) { try { PbArgs _args(_linargs, _kwds); FluidSolver *parent = _args.obtainParent(); bool noTiming = _args.getOpt<bool>("notiming", -1, 0); pbPreparePlugin(parent, "particleSurfaceTurbulence" , !noTiming ); PyObject *_retval = 0; { ArgLocker _lock; FlagGrid& flags = *_args.getPtr<FlagGrid >("flags",0,&_lock); BasicParticleSystem& coarseParts = *_args.getPtr<BasicParticleSystem >("coarseParts",1,&_lock); Particle [...]
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list