/[escript]/trunk/dudley/src/Assemble_interpolate.c
ViewVC logotype

Diff of /trunk/dudley/src/Assemble_interpolate.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 3489 by jfenwick, Mon Oct 11 01:48:14 2010 UTC revision 3490 by caltinay, Wed Mar 30 02:24:33 2011 UTC
# Line 38  void Dudley_Assemble_interpolate(Dudley_ Line 38  void Dudley_Assemble_interpolate(Dudley_
38      index_t *map = NULL;      index_t *map = NULL;
39      const double *shapeFns = 0;      const double *shapeFns = 0;
40      type_t data_type = getFunctionSpaceType(data);      type_t data_type = getFunctionSpaceType(data);
     type_t type;  
41      size_t numComps_size;      size_t numComps_size;
42      Dudley_resetError();      Dudley_resetError();
 #define NODES 0  
 #define REDUCED_NODES 3  
 #define DOF 1  
 #define REDUCED_DOF 2  
43      if (nodes == NULL || elements == NULL)      if (nodes == NULL || elements == NULL)
44      return;      return;
45      reduced_integration = Dudley_Assemble_reducedIntegrationOrder(interpolated_data);      reduced_integration = Dudley_Assemble_reducedIntegrationOrder(interpolated_data);
# Line 54  void Dudley_Assemble_interpolate(Dudley_ Line 49  void Dudley_Assemble_interpolate(Dudley_
49    
50      if (data_type == DUDLEY_NODES)      if (data_type == DUDLEY_NODES)
51      {      {
     type = NODES;  
52      numNodes = Dudley_NodeFile_getNumNodes(nodes);      numNodes = Dudley_NodeFile_getNumNodes(nodes);
53      map = Dudley_NodeFile_borrowTargetNodes(nodes);      map = Dudley_NodeFile_borrowTargetNodes(nodes);
54      }      }
55      else if (data_type == DUDLEY_REDUCED_NODES)      else if (data_type == DUDLEY_REDUCED_NODES)
56      {      {
     type = REDUCED_NODES;  
57      numNodes = Dudley_NodeFile_getNumReducedNodes(nodes);      numNodes = Dudley_NodeFile_getNumReducedNodes(nodes);
58      map = Dudley_NodeFile_borrowTargetReducedNodes(nodes);      map = Dudley_NodeFile_borrowTargetReducedNodes(nodes);
59      }      }
# Line 72  void Dudley_Assemble_interpolate(Dudley_ Line 65  void Dudley_Assemble_interpolate(Dudley_
65                  "Dudley_Assemble_interpolate: for more than one processor DEGREES_OF_FREEDOM data are not accepted as input.");                  "Dudley_Assemble_interpolate: for more than one processor DEGREES_OF_FREEDOM data are not accepted as input.");
66          return;          return;
67      }      }
     type = DOF;  
68      numNodes = Dudley_NodeFile_getNumDegreesOfFreedom(nodes);      numNodes = Dudley_NodeFile_getNumDegreesOfFreedom(nodes);
69      map = Dudley_NodeFile_borrowTargetDegreesOfFreedom(nodes);      map = Dudley_NodeFile_borrowTargetDegreesOfFreedom(nodes);
70      }      }
# Line 84  void Dudley_Assemble_interpolate(Dudley_ Line 76  void Dudley_Assemble_interpolate(Dudley_
76                  "Dudley_Assemble_interpolate: for more than one processor REDUCED_DEGREES_OF_FREEDOM data are not accepted as input.");                  "Dudley_Assemble_interpolate: for more than one processor REDUCED_DEGREES_OF_FREEDOM data are not accepted as input.");
77          return;          return;
78      }      }
     type = REDUCED_DOF;  
79      numNodes = Dudley_NodeFile_getNumReducedDegreesOfFreedom(nodes);      numNodes = Dudley_NodeFile_getNumReducedDegreesOfFreedom(nodes);
80      map = Dudley_NodeFile_borrowTargetReducedDegreesOfFreedom(nodes);      map = Dudley_NodeFile_borrowTargetReducedDegreesOfFreedom(nodes);
81      }      }
# Line 153  void Dudley_Assemble_interpolate(Dudley_ Line 144  void Dudley_Assemble_interpolate(Dudley_
144          THREAD_MEMFREE(local_data);          THREAD_MEMFREE(local_data);
145      }           /* end of parallel region */      }           /* end of parallel region */
146      }      }
 #undef NODES  
 #undef REDUCED_NODES  
 #undef DOF  
 #undef REDUCED_DOF  
147  }  }

Legend:
Removed from v.3489  
changed lines
  Added in v.3490

  ViewVC Help
Powered by ViewVC 1.1.26