[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12754] branches/soc-2007-joeedh: merge with trunk, revisions 12513-to-12753
Joseph Eagar
joeedh at gmail.com
Sun Dec 2 05:33:31 CET 2007
Revision: 12754
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12754
Author: joeedh
Date: 2007-12-02 05:33:04 +0100 (Sun, 02 Dec 2007)
Log Message:
-----------
merge with trunk, revisions 12513-to-12753
yay!!!
Modified Paths:
--------------
branches/soc-2007-joeedh/bin/.blender/locale/de/LC_MESSAGES/blender.mo
branches/soc-2007-joeedh/intern/elbeem/extern/elbeem.h
branches/soc-2007-joeedh/intern/elbeem/intern/attributes.cpp
branches/soc-2007-joeedh/intern/elbeem/intern/isosurface.cpp
branches/soc-2007-joeedh/intern/elbeem/intern/loop_tools.h
branches/soc-2007-joeedh/intern/elbeem/intern/ntl_vector3dim.h
branches/soc-2007-joeedh/intern/elbeem/intern/particletracer.cpp
branches/soc-2007-joeedh/intern/elbeem/intern/simulation_object.cpp
branches/soc-2007-joeedh/intern/elbeem/intern/solver_adap.cpp
branches/soc-2007-joeedh/intern/elbeem/intern/solver_class.h
branches/soc-2007-joeedh/intern/elbeem/intern/solver_init.cpp
branches/soc-2007-joeedh/intern/elbeem/intern/solver_interface.cpp
branches/soc-2007-joeedh/intern/elbeem/intern/solver_interface.h
branches/soc-2007-joeedh/intern/elbeem/intern/solver_main.cpp
branches/soc-2007-joeedh/intern/elbeem/intern/solver_util.cpp
branches/soc-2007-joeedh/intern/elbeem/intern/utilities.cpp
branches/soc-2007-joeedh/intern/elbeem/intern/utilities.h
branches/soc-2007-joeedh/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/soc-2007-joeedh/intern/opennl/intern/opennl.c
branches/soc-2007-joeedh/po/de.po
branches/soc-2007-joeedh/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj
branches/soc-2007-joeedh/projectfiles_vc7/blender/blenlib/BLI_blenlib.vcproj
branches/soc-2007-joeedh/projectfiles_vc7/blender/imbuf/BL_imbuf.vcproj
branches/soc-2007-joeedh/projectfiles_vc7/blender/makesdna/DNA_makesdna.vcproj
branches/soc-2007-joeedh/projectfiles_vc7/blender/src/BL_src.vcproj
branches/soc-2007-joeedh/release/datafiles/blenderbuttons
branches/soc-2007-joeedh/release/datafiles/preview.blend
branches/soc-2007-joeedh/release/scripts/bpymodules/BPyMessages.py
branches/soc-2007-joeedh/release/scripts/flt_export.py
branches/soc-2007-joeedh/release/scripts/flt_filewalker.py
branches/soc-2007-joeedh/release/scripts/flt_import.py
branches/soc-2007-joeedh/release/scripts/import_dxf.py
branches/soc-2007-joeedh/release/scripts/mesh_edges2curves.py
branches/soc-2007-joeedh/release/scripts/mesh_skin.py
branches/soc-2007-joeedh/release/scripts/mesh_wire.py
branches/soc-2007-joeedh/release/scripts/weightpaint_normalize.py
branches/soc-2007-joeedh/source/Makefile
branches/soc-2007-joeedh/source/blender/blenkernel/BKE_DerivedMesh.h
branches/soc-2007-joeedh/source/blender/blenkernel/BKE_bad_level_calls.h
branches/soc-2007-joeedh/source/blender/blenkernel/BKE_blender.h
branches/soc-2007-joeedh/source/blender/blenkernel/BKE_displist.h
branches/soc-2007-joeedh/source/blender/blenkernel/BKE_global.h
branches/soc-2007-joeedh/source/blender/blenkernel/BKE_lattice.h
branches/soc-2007-joeedh/source/blender/blenkernel/BKE_main.h
branches/soc-2007-joeedh/source/blender/blenkernel/BKE_material.h
branches/soc-2007-joeedh/source/blender/blenkernel/BKE_modifier.h
branches/soc-2007-joeedh/source/blender/blenkernel/BKE_node.h
branches/soc-2007-joeedh/source/blender/blenkernel/BKE_softbody.h
branches/soc-2007-joeedh/source/blender/blenkernel/BKE_utildefines.h
branches/soc-2007-joeedh/source/blender/blenkernel/bad_level_call_stubs/stubs.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/action.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/anim.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/armature.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/blender.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/constraint.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/curve.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/customdata.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/displist.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/effect.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/image.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/ipo.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/key.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/library.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/material.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/modifier.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/object.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/scene.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/softbody.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/texture.c
branches/soc-2007-joeedh/source/blender/blenlib/BLI_arithb.h
branches/soc-2007-joeedh/source/blender/blenlib/intern/arithb.c
branches/soc-2007-joeedh/source/blender/blenlib/intern/threads.c
branches/soc-2007-joeedh/source/blender/blenlib/intern/util.c
branches/soc-2007-joeedh/source/blender/blenloader/intern/readfile.c
branches/soc-2007-joeedh/source/blender/blenloader/intern/writefile.c
branches/soc-2007-joeedh/source/blender/include/BDR_editcurve.h
branches/soc-2007-joeedh/source/blender/include/BDR_editobject.h
branches/soc-2007-joeedh/source/blender/include/BIF_butspace.h
branches/soc-2007-joeedh/source/blender/include/BIF_editdeform.h
branches/soc-2007-joeedh/source/blender/include/BIF_editseq.h
branches/soc-2007-joeedh/source/blender/include/BIF_editsima.h
branches/soc-2007-joeedh/source/blender/include/BIF_editview.h
branches/soc-2007-joeedh/source/blender/include/BIF_meshtools.h
branches/soc-2007-joeedh/source/blender/include/BIF_resources.h
branches/soc-2007-joeedh/source/blender/include/BIF_transform.h
branches/soc-2007-joeedh/source/blender/include/BIF_usiblender.h
branches/soc-2007-joeedh/source/blender/include/BSE_drawview.h
branches/soc-2007-joeedh/source/blender/include/BSE_editipo.h
branches/soc-2007-joeedh/source/blender/include/BSE_sequence.h
branches/soc-2007-joeedh/source/blender/include/blendef.h
branches/soc-2007-joeedh/source/blender/include/butspace.h
branches/soc-2007-joeedh/source/blender/include/transform.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_ID.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_armature_types.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_constraint_types.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_customdata_types.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_image_types.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_ipo_types.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_key_types.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_material_types.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_meshdata_types.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_modifier_types.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_object_force.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_object_types.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_scene_types.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_sequence_types.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_space_types.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_texture_types.h
branches/soc-2007-joeedh/source/blender/makesdna/intern/makesdna.c
branches/soc-2007-joeedh/source/blender/nodes/intern/CMP_nodes/CMP_chromaMatte.c
branches/soc-2007-joeedh/source/blender/nodes/intern/CMP_nodes/CMP_scale.c
branches/soc-2007-joeedh/source/blender/nodes/intern/CMP_nodes/CMP_texture.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/Blender.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/Constraint.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/CurNurb.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/Curve.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/Geometry.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/Mesh.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/Object.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/Texture.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/Window.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/doc/Blender.py
branches/soc-2007-joeedh/source/blender/python/api2_2x/doc/Curve.py
branches/soc-2007-joeedh/source/blender/python/api2_2x/doc/Mesh.py
branches/soc-2007-joeedh/source/blender/python/api2_2x/doc/Object.py
branches/soc-2007-joeedh/source/blender/python/api2_2x/doc/Text3d.py
branches/soc-2007-joeedh/source/blender/python/api2_2x/doc/Texture.py
branches/soc-2007-joeedh/source/blender/python/api2_2x/doc/Window.py
branches/soc-2007-joeedh/source/blender/python/api2_2x/sceneSequence.c
branches/soc-2007-joeedh/source/blender/render/extern/include/RE_pipeline.h
branches/soc-2007-joeedh/source/blender/render/extern/include/RE_raytrace.h
branches/soc-2007-joeedh/source/blender/render/extern/include/RE_render_ext.h
branches/soc-2007-joeedh/source/blender/render/extern/include/RE_shader_ext.h
branches/soc-2007-joeedh/source/blender/render/intern/include/render_types.h
branches/soc-2007-joeedh/source/blender/render/intern/include/renderdatabase.h
branches/soc-2007-joeedh/source/blender/render/intern/source/convertblender.c
branches/soc-2007-joeedh/source/blender/render/intern/source/imagetexture.c
branches/soc-2007-joeedh/source/blender/render/intern/source/initrender.c
branches/soc-2007-joeedh/source/blender/render/intern/source/rayshade.c
branches/soc-2007-joeedh/source/blender/render/intern/source/raytrace.c
branches/soc-2007-joeedh/source/blender/render/intern/source/rendercore.c
branches/soc-2007-joeedh/source/blender/render/intern/source/renderdatabase.c
branches/soc-2007-joeedh/source/blender/render/intern/source/shadeinput.c
branches/soc-2007-joeedh/source/blender/render/intern/source/shadeoutput.c
branches/soc-2007-joeedh/source/blender/render/intern/source/texture.c
branches/soc-2007-joeedh/source/blender/src/SConscript
branches/soc-2007-joeedh/source/blender/src/blenderbuttons.c
branches/soc-2007-joeedh/source/blender/src/butspace.c
branches/soc-2007-joeedh/source/blender/src/buttons_editing.c
branches/soc-2007-joeedh/source/blender/src/buttons_object.c
branches/soc-2007-joeedh/source/blender/src/buttons_scene.c
branches/soc-2007-joeedh/source/blender/src/buttons_shading.c
branches/soc-2007-joeedh/source/blender/src/drawarmature.c
branches/soc-2007-joeedh/source/blender/src/drawimage.c
branches/soc-2007-joeedh/source/blender/src/drawipo.c
branches/soc-2007-joeedh/source/blender/src/drawmesh.c
branches/soc-2007-joeedh/source/blender/src/drawnode.c
branches/soc-2007-joeedh/source/blender/src/drawobject.c
branches/soc-2007-joeedh/source/blender/src/drawscene.c
branches/soc-2007-joeedh/source/blender/src/drawseq.c
branches/soc-2007-joeedh/source/blender/src/drawtime.c
branches/soc-2007-joeedh/source/blender/src/drawview.c
branches/soc-2007-joeedh/source/blender/src/edit.c
branches/soc-2007-joeedh/source/blender/src/editarmature.c
branches/soc-2007-joeedh/source/blender/src/editcurve.c
branches/soc-2007-joeedh/source/blender/src/editdeform.c
branches/soc-2007-joeedh/source/blender/src/editface.c
branches/soc-2007-joeedh/source/blender/src/editimasel.c
branches/soc-2007-joeedh/source/blender/src/editipo.c
branches/soc-2007-joeedh/source/blender/src/editipo_lib.c
branches/soc-2007-joeedh/source/blender/src/editipo_mods.c
branches/soc-2007-joeedh/source/blender/src/editkey.c
branches/soc-2007-joeedh/source/blender/src/editmesh_add.c
branches/soc-2007-joeedh/source/blender/src/editmesh_lib.c
branches/soc-2007-joeedh/source/blender/src/editmesh_mods.c
branches/soc-2007-joeedh/source/blender/src/editmesh_tools.c
branches/soc-2007-joeedh/source/blender/src/editobject.c
branches/soc-2007-joeedh/source/blender/src/editscreen.c
branches/soc-2007-joeedh/source/blender/src/editseq.c
branches/soc-2007-joeedh/source/blender/src/editsima.c
branches/soc-2007-joeedh/source/blender/src/editview.c
branches/soc-2007-joeedh/source/blender/src/filesel.c
branches/soc-2007-joeedh/source/blender/src/header_buttonswin.c
branches/soc-2007-joeedh/source/blender/src/header_info.c
branches/soc-2007-joeedh/source/blender/src/header_ipo.c
branches/soc-2007-joeedh/source/blender/src/header_seq.c
branches/soc-2007-joeedh/source/blender/src/header_view3d.c
branches/soc-2007-joeedh/source/blender/src/headerbuttons.c
branches/soc-2007-joeedh/source/blender/src/interface_panel.c
branches/soc-2007-joeedh/source/blender/src/meshlaplacian.c
branches/soc-2007-joeedh/source/blender/src/meshtools.c
branches/soc-2007-joeedh/source/blender/src/outliner.c
branches/soc-2007-joeedh/source/blender/src/parametrizer.c
branches/soc-2007-joeedh/source/blender/src/poseobject.c
branches/soc-2007-joeedh/source/blender/src/preview.blend.c
branches/soc-2007-joeedh/source/blender/src/renderwin.c
branches/soc-2007-joeedh/source/blender/src/sequence.c
branches/soc-2007-joeedh/source/blender/src/space.c
branches/soc-2007-joeedh/source/blender/src/toets.c
branches/soc-2007-joeedh/source/blender/src/transform.c
branches/soc-2007-joeedh/source/blender/src/transform_constraints.c
branches/soc-2007-joeedh/source/blender/src/transform_conversions.c
branches/soc-2007-joeedh/source/blender/src/transform_generics.c
branches/soc-2007-joeedh/source/blender/src/transform_manipulator.c
branches/soc-2007-joeedh/source/blender/src/unwrapper.c
branches/soc-2007-joeedh/source/blender/src/usiblender.c
branches/soc-2007-joeedh/source/blender/src/view.c
branches/soc-2007-joeedh/source/blender/src/vpaint.c
branches/soc-2007-joeedh/source/creator/buildinfo.c
branches/soc-2007-joeedh/source/creator/creator.c
branches/soc-2007-joeedh/source/gameengine/Converter/BL_SkinDeformer.cpp
branches/soc-2007-joeedh/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/soc-2007-joeedh/tools/Blender.py
branches/soc-2007-joeedh/tools/btools.py
Added Paths:
-----------
branches/soc-2007-joeedh/intern/elbeem/intern/paraloopend.h
branches/soc-2007-joeedh/release/scripts/flt_defaultp.py
branches/soc-2007-joeedh/release/scripts/flt_palettemanager.py
branches/soc-2007-joeedh/release/scripts/flt_properties.py
branches/soc-2007-joeedh/release/scripts/flt_toolbar.py
branches/soc-2007-joeedh/release/scripts/weightpaint_invert.py
branches/soc-2007-joeedh/release/scripts/wizard_curve2tree.py
branches/soc-2007-joeedh/source/blender/blenkernel/BKE_particle.h
branches/soc-2007-joeedh/source/blender/blenkernel/BKE_pointcache.h
branches/soc-2007-joeedh/source/blender/blenkernel/intern/particle.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/particle_system.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/pointcache.c
branches/soc-2007-joeedh/source/blender/blenlib/BLI_fnmatch.h
branches/soc-2007-joeedh/source/blender/blenlib/BLI_kdtree.h
branches/soc-2007-joeedh/source/blender/blenlib/intern/BLI_kdtree.c
branches/soc-2007-joeedh/source/blender/blenlib/intern/fnmatch.c
branches/soc-2007-joeedh/source/blender/include/BIF_editparticle.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_particle_types.h
branches/soc-2007-joeedh/source/blender/src/editparticle.c
Modified: branches/soc-2007-joeedh/bin/.blender/locale/de/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/soc-2007-joeedh/intern/elbeem/extern/elbeem.h
===================================================================
--- branches/soc-2007-joeedh/intern/elbeem/extern/elbeem.h 2007-12-02 02:23:29 UTC (rev 12753)
+++ branches/soc-2007-joeedh/intern/elbeem/extern/elbeem.h 2007-12-02 04:33:04 UTC (rev 12754)
@@ -154,7 +154,7 @@
short volumeInitType;
/* name of the mesh, mostly for debugging */
- char *name;
+ const char *name;
} elbeemMesh;
// API functions
Modified: branches/soc-2007-joeedh/intern/elbeem/intern/attributes.cpp
===================================================================
--- branches/soc-2007-joeedh/intern/elbeem/intern/attributes.cpp 2007-12-02 02:23:29 UTC (rev 12753)
+++ branches/soc-2007-joeedh/intern/elbeem/intern/attributes.cpp 2007-12-02 04:33:04 UTC (rev 12754)
@@ -103,7 +103,7 @@
// set that a parameter can be given, and will be ignored...
bool AttributeList::ignoreParameter(string name, string source) {
- name=source=(""); // remove warning
+ name = source = ("");
return false;
}
Modified: branches/soc-2007-joeedh/intern/elbeem/intern/isosurface.cpp
===================================================================
--- branches/soc-2007-joeedh/intern/elbeem/intern/isosurface.cpp 2007-12-02 02:23:29 UTC (rev 12753)
+++ branches/soc-2007-joeedh/intern/elbeem/intern/isosurface.cpp 2007-12-02 04:33:04 UTC (rev 12754)
@@ -13,6 +13,11 @@
#include <algorithm>
#include <stdio.h>
+#if !defined(linux) && (defined (__sparc) || defined (__sparc__))
+#include <ieeefp.h>
+#endif
+
+
// just use default rounding for platforms where its not available
#ifndef round
#define round(x) (x)
Modified: branches/soc-2007-joeedh/intern/elbeem/intern/loop_tools.h
===================================================================
--- branches/soc-2007-joeedh/intern/elbeem/intern/loop_tools.h 2007-12-02 02:23:29 UTC (rev 12753)
+++ branches/soc-2007-joeedh/intern/elbeem/intern/loop_tools.h 2007-12-02 04:33:04 UTC (rev 12754)
@@ -54,16 +54,85 @@
-#define unused_GRID_REGION_END() \
- } /* main_region */ \
- // end unusedGRID_REGION_END
-
// -----------------------------------------------------------------------------------
#else // PARALLEL==1
-#include "paraloop.h"
+//#include "paraloop.h"
+#define PERFORM_USQRMAXCHECK USQRMAXCHECK(usqr,ux,uy,uz, calcMaxVlen, calcMxvx,calcMxvy,calcMxvz);
+#define LIST_EMPTY(x) calcListEmpty.push_back( x );
+#define LIST_FULL(x) calcListFull.push_back( x );
+#define FSGR_ADDPART(x) calcListParts.push_back( x );
+
+// parallel region
+//was: # pragma omp parallel default(shared)
+#if COMPRESSGRIDS!=1
+ // requires compressed grids...!
+ ERROR!
+#endif
+
+// loop start
+#define GRID_REGION_START() \
+ { \
+ \
+ \
+ if(mSizez<2) { \
+ mPanic = 1; \
+ errFatal("ParaLoop::2D","Not valid...!", SIMWORLD_GENERICERROR); \
+ } \
+ \
+ \
+ vector<LbmPoint> calcListFull; \
+ vector<LbmPoint> calcListEmpty; \
+ vector<ParticleObject> calcListParts; \
+ LbmFloat calcMxvx, calcMxvy, calcMxvz, calcMaxVlen; \
+ calcMxvx = calcMxvy = calcMxvz = calcMaxVlen = 0.0; \
+ calcListEmpty.reserve(mListEmpty.capacity() / omp_get_num_threads() ); \
+ calcListFull.reserve( mListFull.capacity() / omp_get_num_threads() ); \
+ calcListParts.reserve(mSizex); \
+ \
+ \
+ const int id = omp_get_thread_num(); \
+ const int Nthrds = omp_get_num_threads(); \
+ \
+ \
+ \
+ \
+ \
+ int kdir = 1; \
+ \
+ int kstart=getForZMinBnd(), kend=getForZMaxBnd(mMaxRefine); \
+ if(gridLoopBound>0){ kstart=getForZMin1(); kend=getForZMax1(mMaxRefine); } \
+ LbmFloat *ccel = NULL, *tcel = NULL; \
+ CellFlagType *pFlagSrc=NULL, *pFlagDst=NULL; \
+ \
+ \
+ if(mLevel[mMaxRefine].setCurr==1) { \
+ kdir = -1; \
+ int temp = kend; \
+ kend = kstart-1; \
+ kstart = temp-1; \
+ } \
+ \
+ const int Nj = mLevel[mMaxRefine].lSizey; \
+ int jstart = 0+( id * (Nj / Nthrds) ); \
+ int jend = 0+( (id+1) * (Nj / Nthrds) ); \
+ if( ((Nj/Nthrds) *Nthrds) != Nj) { \
+ errMsg("LbmFsgrSolver","Invalid domain size Nj="<<Nj<<" Nthrds="<<Nthrds); \
+ } \
+ \
+ if(jstart<gridLoopBound) jstart = gridLoopBound; \
+ if(jend>mLevel[mMaxRefine].lSizey-gridLoopBound) jend = mLevel[mMaxRefine].lSizey-gridLoopBound; \
+ \
+ debMsgStd("ParaLoop::OMP",DM_MSG,"Thread:"<<id<<" i:"<<istart<<"-"<<iend<<" j:"<<jstart<<"-"<<jend<<", k:"<<kstart<<"-"<<kend<<" ", 1); \
+ \
+
+
+
+
+// para GRID LOOP END is parainc3
+
#endif // PARALLEL==1
@@ -101,9 +170,11 @@
+
// old loop for COMPRESSGRIDS==0
#define old__GRID_LOOP_START() \
for(int k=kstart;k<kend;++k) { \
for(int j=1;j<mLevel[lev].lSizey-1;++j) { \
for(int i=0;i<mLevel[lev].lSizex-2; ) {
+
Modified: branches/soc-2007-joeedh/intern/elbeem/intern/ntl_vector3dim.h
===================================================================
--- branches/soc-2007-joeedh/intern/elbeem/intern/ntl_vector3dim.h 2007-12-02 02:23:29 UTC (rev 12753)
+++ branches/soc-2007-joeedh/intern/elbeem/intern/ntl_vector3dim.h 2007-12-02 04:33:04 UTC (rev 12754)
@@ -22,6 +22,7 @@
#include <math.h>
#include <string.h>
#include <stdio.h>
+#include <stdlib.h>
// hack for MSVC6.0 compiler
#ifdef _MSC_VER
Copied: branches/soc-2007-joeedh/intern/elbeem/intern/paraloopend.h (from rev 12753, trunk/blender/intern/elbeem/intern/paraloopend.h)
===================================================================
--- branches/soc-2007-joeedh/intern/elbeem/intern/paraloopend.h (rev 0)
+++ branches/soc-2007-joeedh/intern/elbeem/intern/paraloopend.h 2007-12-02 04:33:04 UTC (rev 12754)
@@ -0,0 +1,42 @@
+
+// same as grid loop_end + barrier
+
+ } // i
+ int i=0; //dummy
+ ADVANCE_POINTERS(2*gridLoopBound);
+ } // j
+
+# if COMPRESSGRIDS==1
+# if PARALLEL==1
+ //frintf(stderr," (id=%d k=%d) ",id,k);
+#pragma omp barrier
+# endif // PARALLEL==1
+# else // COMPRESSGRIDS==1
+ int i=0; //dummy
+ ADVANCE_POINTERS(mLevel[lev].lSizex*2);
+# endif // COMPRESSGRIDS==1
+
+} // all cell loop k,j,i
+
+#pragma omp critical
+{
+ if(doReduce) {
+ // synchronize global vars
+ for(int j=0; j<calcListFull.size() ; j++) mListFull.push_back( calcListFull[j] );
+ for(int j=0; j<calcListEmpty.size(); j++) mListEmpty.push_back( calcListEmpty[j] );
+ for(int j=0; j<calcListParts.size(); j++) mpParticles->addFullParticle( calcListParts[j] );
+ if(calcMaxVlen>mMaxVlen) {
+ mMxvx = calcMxvx;
+ mMxvy = calcMxvy;
+ mMxvz = calcMxvz;
+ mMaxVlen = calcMaxVlen;
+ }
+ if(0) {debMsgStd("OMP_CRIT",DM_MSG, "reduce id"<<id<<" curr: "<<mMaxVlen<<"|"<<mMxvx<<","<<mMxvy<<","<<mMxvz<<
+ " calc[ "<<calcMaxVlen<<"|"<<calcMxvx<<","<<calcMxvy<<","<<calcMxvz<<"] " ,4 ); }
+ }
+} // critical
+
+
+} /* main_region */
+ //?lobOutstrForce = true;
+
Modified: branches/soc-2007-joeedh/intern/elbeem/intern/particletracer.cpp
===================================================================
--- branches/soc-2007-joeedh/intern/elbeem/intern/particletracer.cpp 2007-12-02 02:23:29 UTC (rev 12753)
+++ branches/soc-2007-joeedh/intern/elbeem/intern/particletracer.cpp 2007-12-02 04:33:04 UTC (rev 12754)
@@ -325,7 +325,7 @@
// suppress warnings...
vertices = NULL; triangles = NULL;
normals = NULL; objectId = 0;
- time = 0.0;
+ time = 0.;
#else // ELBEEM_PLUGIN
int pcnt = 0;
// currently not used in blender
Modified: branches/soc-2007-joeedh/intern/elbeem/intern/simulation_object.cpp
===================================================================
--- branches/soc-2007-joeedh/intern/elbeem/intern/simulation_object.cpp 2007-12-02 02:23:29 UTC (rev 12753)
+++ branches/soc-2007-joeedh/intern/elbeem/intern/simulation_object.cpp 2007-12-02 04:33:04 UTC (rev 12754)
@@ -15,7 +15,6 @@
#include "solver_interface.h"
#include "particletracer.h"
#include "elbeem.h"
-#include <stdlib.h> /* exit(3) - also in linux */
#ifdef _WIN32
#else
@@ -69,6 +68,7 @@
/*! init tree for certain geometry init */
/*****************************************************************************/
void SimulationObject::initGeoTree() {
+ // unused!! overriden by solver interface
if(mpGlob == NULL) {
errFatal("SimulationObject::initGeoTree error","Requires globals!", SIMWORLD_INITERROR);
return;
@@ -80,7 +80,7 @@
char treeFlag = (1<<(mGeoInitId+4));
mpGiTree = new ntlTree( 20, 4, // warning - fixed values for depth & maxtriangles here...
scene, treeFlag );
- exit(1); // unused!? overriden by solver interface
+ // unused!! overriden by solver interface
}
/*****************************************************************************/
@@ -310,7 +310,7 @@
// dont advance for stopped time
mpLbm->step();
mTime += mpParam->getTimestep();
-//if(mTime>0.001) { errMsg("DEBUG!!!!!!!!","quit mlsu..."); exit(1); } // PROFILE DEBUG TEST!
+ //if(mTime>0.001) { errMsg("DEBUG!!!!!!!!","quit mlsu..."); xit(1); } // PROFILE DEBUG TEST!
}
if(mpLbm->getPanic()) mPanic = true;
Modified: branches/soc-2007-joeedh/intern/elbeem/intern/solver_adap.cpp
===================================================================
--- branches/soc-2007-joeedh/intern/elbeem/intern/solver_adap.cpp 2007-12-02 02:23:29 UTC (rev 12753)
+++ branches/soc-2007-joeedh/intern/elbeem/intern/solver_adap.cpp 2007-12-02 04:33:04 UTC (rev 12754)
@@ -11,6 +11,9 @@
#include "solver_relax.h"
#include "particletracer.h"
+#if !defined(linux) && (defined (__sparc) || defined (__sparc__))
+#include <ieeefp.h>
+#endif
/*****************************************************************************/
Modified: branches/soc-2007-joeedh/intern/elbeem/intern/solver_class.h
===================================================================
--- branches/soc-2007-joeedh/intern/elbeem/intern/solver_class.h 2007-12-02 02:23:29 UTC (rev 12753)
+++ branches/soc-2007-joeedh/intern/elbeem/intern/solver_class.h 2007-12-02 04:33:04 UTC (rev 12754)
@@ -101,7 +101,7 @@
// sirdude fix for solaris
#if !defined(linux) && defined(sun)
#ifndef expf
-#define expf(a) exp((double)(a))
+#define expf(x) exp((double)(x))
#endif
#endif
Modified: branches/soc-2007-joeedh/intern/elbeem/intern/solver_init.cpp
===================================================================
--- branches/soc-2007-joeedh/intern/elbeem/intern/solver_init.cpp 2007-12-02 02:23:29 UTC (rev 12753)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list