[Bf-blender-cvs] [1c1e99363d9] fluid-mantaflow: improvements to the pointcache
Sebastián Barschkis
noreply at git.blender.org
Sun Jun 4 22:12:43 CEST 2017
Commit: 1c1e99363d9b13939ccda0fc645f6e7057f26f1d
Author: Sebastián Barschkis
Date: Sun Jun 4 22:05:43 2017 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rB1c1e99363d9b13939ccda0fc645f6e7057f26f1d
improvements to the pointcache
fixed a problem where caching would not resume after restarting the simulation. also, cache file names are now a bit nicer
===================================================================
M intern/mantaflow/intern/strings/liquid_script.h
M intern/mantaflow/intern/strings/smoke_script.h
M source/blender/blenkernel/intern/pointcache.c
===================================================================
diff --git a/intern/mantaflow/intern/strings/liquid_script.h b/intern/mantaflow/intern/strings/liquid_script.h
index 9169ee21ba6..5c5fa5374d2 100644
--- a/intern/mantaflow/intern/strings/liquid_script.h
+++ b/intern/mantaflow/intern/strings/liquid_script.h
@@ -291,83 +291,83 @@ def save_particles_low_$ID$(path):\n\
const std::string liquid_import_low = "\n\
def load_liquid_data_low_$ID$(path):\n\
- flags_s$ID$.load(os.path.join(path, 'flags_s$ID$.uni'))\n\
- \n\
- phiParts_s$ID$.load(os.path.join(path, 'phiParts_s$ID$.uni'))\n\
- phi_s$ID$.load(os.path.join(path, 'phi_s$ID$.uni'))\n\
- phiIn_s$ID$.load(os.path.join(path, 'phiIn_s$ID$.uni'))\n\
- phiObs_s$ID$.load(os.path.join(path, 'phiObs_s$ID$.uni'))\n\
- phiObsIn_s$ID$.load(os.path.join(path, 'phiObsIn_s$ID$.uni'))\n\
- phiOut_s$ID$.load(os.path.join(path, 'phiOut_s$ID$.uni'))\n\
- fractions_s$ID$.load(os.path.join(path, 'fractions_s$ID$.uni'))\n\
- pressure_s$ID$.load(os.path.join(path, 'pressure_s$ID$.uni'))\n\
- \n\
- vel_s$ID$.load(os.path.join(path, 'vel_s$ID$.uni'))\n\
- obvel_s$ID$.load(os.path.join(path, 'obvel_s$ID$.uni'))\n\
- velOld_s$ID$.load(os.path.join(path, 'velOld_s$ID$.uni'))\n\
- velParts_s$ID$.load(os.path.join(path, 'velParts_s$ID$.uni'))\n\
- mapWeights_s$ID$.load(os.path.join(path, 'mapWeights_s$ID$.uni'))\n\
- \n\
- x_vel_s$ID$.load(os.path.join(path, 'x_vel_s$ID$.uni'))\n\
- y_vel_s$ID$.load(os.path.join(path, 'y_vel_s$ID$.uni'))\n\
- z_vel_s$ID$.load(os.path.join(path, 'z_vel_s$ID$.uni'))\n\
- x_obvel_s$ID$.load(os.path.join(path, 'x_obvel_s$ID$.uni'))\n\
- y_obvel_s$ID$.load(os.path.join(path, 'y_obvel_s$ID$.uni'))\n\
- z_obvel_s$ID$.load(os.path.join(path, 'z_obvel_s$ID$.uni'))\n\
- \n\
- pp_s$ID$.load(os.path.join(path, 'pp_s$ID$.uni'))\n\
- pVel_s$ID$.load(os.path.join(path, 'pVel_s$ID$.uni'))\n\
- \n\
- gpi_s$ID$.load(os.path.join(path, 'gpi_s$ID$.uni'))\n";
+ flags_s$ID$.load(path + '_flags.uni')\n\
+ \n\
+ phiParts_s$ID$.load(path + '_phiParts.uni')\n\
+ phi_s$ID$.load(path + '_phi.uni')\n\
+ phiIn_s$ID$.load(path + '_phiIn.uni')\n\
+ phiObs_s$ID$.load(path + '_phiObs.uni')\n\
+ phiObsIn_s$ID$.load(path + '_phiObsIn.uni')\n\
+ phiOut_s$ID$.load(path + '_phiOut.uni')\n\
+ fractions_s$ID$.load(path + '_fractions.uni')\n\
+ pressure_s$ID$.load(path + '_pressure.uni')\n\
+ \n\
+ vel_s$ID$.load(path + '_vel.uni')\n\
+ obvel_s$ID$.load(path + '_obvel.uni')\n\
+ velOld_s$ID$.load(path + '_velOld.uni')\n\
+ velParts_s$ID$.load(path + '_velParts.uni')\n\
+ mapWeights_s$ID$.load(path + '_mapWeights.uni')\n\
+ \n\
+ x_vel_s$ID$.load(path + '_x_vel.uni')\n\
+ y_vel_s$ID$.load(path + '_y_vel.uni')\n\
+ z_vel_s$ID$.load(path + '_z_vel.uni')\n\
+ x_obvel_s$ID$.load(path + '_x_obvel.uni')\n\
+ y_obvel_s$ID$.load(path + '_y_obvel.uni')\n\
+ z_obvel_s$ID$.load(path + '_z_obvel.uni')\n\
+ \n\
+ pp_s$ID$.load(path + '_pp.uni')\n\
+ pVel_s$ID$.load(path + '_pVel.uni')\n\
+ \n\
+ gpi_s$ID$.load(path + '_gpi.uni')\n";
const std::string liquid_import_high = "\n\
def load_liquid_data_high_$ID$(path):\n\
- flags_xl$ID$.load(os.path.join(path, 'flags_xl$ID$.uni'))\n\
+ flags_xl$ID$.load(path + '_flags_xl.uni')\n\
\n\
- phiParts_xl$ID$.load(os.path.join(path, 'phiParts_xl$ID$.uni'))\n\
- phi_xl$ID$.load(os.path.join(path, 'phi_xl$ID$.uni'))\n\
+ phiParts_xl$ID$.load(path + '_phiParts_xl.uni')\n\
+ phi_xl$ID$.load(path + '_phi_xl.uni')\n\
\n\
- pp_xl$ID$.load(os.path.join(path, 'pp_xl$ID$.uni'))\n";
+ pp_xl$ID$.load(path + '_pp_xl.uni')\n";
const std::string liquid_export_low = "\n\
def save_liquid_data_low_$ID$(path):\n\
- flags_s$ID$.save(os.path.join(path, 'flags_s$ID$.uni'))\n\
- \n\
- phiParts_s$ID$.save(os.path.join(path, 'phiParts_s$ID$.uni'))\n\
- phi_s$ID$.save(os.path.join(path, 'phi_s$ID$.uni'))\n\
- phiIn_s$ID$.save(os.path.join(path, 'phiIn_s$ID$.uni'))\n\
- phiObs_s$ID$.save(os.path.join(path, 'phiObs_s$ID$.uni'))\n\
- phiObsIn_s$ID$.save(os.path.join(path, 'phiObsIn_s$ID$.uni'))\n\
- phiOut_s$ID$.save(os.path.join(path, 'phiOut_s$ID$.uni'))\n\
- fractions_s$ID$.save(os.path.join(path, 'fractions_s$ID$.uni'))\n\
- pressure_s$ID$.save(os.path.join(path, 'pressure_s$ID$.uni'))\n\
- \n\
- vel_s$ID$.save(os.path.join(path, 'vel_s$ID$.uni'))\n\
- obvel_s$ID$.save(os.path.join(path, 'obvel_s$ID$.uni'))\n\
- velOld_s$ID$.save(os.path.join(path, 'velOld_s$ID$.uni'))\n\
- velParts_s$ID$.save(os.path.join(path, 'velParts_s$ID$.uni'))\n\
- mapWeights_s$ID$.save(os.path.join(path, 'mapWeights_s$ID$.uni'))\n\
- \n\
- x_vel_s$ID$.save(os.path.join(path, 'x_vel_s$ID$.uni'))\n\
- y_vel_s$ID$.save(os.path.join(path, 'y_vel_s$ID$.uni'))\n\
- z_vel_s$ID$.save(os.path.join(path, 'z_vel_s$ID$.uni'))\n\
- x_obvel_s$ID$.save(os.path.join(path, 'x_obvel_s$ID$.uni'))\n\
- y_obvel_s$ID$.save(os.path.join(path, 'y_obvel_s$ID$.uni'))\n\
- z_obvel_s$ID$.save(os.path.join(path, 'z_obvel_s$ID$.uni'))\n\
- \n\
- pp_s$ID$.save(os.path.join(path, 'pp_s$ID$.uni'))\n\
- pVel_s$ID$.save(os.path.join(path, 'pVel_s$ID$.uni'))\n\
- \n\
- gpi_s$ID$.save(os.path.join(path, 'gpi_s$ID$.uni'))\n";
+ flags_s$ID$.save(path + '_flags.uni')\n\
+ \n\
+ phiParts_s$ID$.save(path + '_phiParts.uni')\n\
+ phi_s$ID$.save(path + '_phi.uni')\n\
+ phiIn_s$ID$.save(path + '_phiIn.uni')\n\
+ phiObs_s$ID$.save(path + '_phiObs.uni')\n\
+ phiObsIn_s$ID$.save(path + '_phiObsIn.uni')\n\
+ phiOut_s$ID$.save(path + '_phiOut.uni')\n\
+ fractions_s$ID$.save(path + '_fractions.uni')\n\
+ pressure_s$ID$.save(path + '_pressure.uni')\n\
+ \n\
+ vel_s$ID$.save(path + '_vel.uni')\n\
+ obvel_s$ID$.save(path + '_obvel.uni')\n\
+ velOld_s$ID$.save(path + '_velOld.uni')\n\
+ velParts_s$ID$.save(path + '_velParts.uni')\n\
+ mapWeights_s$ID$.save(path + '_mapWeights.uni')\n\
+ \n\
+ x_vel_s$ID$.save(path + '_x_vel.uni')\n\
+ y_vel_s$ID$.save(path + '_y_vel.uni')\n\
+ z_vel_s$ID$.save(path + '_z_vel.uni')\n\
+ x_obvel_s$ID$.save(path + '_x_obvel.uni')\n\
+ y_obvel_s$ID$.save(path + '_y_obvel.uni')\n\
+ z_obvel_s$ID$.save(path + '_z_obvel.uni')\n\
+ \n\
+ pp_s$ID$.save(path + '_pp.uni')\n\
+ pVel_s$ID$.save(path + '_pVel.uni')\n\
+ \n\
+ gpi_s$ID$.save(path + '_gpi.uni')\n";
const std::string liquid_export_high = "\n\
def save_liquid_data_high_$ID$(path):\n\
- flags_xl$ID$.save(os.path.join(path, 'flags_xl$ID$.uni'))\n\
+ flags_xl$ID$.save(path + '_flags_xl.uni')\n\
\n\
- phiParts_xl$ID$.save(os.path.join(path, 'phiParts_xl$ID$.uni'))\n\
- phi_xl$ID$.save(os.path.join(path, 'phi_xl$ID$.uni'))\n\
+ phiParts_xl$ID$.save(path + '_phiParts_xl.uni')\n\
+ phi_xl$ID$.save(path + '_phi_xl.uni')\n\
\n\
- pp_xl$ID$.save(os.path.join(path, 'pp_xl$ID$.uni'))\n";
+ pp_xl$ID$.save(path + '_pp_xl.uni')\n";
//////////////////////////////////////////////////////////////////////
// DESTRUCTION
diff --git a/intern/mantaflow/intern/strings/smoke_script.h b/intern/mantaflow/intern/strings/smoke_script.h
index df84de7dd72..2afdfb1ca13 100644
--- a/intern/mantaflow/intern/strings/smoke_script.h
+++ b/intern/mantaflow/intern/strings/smoke_script.h
@@ -381,109 +381,109 @@ def update_flame_high_$ID$():\n\
const std::string smoke_import_low = "\n\
def load_smoke_data_low_$ID$(path):\n\
- density_s$ID$.load(os.path.join(path, 'density_s$ID$.uni'))\n\
- flags_s$ID$.load(os.path.join(path, 'flags_s$ID$.uni'))\n\
- vel_s$ID$.load(os.path.join(path, 'vel_s$ID$.uni'))\n\
- obvel_s$ID$.load(os.path.join(path, 'obvel_s$ID$.uni'))\n\
- pressure_s$ID$.load(os.path.join(path, 'pressure_s$ID$.uni'))\n\
- forces_s$ID$.load(os.path.join(path, 'forces_s$ID$.uni'))\n\
- x_force_s$ID$.load(os.path.join(path, 'x_force_s$ID$.uni'))\n\
- y_force_s$ID$.load(os.path.join(path, 'y_force_s$ID$.uni'))\n\
- z_force_s$ID$.load(os.path.join(path, 'z_force_s$ID$.uni'))\n\
- inflow_s$ID$.load(os.path.join(path, 'inflow_s$ID$.uni'))\n\
- x_vel_s$ID$.load(os.path.join(path, 'x_vel_s$ID$.uni'))\n\
- y_vel_s$ID$.load(os.path.join(path, 'y_vel_s$ID$.uni'))\n\
- z_vel_s$ID$.load(os.path.join(path, 'z_vel_s$ID$.uni'))\n\
- x_obvel_s$ID$.load(os.path.join(path, 'x_obvel_s$ID$.uni'))\n\
- y_obvel_s$ID$.load(os.path.join(path, 'y_obvel_s$ID$.uni'))\n\
- z_obvel_s$ID$.load(os.path.join(path, 'z_obvel_s$ID$.uni'))\n\
- phiObsIn_s$ID$.load(os.path.join(path, 'phiObsIn_s$ID$.uni'))\n\
- phiOut_s$ID$.load(os.path.join(path, 'phiOut_s$ID$.uni'))\n\
- numObs_s$ID$.load(os.path.join(path, 'numObs_s$ID$.uni'))\n\
+ density_s$ID$.load(path + '_density.uni')\n\
+ flags_s$ID$.load(path + '_flags.uni')\n\
+ vel_s$ID$.load(path + '_vel.uni')\n\
+ obvel_s$ID$.load(path + '_obvel.uni')\n\
+ pressure_s$ID$.load(path + '_pressure.uni')\n\
+ forces_s$ID$.load(path + '_forces.uni')\n\
+ x_force_s$ID$.load(path + '_x_force.uni')\n\
+ y_force_s$ID$.load(path + '_y_force.uni')\n\
+ z_force_s$ID$.load(path + '_z_force.uni')\n\
+ inflow_s$ID$.load(path + '_inflow.uni')\n\
+ x_vel_s$ID$.load(path + '_x_vel.uni')\n\
+ y_vel_s$ID$.load(path + '_y_vel.uni')\n\
+ z_vel_s$ID$.load(path + '_z_vel.uni')\n\
+ x_obvel_s$ID$.load(path + '_x_obvel.uni')\n\
+ y_obvel_s$ID$.load(path + '_y_obvel.uni')\n\
+ z_obvel_s$ID$.load(path + '_z_obvel.uni')\n\
+ phiObsIn_s$ID$.load(path + '_phiObsIn.uni')\n\
+ phiOut_s$ID$.load(path + '_phiOut.uni')\n\
+ numObs_s$ID$.load(path + '_numObs.uni')\n\
if using_colors_s$ID$:\n\
- color_r_s$ID$.load(os.path.join(path, 'color_r_s$ID$.uni'))\n\
- color_g_s$ID$.load(os.path.join(path, 'color_g_s$ID$.uni'))\n\
- color_b_s$ID$.load(os.path.join(path, 'color_b_s$ID$.uni'))\n\
+ color_r_s$ID$.load(path + '_color_r.uni')\n\
+ color_g_s$ID$.load(path + '_color_g.uni')\n\
+ color_b_s$ID$.load(path + '_color_b.uni')\n\
if using_heat_s$ID$:\n\
- heat_s$ID$.load(os.path.join(path, 'heat_s$ID$.uni'))\n\
+ heat_s$ID$.load(path + '_heat.uni')\n\
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list