[Bf-blender-cvs] [f2b5dd6ecdf] fluid-mantaflow: cleanup alphaV viscosity

Sebastián Barschkis noreply at git.blender.org
Sun Dec 3 12:24:56 CET 2017


Commit: f2b5dd6ecdf1577dbe1e9a9112c416e0cb735434
Author: Sebastián Barschkis
Date:   Sun Dec 3 12:24:39 2017 +0100
Branches: fluid-mantaflow
https://developer.blender.org/rBf2b5dd6ecdf1577dbe1e9a9112c416e0cb735434

cleanup alphaV viscosity

===================================================================

M	intern/mantaflow/intern/strings/liquid_script.h
M	intern/mantaflow/intern/strings/shared_script.h

===================================================================

diff --git a/intern/mantaflow/intern/strings/liquid_script.h b/intern/mantaflow/intern/strings/liquid_script.h
index f9dc24656bc..45b98a058fe 100644
--- a/intern/mantaflow/intern/strings/liquid_script.h
+++ b/intern/mantaflow/intern/strings/liquid_script.h
@@ -272,9 +272,7 @@ def liquid_step_$ID$():\n\
     if viscosity_s$ID$ > 0.:\n\
         mantaMsg('Viscosity')\n\
         # diffusion param for solve = const * dt / dx^2\n\
-        #alphaV = viscosity_s$ID$ * s$ID$.timestep * float(res_s$ID$*res_s$ID$)\n\
-        # convert world viscosity (viscosityW) to grid space viscosity (alphaV)\n\
-        alphaV = viscosity_s$ID$ * (Real(res_s$ID$*res_s$ID$) / Real(domainSize_s$ID$*domainSize_s$ID$)) * s$ID$.frameLength * s$ID$.timestep\n\
+        alphaV = viscosity_s$ID$ * s$ID$.timestep * float(res_s$ID$*res_s$ID$)\n\
         setWallBcs(flags=flags_s$ID$, vel=vel_s$ID$, obvel=obvel_s$ID$ if using_obstacle_s$ID$ else 0, phiObs=phiObs_s$ID$, fractions=fractions_s$ID$)\n\
         cgSolveDiffusion(flags_s$ID$, vel_s$ID$, alphaV)\n\
     \n\
diff --git a/intern/mantaflow/intern/strings/shared_script.h b/intern/mantaflow/intern/strings/shared_script.h
index 0b0a2e1dbf9..170461da8ce 100644
--- a/intern/mantaflow/intern/strings/shared_script.h
+++ b/intern/mantaflow/intern/strings/shared_script.h
@@ -92,8 +92,7 @@ theta_s$ID$ = 1.0\n\
 # fluid diffusion / viscosity\n\
 domainSize_s$ID$ = $FLUID_DOMAIN_SIZE$ # longest domain side in cm\n\
 if domainSize_s$ID$ == 0: domainSize_s$ID$ = 100 # TODO (sebbas): just for versioning, remove with proper 2.8 versioning\n\
-#viscosity_s$ID$ = $FLUID_VISCOSITY$ / ((domainSize_s$ID$*domainSize_s$ID$) / s$ID$.frameLength)\n\
-viscosity_s$ID$  = $FLUID_VISCOSITY$ # kinmetic viscosity in m^2/s\n";
+viscosity_s$ID$ = $FLUID_VISCOSITY$ / (domainSize_s$ID$*domainSize_s$ID$) # kinematic viscosity in m^2/s\n";
 
 const std::string fluid_variables_high= "\n\
 upres_xl$ID$  = $UPRES$\n\



More information about the Bf-blender-cvs mailing list