--- trunk/esys2/finley/src/finleyC/Assemble_PDE.c	2004/12/15 03:48:48	100
+++ trunk/esys2/finley/src/finleyC/Assemble_PDE.c	2005/08/12 01:45:47	147
@@ -52,9 +52,9 @@
 
   double *EM_S=NULL,*EM_F=NULL,*V=NULL,*dVdv=NULL,*dSdV=NULL,*Vol=NULL,*dvdV=NULL;
   double time0;
-  int dimensions[ESCRIPT_MAX_DATA_RANK],e,q,color;
+  dim_t dimensions[ESCRIPT_MAX_DATA_RANK],e,q;
   Assemble_Parameters p;
-  maybelong *index_row=NULL,*index_col=NULL;
+  index_t *index_row=NULL,*index_col=NULL,color;
 
   if (nodes==NULL || elements==NULL) return;
   if (S==NULL && isEmpty(F)) return;
@@ -75,7 +75,7 @@
     return;
   }
   /*  get a functionspace */
-  int funcspace=UNKNOWN;
+  type_t funcspace=UNKNOWN;
   updateFunctionSpaceType(funcspace,A);
   updateFunctionSpaceType(funcspace,B);
   updateFunctionSpaceType(funcspace,C);
@@ -88,27 +88,27 @@
 
   if (! functionSpaceTypeEqual(funcspace,A) ) {
         Finley_ErrorCode=TYPE_ERROR;
-        sprintf(Finley_ErrorMsg,"unexpected function space typ for coefficient A");
+        sprintf(Finley_ErrorMsg,"unexpected function space type for coefficient A");
   }
   if (! functionSpaceTypeEqual(funcspace,B) ) {
         Finley_ErrorCode=TYPE_ERROR; 
-        sprintf(Finley_ErrorMsg,"unexpected function space typ for coefficient B");
+        sprintf(Finley_ErrorMsg,"unexpected function space type for coefficient B");
   }
   if (! functionSpaceTypeEqual(funcspace,C) ) {
         Finley_ErrorCode=TYPE_ERROR; 
-        sprintf(Finley_ErrorMsg,"unexpected function space typ for coefficient C");
+        sprintf(Finley_ErrorMsg,"unexpected function space type for coefficient C");
   }
   if (! functionSpaceTypeEqual(funcspace,D) ) {
         Finley_ErrorCode=TYPE_ERROR; 
-        sprintf(Finley_ErrorMsg,"unexpected function space typ for coefficient D");
+        sprintf(Finley_ErrorMsg,"unexpected function space type for coefficient D");
   }
   if (! functionSpaceTypeEqual(funcspace,X) ) {
         Finley_ErrorCode=TYPE_ERROR; 
-        sprintf(Finley_ErrorMsg,"unexpected function space typ for coefficient X");
+        sprintf(Finley_ErrorMsg,"unexpected function space type for coefficient X");
   }
   if (! functionSpaceTypeEqual(funcspace,Y) ) {
         Finley_ErrorCode=TYPE_ERROR; 
-        sprintf(Finley_ErrorMsg,"unexpected function space typ for coefficient Y");
+        sprintf(Finley_ErrorMsg,"unexpected function space type for coefficient Y");
   }
 
   /* check if all function spaces are the same */
@@ -251,21 +251,21 @@
 
          /* allocate work arrays: */
 
-         EM_S=(double*) THREAD_MEMALLOC(p.NN_row*p.NN_col*p.numEqu*p.numComp*sizeof(double));
-         EM_F=(double*) THREAD_MEMALLOC(p.NN_row*p.numEqu*sizeof(double));
-         V=(double*) THREAD_MEMALLOC(p.NN*p.numDim*sizeof(double));
-         dVdv=(double*) THREAD_MEMALLOC(p.numDim*p.numDim*p.numQuad*sizeof(double));
-         dvdV=(double*) THREAD_MEMALLOC(p.numDim*p.numDim*p.numQuad*sizeof(double));
-         dSdV=(double*) THREAD_MEMALLOC(p.NS_row*p.numQuad*p.numDim*sizeof(double));
-         Vol=(double*) THREAD_MEMALLOC(p.numQuad*sizeof(double));
-         index_col=(maybelong*) THREAD_MEMALLOC(p.NN_col*sizeof(maybelong));
-         index_row=(maybelong*) THREAD_MEMALLOC(p.NN_row*sizeof(maybelong));
+         EM_S=(double*) THREAD_MEMALLOC(p.NN_row*p.NN_col*p.numEqu*p.numComp,double);
+         EM_F=(double*) THREAD_MEMALLOC(p.NN_row*p.numEqu,double);
+         V=(double*) THREAD_MEMALLOC(p.NN*p.numDim,double);
+         dVdv=(double*) THREAD_MEMALLOC(p.numDim*p.numDim*p.numQuad,double);
+         dvdV=(double*) THREAD_MEMALLOC(p.numDim*p.numDim*p.numQuad,double);
+         dSdV=(double*) THREAD_MEMALLOC(p.NS_row*p.numQuad*p.numDim,double);
+         Vol=(double*) THREAD_MEMALLOC(p.numQuad,double);
+         index_col=(index_t*) THREAD_MEMALLOC(p.NN_col,index_t);
+         index_row=(index_t*) THREAD_MEMALLOC(p.NN_row,index_t);
 
          if (! (Finley_checkPtr(EM_S) || Finley_checkPtr(EM_F) || Finley_checkPtr(V) || Finley_checkPtr(index_col) ||
                 Finley_checkPtr(index_row) || Finley_checkPtr(dVdv) || Finley_checkPtr(dSdV) || Finley_checkPtr(Vol) ))  {
 
            /*  open loop over all colors: */
-           for (color=0;color<elements->numColors;color++) {
+           for (color=elements->minColor;color<=elements->maxColor;color++) {
               /*  open loop over all elements: */
               #pragma omp for private(e) schedule(static) 
               for(e=0;e<elements->numElements;e++){
@@ -342,20 +342,23 @@
 }
 /*
  * $Log$
- * Revision 1.3  2004/12/15 03:48:44  jgs
- * *** empty log message ***
+ * Revision 1.6  2005/08/12 01:45:42  jgs
+ * erge of development branch dev-02 back to main trunk on 2005-08-12
+ *
+ * Revision 1.5.2.1  2005/08/03 08:54:27  gross
+ * contact element assemblage was called with wrong element table pointer
  *
- * Revision 1.1.1.1  2004/10/26 06:53:57  jgs
- * initial import of project esys2
+ * Revision 1.5  2005/07/08 04:07:46  jgs
+ * Merge of development branch back to main trunk on 2005-07-08
  *
- * Revision 1.3  2004/07/30 04:37:06  gross
- * escript and finley are linking now and RecMeshTest.py has been passed
+ * Revision 1.4  2004/12/15 07:08:32  jgs
+ * *** empty log message ***
+ * Revision 1.1.1.1.2.2  2005/06/29 02:34:47  gross
+ * some changes towards 64 integers in finley
  *
- * Revision 1.2  2004/07/21 05:00:54  gross
- * name changes in DataC
+ * Revision 1.1.1.1.2.1  2004/11/24 01:37:12  gross
+ * some changes dealing with the integer overflow in memory allocation. Finley solves 4M unknowns now
  *
- * Revision 1.1  2004/07/02 04:21:13  gross
- * Finley C code has been included
  *
  *
  */