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/Icefront.h

    r11527 r11995  
    7474                void  Configure(Elements* elements,Loads* loads,Nodes* nodes,Vertices* vertices,Materials* materials,Parameters* parameters);
    7575                void  SetCurrentConfiguration(Elements* elements,Loads* loads,Nodes* nodes,Vertices* vertices,Materials* materials,Parameters* parameters);
    76                 void  CreateKMatrix(Mat Kff, Mat Kfs);
    77                 void  CreatePVector(Vec pf);
    78                 void  CreateJacobianMatrix(Mat Jff);
    79                 void  PenaltyCreateKMatrix(Mat Kff, Mat kfs, double kmax);
    80                 void  PenaltyCreatePVector(Vec pf, double kmax);
    81                 void  PenaltyCreateJacobianMatrix(Mat Jff,double kmax);
     76                void  CreateKMatrix(Matrix* Kff, Matrix* Kfs);
     77                void  CreatePVector(Vector* pf);
     78                void  CreateJacobianMatrix(Matrix* Jff);
     79                void  PenaltyCreateKMatrix(Matrix* Kff, Matrix* kfs, double kmax);
     80                void  PenaltyCreatePVector(Vector* pf, double kmax);
     81                void  PenaltyCreateJacobianMatrix(Matrix* Jff,double kmax);
    8282                bool  InAnalysis(int analysis_type);
    8383                /*}}}*/
    … …  
    9393                ElementVector* CreatePVectorDiagnosticMacAyeal2d(void);
    9494                #endif
    95         #ifdef _HAVE_THREED_
     95        #ifdef _HAVE_3D_
    9696                ElementVector* CreatePVectorDiagnosticMacAyeal3d(void);
    9797                ElementVector* CreatePVectorDiagnosticPattyn(void);
Note: See TracChangeset for help on using the changeset viewer.