diff options
| author | Sebastián Barschkis <sebbas@sebbas.org> | 2020-03-05 16:22:51 +0300 |
|---|---|---|
| committer | Sebastián Barschkis <sebbas@sebbas.org> | 2020-03-05 16:22:51 +0300 |
| commit | 950a35e35380dc84a4ca7dbff2837cc17a05d85e (patch) | |
| tree | 45b993fc1d9bf1975824a32f9811a2018d80915a /intern/mantaflow | |
| parent | cd0a6ff5c45382fa5620dc6dbf089e2909e38a78 (diff) | |
Fluid: More optimizations in smoke / liquid scripts
Reduced extrapolation distances, no need to extrapolate that far.
Diffstat (limited to 'intern/mantaflow')
| -rw-r--r-- | intern/mantaflow/intern/strings/liquid_script.h | 4 | ||||
| -rw-r--r-- | intern/mantaflow/intern/strings/smoke_script.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/intern/mantaflow/intern/strings/liquid_script.h b/intern/mantaflow/intern/strings/liquid_script.h index 011b8c4cb1a..23ec16b9d84 100644 --- a/intern/mantaflow/intern/strings/liquid_script.h +++ b/intern/mantaflow/intern/strings/liquid_script.h @@ -204,7 +204,7 @@ def liquid_adaptive_step_$ID$(framenr):\n\ \n\ # add initial velocity: set invel as source grid to ensure const vels in inflow region, sampling makes use of this\n\ if using_invel_s$ID$:\n\ - extrapolateVec3Simple(vel=invelC_s$ID$, phi=phiIn_s$ID$, distance=int(res_s$ID$/2), inside=True)\n\ + extrapolateVec3Simple(vel=invelC_s$ID$, phi=phiIn_s$ID$, distance=6, inside=True)\n\ resampleVec3ToMac(source=invelC_s$ID$, target=invel_s$ID$)\n\ pVel_pp$ID$.setSource(invel_s$ID$, isMAC=True)\n\ \n\ @@ -296,7 +296,7 @@ def liquid_step_$ID$():\n\ setWallBcs(flags=flags_s$ID$, vel=vel_s$ID$, obvel=None if using_fractions_s$ID$ else obvel_s$ID$, phiObs=phiObs_s$ID$, fractions=fractions_s$ID$)\n\ \n\ if not using_fractions_s$ID$:\n\ - extrapolateMACSimple(flags=flags_s$ID$, vel=vel_s$ID$, distance=(int(maxVel_s$ID$*1.25)))\n\ + extrapolateMACSimple(flags=flags_s$ID$, vel=vel_s$ID$)\n\ \n\ # set source grids for resampling, used in adjustNumber!\n\ pVel_pp$ID$.setSource(vel_s$ID$, isMAC=True)\n\ diff --git a/intern/mantaflow/intern/strings/smoke_script.h b/intern/mantaflow/intern/strings/smoke_script.h index e755bc70705..3b3d6380b6a 100644 --- a/intern/mantaflow/intern/strings/smoke_script.h +++ b/intern/mantaflow/intern/strings/smoke_script.h @@ -376,7 +376,7 @@ def smoke_step_$ID$():\n\ if using_obstacle_s$ID$:\n\ mantaMsg('Extrapolating object velocity')\n\ # ensure velocities inside of obs object, slightly add obvels outside of obs object\n\ - extrapolateVec3Simple(vel=obvelC_s$ID$, phi=phiObsIn_s$ID$, distance=int(res_s$ID$/2), inside=True)\n\ + extrapolateVec3Simple(vel=obvelC_s$ID$, phi=phiObsIn_s$ID$, distance=6, inside=True)\n\ extrapolateVec3Simple(vel=obvelC_s$ID$, phi=phiObsIn_s$ID$, distance=3, inside=False)\n\ resampleVec3ToMac(source=obvelC_s$ID$, target=obvel_s$ID$)\n\ \n\ |