[Bf-blender-cvs] [88537b7] fluid-mantaflow: reverting to old IO functions. changes from D2317 produce posixpath, mantaflow save() and load() require string though

[Sebastián Barschkis]

Commit: 88537b758edddd6b58529e726080005abde73938
Author: Sebastián Barschkis
Date:   Sat Oct 29 22:30:23 2016 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rB88537b758edddd6b58529e726080005abde73938

reverting to old IO functions. changes from D2317 produce posixpath, mantaflow save() and load() require string though

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

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

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

diff --git a/intern/mantaflow/intern/strings/liquid_script.h b/intern/mantaflow/intern/strings/liquid_script.h
index fc6fcc2..a7f0cea 100644
--- a/intern/mantaflow/intern/strings/liquid_script.h
+++ b/intern/mantaflow/intern/strings/liquid_script.h
@@ -260,69 +260,65 @@ def save_mesh_high(path):\n\
 
 const std::string liquid_import_low = "\n\
 def load_liquid_data_low(path):\n\
-    path = Path(path)\n\
-    flags.load(path / 'flags.uni')\n\
+    flags.load(os.path.join(path, 'flags.uni'))\n\
     \n\
-    phiParts.load(path / 'phiParts.uni')\n\
-    phi.load(path / 'phi.uni')\n\
-    phiInit.load(path / 'phiInit.uni')\n\
-    phiObs.load(path / 'phiObs.uni')\n\
-    phiObsInit.load(path / 'phiObsInit.uni')\n\
-    fractions.load(path / 'fractions.uni')\n\
-    pressure.load(path / 'pressure.uni')\n\
+    phiParts.load(os.path.join(path, 'phiParts.uni'))\n\
+    phi.load(os.path.join(path, 'phi.uni'))\n\
+    phiInit.load(os.path.join(path, 'phiInit.uni'))\n\
+    phiObs.load(os.path.join(path, 'phiObs.uni'))\n\
+    phiObsInit.load(os.path.join(path, 'phiObsInit.uni'))\n\
+    fractions.load(os.path.join(path, 'fractions.uni'))\n\
+    pressure.load(os.path.join(path, 'pressure.uni'))\n\
     \n\
-    vel.load(path / 'vel.uni')\n\
-    velOld.load(path / 'velOld.uni')\n\
-    velParts.load(path / 'velParts.uni')\n\
-    mapWeights.load(path / 'mapWeights.uni')\n\
+    vel.load(os.path.join(path, 'vel.uni'))\n\
+    velOld.load(os.path.join(path, 'velOld.uni'))\n\
+    velParts.load(os.path.join(path, 'velParts.uni'))\n\
+    mapWeights.load(os.path.join(path, 'mapWeights.uni'))\n\
     \n\
-    pp.load(path / 'pp.uni')\n\
-    pVel.load(path / 'pVel.uni')\n\
+    pp.load(os.path.join(path, 'pp.uni'))\n\
+    pVel.load(os.path.join(path, 'pVel.uni'))\n\
     \n\
-    gpi.load(path / 'gpi.uni')\n";
+    gpi.load(os.path.join(path, 'gpi.uni'))\n";
 
 const std::string liquid_import_high = "\n\
 def load_liquid_data_high(path):\n\
-    path = Path(path)\n\
-    xl_flags.load(path / 'xl_flags.uni')\n\
+    xl_flags.load(os.path.join(path, 'xl_flags.uni'))\n\
     \n\
-    xl_phiParts.load(path / 'xl_phiParts.uni')\n\
-    xl_phi.load(path / 'xl_phi.uni')\n\
+    xl_phiParts.load(os.path.join(path, 'xl_phiParts.uni'))\n\
+    xl_phi.load(os.path.join(path, 'xl_phi.uni'))\n\
     \n\
-    xl_pp.load(path / 'xl_pp.uni')\n";
+    xl_pp.load(os.path.join(path, 'xl_pp.uni'))\n";
 
 const std::string liquid_export_low = "\n\
 def save_liquid_data_low(path):\n\
-    path = Path(path)\n\
-    flags.save(path / 'flags.uni')\n\
+    flags.save(os.path.join(path, 'flags.uni'))\n\
     \n\
-    phiParts.save(path / 'phiParts.uni')\n\
-    phi.save(path / 'phi.uni')\n\
-    phiInit.save(path / 'phiInit.uni')\n\
-    phiObs.save(path / 'phiObs.uni')\n\
-    phiObsInit.save(path / 'phiObsInit.uni')\n\
-    fractions.save(path / 'fractions.uni')\n\
-    pressure.save(path / 'pressure.uni')\n\
+    phiParts.save(os.path.join(path, 'phiParts.uni'))\n\
+    phi.save(os.path.join(path, 'phi.uni'))\n\
+    phiInit.save(os.path.join(path, 'phiInit.uni'))\n\
+    phiObs.save(os.path.join(path, 'phiObs.uni'))\n\
+    phiObsInit.save(os.path.join(path, 'phiObsInit.uni'))\n\
+    fractions.save(os.path.join(path, 'fractions.uni'))\n\
+    pressure.save(os.path.join(path, 'pressure.uni'))\n\
     \n\
-    vel.save(path / 'vel.uni')\n\
-    velOld.save(path / 'velOld.uni')\n\
-    velParts.save(path / 'velParts.uni')\n\
-    mapWeights.save(path / 'mapWeights.uni')\n\
+    vel.save(os.path.join(path, 'vel.uni'))\n\
+    velOld.save(os.path.join(path, 'velOld.uni'))\n\
+    velParts.save(os.path.join(path, 'velParts.uni'))\n\
+    mapWeights.save(os.path.join(path, 'mapWeights.uni'))\n\
     \n\
-    pp.save(path / 'pp.uni')\n\
-    pVel.save(path / 'pVel.uni')\n\
+    pp.save(os.path.join(path, 'pp.uni'))\n\
+    pVel.save(os.path.join(path, 'pVel.uni'))\n\
     \n\
-    gpi.save(path / 'gpi.uni')\n";
+    gpi.save(os.path.join(path, 'gpi.uni'))\n";
 
 const std::string liquid_export_high = "\n\
 def save_liquid_data_high(path):\n\
-    path = Path(path)\n\
-    xl_flags.save(path / 'xl_flags.uni')\n\
+    xl_flags.save(os.path.join(path, 'xl_flags.uni'))\n\
     \n\
-    xl_phiParts.save(path / 'xl_phiParts.uni')\n\
-    xl_phi.save(path / 'xl_phi.uni')\n\
+    xl_phiParts.save(os.path.join(path, 'xl_phiParts.uni'))\n\
+    xl_phi.save(os.path.join(path, 'xl_phi.uni'))\n\
     \n\
-    xl_pp.save(path / 'xl_pp.uni')\n";
+    xl_pp.save(os.path.join(path, 'xl_pp.uni'))\n";
 
 //////////////////////////////////////////////////////////////////////
 // DESTRUCTION
diff --git a/intern/mantaflow/intern/strings/smoke_script.h b/intern/mantaflow/intern/strings/smoke_script.h
index b23e360..a0e0e5e 100644
--- a/intern/mantaflow/intern/strings/smoke_script.h
+++ b/intern/mantaflow/intern/strings/smoke_script.h
@@ -344,71 +344,67 @@ def update_flame_high():\n\
 
 const std::string smoke_import_low = "\n\
 def load_smoke_data_low(path):\n\
-    path = Path(path)\n\
-    density.load(path / 'density.uni')\n\
-    flags.load(path / 'flags.uni')\n\
-    vel.load(path / 'vel.uni')\n\
-    forces.load(path / 'forces.uni')\n\
-    inflow_grid.load(path / 'inflow_low.uni')\n\
-    fuel_inflow.load(path / 'fuel_inflow.uni')\n\
+    density.load(os.path.join(path, 'density.uni'))\n\
+    flags.load(os.path.join(path, 'flags.uni'))\n\
+    vel.load(os.path.join(path, 'vel.uni'))\n\
+    forces.load(os.path.join(path, 'forces.uni'))\n\
+    inflow_grid.load(os.path.join(path, 'inflow_low.uni'))\n\
+    fuel_inflow.load(os.path.join(path, 'fuel_inflow.uni'))\n\
     if using_colors:\n\
-        color_r.load(path / 'color_r.uni')\n\
-        color_g.load(path / 'color_g.uni')\n\
-        color_b.load(path / 'color_b.uni')\n\
+        color_r.load(os.path.join(path, 'color_r.uni'))\n\
+        color_g.load(os.path.join(path, 'color_g.uni'))\n\
+        color_b.load(os.path.join(path, 'color_b.uni'))\n\
     if using_heat:\n\
-        heat.load(path / 'heat.uni')\n\
+        heat.load(os.path.join(path, 'heat.uni'))\n\
     if using_fire:\n\
-        flame.load(path / 'flame.uni')\n\
-        fuel.load(path / 'fuel.uni')\n\
-        react.load(path / 'react.uni')\n";
+        flame.load(os.path.join(path, 'flame.uni'))\n\
+        fuel.load(os.path.join(path, 'fuel.uni'))\n\
+        react.load(os.path.join(path, 'react.uni'))\n";
 
 const std::string smoke_import_high = "\n\
 def load_smoke_data_high(path):\n\
-    path = Path(path)\n\
-    xl_density.load(path / 'xl_density.uni')\n\
-    xl_flags.load(path / 'xl_flags.uni')\n\
+    xl_density.load(os.path.join(path, 'xl_density.uni'))\n\
+    xl_flags.load(os.path.join(path, 'xl_flags.uni'))\n\
     if using_colors:\n\
-        xl_color_r.load(path / 'xl_color_r.uni')\n\
-        xl_color_g.load(path / 'xl_color_g.uni')\n\
-        xl_color_b.load(path / 'xl_color_b.uni')\n\
+        xl_color_r.load(os.path.join(path, 'xl_color_r.uni'))\n\
+        xl_color_g.load(os.path.join(path, 'xl_color_g.uni'))\n\
+        xl_color_b.load(os.path.join(path, 'xl_color_b.uni'))\n\
     if using_fire:\n\
-        xl_flame.load(path / 'xl_flame.uni')\n\
-        xl_fuel.load(path / 'xl_fuel.uni')\n\
-        xl_react.load(path / 'xl_react.uni')\n";
+        xl_flame.load(os.path.join(path, 'xl_flame.uni'))\n\
+        xl_fuel.load(os.path.join(path, 'xl_fuel.uni'))\n\
+        xl_react.load(os.path.join(path, 'xl_react.uni'))\n";
 
 const std::string smoke_export_low = "\n\
 def save_smoke_data_low(path):\n\
-    path = Path(path)\n\
-    density.save(path / 'density.uni')\n\
-    flags.save(path / 'flags.uni')\n\
-    vel.save(path / 'vel.uni')\n\
-    forces.save(path / 'forces.uni')\n\
-    inflow_grid.save(path / 'inflow_low.uni')\n\
-    fuel_inflow.save(path / 'fuel_inflow.uni')\n\
+    density.save(os.path.join(path, 'density.uni'))\n\
+    flags.save(os.path.join(path, 'flags.uni'))\n\
+    vel.save(os.path.join(path, 'vel.uni'))\n\
+    forces.save(os.path.join(path, 'forces.uni'))\n\
+    inflow_grid.save(os.path.join(path, 'inflow_low.uni'))\n\
+    fuel_inflow.save(os.path.join(path, 'fuel_inflow.uni'))\n\
     if using_colors:\n\
-        color_r.save(path / 'color_r.uni')\n\
-        color_g.save(path / 'color_g.uni')\n\
-        color_b.save(path / 'color_b.uni')\n\
+        color_r.save(os.path.join(path, 'color_r.uni'))\n\
+        color_g.save(os.path.join(path, 'color_g.uni'))\n\
+        color_b.save(os.path.join(path, 'color_b.uni'))\n\
     if using_heat:\n\
-        heat.save(path / 'heat.uni')\n\
+        heat.save(os.path.join(path, 'heat.uni'))\n\
     if using_fire:\n\
-        flame.save(path / 'flame.uni')\n\
-        fuel.save(path / 'fuel.uni')\n\
-        react.save(path / 'react.uni')\n";
+        flame.save(os.path.join(path, 'flame.uni'))\n\
+        fuel.save(os.path.join(path, 'fuel.uni'))\n\
+        react.save(os.path.join(path, 'react.uni'))\n";
 
 const std::string smoke_export_high = "\n\
 def save_smoke_data_low(path):\n\
-    path = Path(path)\n\
-    xl_density.save(path / 'xl_density.uni')\n\
-    xl_flags.save(path / 'xl_flags.uni')\n\
+    xl_density.save(os.path.join(path, 'xl_density.uni'))\n\
+    xl_flags.save(os.path.join(path, 'xl_flags.uni'))\n\
     if using_colors:\n\
-        xl_color_r.save(path / 'xl_color_r.uni')\n\
-        xl_color_g.save(path / 'xl_color_g.uni')\n\
-        xl_color_b.save(path / 'xl_color_b.uni')\n\
+        xl_color_r.save(os.path.join(path, 'xl_color_r.uni'))\n\
+        xl_color_g.save(os.path.join(path, 'xl_color_g.uni'))\n\
+        xl_color_b.save(os.path.join(path, 'xl_color_b.uni'))\n\
     if using_fire:\n\
-        xl_flame.save(path / 'xl_flame.uni')\n\
-        xl_fuel.save(path / 'xl_fuel.uni')\n\
-        xl_react.save(path / 'xl_react.uni')\n";
+        xl_flame.save(os.path.join(path, 'xl_flame.uni'))\n\
+        xl_fuel.save(os.path.join(path, 'xl_fuel.uni'))\n\
+        xl_react.save(os.path.join(path, 'xl_react.uni'))\n";
 
 //////////////////////////////////////////////////////////////////////
 // DESTRUCTION