Ignore:
Timestamp:
04/16/12 14:57:18 (13 years ago)
Author:
Mathieu Morlighem
Message:

merged trunk-jpl and trunk for revision 11994M

Location:
issm/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk

  • issm/trunk/src/c/objects/Loads/Numericalflux.h

    r11527 r11995  
    7070                void  Configure(Elements* elements,Loads* loads,Nodes* nodes,Vertices* vertices,Materials* materials,Parameters* parameters);
    7171                void  SetCurrentConfiguration(Elements* elements,Loads* loads,Nodes* nodes,Vertices* vertices,Materials* materials,Parameters* parameters);
    72                 void  CreateKMatrix(Mat Kff, Mat Kfs);
    73                 void  CreatePVector(Vec pf);
    74                 void  CreateJacobianMatrix(Mat Jff){_error_("Not implemented yet");};
    75                 void  PenaltyCreateJacobianMatrix(Mat Jff,double kmax){_error_("Not implemented yet");};
    76                 void  PenaltyCreateKMatrix(Mat Kff, Mat kfs, double kmax);
    77                 void  PenaltyCreatePVector(Vec pf, double kmax);
     72                void  CreateKMatrix(Matrix* Kff, Matrix* Kfs);
     73                void  CreatePVector(Vector* pf);
     74                void  CreateJacobianMatrix(Matrix* Jff){_error_("Not implemented yet");};
     75                void  PenaltyCreateJacobianMatrix(Matrix* Jff,double kmax){_error_("Not implemented yet");};
     76                void  PenaltyCreateKMatrix(Matrix* Kff, Matrix* kfs, double kmax);
     77                void  PenaltyCreatePVector(Vector* pf, double kmax);
    7878                bool  InAnalysis(int analysis_type);
    7979                /*}}}*/
Note: See TracChangeset for help on using the changeset viewer.