[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12663] trunk/blender/intern/elbeem/intern /paraloopend.h: - forgot to include a file in the last commit
Nils Thuerey
nils at thuerey.de
Sat Nov 24 18:10:48 CET 2007
Revision: 12663
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12663
Author: n_t
Date: 2007-11-24 18:10:48 +0100 (Sat, 24 Nov 2007)
Log Message:
-----------
- forgot to include a file in the last commit
Added Paths:
-----------
trunk/blender/intern/elbeem/intern/paraloopend.h
Added: trunk/blender/intern/elbeem/intern/paraloopend.h
===================================================================
--- trunk/blender/intern/elbeem/intern/paraloopend.h (rev 0)
+++ trunk/blender/intern/elbeem/intern/paraloopend.h 2007-11-24 17:10:48 UTC (rev 12663)
@@ -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;
+
More information about the Bf-blender-cvs
mailing list