/[escript]/branches/diaplayground/finley/src/CPPAdapter/MeshAdapter.cpp
ViewVC logotype

Diff of /branches/diaplayground/finley/src/CPPAdapter/MeshAdapter.cpp

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

revision 1080 by gross, Wed Apr 11 06:07:30 2007 UTC revision 1366 by gross, Tue Dec 18 05:49:17 2007 UTC
# Line 1  Line 1 
 // $Id$  
 /*  
  ******************************************************************************  
  *                                                                            *  
  *       COPYRIGHT  ACcESS 2004 -  All Rights Reserved                        *  
  *                                                                            *  
  * This software is the property of ACcESS. No part of this code              *  
  * may be copied in any form or by any means without the expressed written    *  
  * consent of ACcESS.  Copying, use or modification of this software          *  
  * by any unauthorised person is illegal unless that person has a software    *  
  * license agreement with ACcESS.                                             *  
  *                                                                            *  
  ******************************************************************************  
 */  
1    
2  #ifdef PASO_MPI  /* $Id$ */
 #include <mpi.h>  
 #endif  
 #include "MeshAdapter.h"  
3    
4    /*******************************************************
5     *
6     *           Copyright 2003-2007 by ACceSS MNRF
7     *       Copyright 2007 by University of Queensland
8     *
9     *                http://esscc.uq.edu.au
10     *        Primary Business: Queensland, Australia
11     *  Licensed under the Open Software License version 3.0
12     *     http://www.opensource.org/licenses/osl-3.0.php
13     *
14     *******************************************************/
15    
16    #include "MeshAdapter.h"
17  #include "escript/Data.h"  #include "escript/Data.h"
18  #include "escript/DataFactory.h"  #include "escript/DataFactory.h"
19    #ifdef USE_NETCDF
20    #include <netcdfcpp.h>
21    #endif
22    extern "C" {
23    #include "escript/blocktimer.h"
24    }
25    #include <vector>
26    
27  using namespace std;  using namespace std;
28  using namespace escript;  using namespace escript;
# Line 47  MeshAdapter::MeshAdapter(Finley_Mesh* fi Line 50  MeshAdapter::MeshAdapter(Finley_Mesh* fi
50  {  {
51    setFunctionSpaceTypeNames();    setFunctionSpaceTypeNames();
52    //    //
53    // need to use a null_deleter as Finley_Mesh_dealloc deletes the pointer    // need to use a null_deleter as Finley_Mesh_free deletes the pointer
54    // for us.    // for us.
55    m_finleyMesh.reset(finleyMesh,null_deleter());    m_finleyMesh.reset(finleyMesh,null_deleter());
56  }  }
# Line 66  MeshAdapter::~MeshAdapter() Line 69  MeshAdapter::~MeshAdapter()
69    // I hope the case for the pointer being zero has been taken care of.    // I hope the case for the pointer being zero has been taken care of.
70    //  cout << "In MeshAdapter destructor." << endl;    //  cout << "In MeshAdapter destructor." << endl;
71    if (m_finleyMesh.unique()) {    if (m_finleyMesh.unique()) {
72      //   cout << "Calling dealloc." << endl;      Finley_Mesh_free(m_finleyMesh.get());
     Finley_Mesh_dealloc(m_finleyMesh.get());  
     //   cout << "Finished dealloc." << endl;  
73    }    }
74  }  }
75    
76    int MeshAdapter::getMPISize() const
77    {
78       return m_finleyMesh.get()->MPIInfo->size;
79    }
80    int MeshAdapter::getMPIRank() const
81    {
82       return m_finleyMesh.get()->MPIInfo->rank;
83    }
84    
85    
86  Finley_Mesh* MeshAdapter::getFinley_Mesh() const {  Finley_Mesh* MeshAdapter::getFinley_Mesh() const {
87     return m_finleyMesh.get();     return m_finleyMesh.get();
88  }  }
# Line 85  void MeshAdapter::write(const std::strin Line 96  void MeshAdapter::write(const std::strin
96    TMPMEMFREE(fName);    TMPMEMFREE(fName);
97  }  }
98    
99    void MeshAdapter::Print_Mesh_Info(const bool full=false) const
100    {
101      Finley_PrintMesh_Info(m_finleyMesh.get(), full);
102    }
103    
104    void MeshAdapter::dump(const std::string& fileName) const
105    {
106    #ifdef USE_NETCDF
107       const NcDim* ncdims[12];
108       NcVar *ids, *data;
109       int *int_ptr;
110       Finley_Mesh *mesh = m_finleyMesh.get();
111       Finley_TagMap* tag_map;
112       int num_Tags = 0;
113       int mpi_size             = mesh->MPIInfo->size;
114       int mpi_rank             = mesh->MPIInfo->rank;
115       int numDim               = mesh->Nodes->numDim;
116       int numNodes             = mesh->Nodes->numNodes;
117       int num_Elements         = mesh->Elements->numElements;
118       int num_FaceElements         = mesh->FaceElements->numElements;
119       int num_ContactElements      = mesh->ContactElements->numElements;
120       int num_Points           = mesh->Points->numElements;
121       int num_Elements_numNodes        = mesh->Elements->numNodes;
122       int num_FaceElements_numNodes    = mesh->FaceElements->numNodes;
123       int num_ContactElements_numNodes = mesh->ContactElements->numNodes;
124       char *newFileName = Paso_MPI_appendRankToFileName(strdup(fileName.c_str()), mpi_size, mpi_rank);
125    
126       /* Figure out how much storage is required for tags */
127       tag_map = mesh->TagMap;
128       if (tag_map) {
129         while (tag_map) {
130        num_Tags++;
131            tag_map=tag_map->next;
132         }
133       }
134    
135       // NetCDF error handler
136       NcError err(NcError::verbose_nonfatal);
137       // Create the file.
138       NcFile dataFile(newFileName, NcFile::Replace);
139       // check if writing was successful
140       if (!dataFile.is_valid())
141            throw DataException("Error - MeshAdapter::dump: opening of NetCDF file for output failed: " + *newFileName);
142    
143       // Define dimensions (num_Elements and dim_Elements are identical, dim_Elements only appears if > 0)
144       if (! (ncdims[0] = dataFile.add_dim("numNodes", numNodes)) )
145            throw DataException("Error - MeshAdapter::dump: appending dimension numNodes to netCDF file failed: " + *newFileName);
146       if (! (ncdims[1] = dataFile.add_dim("numDim", numDim)) )
147            throw DataException("Error - MeshAdapter::dump: appending dimension numDim to netCDF file failed: " + *newFileName);
148       if (! (ncdims[2] = dataFile.add_dim("mpi_size_plus_1", mpi_size+1)) )
149            throw DataException("Error - MeshAdapter::dump: appending dimension mpi_size to netCDF file failed: " + *newFileName);
150       if (num_Elements>0)
151          if (! (ncdims[3] = dataFile.add_dim("dim_Elements", num_Elements)) )
152            throw DataException("Error - MeshAdapter::dump: appending dimension dim_Elements to netCDF file failed: " + *newFileName);
153       if (num_FaceElements>0)
154          if (! (ncdims[4] = dataFile.add_dim("dim_FaceElements", num_FaceElements)) )
155            throw DataException("Error - MeshAdapter::dump: appending dimension dim_FaceElements to netCDF file failed: " + *newFileName);
156       if (num_ContactElements>0)
157          if (! (ncdims[5] = dataFile.add_dim("dim_ContactElements", num_ContactElements)) )
158            throw DataException("Error - MeshAdapter::dump: appending dimension dim_ContactElements to netCDF file failed: " + *newFileName);
159       if (num_Points>0)
160          if (! (ncdims[6] = dataFile.add_dim("dim_Points", num_Points)) )
161            throw DataException("Error - MeshAdapter::dump: appending dimension dim_Points to netCDF file failed: " + *newFileName);
162       if (num_Elements>0)
163          if (! (ncdims[7] = dataFile.add_dim("dim_Elements_Nodes", num_Elements_numNodes)) )
164            throw DataException("Error - MeshAdapter::dump: appending dimension dim_Elements_Nodes to netCDF file failed: " + *newFileName);
165       if (num_FaceElements>0)
166          if (! (ncdims[8] = dataFile.add_dim("dim_FaceElements_numNodes", num_FaceElements_numNodes)) )
167            throw DataException("Error - MeshAdapter::dump: appending dimension dim_FaceElements_numNodes to netCDF file failed: " + *newFileName);
168       if (num_ContactElements>0)
169          if (! (ncdims[9] = dataFile.add_dim("dim_ContactElements_numNodes", num_ContactElements_numNodes)) )
170            throw DataException("Error - MeshAdapter::dump: appending dimension dim_ContactElements_numNodes to netCDF file failed: " + *newFileName);
171       if (num_Tags>0)
172          if (! (ncdims[10] = dataFile.add_dim("dim_Tags", num_Tags)) )
173            throw DataException("Error - MeshAdapter::dump: appending dimension dim_Tags to netCDF file failed: " + *newFileName);
174    
175       // Attributes: MPI size, MPI rank, Name, order, reduced_order
176       if (!dataFile.add_att("mpi_size", mpi_size) )
177            throw DataException("Error - MeshAdapter::dump: appending mpi_size to NetCDF file failed: " + *newFileName);
178       if (!dataFile.add_att("mpi_rank", mpi_rank) )
179            throw DataException("Error - MeshAdapter::dump: appending mpi_rank to NetCDF file failed: " + *newFileName);
180       if (!dataFile.add_att("Name",mesh->Name) )
181            throw DataException("Error - MeshAdapter::dump: appending Name to NetCDF file failed: " + *newFileName);
182       if (!dataFile.add_att("numDim",numDim) )
183            throw DataException("Error - MeshAdapter::dump: appending order to NetCDF file failed: " + *newFileName);
184       if (!dataFile.add_att("order",mesh->order) )
185            throw DataException("Error - MeshAdapter::dump: appending order to NetCDF file failed: " + *newFileName);
186       if (!dataFile.add_att("reduced_order",mesh->reduced_order) )
187            throw DataException("Error - MeshAdapter::dump: appending reduced_order to NetCDF file failed: " + *newFileName);
188       if (!dataFile.add_att("numNodes",numNodes) )
189            throw DataException("Error - MeshAdapter::dump: appending numNodes to NetCDF file failed: " + *newFileName);
190       if (!dataFile.add_att("num_Elements",num_Elements) )
191            throw DataException("Error - MeshAdapter::dump: appending num_Elements to NetCDF file failed: " + *newFileName);
192       if (!dataFile.add_att("num_FaceElements",num_FaceElements) )
193            throw DataException("Error - MeshAdapter::dump: appending num_FaceElements to NetCDF file failed: " + *newFileName);
194       if (!dataFile.add_att("num_ContactElements",num_ContactElements) )
195            throw DataException("Error - MeshAdapter::dump: appending num_ContactElements to NetCDF file failed: " + *newFileName);
196       if (!dataFile.add_att("num_Points",num_Points) )
197            throw DataException("Error - MeshAdapter::dump: appending num_Points to NetCDF file failed: " + *newFileName);
198       if (!dataFile.add_att("num_Elements_numNodes",num_Elements_numNodes) )
199            throw DataException("Error - MeshAdapter::dump: appending num_Elements_numNodes to NetCDF file failed: " + *newFileName);
200       if (!dataFile.add_att("num_FaceElements_numNodes",num_FaceElements_numNodes) )
201            throw DataException("Error - MeshAdapter::dump: appending num_FaceElements_numNodes to NetCDF file failed: " + *newFileName);
202       if (!dataFile.add_att("num_ContactElements_numNodes",num_ContactElements_numNodes) )
203            throw DataException("Error - MeshAdapter::dump: appending num_ContactElements_numNodes to NetCDF file failed: " + *newFileName);
204       if (!dataFile.add_att("Elements_TypeId", mesh->Elements->ReferenceElement->Type->TypeId) )
205          throw DataException("Error - MeshAdapter::dump: appending Elements_TypeId to NetCDF file failed: " + *newFileName);
206       if (!dataFile.add_att("FaceElements_TypeId", mesh->FaceElements->ReferenceElement->Type->TypeId) )
207          throw DataException("Error - MeshAdapter::dump: appending FaceElements_TypeId to NetCDF file failed: " + *newFileName);
208       if (!dataFile.add_att("ContactElements_TypeId", mesh->ContactElements->ReferenceElement->Type->TypeId) )
209          throw DataException("Error - MeshAdapter::dump: appending ContactElements_TypeId to NetCDF file failed: " + *newFileName);
210       if (!dataFile.add_att("Points_TypeId", mesh->Points->ReferenceElement->Type->TypeId) )
211          throw DataException("Error - MeshAdapter::dump: appending Points_TypeId to NetCDF file failed: " + *newFileName);
212       if (!dataFile.add_att("num_Tags", num_Tags) )
213          throw DataException("Error - MeshAdapter::dump: appending num_Tags to NetCDF file failed: " + *newFileName);
214    
215       // // // // // Nodes // // // // //
216    
217       // Only write nodes if non-empty because NetCDF doesn't like empty arrays (it treats them as NC_UNLIMITED)
218       if (numNodes>0) {
219    
220       // Nodes Id
221       if (! ( ids = dataFile.add_var("Nodes_Id", ncInt, ncdims[0])) )
222            throw DataException("Error - MeshAdapter::dump: appending Nodes_Id to netCDF file failed: " + *newFileName);
223       int_ptr = &mesh->Nodes->Id[0];
224       if (! (ids->put(int_ptr, numNodes)) )
225            throw DataException("Error - MeshAdapter::dump: copy Nodes_Id to netCDF buffer failed: " + *newFileName);
226    
227       // Nodes Tag
228       if (! ( ids = dataFile.add_var("Nodes_Tag", ncInt, ncdims[0])) )
229            throw DataException("Error - MeshAdapter::dump: appending Nodes_Tag to netCDF file failed: " + *newFileName);
230       int_ptr = &mesh->Nodes->Tag[0];
231       if (! (ids->put(int_ptr, numNodes)) )
232            throw DataException("Error - MeshAdapter::dump: copy Nodes_Tag to netCDF buffer failed: " + *newFileName);
233    
234       // Nodes gDOF
235       if (! ( ids = dataFile.add_var("Nodes_gDOF", ncInt, ncdims[0])) )
236            throw DataException("Error - MeshAdapter::dump: appending Nodes_gDOF to netCDF file failed: " + *newFileName);
237       int_ptr = &mesh->Nodes->globalDegreesOfFreedom[0];
238       if (! (ids->put(int_ptr, numNodes)) )
239            throw DataException("Error - MeshAdapter::dump: copy Nodes_gDOF to netCDF buffer failed: " + *newFileName);
240    
241       // Nodes global node index
242       if (! ( ids = dataFile.add_var("Nodes_gNI", ncInt, ncdims[0])) )
243            throw DataException("Error - MeshAdapter::dump: appending Nodes_gNI to netCDF file failed: " + *newFileName);
244       int_ptr = &mesh->Nodes->globalNodesIndex[0];
245       if (! (ids->put(int_ptr, numNodes)) )
246            throw DataException("Error - MeshAdapter::dump: copy Nodes_gNI to netCDF buffer failed: " + *newFileName);
247    
248       // Nodes grDof
249       if (! ( ids = dataFile.add_var("Nodes_grDfI", ncInt, ncdims[0])) )
250            throw DataException("Error - MeshAdapter::dump: appending Nodes_grDfI to netCDF file failed: " + *newFileName);
251       int_ptr = &mesh->Nodes->globalReducedDOFIndex[0];
252       if (! (ids->put(int_ptr, numNodes)) )
253            throw DataException("Error - MeshAdapter::dump: copy Nodes_grDfI to netCDF buffer failed: " + *newFileName);
254    
255       // Nodes grNI
256       if (! ( ids = dataFile.add_var("Nodes_grNI", ncInt, ncdims[0])) )
257            throw DataException("Error - MeshAdapter::dump: appending Nodes_grNI to netCDF file failed: " + *newFileName);
258       int_ptr = &mesh->Nodes->globalReducedNodesIndex[0];
259       if (! (ids->put(int_ptr, numNodes)) )
260            throw DataException("Error - MeshAdapter::dump: copy Nodes_grNI to netCDF buffer failed: " + *newFileName);
261    
262       // Nodes Coordinates
263       if (! ( ids = dataFile.add_var("Nodes_Coordinates", ncDouble, ncdims[0], ncdims[1]) ) )
264            throw DataException("Error - MeshAdapter::dump: appending Nodes_Coordinates to netCDF file failed: " + *newFileName);
265       if (! (ids->put(&(mesh->Nodes->Coordinates[INDEX2(0,0,numDim)]), numNodes, numDim)) )
266            throw DataException("Error - MeshAdapter::dump: copy Nodes_Coordinates to netCDF buffer failed: " + *newFileName);
267    
268       // Nodes degreesOfFreedomDistribution
269       if (! ( ids = dataFile.add_var("Nodes_DofDistribution", ncInt, ncdims[2])) )
270            throw DataException("Error - MeshAdapter::dump: appending Nodes_DofDistribution to netCDF file failed: " + *newFileName);
271       int_ptr = &mesh->Nodes->degreesOfFreedomDistribution->first_component[0];
272       if (! (ids->put(int_ptr, mpi_size+1)) )
273            throw DataException("Error - MeshAdapter::dump: copy Nodes_DofDistribution to netCDF buffer failed: " + *newFileName);
274    
275       }
276    
277       // // // // // Elements // // // // //
278    
279       if (num_Elements>0) {
280    
281         // Temp storage to gather node IDs
282         int *Elements_Nodes = TMPMEMALLOC(num_Elements*num_Elements_numNodes,int);
283    
284         // Elements_Id
285         if (! ( ids = dataFile.add_var("Elements_Id", ncInt, ncdims[3])) )
286            throw DataException("Error - MeshAdapter::dump: appending Elements_Id to netCDF file failed: " + *newFileName);
287         int_ptr = &mesh->Elements->Id[0];
288         if (! (ids->put(int_ptr, num_Elements)) )
289            throw DataException("Error - MeshAdapter::dump: copy Elements_Id to netCDF buffer failed: " + *newFileName);
290    
291         // Elements_Tag
292         if (! ( ids = dataFile.add_var("Elements_Tag", ncInt, ncdims[3])) )
293            throw DataException("Error - MeshAdapter::dump: appending Elements_Tag to netCDF file failed: " + *newFileName);
294         int_ptr = &mesh->Elements->Tag[0];
295         if (! (ids->put(int_ptr, num_Elements)) )
296            throw DataException("Error - MeshAdapter::dump: copy Elements_Tag to netCDF buffer failed: " + *newFileName);
297    
298         // Elements_Owner
299         if (! ( ids = dataFile.add_var("Elements_Owner", ncInt, ncdims[3])) )
300            throw DataException("Error - MeshAdapter::dump: appending Elements_Owner to netCDF file failed: " + *newFileName);
301         int_ptr = &mesh->Elements->Owner[0];
302         if (! (ids->put(int_ptr, num_Elements)) )
303            throw DataException("Error - MeshAdapter::dump: copy Elements_Owner to netCDF buffer failed: " + *newFileName);
304    
305         // Elements_Color
306         if (! ( ids = dataFile.add_var("Elements_Color", ncInt, ncdims[3])) )
307            throw DataException("Error - MeshAdapter::dump: appending Elements_Color to netCDF file failed: " + *newFileName);
308         int_ptr = &mesh->Elements->Color[0];
309         if (! (ids->put(int_ptr, num_Elements)) )
310            throw DataException("Error - MeshAdapter::dump: copy Elements_Color to netCDF buffer failed: " + *newFileName);
311    
312         // Elements_Nodes
313         for (int i=0; i<num_Elements; i++)
314           for (int j=0; j<num_Elements_numNodes; j++)
315             Elements_Nodes[INDEX2(j,i,num_Elements_numNodes)] = mesh->Nodes->Id[mesh->Elements->Nodes[INDEX2(j,i,num_Elements_numNodes)]];
316         if (! ( ids = dataFile.add_var("Elements_Nodes", ncInt, ncdims[3], ncdims[7]) ) )
317            throw DataException("Error - MeshAdapter::dump: appending Elements_Nodes to netCDF file failed: " + *newFileName);
318         if (! (ids->put(&(Elements_Nodes[0]), num_Elements, num_Elements_numNodes)) )
319            throw DataException("Error - MeshAdapter::dump: copy Elements_Nodes to netCDF buffer failed: " + *newFileName);
320    
321         TMPMEMFREE(Elements_Nodes);
322    
323       }
324    
325       // // // // // Face_Elements // // // // //
326    
327       if (num_FaceElements>0) {
328    
329         // Temp storage to gather node IDs
330         int *FaceElements_Nodes = TMPMEMALLOC(num_FaceElements*num_FaceElements_numNodes,int);
331    
332         // FaceElements_Id
333         if (! ( ids = dataFile.add_var("FaceElements_Id", ncInt, ncdims[4])) )
334            throw DataException("Error - MeshAdapter::dump: appending FaceElements_Id to netCDF file failed: " + *newFileName);
335         int_ptr = &mesh->FaceElements->Id[0];
336         if (! (ids->put(int_ptr, num_FaceElements)) )
337            throw DataException("Error - MeshAdapter::dump: copy FaceElements_Id to netCDF buffer failed: " + *newFileName);
338    
339         // FaceElements_Tag
340         if (! ( ids = dataFile.add_var("FaceElements_Tag", ncInt, ncdims[4])) )
341            throw DataException("Error - MeshAdapter::dump: appending FaceElements_Tag to netCDF file failed: " + *newFileName);
342         int_ptr = &mesh->FaceElements->Tag[0];
343         if (! (ids->put(int_ptr, num_FaceElements)) )
344            throw DataException("Error - MeshAdapter::dump: copy FaceElements_Tag to netCDF buffer failed: " + *newFileName);
345    
346         // FaceElements_Owner
347         if (! ( ids = dataFile.add_var("FaceElements_Owner", ncInt, ncdims[4])) )
348            throw DataException("Error - MeshAdapter::dump: appending FaceElements_Owner to netCDF file failed: " + *newFileName);
349         int_ptr = &mesh->FaceElements->Owner[0];
350         if (! (ids->put(int_ptr, num_FaceElements)) )
351            throw DataException("Error - MeshAdapter::dump: copy FaceElements_Owner to netCDF buffer failed: " + *newFileName);
352    
353         // FaceElements_Color
354         if (! ( ids = dataFile.add_var("FaceElements_Color", ncInt, ncdims[4])) )
355            throw DataException("Error - MeshAdapter::dump: appending FaceElements_Color to netCDF file failed: " + *newFileName);
356         int_ptr = &mesh->FaceElements->Color[0];
357         if (! (ids->put(int_ptr, num_FaceElements)) )
358            throw DataException("Error - MeshAdapter::dump: copy FaceElements_Color to netCDF buffer failed: " + *newFileName);
359    
360         // FaceElements_Nodes
361         for (int i=0; i<num_FaceElements; i++)
362           for (int j=0; j<num_FaceElements_numNodes; j++)
363             FaceElements_Nodes[INDEX2(j,i,num_FaceElements_numNodes)] = mesh->Nodes->Id[mesh->FaceElements->Nodes[INDEX2(j,i,num_FaceElements_numNodes)]];
364         if (! ( ids = dataFile.add_var("FaceElements_Nodes", ncInt, ncdims[4], ncdims[8]) ) )
365            throw DataException("Error - MeshAdapter::dump: appending FaceElements_Nodes to netCDF file failed: " + *newFileName);
366         if (! (ids->put(&(FaceElements_Nodes[0]), num_FaceElements, num_FaceElements_numNodes)) )
367            throw DataException("Error - MeshAdapter::dump: copy FaceElements_Nodes to netCDF buffer failed: " + *newFileName);
368    
369         TMPMEMFREE(FaceElements_Nodes);
370    
371       }
372    
373       // // // // // Contact_Elements // // // // //
374    
375       if (num_ContactElements>0) {
376    
377         // Temp storage to gather node IDs
378         int *ContactElements_Nodes = TMPMEMALLOC(num_ContactElements*num_ContactElements_numNodes,int);
379    
380         // ContactElements_Id
381         if (! ( ids = dataFile.add_var("ContactElements_Id", ncInt, ncdims[5])) )
382            throw DataException("Error - MeshAdapter::dump: appending ContactElements_Id to netCDF file failed: " + *newFileName);
383         int_ptr = &mesh->ContactElements->Id[0];
384         if (! (ids->put(int_ptr, num_ContactElements)) )
385            throw DataException("Error - MeshAdapter::dump: copy ContactElements_Id to netCDF buffer failed: " + *newFileName);
386    
387         // ContactElements_Tag
388         if (! ( ids = dataFile.add_var("ContactElements_Tag", ncInt, ncdims[5])) )
389            throw DataException("Error - MeshAdapter::dump: appending ContactElements_Tag to netCDF file failed: " + *newFileName);
390         int_ptr = &mesh->ContactElements->Tag[0];
391         if (! (ids->put(int_ptr, num_ContactElements)) )
392            throw DataException("Error - MeshAdapter::dump: copy ContactElements_Tag to netCDF buffer failed: " + *newFileName);
393    
394         // ContactElements_Owner
395         if (! ( ids = dataFile.add_var("ContactElements_Owner", ncInt, ncdims[5])) )
396            throw DataException("Error - MeshAdapter::dump: appending ContactElements_Owner to netCDF file failed: " + *newFileName);
397         int_ptr = &mesh->ContactElements->Owner[0];
398         if (! (ids->put(int_ptr, num_ContactElements)) )
399            throw DataException("Error - MeshAdapter::dump: copy ContactElements_Owner to netCDF buffer failed: " + *newFileName);
400    
401         // ContactElements_Color
402         if (! ( ids = dataFile.add_var("ContactElements_Color", ncInt, ncdims[5])) )
403            throw DataException("Error - MeshAdapter::dump: appending ContactElements_Color to netCDF file failed: " + *newFileName);
404         int_ptr = &mesh->ContactElements->Color[0];
405         if (! (ids->put(int_ptr, num_ContactElements)) )
406            throw DataException("Error - MeshAdapter::dump: copy ContactElements_Color to netCDF buffer failed: " + *newFileName);
407    
408         // ContactElements_Nodes
409         for (int i=0; i<num_ContactElements; i++)
410           for (int j=0; j<num_ContactElements_numNodes; j++)
411             ContactElements_Nodes[INDEX2(j,i,num_ContactElements_numNodes)] = mesh->Nodes->Id[mesh->ContactElements->Nodes[INDEX2(j,i,num_ContactElements_numNodes)]];
412         if (! ( ids = dataFile.add_var("ContactElements_Nodes", ncInt, ncdims[5], ncdims[9]) ) )
413            throw DataException("Error - MeshAdapter::dump: appending ContactElements_Nodes to netCDF file failed: " + *newFileName);
414         if (! (ids->put(&(ContactElements_Nodes[0]), num_ContactElements, num_ContactElements_numNodes)) )
415            throw DataException("Error - MeshAdapter::dump: copy ContactElements_Nodes to netCDF buffer failed: " + *newFileName);
416    
417         TMPMEMFREE(ContactElements_Nodes);
418    
419       }
420    
421       // // // // // Points // // // // //
422    
423       if (num_Points>0) {
424    
425         fprintf(stderr, "\n\n\nWARNING: MeshAdapter::dump has not been tested with Point elements\n\n\n");
426    
427         // Temp storage to gather node IDs
428         int *Points_Nodes = TMPMEMALLOC(num_Points,int);
429    
430         // Points_Id
431         if (! ( ids = dataFile.add_var("Points_Id", ncInt, ncdims[6])) )
432            throw DataException("Error - MeshAdapter::dump: appending Points_Id to netCDF file failed: " + *newFileName);
433         int_ptr = &mesh->Points->Id[0];
434         if (! (ids->put(int_ptr, num_Points)) )
435            throw DataException("Error - MeshAdapter::dump: copy Points_Id to netCDF buffer failed: " + *newFileName);
436    
437         // Points_Tag
438         if (! ( ids = dataFile.add_var("Points_Tag", ncInt, ncdims[6])) )
439            throw DataException("Error - MeshAdapter::dump: appending Points_Tag to netCDF file failed: " + *newFileName);
440         int_ptr = &mesh->Points->Tag[0];
441         if (! (ids->put(int_ptr, num_Points)) )
442            throw DataException("Error - MeshAdapter::dump: copy Points_Tag to netCDF buffer failed: " + *newFileName);
443    
444         // Points_Owner
445         if (! ( ids = dataFile.add_var("Points_Owner", ncInt, ncdims[6])) )
446            throw DataException("Error - MeshAdapter::dump: appending Points_Owner to netCDF file failed: " + *newFileName);
447         int_ptr = &mesh->Points->Owner[0];
448         if (! (ids->put(int_ptr, num_Points)) )
449            throw DataException("Error - MeshAdapter::dump: copy Points_Owner to netCDF buffer failed: " + *newFileName);
450    
451         // Points_Color
452         if (! ( ids = dataFile.add_var("Points_Color", ncInt, ncdims[6])) )
453            throw DataException("Error - MeshAdapter::dump: appending Points_Color to netCDF file failed: " + *newFileName);
454         int_ptr = &mesh->Points->Color[0];
455         if (! (ids->put(int_ptr, num_Points)) )
456            throw DataException("Error - MeshAdapter::dump: copy Points_Color to netCDF buffer failed: " + *newFileName);
457    
458         // Points_Nodes
459         // mesh->Nodes->Id[mesh->Points->Nodes[INDEX2(0,i,1)]]
460         for (int i=0; i<num_Points; i++)
461           Points_Nodes[i] = mesh->Nodes->Id[mesh->Points->Nodes[INDEX2(0,i,1)]];
462         if (! ( ids = dataFile.add_var("Points_Nodes", ncInt, ncdims[6]) ) )
463            throw DataException("Error - MeshAdapter::dump: appending Points_Nodes to netCDF file failed: " + *newFileName);
464         if (! (ids->put(&(Points_Nodes[0]), num_Points)) )
465            throw DataException("Error - MeshAdapter::dump: copy Points_Nodes to netCDF buffer failed: " + *newFileName);
466    
467         TMPMEMFREE(Points_Nodes);
468    
469       }
470    
471       // // // // // TagMap // // // // //
472    
473       if (num_Tags>0) {
474    
475         // Temp storage to gather node IDs
476         int *Tags_keys = TMPMEMALLOC(num_Tags, int);
477         char name_temp[4096];
478    
479         /* Copy tag data into temp arrays */
480         tag_map = mesh->TagMap;
481         if (tag_map) {
482           int i = 0;
483           while (tag_map) {
484        Tags_keys[i++] = tag_map->tag_key;
485            tag_map=tag_map->next;
486           }
487         }
488    
489         // Tags_keys
490         if (! ( ids = dataFile.add_var("Tags_keys", ncInt, ncdims[10])) )
491            throw DataException("Error - MeshAdapter::dump: appending Tags_keys to netCDF file failed: " + *newFileName);
492         int_ptr = &Tags_keys[0];
493         if (! (ids->put(int_ptr, num_Tags)) )
494            throw DataException("Error - MeshAdapter::dump: copy Tags_keys to netCDF buffer failed: " + *newFileName);
495    
496         // Tags_names_*
497         // This is an array of strings, it should be stored as an array but instead I have hacked in one attribute per string
498         // because the NetCDF manual doesn't tell how to do an array of strings
499         tag_map = mesh->TagMap;
500         if (tag_map) {
501           int i = 0;
502           while (tag_map) {
503             sprintf(name_temp, "Tags_name_%d", i);
504             if (!dataFile.add_att(name_temp, tag_map->name) )
505               throw DataException("Error - MeshAdapter::dump: appending Tags_names_ to NetCDF file failed: " + *newFileName);
506             tag_map=tag_map->next;
507         i++;
508           }
509         }
510    
511         TMPMEMFREE(Tags_keys);
512    
513       }
514    
515    
516       // NetCDF file is closed by destructor of NcFile object
517    #else
518       Finley_setError(IO_ERROR, "MeshAdapter::dump: not configured with NetCDF. Please contact your installation manager.");
519    #endif  /* USE_NETCDF */
520       checkFinleyError();
521    }
522    
523  string MeshAdapter::getDescription() const  string MeshAdapter::getDescription() const
524  {  {
525    return "FinleyMesh";    return "FinleyMesh";
# Line 220  pair<int,int> MeshAdapter::getDataShape( Line 655  pair<int,int> MeshAdapter::getDataShape(
655     switch (functionSpaceCode) {     switch (functionSpaceCode) {
656        case(Nodes):        case(Nodes):
657             numDataPointsPerSample=1;             numDataPointsPerSample=1;
658             if (mesh->Nodes!=NULL) numSamples=mesh->Nodes->numNodes;             numSamples=Finley_NodeFile_getNumNodes(mesh->Nodes);
659             break;             break;
660        case(ReducedNodes):        case(ReducedNodes):
            /* TODO: add ReducedNodes */  
661             numDataPointsPerSample=1;             numDataPointsPerSample=1;
662             if (mesh->Nodes!=NULL) numSamples=mesh->Nodes->numNodes;             numSamples=Finley_NodeFile_getNumReducedNodes(mesh->Nodes);
            throw FinleyAdapterException("Error - ReducedNodes is not supported yet.");  
663             break;             break;
664        case(Elements):        case(Elements):
665             if (mesh->Elements!=NULL) {             if (mesh->Elements!=NULL) {
# Line 285  pair<int,int> MeshAdapter::getDataShape( Line 718  pair<int,int> MeshAdapter::getDataShape(
718        case(DegreesOfFreedom):        case(DegreesOfFreedom):
719             if (mesh->Nodes!=NULL) {             if (mesh->Nodes!=NULL) {
720               numDataPointsPerSample=1;               numDataPointsPerSample=1;
721  #ifndef PASO_MPI               numSamples=Finley_NodeFile_getNumDegreesOfFreedom(mesh->Nodes);
              numSamples=mesh->Nodes->numDegreesOfFreedom;  
 #else  
              numSamples=mesh->Nodes->degreeOfFreedomDistribution->numLocal;  
 #endif  
722             }             }
723             break;             break;
724        case(ReducedDegreesOfFreedom):        case(ReducedDegreesOfFreedom):
725             if (mesh->Nodes!=NULL) {             if (mesh->Nodes!=NULL) {
726               numDataPointsPerSample=1;               numDataPointsPerSample=1;
727  #ifndef PASO_MPI               numSamples=Finley_NodeFile_getNumReducedDegreesOfFreedom(mesh->Nodes);
              numSamples=mesh->Nodes->reducedNumDegreesOfFreedom;  
 #else  
              numSamples=mesh->Nodes->reducedDegreeOfFreedomDistribution->numLocal;  
 #endif  
728             }             }
729             break;             break;
730        default:        default:
# Line 344  void MeshAdapter::addPDEToSystem( Line 769  void MeshAdapter::addPDEToSystem(
769     checkFinleyError();     checkFinleyError();
770  }  }
771    
772    void  MeshAdapter::addPDEToLumpedSystem(
773                         escript::Data& mat,
774                         const escript::Data& D,
775                         const escript::Data& d) const
776    {
777       escriptDataC _mat=mat.getDataC();
778       escriptDataC _D=D.getDataC();
779       escriptDataC _d=d.getDataC();
780    
781       Finley_Mesh* mesh=m_finleyMesh.get();
782    
783       Finley_Assemble_LumpedSystem(mesh->Nodes,mesh->Elements,&_mat, &_D);
784       Finley_Assemble_LumpedSystem(mesh->Nodes,mesh->FaceElements,&_mat, &_d);
785    
786       checkFinleyError();
787    }
788    
789    
790  //  //
791  // adds linear PDE of second order into the right hand side only  // adds linear PDE of second order into the right hand side only
792  //  //
# Line 454  void MeshAdapter::interpolateOnDomain(es Line 897  void MeshAdapter::interpolateOnDomain(es
897       case(Elements):       case(Elements):
898          if (target.getFunctionSpace().getTypeCode()==Elements) {          if (target.getFunctionSpace().getTypeCode()==Elements) {
899             Finley_Assemble_CopyElementData(mesh->Elements,&_target,&_in);             Finley_Assemble_CopyElementData(mesh->Elements,&_target,&_in);
900            } else if (target.getFunctionSpace().getTypeCode()==ReducedElements) {
901               Finley_Assemble_AverageElementData(mesh->Elements,&_target,&_in);
902          } else {          } else {
903             throw FinleyAdapterException("Error - No interpolation with data on elements possible.");             throw FinleyAdapterException("Error - No interpolation with data on elements possible.");
904          }          }
# Line 468  void MeshAdapter::interpolateOnDomain(es Line 913  void MeshAdapter::interpolateOnDomain(es
913       case(FaceElements):       case(FaceElements):
914          if (target.getFunctionSpace().getTypeCode()==FaceElements) {          if (target.getFunctionSpace().getTypeCode()==FaceElements) {
915             Finley_Assemble_CopyElementData(mesh->FaceElements,&_target,&_in);             Finley_Assemble_CopyElementData(mesh->FaceElements,&_target,&_in);
916            } else if (target.getFunctionSpace().getTypeCode()==ReducedFaceElements) {
917               Finley_Assemble_AverageElementData(mesh->FaceElements,&_target,&_in);
918          } else {          } else {
919             throw FinleyAdapterException("Error - No interpolation with data on face elements possible.");             throw FinleyAdapterException("Error - No interpolation with data on face elements possible.");
920         }          }
921         break;          break;
922       case(ReducedFaceElements):       case(ReducedFaceElements):
923    cout << "A\n";
924          if (target.getFunctionSpace().getTypeCode()==FaceElements) {          if (target.getFunctionSpace().getTypeCode()==FaceElements) {
925    cout << "B\n";
926             Finley_Assemble_CopyElementData(mesh->FaceElements,&_target,&_in);             Finley_Assemble_CopyElementData(mesh->FaceElements,&_target,&_in);
927    cout << "C\n";
928            throw FinleyAdapterException("A");
929          } else {          } else {
930             throw FinleyAdapterException("Error - No interpolation with data on face elements with reduced integration order possible.");             throw FinleyAdapterException("Error - No interpolation with data on face elements with reduced integration order possible.");
931         }         }
932    cout << "A\n";
933         break;         break;
934       case(Points):       case(Points):
935          if (target.getFunctionSpace().getTypeCode()==Points) {          if (target.getFunctionSpace().getTypeCode()==Points) {
# Line 490  void MeshAdapter::interpolateOnDomain(es Line 942  void MeshAdapter::interpolateOnDomain(es
942       case(ContactElementsOne):       case(ContactElementsOne):
943          if (target.getFunctionSpace().getTypeCode()==ContactElementsZero || target.getFunctionSpace().getTypeCode()==ContactElementsOne) {          if (target.getFunctionSpace().getTypeCode()==ContactElementsZero || target.getFunctionSpace().getTypeCode()==ContactElementsOne) {
944             Finley_Assemble_CopyElementData(mesh->ContactElements,&_target,&_in);             Finley_Assemble_CopyElementData(mesh->ContactElements,&_target,&_in);
945            } else if (target.getFunctionSpace().getTypeCode()==ReducedContactElementsZero || target.getFunctionSpace().getTypeCode()==ReducedContactElementsOne) {
946               Finley_Assemble_AverageElementData(mesh->ContactElements,&_target,&_in);
947          } else {          } else {
948             throw FinleyAdapterException("Error - No interpolation with data on contact elements possible.");             throw FinleyAdapterException("Error - No interpolation with data on contact elements possible.");
            break;  
949          }          }
950          break;          break;
951       case(ReducedContactElementsZero):       case(ReducedContactElementsZero):
# Line 501  void MeshAdapter::interpolateOnDomain(es Line 954  void MeshAdapter::interpolateOnDomain(es
954             Finley_Assemble_CopyElementData(mesh->ContactElements,&_target,&_in);             Finley_Assemble_CopyElementData(mesh->ContactElements,&_target,&_in);
955          } else {          } else {
956             throw FinleyAdapterException("Error - No interpolation with data on contact elements with reduced integration order possible.");             throw FinleyAdapterException("Error - No interpolation with data on contact elements with reduced integration order possible.");
            break;  
957          }          }
958          break;          break;
959       case(DegreesOfFreedom):             case(DegreesOfFreedom):      
960          switch(target.getFunctionSpace().getTypeCode()) {          switch(target.getFunctionSpace().getTypeCode()) {
961             case(ReducedDegreesOfFreedom):             case(ReducedDegreesOfFreedom):
962             case(DegreesOfFreedom):             case(DegreesOfFreedom):
            case(Nodes):  
            case(ReducedNodes):  
963                Finley_Assemble_CopyNodalData(mesh->Nodes,&_target,&_in);                Finley_Assemble_CopyNodalData(mesh->Nodes,&_target,&_in);
964                break;                break;
965  #ifndef PASO_MPI  
966             case(Elements):             case(Nodes):
967             case(ReducedElements):             case(ReducedNodes):
968                Finley_Assemble_interpolate(mesh->Nodes,mesh->Elements,&_in,&_target);                if (getMPISize()>1) {
969                break;                    escript::Data temp=escript::Data(in);
970             case(FaceElements):                    temp.expand();
971             case(ReducedFaceElements):                    escriptDataC _in2 = temp.getDataC();
972                Finley_Assemble_interpolate(mesh->Nodes,mesh->FaceElements,&_in,&_target);                    Finley_Assemble_CopyNodalData(mesh->Nodes,&_target,&_in2);
973                break;                } else {
974             case(Points):                    Finley_Assemble_CopyNodalData(mesh->Nodes,&_target,&_in);
975                Finley_Assemble_interpolate(mesh->Nodes,mesh->Points,&_in,&_target);                }
976                break;                break;
            case(ContactElementsZero):  
            case(ContactElementsOne):  
            case(ReducedContactElementsZero):  
            case(ReducedContactElementsOne):  
               Finley_Assemble_interpolate(mesh->Nodes,mesh->ContactElements,&_in,&_target);  
              break;  
 #else  
            /* need to copy Degrees of freedom data to nodal data so that the external values are available */  
977             case(Elements):             case(Elements):
978             case(ReducedElements):             case(ReducedElements):
979                escript::Data nodeTemp( in, continuousFunction(asAbstractContinuousDomain()) );                if (getMPISize()>1) {
980                Finley_Assemble_interpolate(mesh->Nodes,mesh->Elements,&(nodeTemp.getDataC()),&_target);                   escript::Data temp=escript::Data( in,  continuousFunction(asAbstractContinuousDomain()) );
981                     escriptDataC _in2 = temp.getDataC();
982                     Finley_Assemble_interpolate(mesh->Nodes,mesh->Elements,&_in2,&_target);
983                  } else {
984                     Finley_Assemble_interpolate(mesh->Nodes,mesh->Elements,&_in,&_target);
985                  }
986                break;                break;
987             case(FaceElements):             case(FaceElements):
988             case(ReducedFaceElements):             case(ReducedFaceElements):
989                escript::Data nodeTemp( in, continuousFunction(asAbstractContinuousDomain()) );                if (getMPISize()>1) {
990                Finley_Assemble_interpolate(mesh->Nodes,mesh->FaceElements,&(nodeTemp.getDataC()),&_target);                   escript::Data temp=escript::Data( in,  continuousFunction(asAbstractContinuousDomain()) );
991                     escriptDataC _in2 = temp.getDataC();
992                     Finley_Assemble_interpolate(mesh->Nodes,mesh->FaceElements,&_in2,&_target);
993    
994                  } else {
995                     Finley_Assemble_interpolate(mesh->Nodes,mesh->FaceElements,&_in,&_target);
996                  }
997                break;                break;
998             case(Points):             case(Points):
999                escript::Data nodeTemp( in, continuousFunction(asAbstractContinuousDomain()) );                if (getMPISize()>1) {
1000                Finley_Assemble_interpolate(mesh->Nodes,mesh->Points,&(nodeTemp.getDataC()),&_target);                   escript::Data temp=escript::Data( in,  continuousFunction(asAbstractContinuousDomain()) );
1001                     escriptDataC _in2 = temp.getDataC();
1002                  } else {
1003                     Finley_Assemble_interpolate(mesh->Nodes,mesh->Points,&_in,&_target);
1004                  }
1005                break;                break;
1006             case(ContactElementsZero):             case(ContactElementsZero):
1007             case(ContactElementsOne):             case(ContactElementsOne):
1008             case(ReducedContactElementsZero):             case(ReducedContactElementsZero):
1009             case(ReducedContactElementsOne):             case(ReducedContactElementsOne):
1010                escript::Data nodeTemp( in, continuousFunction(asAbstractContinuousDomain()) );                if (getMPISize()>1) {
1011                Finley_Assemble_interpolate(mesh->Nodes,mesh->ContactElements,&(nodeTemp.getDataC()),&_target);                   escript::Data temp=escript::Data( in,  continuousFunction(asAbstractContinuousDomain()) );
1012                     escriptDataC _in2 = temp.getDataC();
1013                     Finley_Assemble_interpolate(mesh->Nodes,mesh->ContactElements,&_in2,&_target);
1014                  } else {
1015                     Finley_Assemble_interpolate(mesh->Nodes,mesh->ContactElements,&_in,&_target);
1016                  }
1017               break;               break;
 #endif  
1018             default:             default:
1019               stringstream temp;               stringstream temp;
1020               temp << "Error - Interpolation On Domain: Finley does not know anything about function space type " << target.getFunctionSpace().getTypeCode();               temp << "Error - Interpolation On Domain: Finley does not know anything about function space type " << target.getFunctionSpace().getTypeCode();
# Line 567  void MeshAdapter::interpolateOnDomain(es Line 1028  void MeshAdapter::interpolateOnDomain(es
1028               throw FinleyAdapterException("Error - Finley does not support interpolation from reduced degrees of freedom to mesh nodes.");               throw FinleyAdapterException("Error - Finley does not support interpolation from reduced degrees of freedom to mesh nodes.");
1029               break;               break;
1030            case(ReducedNodes):            case(ReducedNodes):
1031               Finley_Assemble_CopyNodalData(mesh->Nodes,&_target,&_in);                if (getMPISize()>1) {
1032               break;                    escript::Data temp=escript::Data(in);
1033                      temp.expand();
1034                      escriptDataC _in2 = temp.getDataC();
1035                      Finley_Assemble_CopyNodalData(mesh->Nodes,&_target,&_in2);
1036                  } else {
1037                      Finley_Assemble_CopyNodalData(mesh->Nodes,&_target,&_in);
1038                  }
1039                  break;
1040            case(DegreesOfFreedom):            case(DegreesOfFreedom):
1041               throw FinleyAdapterException("Error - Finley does not support interpolation from reduced degrees of freedom to degrees of freedom");               throw FinleyAdapterException("Error - Finley does not support interpolation from reduced degrees of freedom to degrees of freedom");
1042               break;               break;
# Line 577  void MeshAdapter::interpolateOnDomain(es Line 1045  void MeshAdapter::interpolateOnDomain(es
1045               break;               break;
1046            case(Elements):            case(Elements):
1047            case(ReducedElements):            case(ReducedElements):
1048               Finley_Assemble_interpolate(mesh->Nodes,mesh->Elements,&_in,&_target);                if (getMPISize()>1) {
1049                     escript::Data temp=escript::Data( in,  continuousFunction(asAbstractContinuousDomain()) );
1050                     escriptDataC _in2 = temp.getDataC();
1051                     Finley_Assemble_interpolate(mesh->Nodes,mesh->Elements,&_in2,&_target);
1052                  } else {
1053                     Finley_Assemble_interpolate(mesh->Nodes,mesh->Elements,&_in,&_target);
1054                 }
1055               break;               break;
1056            case(FaceElements):            case(FaceElements):
1057            case(ReducedFaceElements):            case(ReducedFaceElements):
1058               Finley_Assemble_interpolate(mesh->Nodes,mesh->FaceElements,&_in,&_target);                if (getMPISize()>1) {
1059                     escript::Data temp=escript::Data( in,  continuousFunction(asAbstractContinuousDomain()) );
1060                     escriptDataC _in2 = temp.getDataC();
1061                     Finley_Assemble_interpolate(mesh->Nodes,mesh->FaceElements,&_in2,&_target);
1062                  } else {
1063                     Finley_Assemble_interpolate(mesh->Nodes,mesh->FaceElements,&_in,&_target);
1064                  }
1065               break;               break;
1066            case(Points):            case(Points):
1067               Finley_Assemble_interpolate(mesh->Nodes,mesh->Points,&_in,&_target);                if (getMPISize()>1) {
1068                     escript::Data temp=escript::Data( in,  continuousFunction(asAbstractContinuousDomain()) );
1069                     escriptDataC _in2 = temp.getDataC();
1070                     Finley_Assemble_interpolate(mesh->Nodes,mesh->Points,&_in2,&_target);
1071                  } else {
1072                     Finley_Assemble_interpolate(mesh->Nodes,mesh->Points,&_in,&_target);
1073                 }
1074               break;               break;
1075            case(ContactElementsZero):            case(ContactElementsZero):
1076            case(ContactElementsOne):            case(ContactElementsOne):
1077            case(ReducedContactElementsZero):            case(ReducedContactElementsZero):
1078            case(ReducedContactElementsOne):            case(ReducedContactElementsOne):
1079               Finley_Assemble_interpolate(mesh->Nodes,mesh->ContactElements,&_in,&_target);                if (getMPISize()>1) {
1080                     escript::Data temp=escript::Data( in,  continuousFunction(asAbstractContinuousDomain()) );
1081                     escriptDataC _in2 = temp.getDataC();
1082                     Finley_Assemble_interpolate(mesh->Nodes,mesh->ContactElements,&_in2,&_target);
1083                  } else {
1084                     Finley_Assemble_interpolate(mesh->Nodes,mesh->ContactElements,&_in,&_target);
1085                 }
1086               break;               break;
1087            default:            default:
1088               stringstream temp;               stringstream temp;
# Line 707  void MeshAdapter::setToIntegrals(std::ve Line 1199  void MeshAdapter::setToIntegrals(std::ve
1199    if (argDomain!=*this)    if (argDomain!=*this)
1200       throw FinleyAdapterException("Error - Illegal domain of integration kernel");       throw FinleyAdapterException("Error - Illegal domain of integration kernel");
1201    
1202      double blocktimer_start = blocktimer_time();
1203    Finley_Mesh* mesh=m_finleyMesh.get();    Finley_Mesh* mesh=m_finleyMesh.get();
1204      escriptDataC _temp;
1205      escript::Data temp;
1206    escriptDataC _arg=arg.getDataC();    escriptDataC _arg=arg.getDataC();
1207    switch(arg.getFunctionSpace().getTypeCode()) {    switch(arg.getFunctionSpace().getTypeCode()) {
1208       case(Nodes):       case(Nodes):
1209          /* TODO */          temp=escript::Data( arg, function(asAbstractContinuousDomain()) );
1210          throw FinleyAdapterException("Error - Integral of data on nodes is not supported.");          _temp=temp.getDataC();
1211            Finley_Assemble_integrate(mesh->Nodes,mesh->Elements,&_temp,&integrals[0]);
1212          break;          break;
1213       case(ReducedNodes):       case(ReducedNodes):
1214          /* TODO */          temp=escript::Data( arg, function(asAbstractContinuousDomain()) );
1215          throw FinleyAdapterException("Error - Integral of data on reduced nodes is not supported.");          _temp=temp.getDataC();
1216            Finley_Assemble_integrate(mesh->Nodes,mesh->Elements,&_temp,&integrals[0]);
1217          break;          break;
1218       case(Elements):       case(Elements):
1219          Finley_Assemble_integrate(mesh->Nodes,mesh->Elements,&_arg,&integrals[0]);          Finley_Assemble_integrate(mesh->Nodes,mesh->Elements,&_arg,&integrals[0]);
# Line 746  void MeshAdapter::setToIntegrals(std::ve Line 1243  void MeshAdapter::setToIntegrals(std::ve
1243          Finley_Assemble_integrate(mesh->Nodes,mesh->ContactElements,&_arg,&integrals[0]);          Finley_Assemble_integrate(mesh->Nodes,mesh->ContactElements,&_arg,&integrals[0]);
1244          break;          break;
1245       case(DegreesOfFreedom):       case(DegreesOfFreedom):
1246          throw FinleyAdapterException("Error - Integral of data on degrees of freedom is not supported.");          temp=escript::Data( arg, function(asAbstractContinuousDomain()) );
1247            _temp=temp.getDataC();
1248            Finley_Assemble_integrate(mesh->Nodes,mesh->Elements,&_temp,&integrals[0]);
1249          break;          break;
1250       case(ReducedDegreesOfFreedom):       case(ReducedDegreesOfFreedom):
1251          throw FinleyAdapterException("Error - Integral of data on reduced degrees of freedom is not supported.");          temp=escript::Data( arg, function(asAbstractContinuousDomain()) );
1252            _temp=temp.getDataC();
1253            Finley_Assemble_integrate(mesh->Nodes,mesh->Elements,&_temp,&integrals[0]);
1254          break;          break;
1255       default:       default:
1256          stringstream temp;          stringstream temp;
# Line 758  void MeshAdapter::setToIntegrals(std::ve Line 1259  void MeshAdapter::setToIntegrals(std::ve
1259          break;          break;
1260    }    }
1261    checkFinleyError();    checkFinleyError();
1262      blocktimer_increment("integrate()", blocktimer_start);
1263  }  }
1264    
1265  //  //
# Line 775  void MeshAdapter::setToGradient(escript: Line 1277  void MeshAdapter::setToGradient(escript:
1277    Finley_Mesh* mesh=m_finleyMesh.get();    Finley_Mesh* mesh=m_finleyMesh.get();
1278    escriptDataC _grad=grad.getDataC();    escriptDataC _grad=grad.getDataC();
1279    escriptDataC nodeDataC;    escriptDataC nodeDataC;
1280  #ifdef PASO_MPI    escript::Data temp;
1281    escript::Data nodeTemp( arg, continuousFunction(asAbstractContinuousDomain()) );    if (getMPISize()>1) {
1282    if( arg.getFunctionSpace().getTypeCode() != Nodes )        if( arg.getFunctionSpace().getTypeCode() == DegreesOfFreedom ) {
1283    {          temp=escript::Data( arg,  continuousFunction(asAbstractContinuousDomain()) );
1284      Finley_Assemble_CopyNodalData(mesh->Nodes,&(nodeTemp.getDataC()),&(arg.getDataC()));          nodeDataC = temp.getDataC();
1285      nodeDataC = nodeTemp.getDataC();        } else if( arg.getFunctionSpace().getTypeCode() == ReducedDegreesOfFreedom ) {
1286            temp=escript::Data( arg,  reducedContinuousFunction(asAbstractContinuousDomain()) );
1287            nodeDataC = temp.getDataC();
1288          } else {
1289            nodeDataC = arg.getDataC();
1290          }
1291      } else {
1292         nodeDataC = arg.getDataC();
1293    }    }
   else  
     nodeDataC = arg.getDataC();  
 #else  
   nodeDataC = arg.getDataC();  
 #endif  
1294    switch(grad.getFunctionSpace().getTypeCode()) {    switch(grad.getFunctionSpace().getTypeCode()) {
1295         case(Nodes):         case(Nodes):
1296            throw FinleyAdapterException("Error - Gradient at nodes is not supported.");            throw FinleyAdapterException("Error - Gradient at nodes is not supported.");
# Line 917  void MeshAdapter::saveDX(const std::stri Line 1421  void MeshAdapter::saveDX(const std::stri
1421    escriptDataC *data = (num_data>0) ? TMPMEMALLOC(num_data,escriptDataC) : (escriptDataC*)NULL;    escriptDataC *data = (num_data>0) ? TMPMEMALLOC(num_data,escriptDataC) : (escriptDataC*)NULL;
1422    escriptDataC* *ptr_data = (num_data>0) ? TMPMEMALLOC(num_data,escriptDataC*) : (escriptDataC**)NULL;    escriptDataC* *ptr_data = (num_data>0) ? TMPMEMALLOC(num_data,escriptDataC*) : (escriptDataC**)NULL;
1423    
1424      boost::python::list keys=arg.keys();    boost::python::list keys=arg.keys();
1425      for (int i=0;i<num_data;++i) {    for (int i=0;i<num_data;++i) {
1426             std::string n=boost::python::extract<std::string>(keys[i]);
1427           escript::Data& d=boost::python::extract<escript::Data&>(arg[keys[i]]);           escript::Data& d=boost::python::extract<escript::Data&>(arg[keys[i]]);
1428           if (dynamic_cast<const MeshAdapter&>(d.getFunctionSpace().getDomain()) !=*this)           if (dynamic_cast<const MeshAdapter&>(d.getFunctionSpace().getDomain()) !=*this)
1429               throw FinleyAdapterException("Error  in saveDX: Data must be defined on same Domain");               throw FinleyAdapterException("Error  in saveVTK: Data must be defined on same Domain");
1430           data[i]=d.getDataC();           data[i]=d.getDataC();
1431           ptr_data[i]=&(data[i]);           ptr_data[i]=&(data[i]);
          std::string n=boost::python::extract<std::string>(keys[i]);  
1432           c_names[i]=&(names[i][0]);           c_names[i]=&(names[i][0]);
1433           if (n.length()>MAX_namelength-1) {           if (n.length()>MAX_namelength-1) {
1434              strncpy(c_names[i],n.c_str(),MAX_namelength-1);              strncpy(c_names[i],n.c_str(),MAX_namelength-1);
# Line 967  void MeshAdapter::saveVTK(const std::str Line 1471  void MeshAdapter::saveVTK(const std::str
1471    
1472      boost::python::list keys=arg.keys();      boost::python::list keys=arg.keys();
1473      for (int i=0;i<num_data;++i) {      for (int i=0;i<num_data;++i) {
1474             std::string n=boost::python::extract<std::string>(keys[i]);
1475           escript::Data& d=boost::python::extract<escript::Data&>(arg[keys[i]]);           escript::Data& d=boost::python::extract<escript::Data&>(arg[keys[i]]);
1476           if (dynamic_cast<const MeshAdapter&>(d.getFunctionSpace().getDomain()) !=*this)           if (dynamic_cast<const MeshAdapter&>(d.getFunctionSpace().getDomain()) !=*this)
1477               throw FinleyAdapterException("Error  in saveVTK: Data must be defined on same Domain");               throw FinleyAdapterException("Error  in saveVTK: Data must be defined on same Domain");
1478           data[i]=d.getDataC();           data[i]=d.getDataC();
1479           ptr_data[i]=&(data[i]);           ptr_data[i]=&(data[i]);
          std::string n=boost::python::extract<std::string>(keys[i]);  
1480           c_names[i]=&(names[i][0]);           c_names[i]=&(names[i][0]);
1481           if (n.length()>MAX_namelength-1) {           if (n.length()>MAX_namelength-1) {
1482              strncpy(c_names[i],n.c_str(),MAX_namelength-1);              strncpy(c_names[i],n.c_str(),MAX_namelength-1);
# Line 981  void MeshAdapter::saveVTK(const std::str Line 1485  void MeshAdapter::saveVTK(const std::str
1485              strcpy(c_names[i],n.c_str());              strcpy(c_names[i],n.c_str());
1486           }           }
1487      }      }
 #ifndef PASO_MPI      
1488      Finley_Mesh_saveVTK(filename.c_str(),m_finleyMesh.get(),num_data,c_names,ptr_data);      Finley_Mesh_saveVTK(filename.c_str(),m_finleyMesh.get(),num_data,c_names,ptr_data);
 #else  
     Finley_Mesh_saveVTK_MPIO(filename.c_str(),m_finleyMesh.get(),num_data,c_names,ptr_data);  
 #endif  
1489    
1490  checkFinleyError();    checkFinleyError();
1491    /* win32 refactor */    /* win32 refactor */
1492    TMPMEMFREE(c_names);    TMPMEMFREE(c_names);
1493    TMPMEMFREE(data);    TMPMEMFREE(data);
# Line 1038  SystemMatrixAdapter MeshAdapter::newSyst Line 1538  SystemMatrixAdapter MeshAdapter::newSyst
1538            
1539      Paso_SystemMatrixPattern* fsystemMatrixPattern=Finley_getPattern(getFinley_Mesh(),reduceRowOrder,reduceColOrder);      Paso_SystemMatrixPattern* fsystemMatrixPattern=Finley_getPattern(getFinley_Mesh(),reduceRowOrder,reduceColOrder);
1540      checkFinleyError();      checkFinleyError();
1541      Paso_SystemMatrix* fsystemMatrix=Paso_SystemMatrix_alloc(type,fsystemMatrixPattern,row_blocksize,column_blocksize);      Paso_SystemMatrix* fsystemMatrix;
1542        int trilinos = 0;
1543        if (trilinos) {
1544    #ifdef TRILINOS
1545          /* Allocation Epetra_VrbMatrix here */
1546    #endif
1547        }
1548        else {
1549          fsystemMatrix=Paso_SystemMatrix_alloc(type,fsystemMatrixPattern,row_blocksize,column_blocksize);
1550        }
1551      checkPasoError();      checkPasoError();
1552      Paso_SystemMatrixPattern_dealloc(fsystemMatrixPattern);      Paso_SystemMatrixPattern_free(fsystemMatrixPattern);
1553      return SystemMatrixAdapter(fsystemMatrix,row_blocksize,row_functionspace,column_blocksize,column_functionspace);      return SystemMatrixAdapter(fsystemMatrix,row_blocksize,row_functionspace,column_blocksize,column_functionspace);
1554  }  }
1555    // creates a TransportProblemAdapter
1556    TransportProblemAdapter MeshAdapter::newTransportProblem(
1557                          const double theta,
1558                          const double dt_max,
1559                          const int blocksize,
1560                          const escript::FunctionSpace& functionspace,
1561                          const int type) const
1562    {
1563        int reduceOrder=0;
1564        // is the domain right?
1565        const MeshAdapter& domain=dynamic_cast<const MeshAdapter&>(functionspace.getDomain());
1566        if (domain!=*this)
1567              throw FinleyAdapterException("Error - domain of function space does not match the domain of transport problem generator.");
1568        // is the function space type right
1569        if (functionspace.getTypeCode()==DegreesOfFreedom) {
1570            reduceOrder=0;
1571        } else if (functionspace.getTypeCode()==ReducedDegreesOfFreedom) {
1572            reduceOrder=1;
1573        } else {
1574            throw FinleyAdapterException("Error - illegal function space type for system matrix rows.");
1575        }
1576        // generate matrix:
1577        
1578        Paso_SystemMatrixPattern* fsystemMatrixPattern=Finley_getPattern(getFinley_Mesh(),reduceOrder,reduceOrder);
1579        checkFinleyError();
1580        Paso_FCTransportProblem* transportProblem;
1581        transportProblem=Paso_FCTransportProblem_alloc(theta,dt_max,fsystemMatrixPattern,blocksize);
1582        checkPasoError();
1583        Paso_SystemMatrixPattern_free(fsystemMatrixPattern);
1584        return TransportProblemAdapter(transportProblem,theta,dt_max,blocksize,functionspace);
1585    }
1586    
1587  //  //
1588  // vtkObject MeshAdapter::createVtkObject() const  // vtkObject MeshAdapter::createVtkObject() const
# Line 1131  bool MeshAdapter::probeInterpolationOnDo Line 1671  bool MeshAdapter::probeInterpolationOnDo
1671       case(Elements):       case(Elements):
1672          if (functionSpaceType_target==Elements) {          if (functionSpaceType_target==Elements) {
1673             return true;             return true;
1674            } else if (functionSpaceType_target==ReducedElements) {
1675               return true;
1676          } else {          } else {
1677             return false;             return false;
1678          }          }
# Line 1143  bool MeshAdapter::probeInterpolationOnDo Line 1685  bool MeshAdapter::probeInterpolationOnDo
1685       case(FaceElements):       case(FaceElements):
1686          if (functionSpaceType_target==FaceElements) {          if (functionSpaceType_target==FaceElements) {
1687             return true;             return true;
1688            } else if (functionSpaceType_target==ReducedFaceElements) {
1689               return true;
1690          } else {          } else {
1691             return false;             return false;
1692          }          }
# Line 1162  bool MeshAdapter::probeInterpolationOnDo Line 1706  bool MeshAdapter::probeInterpolationOnDo
1706       case(ContactElementsOne):       case(ContactElementsOne):
1707          if (functionSpaceType_target==ContactElementsZero || functionSpaceType_target==ContactElementsOne) {          if (functionSpaceType_target==ContactElementsZero || functionSpaceType_target==ContactElementsOne) {
1708             return true;             return true;
1709            } else if (functionSpaceType_target==ReducedContactElementsZero || functionSpaceType_target==ReducedContactElementsOne) {
1710               return true;
1711          } else {          } else {
1712             return false;             return false;
1713          }          }
# Line 1275  int* MeshAdapter::borrowSampleReferenceI Line 1821  int* MeshAdapter::borrowSampleReferenceI
1821    Finley_Mesh* mesh=m_finleyMesh.get();    Finley_Mesh* mesh=m_finleyMesh.get();
1822    switch (functionSpaceType) {    switch (functionSpaceType) {
1823      case(Nodes):      case(Nodes):
1824        if (mesh->Nodes!=NULL) {        out=mesh->Nodes->Id;
1825          out=mesh->Nodes->Id;        break;
         break;  
       }  
1826      case(ReducedNodes):      case(ReducedNodes):
1827        throw FinleyAdapterException("Error -  ReducedNodes not supported yet.");        out=mesh->Nodes->reducedNodesId;
1828        break;        break;
1829      case(Elements):      case(Elements):
1830        out=mesh->Elements->Id;        out=mesh->Elements->Id;
# Line 1310  int* MeshAdapter::borrowSampleReferenceI Line 1854  int* MeshAdapter::borrowSampleReferenceI
1854        out=mesh->ContactElements->Id;        out=mesh->ContactElements->Id;
1855        break;        break;
1856      case(DegreesOfFreedom):      case(DegreesOfFreedom):
1857        out=mesh->Nodes->degreeOfFreedomId;        out=mesh->Nodes->degreesOfFreedomId;
1858        break;        break;
1859      case(ReducedDegreesOfFreedom):      case(ReducedDegreesOfFreedom):
1860        out=mesh->Nodes->reducedDegreeOfFreedomId;        out=mesh->Nodes->reducedDegreesOfFreedomId;
1861        break;        break;
1862      default:      default:
1863        stringstream temp;        stringstream temp;

Legend:
Removed from v.1080  
changed lines
  Added in v.1366

  ViewVC Help
Powered by ViewVC 1.1.26