diff options
Diffstat (limited to 'intern/smoke/intern/FLUID_3D.h')
| -rw-r--r-- | intern/smoke/intern/FLUID_3D.h | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/intern/smoke/intern/FLUID_3D.h b/intern/smoke/intern/FLUID_3D.h index 78a4cf076e3..9d9e7318204 100644 --- a/intern/smoke/intern/FLUID_3D.h +++ b/intern/smoke/intern/FLUID_3D.h @@ -64,7 +64,7 @@ class FLUID_3D // dimensions int _xRes, _yRes, _zRes, _maxRes; Vec3Int _res; - int _totalCells; + size_t _totalCells; int _slabSize; float _dx; float _p0[3]; @@ -81,7 +81,6 @@ class FLUID_3D float* _densityOld; float* _heat; float* _heatOld; - float* _pressure; float* _xVelocity; float* _yVelocity; float* _zVelocity; @@ -91,19 +90,9 @@ class FLUID_3D float* _xForce; float* _yForce; float* _zForce; - float* _divergence; - float* _xVorticity; - float* _yVorticity; - float* _zVorticity; - float* _vorticity; - float* _h; - float* _Precond; unsigned char* _obstacles; // CG fields - float* _residual; - float* _direction; - float* _q; int _iterations; // simulation constants @@ -134,8 +123,8 @@ class FLUID_3D void solveHeat(float* field, float* b, unsigned char* skip); // handle obstacle boundaries - void setObstacleBoundaries(); - void setObstaclePressure(); + void setObstacleBoundaries(float *_pressure); + void setObstaclePressure(float *_pressure); public: // advection, accessed e.g. by WTURBULENCE class |