[SPRINT 3] - Final project proposal. Stopped cout call for performanc…

…e analysis. Enabled viscosity calculation
debanshusingh · Apr 16, 2016 · ca72a49 · ca72a49
1 parent cb967c7
commit ca72a49
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -1,8 +1,16 @@
 # Korra Fluid Solver, CIS 563, University of Pennsylvania, Spring 2016
 
-[Youtube Link](https://youtu.be/QeSkB5jceCE)
-![](https://s3-us-west-2.amazonaws.com/trle/SPHSolverCPP/SPHSnapShotFullRender_SkyLight.jpg)
-![](https://s3-us-west-2.amazonaws.com/trle/SPHSolverCPP/render_full_angled.jpg)
+[![Youtube Link](https://s3-us-west-2.amazonaws.com/trle/SPHSolverCPP/SPHSolverYoutubePreview.png)](https://youtu.be/QeSkB5jceCE)
+![Rendered 1](https://s3-us-west-2.amazonaws.com/trle/SPHSolverCPP/SPHSnapShotFullRender_SkyLight.jpg)
+![Rendered 2](https://s3-us-west-2.amazonaws.com/trle/SPHSolverCPP/render_full_angled.jpg)
+![GUI](https://s3-us-west-2.amazonaws.com/trle/SPHSolverCPP/GUI_screenshot.png)
+
+## Update April 15 (Final project)
+
+For the proposal of the final project, I want to implement a real time interactive IISPH Solver based on the following papers:
+- [A Parallel Architecture for IISPH Fluids](https://graphics.ethz.ch/~sobarbar/papers/Sol14b/Sol14b.pdf) by Felix Thaler, Barbara Solenthaler, and Markus Gross. [Reference video](https://youtu.be/8ikKE4cM_Kk)
+- [Real-Time Incompressible Fluid Simulation on the GPU](http://www.hindawi.com/journals/ijcgt/2015/417417/) by Xiao Nie, Leiting Chen, and Tao Xiang
+
 
 ## Update April 10 (Sprint 3)
 
@@ -11,6 +19,7 @@
 - OpenVDB export + meshing
 - Solid interaction
 - Fluid tank
+- Ability to save screenshot every frame into bmp
 
 ### Incomplete features:
 - IISPH

diff --git a/src/fluidSolver/SPHSolver.cpp b/src/fluidSolver/SPHSolver.cpp
@@ -129,7 +129,7 @@ SPHSolver::Update(
     // -- Calculate force field
     for (FluidParticle* p : m_particles) {
         this->CalculatePressureForceField(p);
-        // this->CalculateViscosityForceField(p);
+        this->CalculateViscosityForceField(p);
     }
 
     // -- Update particles
@@ -141,7 +141,6 @@ SPHSolver::Update(
 
     double endTime = glfwGetTime();
     double deltaTime = double(endTime - startTime);
-    cout << to_string(deltaTime) << endl;
 }
 
 void
@@ -257,7 +256,7 @@ SPHSolver::CalculateViscosityForceField(
         glm::vec3 tempVisForce = (neighbor->Velocity() - particle->Velocity()) * laplacianKernelViscous / neighbor->Density();
         viscosityForce += tempVisForce;
     }
-    viscosityForce = viscosityForce * FluidParticle::mass * m_viscosity;
+    viscosityForce = viscosityForce * FluidParticle::mass * FluidParticle::mass * m_viscosity * 0.01f;
     particle->SetViscosityForce(viscosityForce);
 }
 

diff --git a/src/scene/scene_tank.json b/src/scene/scene_tank.json
@@ -14,7 +14,7 @@
         "centerY": 0.2,
         "centerZ": 0.0
     },
-    "tankHeight": 0.5,
+    "tankHeight": 0.3,
     "stiffness": 10,
     "viscosity": 0.0,
     "mass": 0.125,