Changeset 2591

Timestamp:

11/02/09 14:36:31 (15 years ago)

Author:

Eric.Larour

Message:

Multithreaded ContourToMesh module.

Location:

issm/trunk/src/c

Files:

• ContourToMeshx/ContourToMeshx.cpp (modified) (4 diffs)
• ContourToMeshx/ContourToMeshx.h (modified) (1 diff)
• ContourToMeshx/ContourToMeshxt.cpp (added)
• ContourToNodesx/ContourToNodesx.cpp (modified) (1 diff)
• Makefile.am (modified) (2 diffs)

issm/trunk/src/c/ContourToMeshx/ContourToMeshx.cpp

@@ -1 +1 @@
 /*! \file  ContourToMeshx.c
  */
+
+#ifdef HAVE_CONFIG_H
+        #include "config.h"
+#else
+#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
+#endif
+
 
 #include "./ContourToMeshx.h"
@@ -14 +21 @@
 
         /*Contour:*/
-        Contour* contouri=NULL;
-        int      numgrids;
-        double*  xc=NULL;
-        double*  yc=NULL;
         double*  in_nod_serial;
         double   value;
+
+        /*threading: */
+        ContourToMeshxThreadStruct gate;
+        int num=1;
+        #ifdef _MULTITHREADING_
+        num=_NUMTHREADS_;
+        #endif
+
 
         /*output: */
@@ -28 +39 @@
         in_elem=NewVec(nel);
 
-        /*Loop through all contours: */
-        for (i=0;i<numcontours;i++){
-                #ifdef _ISSM_DEBUG_
-                        printf("\nHandling contour %i/%i\n",i,numcontours);
-                #endif
-                contouri=*(contours+i);
-                numgrids=contouri->nods;
-                xc=contouri->x;
-                yc=contouri->y;
-                IsInPoly(in_nod,xc,yc,numgrids,x,y,nods,edgevalue);
-        }
+        /*initialize thread parameters: */
+        gate.numcontours=numcontours;
+        gate.contours=contours;
+        gate.nods=nods;
+        gate.edgevalue=edgevalue;
+        gate.in_nod=in_nod;
+        gate.x=x;
+        gate.y=y;
+
+        /*launch the thread manager with ContourToMeshxt as a core: */
+        LaunchThread(ContourToMeshxt,(void*)&gate,num);
+
+        /*Assemble in_nod: */
+        VecAssemblyBegin(in_nod);
+        VecAssemblyEnd(in_nod);
 
         /*Get in_nod serialised for next operation: */
@@ -53 +68 @@
 
         /*Assemble vectors: */
-        VecAssemblyBegin(in_nod);
-        VecAssemblyEnd(in_nod);
         VecAssemblyBegin(in_elem);
         VecAssemblyEnd(in_elem);

issm/trunk/src/c/ContourToMeshx/ContourToMeshx.h

@@ -10 +10 @@
 #include "../objects/objects.h"
 
+/*threading: */
+typedef struct{
+
+        int numcontours;
+        Contour** contours;
+        int nods;
+        int edgevalue;
+        Vec in_nod;
+        double* x;
+        double* y;
+
+} ContourToMeshxThreadStruct;
+
+
 /* local prototypes: */
 int ContourToMeshx( Vec* pin_nods,Vec* pin_elem, double* index, double* x, double* y,Contour** contours,int numcontours,char* interptype,int nel,int nods, int edgevalue);
 
+void* ContourToMeshxt(void* vContourToMeshxThreadStruct);
+
+
 #endif /* _CONTOURTOMESHX_H */
 

issm/trunk/src/c/ContourToNodesx/ContourToNodesx.cpp

@@ -33 +33 @@
                 xc=contouri->x;
                 yc=contouri->y;
-                IsInPoly(flags,xc,yc,numgrids,x,y,nods,edgevalue);
+                IsInPoly(flags,xc,yc,numgrids,x,y,0,nods,edgevalue);
         }
 

issm/trunk/src/c/Makefile.am

@@ -263 +263 @@
                                         ./MeshPartitionx/MeshPartitionx.h\
                                         ./ContourToMeshx/ContourToMeshx.cpp\
+                                        ./ContourToMeshx/ContourToMeshxt.cpp\
                                         ./ContourToMeshx/ContourToMeshx.h\
                                         ./ContourToNodesx/ContourToNodesx.cpp\
@@ -561 +562 @@
                                         ./MeshPartitionx/MeshPartitionx.h\
                                         ./ContourToMeshx/ContourToMeshx.cpp\
+                                        ./ContourToMeshx/ContourToMeshxt.cpp\
                                         ./ContourToMeshx/ContourToMeshx.h\
                                         ./Reducevectorgtosx/Reducevectorgtosx.cpp\