Commit: 09a3217c96f5fed8fe9916a9cbf644149702a21d Author: Sebastián Barschkis Date: Fri May 10 11:56:56 2019 +0200 Branches: fluid-mantaflow https://developer.blender.org/rB09a3217c96f5fed8fe9916a9cbf644149702a21d
Mantaflow: Updated manta pp files and added update script =================================================================== M CMakeLists.txt M intern/mantaflow/CMakeLists.txt A intern/mantaflow/intern/manta_develop/dependencies/cnpy/LICENSE A intern/mantaflow/intern/manta_develop/dependencies/cnpy/cnpy.cpp A intern/mantaflow/intern/manta_develop/dependencies/cnpy/cnpy.h A intern/mantaflow/intern/manta_develop/dependencies/cnpy/example1.cpp R084 intern/mantaflow/intern/manta_pp/tbb/pwrapper/manta.h intern/mantaflow/intern/manta_develop/helper/pwrapper/manta.h A intern/mantaflow/intern/manta_develop/helper/pwrapper/numpyWrap.cpp A intern/mantaflow/intern/manta_develop/helper/pwrapper/numpyWrap.h A intern/mantaflow/intern/manta_develop/helper/pwrapper/pclass.cpp A intern/mantaflow/intern/manta_develop/helper/pwrapper/pclass.h A intern/mantaflow/intern/manta_develop/helper/pwrapper/pconvert.cpp A intern/mantaflow/intern/manta_develop/helper/pwrapper/pconvert.h A intern/mantaflow/intern/manta_develop/helper/pwrapper/pvec3.cpp A intern/mantaflow/intern/manta_develop/helper/pwrapper/pymain.cpp A intern/mantaflow/intern/manta_develop/helper/pwrapper/pythonInclude.h A intern/mantaflow/intern/manta_develop/helper/pwrapper/registry.cpp A intern/mantaflow/intern/manta_develop/helper/pwrapper/registry.h A intern/mantaflow/intern/manta_develop/helper/util/integrator.h A intern/mantaflow/intern/manta_develop/helper/util/interpol.h A intern/mantaflow/intern/manta_develop/helper/util/interpolHigh.h A intern/mantaflow/intern/manta_develop/helper/util/matrixbase.h R087 intern/mantaflow/intern/manta_pp/tbb/util/mcubes.h intern/mantaflow/intern/manta_develop/helper/util/mcubes.h A intern/mantaflow/intern/manta_develop/helper/util/quaternion.h A intern/mantaflow/intern/manta_develop/helper/util/randomstream.h A intern/mantaflow/intern/manta_develop/helper/util/rcmatrix.h A intern/mantaflow/intern/manta_develop/helper/util/simpleimage.cpp A intern/mantaflow/intern/manta_develop/helper/util/simpleimage.h A intern/mantaflow/intern/manta_develop/helper/util/solvana.h A intern/mantaflow/intern/manta_develop/helper/util/vector4d.cpp A intern/mantaflow/intern/manta_develop/helper/util/vector4d.h A intern/mantaflow/intern/manta_develop/helper/util/vectorbase.cpp A intern/mantaflow/intern/manta_develop/helper/util/vectorbase.h A intern/mantaflow/intern/manta_develop/preprocessed/omp/commonkernels.h R100 intern/mantaflow/intern/manta_pp/omp/commonkernels.h.reg intern/mantaflow/intern/manta_develop/preprocessed/omp/commonkernels.h.reg R088 intern/mantaflow/intern/manta_pp/tbb/commonkernels.h.reg.cpp intern/mantaflow/intern/manta_develop/preprocessed/omp/commonkernels.h.reg.cpp A intern/mantaflow/intern/manta_develop/preprocessed/omp/conjugategrad.cpp A intern/mantaflow/intern/manta_develop/preprocessed/omp/conjugategrad.h R100 intern/mantaflow/intern/manta_pp/omp/conjugategrad.h.reg intern/mantaflow/intern/manta_develop/preprocessed/omp/conjugategrad.h.reg R088 intern/mantaflow/intern/manta_pp/tbb/conjugategrad.h.reg.cpp intern/mantaflow/intern/manta_develop/preprocessed/omp/conjugategrad.h.reg.cpp A intern/mantaflow/intern/manta_develop/preprocessed/omp/edgecollapse.cpp R054 intern/mantaflow/intern/manta_pp/omp/edgecollapse.h intern/mantaflow/intern/manta_develop/preprocessed/omp/edgecollapse.h R100 intern/mantaflow/intern/manta_pp/omp/edgecollapse.h.reg intern/mantaflow/intern/manta_develop/preprocessed/omp/edgecollapse.h.reg R088 intern/mantaflow/intern/manta_pp/omp/edgecollapse.h.reg.cpp intern/mantaflow/intern/manta_develop/preprocessed/omp/edgecollapse.h.reg.cpp A intern/mantaflow/intern/manta_develop/preprocessed/omp/fastmarch.cpp A intern/mantaflow/intern/manta_develop/preprocessed/omp/fastmarch.h R100 intern/mantaflow/intern/manta_pp/omp/fastmarch.h.reg intern/mantaflow/intern/manta_develop/preprocessed/omp/fastmarch.h.reg R088 intern/mantaflow/intern/manta_pp/tbb/fastmarch.h.reg.cpp intern/mantaflow/intern/manta_develop/preprocessed/omp/fastmarch.h.reg.cpp A intern/mantaflow/intern/manta_develop/preprocessed/omp/fileio/iogrids.cpp A intern/mantaflow/intern/manta_develop/preprocessed/omp/fileio/iomeshes.cpp A intern/mantaflow/intern/manta_develop/preprocessed/omp/fileio/ioparticles.cpp A intern/mantaflow/intern/manta_develop/preprocessed/omp/fileio/mantaio.h R100 intern/mantaflow/intern/manta_pp/omp/fileio/mantaio.h.reg intern/mantaflow/intern/manta_develop/preprocessed/omp/fileio/mantaio.h.reg R088 intern/mantaflow/intern/manta_pp/tbb/fileio/mantaio.h.reg.cpp intern/mantaflow/intern/manta_develop/preprocessed/omp/fileio/mantaio.h.reg.cpp A intern/mantaflow/intern/manta_develop/preprocessed/omp/fluidsolver.cpp A intern/mantaflow/intern/manta_develop/preprocessed/omp/fluidsolver.h R100 intern/mantaflow/intern/manta_pp/omp/fluidsolver.h.reg intern/mantaflow/intern/manta_develop/preprocessed/omp/fluidsolver.h.reg A intern/mantaflow/intern/manta_develop/preprocessed/omp/fluidsolver.h.reg.cpp A intern/mantaflow/intern/manta_develop/preprocessed/omp/general.cpp A intern/mantaflow/intern/manta_develop/preprocessed/omp/general.h R100 intern/mantaflow/intern/manta_pp/omp/general.h.reg intern/mantaflow/intern/manta_develop/preprocessed/omp/general.h.reg R088 intern/mantaflow/intern/manta_pp/omp/general.h.reg.cpp intern/mantaflow/intern/manta_develop/preprocessed/omp/general.h.reg.cpp A intern/mantaflow/intern/manta_develop/preprocessed/omp/gitinfo.h A intern/mantaflow/intern/manta_develop/preprocessed/omp/grid.cpp A intern/mantaflow/intern/manta_develop/preprocessed/omp/grid.h R100 intern/mantaflow/intern/manta_pp/omp/grid.h.reg intern/mantaflow/intern/manta_develop/preprocessed/omp/grid.h.reg A intern/mantaflow/intern/manta_develop/preprocessed/omp/grid.h.reg.cpp A intern/mantaflow/intern/manta_develop/preprocessed/omp/grid4d.cpp A intern/mantaflow/intern/manta_develop/preprocessed/omp/grid4d.h R100 intern/mantaflow/intern/manta_pp/omp/grid4d.h.reg intern/mantaflow/intern/manta_develop/preprocessed/omp/grid4d.h.reg A intern/mantaflow/intern/manta_develop/preprocessed/omp/grid4d.h.reg.cpp A intern/mantaflow/intern/manta_develop/preprocessed/omp/kernel.cpp A intern/mantaflow/intern/manta_develop/preprocessed/omp/kernel.h R100 intern/mantaflow/intern/manta_pp/omp/kernel.h.reg intern/mantaflow/intern/manta_develop/preprocessed/omp/kernel.h.reg R088 intern/mantaflow/intern/manta_pp/omp/kernel.h.reg.cpp intern/mantaflow/intern/manta_develop/preprocessed/omp/kernel.h.reg.cpp A intern/mantaflow/intern/manta_develop/preprocessed/omp/levelset.cpp A intern/mantaflow/intern/manta_develop/preprocessed/omp/levelset.h R100 intern/mantaflow/intern/manta_pp/omp/levelset.h.reg intern/mantaflow/intern/manta_develop/preprocessed/omp/levelset.h.reg A intern/mantaflow/intern/manta_develop/preprocessed/omp/levelset.h.reg.cpp A intern/mantaflow/intern/manta_develop/preprocessed/omp/mesh.cpp A intern/mantaflow/intern/manta_develop/preprocessed/omp/mesh.h R100 intern/mantaflow/intern/manta_pp/omp/mesh.h.reg intern/mantaflow/intern/manta_develop/preprocessed/omp/mesh.h.reg A intern/mantaflow/intern/manta_develop/preprocessed/omp/mesh.h.reg.cpp A intern/mantaflow/intern/manta_develop/preprocessed/omp/movingobs.cpp A intern/mantaflow/intern/manta_develop/preprocessed/omp/movingobs.h R100 intern/mantaflow/intern/manta_pp/omp/movingobs.h.reg intern/mantaflow/intern/manta_develop/preprocessed/omp/movingobs.h.reg A intern/mantaflow/intern/manta_develop/preprocessed/omp/movingobs.h.reg.cpp A intern/mantaflow/intern/manta_develop/preprocessed/omp/multigrid.cpp A intern/mantaflow/intern/manta_develop/preprocessed/omp/multigrid.h R100 intern/mantaflow/intern/manta_pp/omp/multigrid.h.reg intern/mantaflow/intern/manta_develop/preprocessed/omp/multigrid.h.reg R088 intern/mantaflow/intern/manta_pp/tbb/multigrid.h.reg.cpp intern/mantaflow/intern/manta_develop/preprocessed/omp/multigrid.h.reg.cpp A intern/mantaflow/intern/manta_develop/preprocessed/omp/noisefield.cpp A intern/mantaflow/intern/manta_develop/preprocessed/omp/noisefield.h R100 intern/mantaflow/intern/manta_pp/omp/noisefield.h.reg intern/mantaflow/intern/manta_develop/preprocessed/omp/noisefield.h.reg A intern/mantaflow/intern/manta_develop/preprocessed/omp/noisefield.h.reg.cpp A intern/mantaflow/intern/manta_develop/preprocessed/omp/particle.cpp A intern/mantaflow/intern/manta_develop/preprocessed/omp/particle.h R100 intern/mantaflow/intern/manta_pp/omp/particle.h.reg intern/mantaflow/intern/manta_develop/preprocessed/omp/particle.h.reg A intern/mantaflow/intern/manta_develop/preprocessed/omp/particle.h.reg.cpp A intern/mantaflow/intern/manta_develop/preprocessed/omp/plugin/advection.cpp A intern/mantaflow/intern/manta_develop/preprocessed/omp/plugin/apic.cpp A intern/mantaflow/intern/manta_develop/preprocessed/omp/plugin/extforces.cpp A intern/mantaflow/intern/manta_develop/preprocessed/omp/plugin/fire.cpp A intern/mantaflow/intern/manta_develop/preprocessed/omp/plugin/flip.cpp A intern/mantaflow/intern/manta_develop/preprocessed/omp/plugin/fluidguiding.cpp A intern/mantaflow/intern/manta_develop/preprocessed/omp/plugin/initplugins.cpp A intern/mantaflow/intern/manta_develop/preprocessed/omp/plugin/kepsilon.cpp A intern/mantaflow/intern/manta_develop/preprocessed/omp/plugin/meshplugins.cpp A intern/mantaflow/intern/manta_develop/preprocessed/omp/plugin/numpyconvert.cpp A intern/mantaflow/intern/manta_develop/preprocessed/omp/plugin/pressure.cpp A intern/mantaflow/intern/manta_develop/preprocessed/omp/plugin/ptsplugins.cpp A intern/mantaflow/intern/manta_develop/preprocessed/omp/plugin/secondaryparticles.cpp A intern/mantaflow/intern/manta_develop/preprocessed/omp/plugin/surfaceturbulence.cpp A intern/mantaflow/intern/manta_develop/preprocessed/omp/plugin/tfplugins.cpp A intern/mantaflow/intern/manta_develop/preprocessed/omp/plugin/vortexplugins.cpp A intern/mantaflow/intern/manta_develop/preprocessed/omp/plugin/waveletturbulence.cpp A intern/mantaflow/intern/manta_develop/preprocessed/omp/plugin/waves.cpp R100 intern/mantaflow/intern/manta_pp/omp/python/defines.py intern/mantaflow/intern/manta_develop/preprocessed/omp/python/defines.py R087 intern/mantaflow/intern/manta_pp/tbb/python/defines.py.reg intern/mantaflow/intern/manta_develop/preprocessed/omp/python/defines.py.reg A intern/mantaflow/intern/manta_develop/preprocessed/omp/python/defines.py.reg.cpp A intern/mantaflow/intern/manta_develop/preprocessed/omp/registration.cpp A intern/mantaflow/intern/manta_develop/preprocessed/omp/shapes.cpp A intern/mantaflow/intern/manta_develop/preprocessed/omp/shapes.h R100 intern/mantaflow/intern/manta_pp/omp/shapes.h.reg intern/mantaflow/intern/manta_develop/preprocessed/omp/shapes.h.reg A intern/mantaflow/intern/manta_develop/preprocessed/omp/shapes.h.reg.cpp A intern/mantaflow/intern/manta_develop/preprocessed/omp/test.cpp A intern/mantaflow/intern/manta_develop/preprocessed/omp/timing.cpp A intern/mantaflow/intern/manta_develop/preprocessed/omp/timing.h R100 intern/mantaflow/intern/manta_pp/omp/timing.h.reg intern/mantaflow/intern/manta_develop/preprocessed/omp/timing.h.reg A intern/mantaflow/intern/manta_develop/preprocessed/omp/timing.h.reg.cpp A intern/mantaflow/intern/manta_develop/preprocessed/omp/turbulencepart.cpp A intern/mantaflow/intern/manta_develop/preprocessed/omp/turbulencepart.h R100 intern/mantaflow/intern/manta_pp/omp/turbulencepart.h.reg intern/mantaflow/intern/manta_develop/preprocessed/omp/turbulencepart.h.reg A intern/mantaflow/intern/manta_develop/preprocessed/omp/turbulencepart.h.reg.cpp A intern/mantaflow/intern/manta_develop/preprocessed/omp/vortexpart.cpp A intern/mantaflow/intern/manta_develop/preprocessed/omp/vortexpart.h R100 intern/mantaflow/intern/manta_pp/omp/vortexpart.h.reg intern/mantaflow/intern/manta_develop/preprocessed/omp/vortexpart.h.reg A intern/mantaflow/intern/manta_develop/preprocessed/omp/vortexpart.h.reg.cpp A intern/mantaflow/intern/manta_develop/preprocessed/omp/vortexsheet.cpp A intern/mantaflow/intern/manta_develop/preprocessed/omp/vortexsheet.h R100 intern/mantaflow/intern/manta_pp/omp/vortexsheet.h.reg intern/mantaflow/intern/manta_develop/preprocessed/omp/vortexsheet.h.reg A intern/mantaflow/intern/manta_develop/preprocessed/omp/vortexsheet.h.reg.cpp A intern/mantaflow/intern/manta_develop/preprocessed/tbb/commonkernels.h R100 intern/mantaflow/intern/manta_pp/tbb/commonkernels.h.reg intern/mantaflow/intern/manta_develop/preprocessed/tbb/commonkernels.h.reg R088 intern/mantaflow/intern/manta_pp/omp/commonkernels.h.reg.cpp intern/mantaflow/intern/manta_develop/preprocessed/tbb/commonkernels.h.reg.cpp A intern/mantaflow/intern/manta_develop/preprocessed/tbb/conjugategrad.cpp A intern/mantaflow/intern/manta_develop/preprocessed/tbb/conjugategrad.h R100 intern/mantaflow/intern/manta_pp/tbb/conjugategrad.h.reg intern/mantaflow/intern/manta_develop/preprocessed/tbb/conjugategrad.h.reg R088 intern/mantaflow/intern/manta_pp/omp/conjugategrad.h.reg.cpp intern/mantaflow/intern/manta_develop/preprocessed/tbb/conjugategrad.h.reg.cpp A intern/mantaflow/intern/manta_develop/preprocessed/tbb/edgecollapse.cpp R054 intern/mantaflow/intern/manta_pp/tbb/edgecollapse.h intern/mantaflow/intern/manta_develop/preprocessed/tbb/edgecollapse.h R100 intern/mantaflow/intern/manta_pp/tbb/edgecollapse.h.reg intern/mantaflow/intern/manta_develop/preprocessed/tbb/edgecollapse.h.reg R088 intern/mantaflow/intern/manta_pp/tbb/edgecollapse.h.reg.cpp intern/mantaflow/intern/manta_develop/preprocessed/tbb/edgecollapse.h.reg.cpp A intern/mantaflow/intern/manta_develop/preprocessed/tbb/fastmarch.cpp A intern/mantaflow/intern/manta_develop/preprocessed/tbb/fastmarch.h R100 intern/mantaflow/intern/manta_pp/tbb/fastmarch.h.reg intern/mantaflow/intern/manta_develop/preprocessed/tbb/fastmarch.h.reg R088 intern/mantaflow/intern/manta_pp/omp/fastmarch.h.reg.cpp intern/mantaflow/intern/manta_develop/preprocessed/tbb/fastmarch.h.reg.cpp A intern/mantaflow/intern/manta_develop/preprocessed/tbb/fileio/iogrids.cpp A intern/mantaflow/intern/manta_develop/preprocessed/tbb/fileio/iomeshes.cpp A intern/mantaflow/intern/manta_develop/preprocessed/tbb/fileio/ioparticles.cpp A intern/mantaflow/intern/manta_develop/preprocessed/tbb/fileio/mantaio.h R100 intern/mantaflow/intern/manta_pp/tbb/fileio/mantaio.h.reg intern/mantaflow/intern/manta_develop/preprocessed/tbb/fileio/mantaio.h.reg R088 intern/mantaflow/intern/manta_pp/omp/fileio/mantaio.h.reg.cpp intern/mantaflow/intern/manta_develop/preprocessed/tbb/fileio/mantaio.h.reg.cpp A intern/mantaflow/intern/manta_develop/preprocessed/tbb/fluidsolver.cpp A intern/mantaflow/intern/manta_develop/preprocessed/tbb/fluidsolver.h R100 intern/mantaflow/intern/manta_pp/tbb/fluidsolver.h.reg intern/mantaflow/intern/manta_develop/preprocessed/tbb/fluidsolver.h.reg A intern/mantaflow/intern/manta_develop/preprocessed/tbb/fluidsolver.h.reg.cpp A intern/mantaflow/intern/manta_develop/preprocessed/tbb/general.cpp A intern/mantaflow/intern/manta_develop/preprocessed/tbb/general.h R100 intern/mantaflow/intern/manta_pp/tbb/general.h.reg intern/mantaflow/intern/manta_develop/preprocessed/tbb/general.h.reg R088 intern/mantaflow/intern/manta_pp/tbb/general.h.reg.cpp intern/mantaflow/intern/manta_develop/preprocessed/tbb/general.h.reg.cpp A intern/mantaflow/intern/manta_develop/preprocessed/tbb/gitinfo.h A intern/mantaflow/intern/manta_develop/preprocessed/tbb/grid.cpp A intern/mantaflow/intern/manta_develop/preprocessed/tbb/grid.h R100 intern/mantaflow/intern/manta_pp/tbb/grid.h.reg intern/mantaflow/intern/manta_develop/preprocessed/tbb/grid.h.reg A intern/mantaflow/intern/manta_develop/preprocessed/tbb/grid.h.reg.cpp A intern/mantaflow/intern/manta_develop/preprocessed/tbb/grid4d.cpp A intern/mantaflow/intern/manta_develop/preprocessed/tbb/grid4d.h R100 intern/mantaflow/intern/manta_pp/tbb/grid4d.h.reg intern/mantaflow/intern/manta_develop/preprocessed/tbb/grid4d.h.reg A intern/mantaflow/intern/manta_develop/preprocessed/tbb/grid4d.h.reg.cpp A intern/mantaflow/intern/manta_develop/preprocessed/tbb/kernel.cpp A intern/mantaflow/intern/manta_develop/preprocessed/tbb/kernel.h R100 intern/mantaflow/intern/manta_pp/tbb/kernel.h.reg intern/mantaflow/intern/manta_develop/preprocessed/tbb/kernel.h.reg R088 intern/mantaflow/intern/manta_pp/tbb/kernel.h.reg.cpp intern/mantaflow/intern/manta_develop/preprocessed/tbb/kernel.h.reg.cpp A intern/mantaflow/intern/manta_develop/preprocessed/tbb/levelset.cpp A intern/mantaflow/intern/manta_develop/preprocessed/tbb/levelset.h R100 intern/mantaflow/intern/manta_pp/tbb/levelset.h.reg intern/mantaflow/intern/manta_develop/preprocessed/tbb/levelset.h.reg A intern/mantaflow/intern/manta_develop/preprocessed/tbb/levelset.h.reg.cpp A intern/mantaflow/intern/manta_develop/preprocessed/tbb/mesh.cpp A intern/mantaflow/intern/manta_develop/preprocessed/tbb/mesh.h R100 intern/mantaflow/intern/manta_pp/tbb/mesh.h.reg intern/mantaflow/intern/manta_develop/preprocessed/tbb/mesh.h.reg A intern/mantaflow/intern/manta_develop/preprocessed/tbb/mesh.h.reg.cpp A intern/mantaflow/intern/manta_develop/preprocessed/tbb/movingobs.cpp A intern/mantaflow/intern/manta_develop/preprocessed/tbb/movingobs.h R100 intern/mantaflow/intern/manta_pp/tbb/movingobs.h.reg intern/mantaflow/intern/manta_develop/preprocessed/tbb/movingobs.h.reg A intern/mantaflow/intern/manta_develop/preprocessed/tbb/movingobs.h.reg.cpp A intern/mantaflow/intern/manta_develop/preprocessed/tbb/multigrid.cpp A intern/mantaflow/intern/manta_develop/preprocessed/tbb/multigrid.h R100 intern/mantaflow/intern/manta_pp/tbb/multigrid.h.reg intern/mantaflow/intern/manta_develop/preprocessed/tbb/multigrid.h.reg R088 intern/mantaflow/intern/manta_pp/omp/multigrid.h.reg.cpp intern/mantaflow/intern/manta_develop/preprocessed/tbb/multigrid.h.reg.cpp A intern/mantaflow/intern/manta_develop/preprocessed/tbb/noisefield.cpp A intern/mantaflow/intern/manta_develop/preprocessed/tbb/noisefield.h R100 intern/mantaflow/intern/manta_pp/tbb/noisefield.h.reg intern/mantaflow/intern/manta_develop/preprocessed/tbb/noisefield.h.reg A intern/mantaflow/intern/manta_develop/preprocessed/tbb/noisefield.h.reg.cpp A intern/mantaflow/intern/manta_develop/preprocessed/tbb/particle.cpp A intern/mantaflow/intern/manta_develop/preprocessed/tbb/particle.h R100 intern/mantaflow/intern/manta_pp/tbb/particle.h.reg intern/mantaflow/intern/manta_develop/preprocessed/tbb/particle.h.reg A intern/mantaflow/intern/manta_develop/preprocessed/tbb/particle.h.reg.cpp A intern/mantaflow/intern/manta_develop/preprocessed/tbb/plugin/advection.cpp A intern/mantaflow/intern/manta_develop/preprocessed/tbb/plugin/apic.cpp A intern/mantaflow/intern/manta_develop/preprocessed/tbb/plugin/extforces.cpp A intern/mantaflow/intern/manta_develop/preprocessed/tbb/plugin/fire.cpp A intern/mantaflow/intern/manta_develop/preprocessed/tbb/plugin/flip.cpp A intern/mantaflow/intern/manta_develop/preprocessed/tbb/plugin/fluidguiding.cpp A intern/mantaflow/intern/manta_develop/preprocessed/tbb/plugin/initplugins.cpp A intern/mantaflow/intern/manta_develop/preprocessed/tbb/plugin/kepsilon.cpp A intern/mantaflow/intern/manta_develop/preprocessed/tbb/plugin/meshplugins.cpp A intern/mantaflow/intern/manta_develop/preprocessed/tbb/plugin/numpyconvert.cpp A intern/mantaflow/intern/manta_develop/preprocessed/tbb/plugin/pressure.cpp A intern/mantaflow/intern/manta_develop/preprocessed/tbb/plugin/ptsplugins.cpp A intern/mantaflow/intern/manta_develop/preprocessed/tbb/plugin/secondaryparticles.cpp A intern/mantaflow/intern/manta_develop/preprocessed/tbb/plugin/surfaceturbulence.cpp A intern/mantaflow/intern/manta_develop/preprocessed/tbb/plugin/tfplugins.cpp A intern/mantaflow/intern/manta_develop/preprocessed/tbb/plugin/vortexplugins.cpp A intern/mantaflow/intern/manta_develop/preprocessed/tbb/plugin/waveletturbulence.cpp A intern/mantaflow/intern/manta_develop/preprocessed/tbb/plugin/waves.cpp R100 intern/mantaflow/intern/manta_pp/tbb/python/defines.py intern/mantaflow/intern/manta_develop/preprocessed/tbb/python/defines.py R087 intern/mantaflow/intern/manta_pp/omp/python/defines.py.reg intern/mantaflow/intern/manta_develop/preprocessed/tbb/python/defines.py.reg A intern/mantaflow/intern/manta_develop/preprocessed/tbb/python/defines.py.reg.cpp A intern/mantaflow/intern/manta_develop/preprocessed/tbb/registration.cpp A intern/mantaflow/intern/manta_develop/preprocessed/tbb/shapes.cpp A intern/mantaflow/intern/manta_develop/preprocessed/tbb/shapes.h R100 intern/mantaflow/intern/manta_pp/tbb/shapes.h.reg intern/mantaflow/intern/manta_develop/preprocessed/tbb/shapes.h.reg A intern/mantaflow/intern/manta_develop/preprocessed/tbb/shapes.h.reg.cpp A intern/mantaflow/intern/manta_develop/preprocessed/tbb/test.cpp A intern/mantaflow/intern/manta_develop/preprocessed/tbb/timing.cpp A intern/mantaflow/intern/manta_develop/preprocessed/tbb/timing.h R100 intern/mantaflow/intern/manta_pp/tbb/timing.h.reg intern/mantaflow/intern/manta_develop/preprocessed/tbb/timing.h.reg A intern/mantaflow/intern/manta_develop/preprocessed/tbb/timing.h.reg.cpp A intern/mantaflow/intern/manta_develop/preprocessed/tbb/turbulencepart.cpp A intern/mantaflow/intern/manta_develop/preprocessed/tbb/turbulencepart.h R100 intern/mantaflow/intern/manta_pp/tbb/turbulencepart.h.reg intern/mantaflow/intern/manta_develop/preprocessed/tbb/turbulencepart.h.reg A intern/mantaflow/intern/manta_develop/preprocessed/tbb/turbulencepart.h.reg.cpp A intern/mantaflow/intern/manta_develop/preprocessed/tbb/vortexpart.cpp A intern/mantaflow/intern/manta_develop/preprocessed/tbb/vortexpart.h R100 intern/mantaflow/intern/manta_pp/tbb/vortexpart.h.reg intern/mantaflow/intern/manta_develop/preprocessed/tbb/vortexpart.h.reg A intern/mantaflow/intern/manta_develop/preprocessed/tbb/vortexpart.h.reg.cpp A intern/mantaflow/intern/manta_develop/preprocessed/tbb/vortexsheet.cpp A intern/mantaflow/intern/manta_develop/preprocessed/tbb/vortexsheet.h R100 intern/mantaflow/intern/manta_pp/tbb/vortexsheet.h.reg intern/mantaflow/intern/manta_develop/preprocessed/tbb/vortexsheet.h.reg A intern/mantaflow/intern/manta_develop/preprocessed/tbb/vortexsheet.h.reg.cpp A intern/mantaflow/intern/manta_develop/update_mantaflow.sh D intern/mantaflow/intern/manta_pp/omp/commonkernels.h D intern/mantaflow/intern/manta_pp/omp/conjugategrad.cpp D intern/mantaflow/intern/manta_pp/omp/conjugategrad.h D intern/mantaflow/intern/manta_pp/omp/edgecollapse.cpp D intern/mantaflow/intern/manta_pp/omp/fastmarch.cpp D intern/mantaflow/intern/manta_pp/omp/fastmarch.h D intern/mantaflow/intern/manta_pp/omp/fileio.cpp D intern/mantaflow/intern/manta_pp/omp/fileio.h D intern/mantaflow/intern/manta_pp/omp/fileio.h.reg D intern/mantaflow/intern/manta_pp/omp/fileio.h.reg.cpp D intern/mantaflow/intern/manta_pp/omp/fileio/iogrids.cpp D intern/mantaflow/intern/manta_pp/omp/fileio/iomeshes.cpp D intern/mantaflow/intern/manta_pp/omp/fileio/ioparticles.cpp D intern/mantaflow/intern/manta_pp/omp/fileio/mantaio.h D intern/mantaflow/intern/manta_pp/omp/fluidsolver.cpp D intern/mantaflow/intern/manta_pp/omp/fluidsolver.h D intern/mantaflow/intern/manta_pp/omp/fluidsolver.h.reg.cpp D intern/mantaflow/intern/manta_pp/omp/general.cpp D intern/mantaflow/intern/manta_pp/omp/general.h D intern/mantaflow/intern/manta_pp/omp/gitinfo.h D intern/mantaflow/intern/manta_pp/omp/grid.cpp D intern/mantaflow/intern/manta_pp/omp/grid.h D intern/mantaflow/intern/manta_pp/omp/grid.h.reg.cpp D intern/mantaflow/intern/manta_pp/omp/grid4d.cpp D intern/mantaflow/intern/manta_pp/omp/grid4d.h D intern/mantaflow/intern/manta_pp/omp/grid4d.h.reg.cpp D intern/mantaflow/intern/manta_pp/omp/kernel.cpp D intern/mantaflow/intern/manta_pp/omp/kernel.h D intern/mantaflow/intern/manta_pp/omp/levelset.cpp D intern/mantaflow/intern/manta_pp/omp/levelset.h D intern/mantaflow/intern/manta_pp/omp/levelset.h.reg.cpp D intern/mantaflow/intern/manta_pp/omp/mesh.cpp D intern/mantaflow/intern/manta_pp/omp/mesh.h D intern/mantaflow/intern/manta_pp/omp/mesh.h.reg.cpp D intern/mantaflow/intern/manta_pp/omp/movingobs.cpp D intern/mantaflow/intern/manta_pp/omp/movingobs.h D intern/mantaflow/intern/manta_pp/omp/movingobs.h.reg.cpp D intern/mantaflow/intern/manta_pp/omp/multigrid.cpp D intern/mantaflow/intern/manta_pp/omp/multigrid.h D intern/mantaflow/intern/manta_pp/omp/noisefield.cpp D intern/mantaflow/intern/manta_pp/omp/noisefield.h D intern/mantaflow/intern/manta_pp/omp/noisefield.h.reg.cpp D intern/mantaflow/intern/manta_pp/omp/particle.cpp D intern/mantaflow/intern/manta_pp/omp/particle.h D intern/mantaflow/intern/manta_pp/omp/particle.h.reg.cpp D intern/mantaflow/intern/manta_pp/omp/plugin/advection.cpp D intern/mantaflow/intern/manta_pp/omp/plugin/apic.cpp D intern/mantaflow/intern/manta_pp/omp/plugin/extforces.cpp D intern/mantaflow/intern/manta_pp/omp/plugin/fire.cpp D intern/mantaflow/intern/manta_pp/omp/plugin/flip.cpp D intern/mantaflow/intern/manta_pp/omp/plugin/fluidguiding.cpp D intern/mantaflow/intern/manta_pp/omp/plugin/initplugins.cpp D intern/mantaflow/intern/manta_pp/omp/plugin/kepsilon.cpp D intern/mantaflow/intern/manta_pp/omp/plugin/meshplugins.cpp D intern/mantaflow/intern/manta_pp/omp/plugin/pressure.cpp D intern/mantaflow/intern/manta_pp/omp/plugin/ptsplugins.cpp D intern/mantaflow/intern/manta_pp/omp/plugin/secondaryparticles.cpp D intern/mantaflow/intern/manta_pp/omp/plugin/sndparticles.cpp D intern/mantaflow/intern/manta_pp/omp/plugin/surfaceturbulence.cpp D intern/mantaflow/intern/manta_pp/omp/plugin/vortexplugins.cpp D intern/mantaflow/intern/manta_pp/omp/plugin/waveletturbulence.cpp D intern/mantaflow/intern/manta_pp/omp/plugin/waves.cpp D intern/mantaflow/intern/manta_pp/omp/pwrapper/manta.h D intern/mantaflow/intern/manta_pp/omp/pwrapper/numpyWrap.cpp D intern/mantaflow/intern/manta_pp/omp/pwrapper/numpyWrap.h D intern/mantaflow/intern/manta_pp/omp/pwrapper/pclass.cpp D intern/mantaflow/intern/manta_pp/omp/pwrapper/pclass.h D intern/mantaflow/intern/manta_pp/omp/pwrapper/pconvert.cpp D intern/mantaflow/intern/manta_pp/omp/pwrapper/pconvert.h D intern/mantaflow/intern/manta_pp/omp/pwrapper/pvec3.cpp D intern/mantaflow/intern/manta_pp/omp/pwrapper/pymain.cpp D intern/mantaflow/intern/manta_pp/omp/pwrapper/pythonInclude.h D intern/mantaflow/intern/manta_pp/omp/pwrapper/registry.cpp D intern/mantaflow/intern/manta_pp/omp/pwrapper/registry.h D intern/mantaflow/intern/manta_pp/omp/python/defines.py.reg.cpp D intern/mantaflow/intern/manta_pp/omp/registration.cpp D intern/mantaflow/intern/manta_pp/omp/shapes.cpp D intern/mantaflow/intern/manta_pp/omp/shapes.h D intern/mantaflow/intern/manta_pp/omp/shapes.h.reg.cpp D intern/mantaflow/intern/manta_pp/omp/test.cpp D intern/mantaflow/intern/manta_pp/omp/timing.cpp D intern/mantaflow/intern/manta_pp/omp/timing.h D intern/mantaflow/intern/manta_pp/omp/timing.h.reg.cpp D intern/mantaflow/intern/manta_pp/omp/turbulencepart.cpp D intern/mantaflow/intern/manta_pp/omp/turbulencepart.h D intern/mantaflow/intern/manta_pp/omp/turbulencepart.h.reg.cpp D intern/mantaflow/intern/manta_pp/omp/util/integrator.h D intern/mantaflow/intern/manta_pp/omp/util/interpol.h D intern/mantaflow/intern/manta_pp/omp/util/interpolHigh.h D intern/mantaflow/intern/manta_pp/omp/util/matrixbase.h D intern/mantaflow/intern/manta_pp/omp/util/mcubes.h D intern/mantaflow/intern/manta_pp/omp/util/quaternion.h D intern/mantaflow/intern/manta_pp/omp/util/randomstream.h D intern/mantaflow/intern/manta_pp/omp/util/rcmatrix.h D intern/mantaflow/intern/manta_pp/omp/util/simpleimage.cpp D intern/mantaflow/intern/manta_pp/omp/util/simpleimage.h D intern/mantaflow/intern/manta_pp/omp/util/solvana.h D intern/mantaflow/intern/manta_pp/omp/util/vector4d.cpp D intern/mantaflow/intern/manta_pp/omp/util/vector4d.h D intern/mantaflow/intern/manta_pp/omp/util/vectorbase.cpp D intern/mantaflow/intern/manta_pp/omp/util/vectorbase.h D intern/mantaflow/intern/manta_pp/omp/vortexpart.cpp D intern/mantaflow/intern/manta_pp/omp/vortexpart.h D intern/mantaflow/intern/manta_pp/omp/vortexpart.h.reg.cpp D intern/mantaflow/intern/manta_pp/omp/vortexsheet.cpp D intern/mantaflow/intern/manta_pp/omp/vortexsheet.h D intern/mantaflow/intern/manta_pp/omp/vortexsheet.h.reg.cpp D intern/mantaflow/intern/manta_pp/tbb/commonkernels.h D intern/mantaflow/intern/manta_pp/tbb/conjugategrad.cpp D intern/mantaflow/intern/manta_pp/tbb/conjugategrad.h D intern/mantaflow/intern/manta_pp/tbb/edgecollapse.cpp D intern/mantaflow/intern/manta_pp/tbb/fastmarch.cpp D intern/mantaflow/intern/manta_pp/tbb/fastmarch.h D intern/mantaflow/intern/manta_pp/tbb/fileio.cpp D intern/mantaflow/intern/manta_pp/tbb/fileio.h D intern/mantaflow/intern/manta_pp/tbb/fileio.h.reg D intern/mantaflow/intern/manta_pp/tbb/fileio.h.reg.cpp D intern/mantaflow/intern/manta_pp/tbb/fileio/iogrids.cpp D intern/mantaflow/intern/manta_pp/tbb/fileio/iomeshes.cpp D intern/mantaflow/intern/manta_pp/tbb/fileio/ioparticles.cpp D intern/mantaflow/intern/manta_pp/tbb/fileio/mantaio.h D intern/mantaflow/intern/manta_pp/tbb/fluidsolver.cpp D intern/mantaflow/intern/manta_pp/tbb/fluidsolver.h D intern/mantaflow/intern/manta_pp/tbb/fluidsolver.h.reg.cpp D intern/mantaflow/intern/manta_pp/tbb/general.cpp D intern/mantaflow/intern/manta_pp/tbb/general.h D intern/mantaflow/intern/manta_pp/tbb/gitinfo.h D intern/mantaflow/intern/manta_pp/tbb/grid.cpp D intern/mantaflow/intern/manta_pp/tbb/grid.h D intern/mantaflow/intern/manta_pp/tbb/grid.h.reg.cpp D intern/mantaflow/intern/manta_pp/tbb/grid4d.cpp D intern/mantaflow/intern/manta_pp/tbb/grid4d.h D intern/mantaflow/intern/manta_pp/tbb/grid4d.h.reg.cpp D intern/mantaflow/intern/manta_pp/tbb/kernel.cpp D intern/mantaflow/intern/manta_pp/tbb/kernel.h D intern/mantaflow/intern/manta_pp/tbb/levelset.cpp D intern/mantaflow/intern/manta_pp/tbb/levelset.h D intern/mantaflow/intern/manta_pp/tbb/levelset.h.reg.cpp D intern/mantaflow/intern/manta_pp/tbb/mesh.cpp D intern/mantaflow/intern/manta_pp/tbb/mesh.h D intern/mantaflow/intern/manta_pp/tbb/mesh.h.reg.cpp D intern/mantaflow/intern/manta_pp/tbb/movingobs.cpp D intern/mantaflow/intern/manta_pp/tbb/movingobs.h D intern/mantaflow/intern/manta_pp/tbb/movingobs.h.reg.cpp D intern/mantaflow/intern/manta_pp/tbb/multigrid.cpp D intern/mantaflow/intern/manta_pp/tbb/multigrid.h D intern/mantaflow/intern/manta_pp/tbb/noisefield.cpp D intern/mantaflow/intern/manta_pp/tbb/noisefield.h D intern/mantaflow/intern/manta_pp/tbb/noisefield.h.reg.cpp D intern/mantaflow/intern/manta_pp/tbb/particle.cpp D intern/mantaflow/intern/manta_pp/tbb/particle.h D intern/mantaflow/intern/manta_pp/tbb/particle.h.reg.cpp D intern/mantaflow/intern/manta_pp/tbb/plugin/advection.cpp D intern/mantaflow/intern/manta_pp/tbb/plugin/apic.cpp D intern/mantaflow/intern/manta_pp/tbb/plugin/extforces.cpp D intern/mantaflow/intern/manta_pp/tbb/plugin/fire.cpp D intern/mantaflow/intern/manta_pp/tbb/plugin/flip.cpp D intern/mantaflow/intern/manta_pp/tbb/plugin/fluidguiding.cpp D intern/mantaflow/intern/manta_pp/tbb/plugin/initplugins.cpp D intern/mantaflow/intern/manta_pp/tbb/plugin/kepsilon.cpp D intern/mantaflow/intern/manta_pp/tbb/plugin/meshplugins.cpp D intern/mantaflow/intern/manta_pp/tbb/plugin/pressure.cpp D intern/mantaflow/intern/manta_pp/tbb/plugin/ptsplugins.cpp D intern/mantaflow/intern/manta_pp/tbb/plugin/secondaryparticles.cpp D intern/mantaflow/intern/manta_pp/tbb/plugin/sndparticles.cpp D intern/mantaflow/intern/manta_pp/tbb/plugin/surfaceturbulence.cpp D intern/mantaflow/intern/manta_pp/tbb/plugin/vortexplugins.cpp D intern/mantaflow/intern/manta_pp/tbb/plugin/waveletturbulence.cpp D intern/mantaflow/intern/manta_pp/tbb/plugin/waves.cpp D intern/mantaflow/intern/manta_pp/tbb/pwrapper/numpyWrap.cpp D intern/mantaflow/intern/manta_pp/tbb/pwrapper/numpyWrap.h D intern/mantaflow/intern/manta_pp/tbb/pwrapper/pclass.cpp D intern/mantaflow/intern/manta_pp/tbb/pwrapper/pclass.h D intern/mantaflow/intern/manta_pp/tbb/pwrapper/pconvert.cpp D intern/mantaflow/intern/manta_pp/tbb/pwrapper/pconvert.h D intern/mantaflow/intern/manta_pp/tbb/pwrapper/pvec3.cpp D intern/mantaflow/intern/manta_pp/tbb/pwrapper/pymain.cpp D intern/mantaflow/intern/manta_pp/tbb/pwrapper/pythonInclude.h D intern/mantaflow/intern/manta_pp/tbb/pwrapper/registry.cpp D intern/mantaflow/intern/manta_pp/tbb/pwrapper/registry.h D intern/mantaflow/intern/manta_pp/tbb/python/defines.py.reg.cpp D intern/mantaflow/intern/manta_pp/tbb/registration.cpp D intern/mantaflow/intern/manta_pp/tbb/shapes.cpp D intern/mantaflow/intern/manta_pp/tbb/shapes.h D intern/mantaflow/intern/manta_pp/tbb/shapes.h.reg.cpp D intern/mantaflow/intern/manta_pp/tbb/test.cpp D intern/mantaflow/intern/manta_pp/tbb/timing.cpp D intern/mantaflow/intern/manta_pp/tbb/timing.h D intern/mantaflow/intern/manta_pp/tbb/timing.h.reg.cpp D intern/mantaflow/intern/manta_pp/tbb/turbulencepart.cpp D intern/mantaflow/intern/manta_pp/tbb/turbulencepart.h D intern/mantaflow/intern/manta_pp/tbb/turbulencepart.h.reg.cpp D intern/mantaflow/intern/manta_pp/tbb/util/integrator.h D intern/mantaflow/intern/manta_pp/tbb/util/interpol.h D intern/mantaflow/intern/manta_pp/tbb/util/interpolHigh.h D intern/mantaflow/intern/manta_pp/tbb/util/matrixbase.h D intern/mantaflow/intern/manta_pp/tbb/util/quaternion.h D intern/mantaflow/intern/manta_pp/tbb/util/randomstream.h D intern/mantaflow/intern/manta_pp/tbb/util/rcmatrix.h D intern/mantaflow/intern/manta_pp/tbb/util/simpleimage.cpp D intern/mantaflow/intern/manta_pp/tbb/util/simpleimage.h D intern/mantaflow/intern/manta_pp/tbb/util/solvana.h D intern/mantaflow/intern/manta_pp/tbb/util/vector4d.cpp D intern/mantaflow/intern/manta_pp/tbb/util/vector4d.h D intern/mantaflow/intern/manta_pp/tbb/util/vectorbase.cpp D intern/mantaflow/intern/manta_pp/tbb/util/vectorbase.h D intern/mantaflow/intern/manta_pp/tbb/vortexpart.cpp D intern/mantaflow/intern/manta_pp/tbb/vortexpart.h D intern/mantaflow/intern/manta_pp/tbb/vortexpart.h.reg.cpp D intern/mantaflow/intern/manta_pp/tbb/vortexsheet.cpp D intern/mantaflow/intern/manta_pp/tbb/vortexsheet.h D intern/mantaflow/intern/manta_pp/tbb/vortexsheet.h.reg.cpp =================================================================== diff --git a/CMakeLists.txt b/CMakeLists.txt index ecc1e8da140..c7708e41450 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -300,6 +300,7 @@ endif() # Modifiers option(WITH_MOD_FLUID "Enable Elbeem Modifier (Fluid Simulation)" ON) option(WITH_MOD_MANTA "Enable Mantaflow Fluid Simulation Framework" ON) +option(WITH_MANTA_OMP "Enable Mantaflow OpenMP support (instead of default TBB support)" OFF) option(WITH_MOD_REMESH "Enable Remesh Modifier" ON) # option(WITH_MOD_CLOTH_ELTOPO "Enable Experimental cloth solver" OFF) # this is now only available in a branch # mark_as_advanced(WITH_MOD_CLOTH_ELTOPO) diff --git a/intern/mantaflow/CMakeLists.txt b/intern/mantaflow/CMakeLists.txt index 0736e72b185..4ad68dcc65b 100644 --- a/intern/mantaflow/CMakeLists.txt +++ b/intern/mantaflow/CMakeLists.txt @@ -25,16 +25,22 @@ set(MANTAVERSION "0.12") -if(WITH_OPENMP) +set(MANTA_DEP + intern/manta_develop/dependencies +) +set(MANTA_HLP + intern/manta_develop/helper +) +set(MANTA_PP + intern/manta_develop/preprocessed/tbb +) +add_definitions(-DTBB=1) + +if(WITH_OPENMP AND WITH_MANTA_OMP) set(MANTA_PP - intern/manta_pp/omp + intern/manta_develop/preprocessed/omp ) add_definitions(-DOPENMP=1) -else() - set(MANTA_PP - intern/manta_pp/tbb - ) - add_definitions(-DTBB=1) endif() if(WITH_OPENVDB) @@ -48,8 +54,9 @@ set(INC ${MANTA_PP}/fileio ${MANTA_PP}/python ${MANTA_PP}/plugin - ${MANTA_PP}/pwrapper - ${MANTA_PP}/util + ${MANTA_HLP}/pwrapper + ${MANTA_HLP}/util + ${MANTA_DEP}/cnpy ../../source/blender/makesdna ../../source/blender/blenlib ) @@ -61,14 +68,9 @@ endif() set(INC_SYS ${PYTHON_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS} + ${TBB_INCLUDE_DIRS} ) -if(NOT WITH_OPENMP) - list(APPEND INC_SYS - ${TBB_INCLUDE_DIRS} - ) -endif() - if(WITH_OPENVDB) list(APPEND INC_SYS ${BOOST_INCLUDE_DIR} @@ -89,6 +91,9 @@ set(SRC intern/strings/smoke_script.h intern/strings/liquid_script.h + ${MANTA_DEP}/cnpy/cnpy.cpp + ${MANTA_DEP}/cnpy/cnpy.h + ${MANTA_PP}/commonkernels.h ${MANTA_PP}/commonkernels.h.reg ${MANTA_PP}/commonkernels.h.reg.cpp @@ -164,27 +169,17 @@ set(SRC ${MANTA_PP}/plugin/initplugins.cpp ${MANTA_PP}/plugin/kepsilon.cpp ${MANTA_PP}/plugin/meshplugins.cpp +# TODO (sebbas): add numpy to libraries # ${MANTA_PP}/plugin/numpyconvert.cpp ${MANTA_PP}/plugin/pressure.cpp ${MANTA_PP}/plugin/ptsplugins.cpp - ${MANTA_PP}/plugin/secondaryparticles - ${MANTA_PP}/plugin/sndparticles.cpp + ${MANTA_PP}/plugin/secondaryparticles.cpp ${MANTA_PP}/plugin/surfaceturbulence.cpp +# TODO (sebbas): add numpy to libraries # ${MANTA_PP}/plugin/tfplugins.cpp ${MANTA_PP}/plugin/vortexplugins.cpp ${MANTA_PP}/plugin/waveletturbulence.cpp ${MANTA_PP}/plugin/waves.cpp - ${MANTA_PP}/pwrapper/manta.h -# ${MANTA_PP}/pwrapper/numpyWrap.cpp -# ${MANTA_PP}/pwrapper/numpyWrap.h - ${MANTA_PP}/pwrapper/pclass.cpp - ${MANTA_PP}/pwrapper/pclass.h - ${MANTA_PP}/pwrapper/pconvert.cpp - ${MANTA_PP}/pwrapper/pconvert.h - ${MANTA_PP}/pwrapper/pvec3.cpp - ${MANTA_PP}/pwrapper/pythonInclude.h - ${MANTA_PP}/pwrapper/registry.cpp - ${MANTA_PP}/pwrapper/registry.h ${MANTA_PP}/python/defines.py ${MANTA_PP}/python/defines.py.reg ${MANTA_PP}/python/defines.py.reg.cpp @@ -202,21 +197,6 @@ set(SRC ${MANTA_PP}/turbulencepart.h ${MANTA_PP}/turbulencepart.h.reg ${MANTA_PP}/turbulencepart.h.reg.cpp - ${MANTA_PP}/util/integrator.h - ${MANTA_PP}/util/interpol.h - ${MANTA_PP}/util/interpolHigh.h - ${MANTA_PP}/util/matrixbase.h - ${MANTA_PP}/util/mcubes.h - ${MANTA_PP}/util/quaternion.h - ${MANTA_PP}/util/randomstream.h - ${MANTA_PP}/util/rcmatrix.h - ${MANTA_PP}/util/simpleimage.cpp - ${MANTA_PP}/util/simpleimage.h - ${MANTA_PP}/util/solvana.h - ${MANTA_PP}/util/vector4d.cpp - ${MANTA_PP}/util/vector4d.h - ${MANTA_PP}/util/vectorbase.cpp - ${MANTA_PP}/util/vectorbase.h ${MANTA_PP}/vortexpart.cpp ${MANTA_PP}/vortexpart.h ${MANTA_PP}/vortexpart.h.reg @@ -225,6 +205,34 @@ set(SRC ${MANTA_PP}/vortexsheet.h ${MANTA_PP}/vortexsheet.h.reg ${MANTA_PP}/vortexsheet.h.reg.cpp + + ${MANTA_HLP}/pwrapper/manta.h +# TODO (sebbas): add numpy to libraries +# ${MANTA_HLP}/pwrapper/numpyWrap.cpp +# ${MANTA_HLP}/pwrapper/numpyWrap.h + ${MANTA_HLP}/pwrapper/pclass.cpp + ${MANTA_HLP}/pwrapper/pclass.h + ${MANTA_HLP}/pwrapper/pconvert.cpp + ${MANTA_HLP}/pwrapper/pconvert.h + ${MANTA_HLP}/pwrapper/pvec3.cpp + ${MANTA_HLP}/pwrapper/pythonInclude.h + ${MANTA_HLP}/pwrapper/registry.cpp + ${MANTA_HLP}/pwrapper/registry.h + ${MANTA_HLP}/util/integrator.h + ${MANTA_HLP}/util/interpol.h + ${MANTA_HLP}/util/interpolHigh.h + ${MANTA_HLP}/util/matrixbase.h + ${MANTA_HLP}/util/mcubes.h + ${MANTA_HLP}/util/quaternion.h + ${MANTA_HLP}/util/randomstream.h + ${MANTA_HLP}/util/rcmatrix.h + ${MANTA_HLP}/util/simpleimage.cpp + ${MANTA_HLP}/util/simpleimage.h + ${MANTA_HLP}/util/solvana.h + ${MANTA_HLP}/util/vector4d.cpp + ${MANTA_HLP}/util/vector4d.h + ${MANTA_HLP}/util/vectorbase.cpp + ${MANTA_HLP}/util/vectorbase.h ) set(LIB diff --git a/intern/mantaflow/intern/manta_develop/dependencies/cnpy/LICENSE b/intern/mantaflow/intern/manta_develop/dependencies/cnpy/LICENSE new file mode 100644 index 00000000000..e60eadbccb3 --- /dev/null +++ b/intern/mantaflow/intern/manta_develop/dependencies/cnpy/LICENSE @@ -0,0 +1,21 @@ +The MIT License + +Copyright (c) Carl Rogers, 2011 + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/intern/mantaflow/intern/manta_develop/dependencies/cnpy/cnpy.cpp b/intern/mantaflow/intern/manta_develop/dependencies/cnpy/cnpy.cpp new file mode 100644 index 00000000000..930ebe537cb --- /dev/null +++ b/intern/mantaflow/intern/manta_develop/dependencies/cnpy/cnpy.cpp @@ -0,0 +1,341 @@ +//Copyright (C) 2011 Carl Rogers +//Released under MIT License +//license available in LICENSE file, or at http://www.opensource.org/licenses/mit-license.php + +#include"cnpy.h" +#include<complex> +#include<cstdlib> +#include<algorithm> +#include<cstring> +#include<iomanip> +#include<stdint.h> +#include<stdexcept> +#include <regex> + +char cnpy::BigEndianTest() { + int x = 1; + return (((char *)&x)[0]) ? '<' : '>'; +} + +char cnpy::map_type(const std::type_info& t) +{ + if(t == typeid(float) ) return 'f'; + if(t == typeid(double) ) return 'f'; + if(t == typeid(long double) ) return 'f'; + + if(t == typeid(int) ) return 'i'; + if(t == typeid(char) ) return 'i'; + if(t == typeid(short) ) return 'i'; + if(t == typeid(long) ) return 'i'; + if(t == typeid(long long) ) return 'i'; + + if(t == typeid(unsigned char) ) return 'u'; + if(t == typeid(unsigned short) ) return 'u'; + if(t == typeid(unsigned long) ) return 'u'; + if(t == typeid(unsigned long long) ) return 'u'; + if(t == typeid(unsigned int) ) return 'u'; + + if(t == typeid(bool) ) return 'b'; + + if(t == typeid(std::complex<float>) ) return 'c'; + if(t == typeid(std::complex<double>) ) return 'c'; + if(t == typeid(std::complex<long double>) ) return 'c'; + + else return '?'; +} + +template<> std::vector<char>& cnpy::operator+=(std::vector<char>& lhs, const std::string rhs) { + lhs.insert(lhs.end(),rhs.begin(),rhs.end()); + return lhs; +} + +template<> std::vector<char>& cnpy::operator+=(std::vector<char>& lhs, const char* rhs) { + //write in little endian + size_t len = strlen(rhs); + lhs.reserve(len); + for(size_t byte = 0; byte < len; byte++) { + lhs.push_back(rhs[byte]); + } + return lhs; +} + +void cnpy::parse_npy_header(unsigned char* buffer,size_t& word_size, std::vector<size_t>& shape, bool& fortran_order) { + //std::string magic_string(buffer,6); + uint8_t major_version = *reinterpret_cast<uint8_t*>(buffer+6); + uint8_t minor_version = *reinterpret_cast<uint8_t*>(buffer+7); + uint16_t header_len = *reinterpret_cast<uint16_t*>(buffer+8); + std::string header(reinterpret_cast<char*>(buffer+9),header_len); + + size_t loc1, loc2; + + //fortran order + loc1 = header.find("fortran_order")+16; + fortran_order = (header.substr(loc1,4) == "True" ? true : false); + + //shape + loc1 = header.find("("); + loc2 = header.find(")"); + + std::regex num_regex("[0-9][0-9]*"); + std::smatch sm; + shape.clear(); + + std::string str_shape = header.substr(loc1+1,loc2-loc1-1); + while(std::regex_search(str_shape, sm, num_regex)) { + shape.push_back(std::stoi(sm[0].str())); + str_shape = sm.suffix().str(); + } + + //endian, word size, data type + //byte order code | stands for not applicable. + //not sure when this applies except for byte array + loc1 = header.find("descr")+9; + bool littleEndian = (header[loc1] == '<' || header[loc1] == '|' ? true : false); + assert(littleEndian); + + //char type = header[loc1+1]; + //assert(type == map_type(T)); + + std::string str_ws = header.substr(loc1+2); + loc2 = str_ws.find("'"); + word_size = atoi(str_ws.substr(0,loc2).c_str()); +} + +void cnpy::parse_npy_header(FILE* fp, size_t& word_size, std::vector<size_t>& shape, bool& fortran_order) { + char buffer[2 @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs