[Bf-blender-cvs] [bd34f18] fluid-mantaflow: removed old manta_pp files from internal python dir - manta_pp files are in intern/mantaflow
Sebastián Barschkis
noreply at git.blender.org
Tue Apr 19 12:01:34 CEST 2016
Commit: bd34f1827a1a0452400a1db7bae00c7190c24aaa
Author: Sebastián Barschkis
Date: Mon Apr 4 18:01:30 2016 +0100
Branches: fluid-mantaflow
https://developer.blender.org/rBbd34f1827a1a0452400a1db7bae00c7190c24aaa
removed old manta_pp files from internal python dir - manta_pp files are in intern/mantaflow
===================================================================
D source/blender/python/manta_pp/CMakeLists.txt
D source/blender/python/manta_pp/commonkernels.h
D source/blender/python/manta_pp/commonkernels.h.reg
D source/blender/python/manta_pp/commonkernels.h.reg.cpp
D source/blender/python/manta_pp/conjugategrad.cpp
D source/blender/python/manta_pp/conjugategrad.h
D source/blender/python/manta_pp/conjugategrad.h.reg
D source/blender/python/manta_pp/conjugategrad.h.reg.cpp
D source/blender/python/manta_pp/edgecollapse.cpp
D source/blender/python/manta_pp/edgecollapse.h
D source/blender/python/manta_pp/edgecollapse.h.reg
D source/blender/python/manta_pp/edgecollapse.h.reg.cpp
D source/blender/python/manta_pp/fastmarch.cpp
D source/blender/python/manta_pp/fastmarch.h
D source/blender/python/manta_pp/fastmarch.h.reg
D source/blender/python/manta_pp/fastmarch.h.reg.cpp
D source/blender/python/manta_pp/fileio.cpp
D source/blender/python/manta_pp/fileio.h
D source/blender/python/manta_pp/fileio.h.reg
D source/blender/python/manta_pp/fileio.h.reg.cpp
D source/blender/python/manta_pp/fluidsolver.cpp
D source/blender/python/manta_pp/fluidsolver.h
D source/blender/python/manta_pp/fluidsolver.h.reg
D source/blender/python/manta_pp/fluidsolver.h.reg.cpp
D source/blender/python/manta_pp/general.cpp
D source/blender/python/manta_pp/general.h
D source/blender/python/manta_pp/general.h.reg
D source/blender/python/manta_pp/general.h.reg.cpp
D source/blender/python/manta_pp/gitinfo.h
D source/blender/python/manta_pp/grid.cpp
D source/blender/python/manta_pp/grid.h
D source/blender/python/manta_pp/grid.h.reg
D source/blender/python/manta_pp/grid.h.reg.cpp
D source/blender/python/manta_pp/hginfo.h
D source/blender/python/manta_pp/kernel.cpp
D source/blender/python/manta_pp/kernel.h
D source/blender/python/manta_pp/kernel.h.reg
D source/blender/python/manta_pp/kernel.h.reg.cpp
D source/blender/python/manta_pp/levelset.cpp
D source/blender/python/manta_pp/levelset.h
D source/blender/python/manta_pp/levelset.h.reg
D source/blender/python/manta_pp/levelset.h.reg.cpp
D source/blender/python/manta_pp/mesh.cpp
D source/blender/python/manta_pp/mesh.h
D source/blender/python/manta_pp/mesh.h.reg
D source/blender/python/manta_pp/mesh.h.reg.cpp
D source/blender/python/manta_pp/movingobs.cpp
D source/blender/python/manta_pp/movingobs.h
D source/blender/python/manta_pp/movingobs.h.reg
D source/blender/python/manta_pp/movingobs.h.reg.cpp
D source/blender/python/manta_pp/noisefield.cpp
D source/blender/python/manta_pp/noisefield.h
D source/blender/python/manta_pp/noisefield.h.reg
D source/blender/python/manta_pp/noisefield.h.reg.cpp
D source/blender/python/manta_pp/particle.cpp
D source/blender/python/manta_pp/particle.h
D source/blender/python/manta_pp/particle.h.reg
D source/blender/python/manta_pp/particle.h.reg.cpp
D source/blender/python/manta_pp/plugin/advection.cpp
D source/blender/python/manta_pp/plugin/extforces.cpp
D source/blender/python/manta_pp/plugin/fire.cpp
D source/blender/python/manta_pp/plugin/flip.cpp
D source/blender/python/manta_pp/plugin/initplugins.cpp
D source/blender/python/manta_pp/plugin/kepsilon.cpp
D source/blender/python/manta_pp/plugin/meshplugins.cpp
D source/blender/python/manta_pp/plugin/pressure.cpp
D source/blender/python/manta_pp/plugin/vortexplugins.cpp
D source/blender/python/manta_pp/plugin/waveletturbulence.cpp
D source/blender/python/manta_pp/plugin/waves.cpp
D source/blender/python/manta_pp/pwrapper/manta.h
D source/blender/python/manta_pp/pwrapper/manta_api.cpp
D source/blender/python/manta_pp/pwrapper/manta_api.h
D source/blender/python/manta_pp/pwrapper/pclass.cpp
D source/blender/python/manta_pp/pwrapper/pclass.h
D source/blender/python/manta_pp/pwrapper/pconvert.cpp
D source/blender/python/manta_pp/pwrapper/pconvert.h
D source/blender/python/manta_pp/pwrapper/pvec3.cpp
D source/blender/python/manta_pp/pwrapper/pymain.cpp
D source/blender/python/manta_pp/pwrapper/pythonInclude.h
D source/blender/python/manta_pp/pwrapper/registry.cpp
D source/blender/python/manta_pp/pwrapper/registry.h
D source/blender/python/manta_pp/python/defines.py
D source/blender/python/manta_pp/python/defines.py.reg
D source/blender/python/manta_pp/python/defines.py.reg.cpp
D source/blender/python/manta_pp/shapes.cpp
D source/blender/python/manta_pp/shapes.h
D source/blender/python/manta_pp/shapes.h.reg
D source/blender/python/manta_pp/shapes.h.reg.cpp
D source/blender/python/manta_pp/test.cpp
D source/blender/python/manta_pp/timing.cpp
D source/blender/python/manta_pp/timing.h
D source/blender/python/manta_pp/timing.h.reg
D source/blender/python/manta_pp/timing.h.reg.cpp
D source/blender/python/manta_pp/turbulencepart.cpp
D source/blender/python/manta_pp/turbulencepart.h
D source/blender/python/manta_pp/turbulencepart.h.reg
D source/blender/python/manta_pp/turbulencepart.h.reg.cpp
D source/blender/python/manta_pp/util/integrator.h
D source/blender/python/manta_pp/util/interpol.h
D source/blender/python/manta_pp/util/interpolHigh.h
D source/blender/python/manta_pp/util/mcubes.h
D source/blender/python/manta_pp/util/quaternion.h
D source/blender/python/manta_pp/util/randomstream.h
D source/blender/python/manta_pp/util/simpleimage.cpp
D source/blender/python/manta_pp/util/simpleimage.h
D source/blender/python/manta_pp/util/solvana.h
D source/blender/python/manta_pp/util/vectorbase.cpp
D source/blender/python/manta_pp/util/vectorbase.h
D source/blender/python/manta_pp/vortexpart.cpp
D source/blender/python/manta_pp/vortexpart.h
D source/blender/python/manta_pp/vortexpart.h.reg
D source/blender/python/manta_pp/vortexpart.h.reg.cpp
D source/blender/python/manta_pp/vortexsheet.cpp
D source/blender/python/manta_pp/vortexsheet.h
D source/blender/python/manta_pp/vortexsheet.h.reg
D source/blender/python/manta_pp/vortexsheet.h.reg.cpp
===================================================================
diff --git a/source/blender/python/manta_pp/CMakeLists.txt b/source/blender/python/manta_pp/CMakeLists.txt
deleted file mode 100644
index 0fb2809..0000000
--- a/source/blender/python/manta_pp/CMakeLists.txt
+++ /dev/null
@@ -1,144 +0,0 @@
-if(WITH_OPENMP)
- add_definitions(-DOPENMP)
-else()
- message("Error. Mantaflow pp files require an OpenMP enabled compiler")
-endif()
-
-set(INC
- ${CMAKE_CURRENT_SOURCE_DIR}
- ${CMAKE_CURRENT_SOURCE_DIR}/python
- ${CMAKE_CURRENT_SOURCE_DIR}/plugin
- ${CMAKE_CURRENT_SOURCE_DIR}/pwrapper
- ${CMAKE_CURRENT_SOURCE_DIR}/util
- #gui
-)
-
-set(INC_SYS
- ${ZLIB_INCLUDE_DIRS}
- ${PYTHON_INCLUDE_DIRS}
-)
-
-#message("MANTA_processing ${CMAKE_CURRENT_SOURCE_DIR}/commonkernels.h")
-set(SRC
-#PP SOURCES and HEADERS
-${CMAKE_CURRENT_SOURCE_DIR}/commonkernels.h
-${CMAKE_CURRENT_SOURCE_DIR}/commonkernels.h.reg
-${CMAKE_CURRENT_SOURCE_DIR}/commonkernels.h.reg.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/conjugategrad.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/conjugategrad.h
-${CMAKE_CURRENT_SOURCE_DIR}/conjugategrad.h.reg
-${CMAKE_CURRENT_SOURCE_DIR}/conjugategrad.h.reg.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/edgecollapse.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/edgecollapse.h
-${CMAKE_CURRENT_SOURCE_DIR}/edgecollapse.h.reg
-${CMAKE_CURRENT_SOURCE_DIR}/edgecollapse.h.reg.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/fastmarch.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/fastmarch.h
-${CMAKE_CURRENT_SOURCE_DIR}/fastmarch.h.reg
-${CMAKE_CURRENT_SOURCE_DIR}/fastmarch.h.reg.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/fileio.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/fileio.h
-${CMAKE_CURRENT_SOURCE_DIR}/fileio.h.reg
-${CMAKE_CURRENT_SOURCE_DIR}/fileio.h.reg.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/fluidsolver.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/fluidsolver.h
-${CMAKE_CURRENT_SOURCE_DIR}/fluidsolver.h.reg
-${CMAKE_CURRENT_SOURCE_DIR}/fluidsolver.h.reg.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/general.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/general.h
-${CMAKE_CURRENT_SOURCE_DIR}/general.h.reg
-${CMAKE_CURRENT_SOURCE_DIR}/general.h.reg.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/grid.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/grid.h
-${CMAKE_CURRENT_SOURCE_DIR}/grid.h.reg
-${CMAKE_CURRENT_SOURCE_DIR}/grid.h.reg.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/hginfo.h
-${CMAKE_CURRENT_SOURCE_DIR}/kernel.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/kernel.h
-${CMAKE_CURRENT_SOURCE_DIR}/kernel.h.reg
-${CMAKE_CURRENT_SOURCE_DIR}/kernel.h.reg.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/levelset.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/levelset.h
-${CMAKE_CURRENT_SOURCE_DIR}/levelset.h.reg
-${CMAKE_CURRENT_SOURCE_DIR}/levelset.h.reg.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/mesh.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/mesh.h
-${CMAKE_CURRENT_SOURCE_DIR}/mesh.h.reg
-${CMAKE_CURRENT_SOURCE_DIR}/mesh.h.reg.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/movingobs.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/movingobs.h
-${CMAKE_CURRENT_SOURCE_DIR}/movingobs.h.reg
-${CMAKE_CURRENT_SOURCE_DIR}/movingobs.h.reg.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/noisefield.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/noisefield.h
-${CMAKE_CURRENT_SOURCE_DIR}/noisefield.h.reg
-${CMAKE_CURRENT_SOURCE_DIR}/noisefield.h.reg.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/particle.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/particle.h
-${CMAKE_CURRENT_SOURCE_DIR}/particle.h.reg
-${CMAKE_CURRENT_SOURCE_DIR}/particle.h.reg.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/plugin/advection.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/plugin/extforces.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/plugin/fire.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/plugin/flip.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/plugin/initplugins.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/plugin/kepsilon.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/plugin/meshplugins.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/plugin/pressure.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/plugin/vortexplugins.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/plugin/waveletturbulence.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/plugin/waves.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/python/defines.py
-${CMAKE_CURRENT_SOURCE_DIR}/python/defines.py.reg
-${CMAKE_CURRENT_SOURCE_DIR}/python/defines.py.reg.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/shapes.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/shapes.h
-${CMAKE_CURRENT_SOURCE_DIR}/shapes.h.reg
-${CMAKE_CURRENT_SOURCE_DIR}/shapes.h.reg.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/test.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/timing.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/timing.h
-${CMAKE_CURRENT_SOURCE_DIR}/timing.h.reg
-${CMAKE_CURRENT_SOURCE_DIR}/timing.h.reg.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/turbulencepart.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/turbulencepart.h
-${CMAKE_CURRENT_SOURCE_DIR}/turbulencepart.h.reg
-${CMAKE_CURRENT_SOURCE_DIR}/turbulencepart.h.reg.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/vortexpart.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/vortexpart.h
-${CMAKE_CURRENT_SOURCE_DIR}/vortexpart.h.reg
-${CMAKE_CURRENT_SOURCE_DIR}/vortexpart.h.reg.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/vortexsheet.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/vortexsheet.h
-${CMAKE_CURRENT_SOURCE_DIR}/vortexsheet.h.reg
-${CMAKE_CURRENT_SOURCE_DIR}/vortexsheet.h.reg.cpp
-
-${CMAKE_CURRENT_SOURCE_DIR}/pwrapper/pymain.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/pwrapper/pclass.h
-${CMAKE_CURRENT_SOURCE_DIR}/pwrapper/pclass.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/pwrapper/pvec3.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/pwrapper/pconvert.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/pwrapper/pconvert.h
-${CMAKE_CURRENT_SOURCE_DIR}/pwrapper/registry.h
-${CMAKE_CURRENT_SOURCE_DIR}/pwrapper/registry.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/pwrapper/pythonInclude.h
-${CMAKE_CURRENT_SOURCE_DIR}/pwrapper/manta_api.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/pwrapper/manta.h
-${CMAKE_CURRENT_SOURCE_DIR}/pwrapper/manta_api.h
-${CMAKE_CURRENT_SOURCE_DIR}/util/vectorbase.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/util/integrator.h
-${CMAKE_CURRENT_SOURCE_DIR}/util/vectorbase.h
-${CMAKE_CURRENT_SOURCE_DIR}/util/vectorbase.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/util/quaternion.h
-${CMAKE_CURRENT_SOURCE_DIR}/util/interpol.h
-${CMAKE_CURRENT_SOURCE_DIR}/util/interpolHigh.h
-${CMAKE_CURRENT_SOURCE_DIR}/util/mcubes.h
-${CMAKE_CURRENT_SOURCE_DIR}/util/randomstream.h
-${CMAKE_CURRENT_SOURCE_DIR}/util/solvana.h
-${CMAKE_CURRENT_SOURCE_DIR}/util/simpleimage.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/util/simpleimage.h
-)
-list(REMOVE_DUPLICATES "SRC")
-list_assert_duplicates("${SRC}")
-
-#blender_add_lib(bf_python_manta "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/python/manta_pp/commonkernels.h b/source/blender/python/manta_pp/commonkernels.h
deleted file mode 100644
index 202905d..0000000
--- a/source/blender/python/manta_pp/commonkernels.h
+++ /dev/null
@@ -1,277 +0,0 @@
-
-
-
-
-
-// DO NOT EDIT !
-// This file is generated using the MantaFlow preprocessor (prep generate).
-
-
-
-
-#line 1 "/Users/user/Developer/Xcode Projects/mantaflowDevelop/mantaflowgit/source/commonkernels.h"
-/******************************************************************************
- *
- * MantaFlow fluid solver framework
- * Copyright 2011 Tobias Pfaff, Nils Thuerey
- *
- * This program is free software, distributed under the terms of the
- * GNU General Public License (GPL)
- * http://www.gnu.org/licenses
- *
- * Common grid kernels
- *
- ******************************************************************************/
-
-#ifndef _COMMONKERNELS_H
-#define _COMMONKERNELS_H
-
-#include "general.h"
-#include "kernel.h"
-#include "grid.h"
-
-namespace Manta {
-
-//! Kernel: Invert real values, if positive and fluid
-
-
- struct InvertCheckFluid : public KernelBase { InvertCheckFluid(FlagGrid& flags, Grid<Real>& grid) : KernelBase(&flags,0) ,flags(flags),grid(grid) { run(); } inline void op(int idx, FlagGrid& flags, Grid<Real>& grid ) {
- if (flags.isFluid(idx) && grid[idx] > 0)
- grid[idx] = 1.0 / grid[idx];
-} inline FlagGrid& getArg0() { return flags; } typedef FlagGrid type0;inline Grid<Real>& getArg1() { return grid; } typedef Grid<Real> type1; void run() { const int _sz = size;
-#pragma omp parallel
- { this->threadId = omp_get_thread_num(); this->threadNum = omp_get_num_threads();
-#pragma omp for
- for (int i=0; i < _sz; i++) op(i,flags,grid); } } FlagGrid& flags; Grid<Real>& grid; };
-#line 26 "commonkernels.h"
-
-
-
-//! Kernel: Squared sum over grid
-
- struct GridSumSqr : public KernelBase { GridSumSqr(Grid<Real>& grid) : KernelBase(&grid,0) ,grid(grid) ,sum(0) { run(); } inline void op(int idx, Grid<Real>& grid ,double& sum) {
- sum += square((double)grid[idx]);
-} inline operator double () { return sum; } inline double & getRet() { return sum; } inline Grid<Real>& getArg0() { return grid; } typedef Grid<Real> type0; void run() { const int _sz = size;
-#pragma omp parallel
- { this->threadId = omp_get_thread_num(); this->threadNum = omp_get_num_threads(); double sum = 0;
-#pragma omp for nowait
- for (int i=0; i < _sz; i++) op(i,grid,sum);
-#pragma omp critical
-{this->sum += sum; } } } Grid<Real>& grid; double sum; };
-#line 33 "commonkernels.h"
-
-
-
-//! Kernel: rotation operator \nabla x v for centered vector fields
-
- struct CurlOp : public KernelBase { CurlOp(const Grid<Vec3>& grid, Grid<Vec3>& dst) : KernelBase(&grid,1) ,grid(grid),dst(dst) { run(); } inline void op(int i, int j, int k, const Grid<Vec3>& grid, Grid<Vec3>& dst ) {
- Vec3 v = Vec3(0. , 0. ,
- 0.5*((grid(i+1,j,k).y - grid(i-1,j,k).y) - (grid(i,j+1,k).x - grid(i,j-1,k).x)) );
- if(dst.is3D()) {
- v[0] = 0.5*((grid(i,j+1,k).z - grid(i,j-1,k).z) - (grid(i,j,k+1).y - grid(i,j,k-1).y));
- v[1] = 0.5*((grid(i,j,k+1).x - grid(i,j,k-1).x) - (grid(i+1,j,k).z - grid(i-1,j,k).z));
- }
- dst(i,j,k) = v;
-} inline const Grid<Vec3>& getArg0() { return grid; } typedef Grid<Vec3> type0;inline Grid<Vec3>& getArg1() { return dst; } typedef Grid<Vec3> type1; void run() { const int _maxX = maxX; const int _maxY = maxY; if (maxZ > 1) {
-#pragma omp parallel
- { this->threadId = omp_get_thread_num(); this->threadNum = omp_get_num_threads();
-#pragma omp for
- for (int k=minZ; k < maxZ; k++) for (int j=1; j < _maxY; j++) for (int i=1; i < _maxX; i++) op(i,j,k,grid,dst); } } else { const int k=0;
-#pragma omp parallel
- { this->threadId = omp_get_thread_num(); this->threadNum = omp_get_num_threads();
-#pragma omp for
- for (int j=1; j < _maxY; j++) for (int i=1; i < _maxX; i++) op(i,j,k,grid,dst); } } } const Grid<Vec3>& grid; Grid<Vec3>& dst; };
-#line 39 "commonkernels.h"
-
-;
-
-//! Kernel: divergence operator (from MAC grid)
-
-
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list