blender
/
blender
137
404
Fork 586
Code Issues 6.2k Pull Requests 759 Projects 19 Wiki Activity

Fluid: Added sanity grid initializations in smoke / liquid scripts 

Just a sanity check.
This commit is contained in:
Sebastián Barschkis 2020-03-04 17:50:55 +01:00
parent 8f1876b4f0
commit 3c74d45c9e
Notes: blender-bot 2023-02-14 06:47:29 +01:00 
Referenced by issue #88566, Mantaflow inflow with shapekeys is not working anymore (regression)
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
intern/mantaflow/intern/strings/fluid_script.h
View File

@ -238,6 +238,12 @@ y_force_s$ID$ = s$ID$.create(RealGrid)\n\
z_force_s$ID$ = s$ID$.create(RealGrid)\n\
obvel_s$ID$ = None\n\
\n\
# Set some initial values\n\
phiObs_s$ID$.setConst(9999)\n\
phiSIn_s$ID$.setConst(9999)\n\
phiIn_s$ID$.setConst(9999)\n\
phiOut_s$ID$.setConst(9999)\n\
\n\
# Keep track of important objects in dict to load them later on\n\
fluid_data_dict_final_s$ID$ = dict(vel=vel_s$ID$)\n\
fluid_data_dict_resume_s$ID$ = dict(phiObs=phiObs_s$ID$, phiIn=phiIn_s$ID$, phiOut=phiOut_s$ID$, flags=flags_s$ID$)\n";
@ -253,6 +259,10 @@ x_obvel_s$ID$ = s$ID$.create(RealGrid)\n\
y_obvel_s$ID$ = s$ID$.create(RealGrid)\n\
z_obvel_s$ID$ = s$ID$.create(RealGrid)\n\
\n\
# Set some initial values\n\
phiObsSIn_s$ID$.setConst(9999)\n\
phiObsIn_s$ID$.setConst(9999)\n\
\n\
if 'fluid_data_dict_resume_s$ID$' in globals():\n\
fluid_data_dict_resume_s$ID$.update(phiObsIn=phiObsIn_s$ID$)\n";

10
intern/mantaflow/intern/strings/liquid_script.h
View File

@ -114,6 +114,10 @@ if using_speedvectors_s$ID$:\n\
pindex_sm$ID$ = sm$ID$.create(ParticleIndexSystem)\n\
gpi_sm$ID$ = sm$ID$.create(IntGrid)\n\
\n\
# Set some initial values\n\
phiParts_sm$ID$.setConst(9999)\n\
phi_sm$ID$.setConst(9999)\n\
\n\
# Keep track of important objects in dict to load them later on\n\
liquid_mesh_dict_s$ID$ = dict(lMesh=mesh_sm$ID$)\n\
\n\
@ -138,6 +142,12 @@ trappedAir_sp$ID$ = sp$ID$.create(RealGrid)\n\
waveCrest_sp$ID$ = sp$ID$.create(RealGrid)\n\
kineticEnergy_sp$ID$ = sp$ID$.create(RealGrid)\n\
\n\
# Set some initial values\n\
phi_sp$ID$.setConst(9999)\n\
phiIn_sp$ID$.setConst(9999)\n\
phiObs_sp$ID$.setConst(9999)\n\
phiObsIn_sp$ID$.setConst(9999)\n\
\n\
# Keep track of important objects in dict to load them later on\n\
liquid_particles_dict_final_s$ID$ = dict(ppSnd=ppSnd_sp$ID$, pVelSnd=pVelSnd_pp$ID$, pLifeSnd=pLifeSnd_pp$ID$)\n\
liquid_particles_dict_resume_s$ID$ = dict(trappedAir=trappedAir_sp$ID$, waveCrest=waveCrest_sp$ID$, kineticEnergy=kineticEnergy_sp$ID$)\n";