Changeset 12706 for issm/trunk/src/c/objects/Loads/Load.h

Timestamp:

07/24/12 10:36:19 (13 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 12703

File:

• issm/trunk/src/c/objects/Loads/Load.h (modified) (3 diffs)

issm/trunk/src/c/objects/Loads/Load.h

@@ -10 +10 @@
 
 /*Headers:*/
-/*{{{1*/
+/*{{{*/
 class Object;
 class Matrix;
@@ -26 +26 @@
                 virtual       ~Load(){};
                 
-                /*Virtual functions: {{{1*/
+                /*Virtual functions: {{{*/
                 virtual void  Configure(Elements* elements,Loads* loads,Nodes* nodes,Vertices* vertices,Materials* materials,Parameters* parameters)=0;
                 virtual void  SetCurrentConfiguration(Elements* elements,Loads* loads,Nodes* nodes,Vertices* vertices,Materials* materials,Parameters* parameters)=0;
@@ -32 +32 @@
                 virtual void  CreatePVector(Vector* pf)=0;
                 virtual void  CreateJacobianMatrix(Matrix* Jff)=0;
-                virtual void  PenaltyCreateJacobianMatrix(Matrix* Jff,double kmax)=0;
-                virtual void  PenaltyCreateKMatrix(Matrix* Kff, Matrix* Kfs, double kmax)=0;
-                virtual void  PenaltyCreatePVector(Vector* pf, double kmax)=0;
+                virtual void  PenaltyCreateJacobianMatrix(Matrix* Jff,IssmDouble kmax)=0;
+                virtual void  PenaltyCreateKMatrix(Matrix* Kff, Matrix* Kfs, IssmDouble kmax)=0;
+                virtual void  PenaltyCreatePVector(Vector* pf, IssmDouble kmax)=0;
                 virtual bool  InAnalysis(int analysis_type)=0;
                 /*}}}*/