Fluid: Moved grid reset loop for inner obstacle cells from blenkernel code into Mantaflow

Having this loop in directly Manta is faster and potentially fixes issues T72783 and T72894.

1 files changed, 91 insertions, 85 deletions

diff --git a/extern/mantaflow/preprocessed/grid.h.reg.cpp b/extern/mantaflow/preprocessed/grid.h.reg.cpp
index d7f87604edf..70c4d8de453 100644
--- a/extern/mantaflow/preprocessed/grid.h.reg.cpp
+++ b/extern/mantaflow/preprocessed/grid.h.reg.cpp
@@ -8,11 +8,11 @@ namespace Manta {
 #ifdef _C_FlagGrid
 static const Pb::Register _R_26("FlagGrid", "FlagGrid", "Grid<int>");
 template<> const char *Namify<FlagGrid>::S = "FlagGrid";
-static const Pb::Register _R_27("FlagGrid", "FlagGrid", FlagGrid::_W_37);
-static const Pb::Register _R_28("FlagGrid", "initDomain", FlagGrid::_W_38);
-static const Pb::Register _R_29("FlagGrid", "updateFromLevelset", FlagGrid::_W_39);
-static const Pb::Register _R_30("FlagGrid", "fillGrid", FlagGrid::_W_40);
-static const Pb::Register _R_31("FlagGrid", "countCells", FlagGrid::_W_41);
+static const Pb::Register _R_27("FlagGrid", "FlagGrid", FlagGrid::_W_38);
+static const Pb::Register _R_28("FlagGrid", "initDomain", FlagGrid::_W_39);
+static const Pb::Register _R_29("FlagGrid", "updateFromLevelset", FlagGrid::_W_40);
+static const Pb::Register _R_30("FlagGrid", "fillGrid", FlagGrid::_W_41);
+static const Pb::Register _R_31("FlagGrid", "countCells", FlagGrid::_W_42);
 #endif
 #ifdef _C_Grid
 static const Pb::Register _R_32("Grid<int>", "Grid<int>", "GridBase");
@@ -30,94 +30,97 @@ static const Pb::Register _R_42("Grid<int>", "addConst", Grid<int>::_W_18);
 static const Pb::Register _R_43("Grid<int>", "addScaled", Grid<int>::_W_19);
 static const Pb::Register _R_44("Grid<int>", "mult", Grid<int>::_W_20);
 static const Pb::Register _R_45("Grid<int>", "multConst", Grid<int>::_W_21);
-static const Pb::Register _R_46("Grid<int>", "clamp", Grid<int>::_W_22);
-static const Pb::Register _R_47("Grid<int>", "stomp", Grid<int>::_W_23);
-static const Pb::Register _R_48("Grid<int>", "permuteAxes", Grid<int>::_W_24);
-static const Pb::Register _R_49("Grid<int>", "permuteAxesCopyToGrid", Grid<int>::_W_25);
-static const Pb::Register _R_50("Grid<int>", "getMaxAbs", Grid<int>::_W_26);
-static const Pb::Register _R_51("Grid<int>", "getMax", Grid<int>::_W_27);
-static const Pb::Register _R_52("Grid<int>", "getMin", Grid<int>::_W_28);
-static const Pb::Register _R_53("Grid<int>", "getL1", Grid<int>::_W_29);
-static const Pb::Register _R_54("Grid<int>", "getL2", Grid<int>::_W_30);
-static const Pb::Register _R_55("Grid<int>", "setBound", Grid<int>::_W_31);
-static const Pb::Register _R_56("Grid<int>", "setBoundNeumann", Grid<int>::_W_32);
-static const Pb::Register _R_57("Grid<int>", "getDataPointer", Grid<int>::_W_33);
-static const Pb::Register _R_58("Grid<int>", "printGrid", Grid<int>::_W_34);
-static const Pb::Register _R_59("Grid<Real>", "Grid<Real>", "GridBase");
+static const Pb::Register _R_46("Grid<int>", "safeDivide", Grid<int>::_W_22);
+static const Pb::Register _R_47("Grid<int>", "clamp", Grid<int>::_W_23);
+static const Pb::Register _R_48("Grid<int>", "stomp", Grid<int>::_W_24);
+static const Pb::Register _R_49("Grid<int>", "permuteAxes", Grid<int>::_W_25);
+static const Pb::Register _R_50("Grid<int>", "permuteAxesCopyToGrid", Grid<int>::_W_26);
+static const Pb::Register _R_51("Grid<int>", "getMaxAbs", Grid<int>::_W_27);
+static const Pb::Register _R_52("Grid<int>", "getMax", Grid<int>::_W_28);
+static const Pb::Register _R_53("Grid<int>", "getMin", Grid<int>::_W_29);
+static const Pb::Register _R_54("Grid<int>", "getL1", Grid<int>::_W_30);
+static const Pb::Register _R_55("Grid<int>", "getL2", Grid<int>::_W_31);
+static const Pb::Register _R_56("Grid<int>", "setBound", Grid<int>::_W_32);
+static const Pb::Register _R_57("Grid<int>", "setBoundNeumann", Grid<int>::_W_33);
+static const Pb::Register _R_58("Grid<int>", "getDataPointer", Grid<int>::_W_34);
+static const Pb::Register _R_59("Grid<int>", "printGrid", Grid<int>::_W_35);
+static const Pb::Register _R_60("Grid<Real>", "Grid<Real>", "GridBase");
 template<> const char *Namify<Grid<Real>>::S = "Grid<Real>";
-static const Pb::Register _R_60("Grid<Real>", "Grid", Grid<Real>::_W_9);
-static const Pb::Register _R_61("Grid<Real>", "save", Grid<Real>::_W_10);
-static const Pb::Register _R_62("Grid<Real>", "load", Grid<Real>::_W_11);
-static const Pb::Register _R_63("Grid<Real>", "clear", Grid<Real>::_W_12);
-static const Pb::Register _R_64("Grid<Real>", "copyFrom", Grid<Real>::_W_13);
-static const Pb::Register _R_65("Grid<Real>", "getGridType", Grid<Real>::_W_14);
-static const Pb::Register _R_66("Grid<Real>", "add", Grid<Real>::_W_15);
-static const Pb::Register _R_67("Grid<Real>", "sub", Grid<Real>::_W_16);
-static const Pb::Register _R_68("Grid<Real>", "setConst", Grid<Real>::_W_17);
-static const Pb::Register _R_69("Grid<Real>", "addConst", Grid<Real>::_W_18);
-static const Pb::Register _R_70("Grid<Real>", "addScaled", Grid<Real>::_W_19);
-static const Pb::Register _R_71("Grid<Real>", "mult", Grid<Real>::_W_20);
-static const Pb::Register _R_72("Grid<Real>", "multConst", Grid<Real>::_W_21);
-static const Pb::Register _R_73("Grid<Real>", "clamp", Grid<Real>::_W_22);
-static const Pb::Register _R_74("Grid<Real>", "stomp", Grid<Real>::_W_23);
-static const Pb::Register _R_75("Grid<Real>", "permuteAxes", Grid<Real>::_W_24);
-static const Pb::Register _R_76("Grid<Real>", "permuteAxesCopyToGrid", Grid<Real>::_W_25);
-static const Pb::Register _R_77("Grid<Real>", "getMaxAbs", Grid<Real>::_W_26);
-static const Pb::Register _R_78("Grid<Real>", "getMax", Grid<Real>::_W_27);
-static const Pb::Register _R_79("Grid<Real>", "getMin", Grid<Real>::_W_28);
-static const Pb::Register _R_80("Grid<Real>", "getL1", Grid<Real>::_W_29);
-static const Pb::Register _R_81("Grid<Real>", "getL2", Grid<Real>::_W_30);
-static const Pb::Register _R_82("Grid<Real>", "setBound", Grid<Real>::_W_31);
-static const Pb::Register _R_83("Grid<Real>", "setBoundNeumann", Grid<Real>::_W_32);
-static const Pb::Register _R_84("Grid<Real>", "getDataPointer", Grid<Real>::_W_33);
-static const Pb::Register _R_85("Grid<Real>", "printGrid", Grid<Real>::_W_34);
-static const Pb::Register _R_86("Grid<Vec3>", "Grid<Vec3>", "GridBase");
+static const Pb::Register _R_61("Grid<Real>", "Grid", Grid<Real>::_W_9);
+static const Pb::Register _R_62("Grid<Real>", "save", Grid<Real>::_W_10);
+static const Pb::Register _R_63("Grid<Real>", "load", Grid<Real>::_W_11);
+static const Pb::Register _R_64("Grid<Real>", "clear", Grid<Real>::_W_12);
+static const Pb::Register _R_65("Grid<Real>", "copyFrom", Grid<Real>::_W_13);
+static const Pb::Register _R_66("Grid<Real>", "getGridType", Grid<Real>::_W_14);
+static const Pb::Register _R_67("Grid<Real>", "add", Grid<Real>::_W_15);
+static const Pb::Register _R_68("Grid<Real>", "sub", Grid<Real>::_W_16);
+static const Pb::Register _R_69("Grid<Real>", "setConst", Grid<Real>::_W_17);
+static const Pb::Register _R_70("Grid<Real>", "addConst", Grid<Real>::_W_18);
+static const Pb::Register _R_71("Grid<Real>", "addScaled", Grid<Real>::_W_19);
+static const Pb::Register _R_72("Grid<Real>", "mult", Grid<Real>::_W_20);
+static const Pb::Register _R_73("Grid<Real>", "multConst", Grid<Real>::_W_21);
+static const Pb::Register _R_74("Grid<Real>", "safeDivide", Grid<Real>::_W_22);
+static const Pb::Register _R_75("Grid<Real>", "clamp", Grid<Real>::_W_23);
+static const Pb::Register _R_76("Grid<Real>", "stomp", Grid<Real>::_W_24);
+static const Pb::Register _R_77("Grid<Real>", "permuteAxes", Grid<Real>::_W_25);
+static const Pb::Register _R_78("Grid<Real>", "permuteAxesCopyToGrid", Grid<Real>::_W_26);
+static const Pb::Register _R_79("Grid<Real>", "getMaxAbs", Grid<Real>::_W_27);
+static const Pb::Register _R_80("Grid<Real>", "getMax", Grid<Real>::_W_28);
+static const Pb::Register _R_81("Grid<Real>", "getMin", Grid<Real>::_W_29);
+static const Pb::Register _R_82("Grid<Real>", "getL1", Grid<Real>::_W_30);
+static const Pb::Register _R_83("Grid<Real>", "getL2", Grid<Real>::_W_31);
+static const Pb::Register _R_84("Grid<Real>", "setBound", Grid<Real>::_W_32);
+static const Pb::Register _R_85("Grid<Real>", "setBoundNeumann", Grid<Real>::_W_33);
+static const Pb::Register _R_86("Grid<Real>", "getDataPointer", Grid<Real>::_W_34);
+static const Pb::Register _R_87("Grid<Real>", "printGrid", Grid<Real>::_W_35);
+static const Pb::Register _R_88("Grid<Vec3>", "Grid<Vec3>", "GridBase");
 template<> const char *Namify<Grid<Vec3>>::S = "Grid<Vec3>";
-static const Pb::Register _R_87("Grid<Vec3>", "Grid", Grid<Vec3>::_W_9);
-static const Pb::Register _R_88("Grid<Vec3>", "save", Grid<Vec3>::_W_10);
-static const Pb::Register _R_89("Grid<Vec3>", "load", Grid<Vec3>::_W_11);
-static const Pb::Register _R_90("Grid<Vec3>", "clear", Grid<Vec3>::_W_12);
-static const Pb::Register _R_91("Grid<Vec3>", "copyFrom", Grid<Vec3>::_W_13);
-static const Pb::Register _R_92("Grid<Vec3>", "getGridType", Grid<Vec3>::_W_14);
-static const Pb::Register _R_93("Grid<Vec3>", "add", Grid<Vec3>::_W_15);
-static const Pb::Register _R_94("Grid<Vec3>", "sub", Grid<Vec3>::_W_16);
-static const Pb::Register _R_95("Grid<Vec3>", "setConst", Grid<Vec3>::_W_17);
-static const Pb::Register _R_96("Grid<Vec3>", "addConst", Grid<Vec3>::_W_18);
-static const Pb::Register _R_97("Grid<Vec3>", "addScaled", Grid<Vec3>::_W_19);
-static const Pb::Register _R_98("Grid<Vec3>", "mult", Grid<Vec3>::_W_20);
-static const Pb::Register _R_99("Grid<Vec3>", "multConst", Grid<Vec3>::_W_21);
-static const Pb::Register _R_100("Grid<Vec3>", "clamp", Grid<Vec3>::_W_22);
-static const Pb::Register _R_101("Grid<Vec3>", "stomp", Grid<Vec3>::_W_23);
-static const Pb::Register _R_102("Grid<Vec3>", "permuteAxes", Grid<Vec3>::_W_24);
-static const Pb::Register _R_103("Grid<Vec3>", "permuteAxesCopyToGrid", Grid<Vec3>::_W_25);
-static const Pb::Register _R_104("Grid<Vec3>", "getMaxAbs", Grid<Vec3>::_W_26);
-static const Pb::Register _R_105("Grid<Vec3>", "getMax", Grid<Vec3>::_W_27);
-static const Pb::Register _R_106("Grid<Vec3>", "getMin", Grid<Vec3>::_W_28);
-static const Pb::Register _R_107("Grid<Vec3>", "getL1", Grid<Vec3>::_W_29);
-static const Pb::Register _R_108("Grid<Vec3>", "getL2", Grid<Vec3>::_W_30);
-static const Pb::Register _R_109("Grid<Vec3>", "setBound", Grid<Vec3>::_W_31);
-static const Pb::Register _R_110("Grid<Vec3>", "setBoundNeumann", Grid<Vec3>::_W_32);
-static const Pb::Register _R_111("Grid<Vec3>", "getDataPointer", Grid<Vec3>::_W_33);
-static const Pb::Register _R_112("Grid<Vec3>", "printGrid", Grid<Vec3>::_W_34);
+static const Pb::Register _R_89("Grid<Vec3>", "Grid", Grid<Vec3>::_W_9);
+static const Pb::Register _R_90("Grid<Vec3>", "save", Grid<Vec3>::_W_10);
+static const Pb::Register _R_91("Grid<Vec3>", "load", Grid<Vec3>::_W_11);
+static const Pb::Register _R_92("Grid<Vec3>", "clear", Grid<Vec3>::_W_12);
+static const Pb::Register _R_93("Grid<Vec3>", "copyFrom", Grid<Vec3>::_W_13);
+static const Pb::Register _R_94("Grid<Vec3>", "getGridType", Grid<Vec3>::_W_14);
+static const Pb::Register _R_95("Grid<Vec3>", "add", Grid<Vec3>::_W_15);
+static const Pb::Register _R_96("Grid<Vec3>", "sub", Grid<Vec3>::_W_16);
+static const Pb::Register _R_97("Grid<Vec3>", "setConst", Grid<Vec3>::_W_17);
+static const Pb::Register _R_98("Grid<Vec3>", "addConst", Grid<Vec3>::_W_18);
+static const Pb::Register _R_99("Grid<Vec3>", "addScaled", Grid<Vec3>::_W_19);
+static const Pb::Register _R_100("Grid<Vec3>", "mult", Grid<Vec3>::_W_20);
+static const Pb::Register _R_101("Grid<Vec3>", "multConst", Grid<Vec3>::_W_21);
+static const Pb::Register _R_102("Grid<Vec3>", "safeDivide", Grid<Vec3>::_W_22);
+static const Pb::Register _R_103("Grid<Vec3>", "clamp", Grid<Vec3>::_W_23);
+static const Pb::Register _R_104("Grid<Vec3>", "stomp", Grid<Vec3>::_W_24);
+static const Pb::Register _R_105("Grid<Vec3>", "permuteAxes", Grid<Vec3>::_W_25);
+static const Pb::Register _R_106("Grid<Vec3>", "permuteAxesCopyToGrid", Grid<Vec3>::_W_26);
+static const Pb::Register _R_107("Grid<Vec3>", "getMaxAbs", Grid<Vec3>::_W_27);
+static const Pb::Register _R_108("Grid<Vec3>", "getMax", Grid<Vec3>::_W_28);
+static const Pb::Register _R_109("Grid<Vec3>", "getMin", Grid<Vec3>::_W_29);
+static const Pb::Register _R_110("Grid<Vec3>", "getL1", Grid<Vec3>::_W_30);
+static const Pb::Register _R_111("Grid<Vec3>", "getL2", Grid<Vec3>::_W_31);
+static const Pb::Register _R_112("Grid<Vec3>", "setBound", Grid<Vec3>::_W_32);
+static const Pb::Register _R_113("Grid<Vec3>", "setBoundNeumann", Grid<Vec3>::_W_33);
+static const Pb::Register _R_114("Grid<Vec3>", "getDataPointer", Grid<Vec3>::_W_34);
+static const Pb::Register _R_115("Grid<Vec3>", "printGrid", Grid<Vec3>::_W_35);
 #endif
 #ifdef _C_GridBase
-static const Pb::Register _R_113("GridBase", "GridBase", "PbClass");
+static const Pb::Register _R_116("GridBase", "GridBase", "PbClass");
 template<> const char *Namify<GridBase>::S = "GridBase";
-static const Pb::Register _R_114("GridBase", "GridBase", GridBase::_W_0);
-static const Pb::Register _R_115("GridBase", "getSizeX", GridBase::_W_1);
-static const Pb::Register _R_116("GridBase", "getSizeY", GridBase::_W_2);
-static const Pb::Register _R_117("GridBase", "getSizeZ", GridBase::_W_3);
-static const Pb::Register _R_118("GridBase", "getSize", GridBase::_W_4);
-static const Pb::Register _R_119("GridBase", "is3D", GridBase::_W_5);
-static const Pb::Register _R_120("GridBase", "is4D", GridBase::_W_6);
-static const Pb::Register _R_121("GridBase", "getSizeT", GridBase::_W_7);
-static const Pb::Register _R_122("GridBase", "getStrideT", GridBase::_W_8);
+static const Pb::Register _R_117("GridBase", "GridBase", GridBase::_W_0);
+static const Pb::Register _R_118("GridBase", "getSizeX", GridBase::_W_1);
+static const Pb::Register _R_119("GridBase", "getSizeY", GridBase::_W_2);
+static const Pb::Register _R_120("GridBase", "getSizeZ", GridBase::_W_3);
+static const Pb::Register _R_121("GridBase", "getSize", GridBase::_W_4);
+static const Pb::Register _R_122("GridBase", "is3D", GridBase::_W_5);
+static const Pb::Register _R_123("GridBase", "is4D", GridBase::_W_6);
+static const Pb::Register _R_124("GridBase", "getSizeT", GridBase::_W_7);
+static const Pb::Register _R_125("GridBase", "getStrideT", GridBase::_W_8);
 #endif
 #ifdef _C_MACGrid
-static const Pb::Register _R_123("MACGrid", "MACGrid", "Grid<Vec3>");
+static const Pb::Register _R_126("MACGrid", "MACGrid", "Grid<Vec3>");
 template<> const char *Namify<MACGrid>::S = "MACGrid";
-static const Pb::Register _R_124("MACGrid", "MACGrid", MACGrid::_W_35);
-static const Pb::Register _R_125("MACGrid", "setBoundMAC", MACGrid::_W_36);
+static const Pb::Register _R_127("MACGrid", "MACGrid", MACGrid::_W_36);
+static const Pb::Register _R_128("MACGrid", "setBoundMAC", MACGrid::_W_37);
 #endif
 static const Pb::Register _R_7("GridType_TypeNone", 0);
 static const Pb::Register _R_8("GridType_TypeReal", 1);
@@ -241,6 +244,9 @@ void PbRegister_file_7()
   KEEP_UNUSED(_R_123);
   KEEP_UNUSED(_R_124);
   KEEP_UNUSED(_R_125);
+  KEEP_UNUSED(_R_126);
+  KEEP_UNUSED(_R_127);
+  KEEP_UNUSED(_R_128);
 }
 }
 }  // namespace Manta
\ No newline at end of file