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

Diff of /trunk/finley/src/CPPAdapter/MeshAdapter.cpp

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

revision 146 by jgs, Fri Jul 8 04:08:13 2005 UTC revision 147 by jgs, Fri Aug 12 01:45:47 2005 UTC
# Line 409  void MeshAdapter::addPDEToSystem( Line 409  void MeshAdapter::addPDEToSystem(
409                                    &(d.getDataC()),&(y.getDataC()),                                    &(d.getDataC()),&(y.getDataC()),
410                                    Finley_Assemble_handelShapeMissMatch_Mean_out);                                    Finley_Assemble_handelShapeMissMatch_Mean_out);
411     checkFinleyError();     checkFinleyError();
412     Finley_Assemble_RobinCondition(mesh->Nodes,mesh->FaceElements,     Finley_Assemble_RobinCondition(mesh->Nodes,mesh->ContactElements,
413                    mat.getFinley_SystemMatrix(),                    mat.getFinley_SystemMatrix(),
414                    &(rhs.getDataC()),                    &(rhs.getDataC()),
415                                    &(d_contact.getDataC()),                                    &(d_contact.getDataC()),
# Line 424  void MeshAdapter::addPDEToRHS( Data& rhs Line 424  void MeshAdapter::addPDEToRHS( Data& rhs
424                       const  Data& X,const  Data& Y, const Data& y, const Data& y_contact) const                       const  Data& X,const  Data& Y, const Data& y, const Data& y_contact) const
425  {  {
426     Finley_Mesh* mesh=m_finleyMesh.get();     Finley_Mesh* mesh=m_finleyMesh.get();
427     Finley_Assemble_PDE(mesh->Nodes,mesh->Elements,0,&(rhs.getDataC()),0,0,0,0,&(X.getDataC()),&(Y.getDataC()));  
428       // Finley_Assemble_PDE_RHS(mesh->Nodes,mesh->Elements,&(rhs.getDataC()),&(X.getDataC()),&(Y.getDataC()));
429       Finley_Assemble_PDE(mesh->Nodes,mesh->Elements,0,&(rhs.getDataC()),0,0,0,0,&(X.getDataC()),&(Y.getDataC()));
430     checkFinleyError();     checkFinleyError();
431     Finley_Assemble_RobinCondition(mesh->Nodes,mesh->FaceElements,0,&(rhs.getDataC()),0,&(y.getDataC()),  
432                                    Finley_Assemble_handelShapeMissMatch_Mean_out);     // Finley_Assemble_RobinCondition_RHS(mesh->Nodes,mesh->FaceElements,&(rhs.getDataC()),&(y.getDataC()),Finley_Assemble_handelShapeMissMatch_Mean_out);
433  // cout << "Calling :addPDEToRHS." << endl;     Finley_Assemble_RobinCondition(mesh->Nodes,mesh->FaceElements,0,&(rhs.getDataC()),0,&(y.getDataC()),Finley_Assemble_handelShapeMissMatch_Mean_out);
434    
435     checkFinleyError();     checkFinleyError();
436     Finley_Assemble_RobinCondition(mesh->Nodes,mesh->FaceElements,0,&(rhs.getDataC()),0,&(y_contact.getDataC()),     Finley_Assemble_RobinCondition(mesh->Nodes,mesh->ContactElements,0,&(rhs.getDataC()),0,&(y_contact.getDataC()),Finley_Assemble_handelShapeMissMatch_Step_out);
437                                    Finley_Assemble_handelShapeMissMatch_Step_out);     // Finley_Assemble_RobinCondition_RHS(mesh->Nodes,mesh->ContactElements,&(rhs.getDataC()),&(y_contact.getDataC()),Finley_Assemble_handelShapeMissMatch_Step_out);
 // cout << "Calling :addPDEToRHS." << endl;  
438     checkFinleyError();     checkFinleyError();
439  }  }
440  //  //
# Line 541  void MeshAdapter::interpolateOnDomain(Da Line 543  void MeshAdapter::interpolateOnDomain(Da
543       case(ReducedDegreesOfFreedom):       case(ReducedDegreesOfFreedom):
544         switch(target.getFunctionSpace().getTypeCode()) {         switch(target.getFunctionSpace().getTypeCode()) {
545            case(ReducedDegreesOfFreedom):            case(ReducedDegreesOfFreedom):
           case(Nodes):  
546               Finley_Assemble_CopyNodalData(mesh->Nodes,&(target.getDataC()),&(in.getDataC()));               Finley_Assemble_CopyNodalData(mesh->Nodes,&(target.getDataC()),&(in.getDataC()));
547               break;               break;
548            case(Elements):            case(Elements):
# Line 557  void MeshAdapter::interpolateOnDomain(Da Line 558  void MeshAdapter::interpolateOnDomain(Da
558            case(ContactElementsOne):            case(ContactElementsOne):
559               Finley_Assemble_interpolate(mesh->Nodes,mesh->ContactElements,&(in.getDataC()),&(target.getDataC()));               Finley_Assemble_interpolate(mesh->Nodes,mesh->ContactElements,&(in.getDataC()),&(target.getDataC()));
560               break;               break;
561              case(Nodes):
562                 Finley_ErrorCode=TYPE_ERROR;
563                 sprintf(Finley_ErrorMsg,"Finley does not support interpolation from reduced degrees of freedom to mesh nodes.");
564                 break;
565            case(DegreesOfFreedom):            case(DegreesOfFreedom):
566               Finley_ErrorCode=TYPE_ERROR;               Finley_ErrorCode=TYPE_ERROR;
567               sprintf(Finley_ErrorMsg,"Finley does not support interpolation from reduced degrees of freedom to degrees of freedom");               sprintf(Finley_ErrorMsg,"Finley does not support interpolation from reduced degrees of freedom to degrees of freedom");
# Line 942  bool MeshAdapter::probeInterpolationOnDo Line 947  bool MeshAdapter::probeInterpolationOnDo
947       case(ReducedDegreesOfFreedom):       case(ReducedDegreesOfFreedom):
948         switch(functionSpaceType_target) {         switch(functionSpaceType_target) {
949            case(ReducedDegreesOfFreedom):            case(ReducedDegreesOfFreedom):
           case(Nodes):  
950            case(Elements):            case(Elements):
951            case(FaceElements):            case(FaceElements):
952            case(Points):            case(Points):
953            case(ContactElementsZero):            case(ContactElementsZero):
954            case(ContactElementsOne):            case(ContactElementsOne):
955                return true;                return true;
956              case(Nodes):
957            case(DegreesOfFreedom):            case(DegreesOfFreedom):
958               return false;               return false;
959            default:            default:

Legend:
Removed from v.146  
changed lines
  Added in v.147

  ViewVC Help
Powered by ViewVC 1.1.26