From 4ccbbd308060f0330472828b317c59e054c9ee7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Barschkis?= Date: Thu, 5 Mar 2020 11:40:59 +0100 Subject: Fix T74446: Liquid Inflow Does Not Work Somehow this was forgotton in the optimization patch a5c4a44df67e. --- intern/mantaflow/intern/strings/liquid_script.h | 1 + intern/mantaflow/intern/strings/smoke_script.h | 1 + 2 files changed, 2 insertions(+) (limited to 'intern') diff --git a/intern/mantaflow/intern/strings/liquid_script.h b/intern/mantaflow/intern/strings/liquid_script.h index 1c3f576f1fa..d3ab4db954c 100644 --- a/intern/mantaflow/intern/strings/liquid_script.h +++ b/intern/mantaflow/intern/strings/liquid_script.h @@ -187,6 +187,7 @@ def liquid_adaptive_step_$ID$(framenr):\n\ extrapolateLsSimple(phi=phiObs_s$ID$, distance=3)\n\ \n\ mantaMsg('Initializing fluid levelset')\n\ + phiIn_s$ID$.join(phiSIn_s$ID$) # Join static flow map\n\ extrapolateLsSimple(phi=phiIn_s$ID$, distance=6, inside=True)\n\ extrapolateLsSimple(phi=phiIn_s$ID$, distance=3)\n\ phi_s$ID$.join(phiIn_s$ID$)\n\ diff --git a/intern/mantaflow/intern/strings/smoke_script.h b/intern/mantaflow/intern/strings/smoke_script.h index 04f03100cb9..e755bc70705 100644 --- a/intern/mantaflow/intern/strings/smoke_script.h +++ b/intern/mantaflow/intern/strings/smoke_script.h @@ -290,6 +290,7 @@ def smoke_adaptive_step_$ID$(framenr):\n\ extrapolateLsSimple(phi=phiObs_s$ID$, distance=3, inside=False)\n\ \n\ mantaMsg('Initializing fluid levelset')\n\ + phiIn_s$ID$.join(phiSIn_s$ID$) # Join static flow map\n\ extrapolateLsSimple(phi=phiIn_s$ID$, distance=6, inside=True)\n\ extrapolateLsSimple(phi=phiIn_s$ID$, distance=3, inside=False)\n\ \n\ -- cgit v1.2.3