Changeset 12706 for issm/trunk/src/c/objects/Loads/Numericalflux.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/Numericalflux.h (modified) (3 diffs)

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

@@ -7 +7 @@
 
 /*Headers:*/
-/*{{{1*/
+/*{{{*/
 #include "./Load.h"
 class Hook;
@@ -35 +35 @@
 
 
-                /*Numericalflux constructors,destructors {{{1*/
+                /*Numericalflux constructors,destructors {{{*/
                 Numericalflux();
                 Numericalflux(int numericalflux_id,int i, IoModel* iomodel,int analysis_type);
                 ~Numericalflux();
                 /*}}}*/
-                /*Object virtual functions definitions:{{{1 */
+                /*Object virtual functions definitions:{{{ */
                 void  Echo();
                 void  DeepEcho();
@@ -48 +48 @@
                 Object* copy();
                 /*}}}*/
-                /*Update virtual functions resolution: {{{1*/
-                void    InputUpdateFromVector(double* vector, int name, int type){/*Do nothing*/}
-                void    InputUpdateFromVector(int* vector, int name, int type){_error_("Not implemented yet!");}
-                void    InputUpdateFromVector(bool* vector, int name, int type){_error_("Not implemented yet!");}
-                void    InputUpdateFromMatrixDakota(double* matrix, int nrows, int ncols, int name, int type){/*Do nothing*/}
-                void    InputUpdateFromVectorDakota(double* vector, int name, int type){/*Do nothing*/}
-                void    InputUpdateFromVectorDakota(int* vector, int name, int type){_error_("Not implemented yet!");}
-                void    InputUpdateFromVectorDakota(bool* vector, int name, int type){_error_("Not implemented yet!");}
-                void    InputUpdateFromConstant(double constant, int name){/*Do nothing*/};
+                /*Update virtual functions resolution: {{{*/
+                void    InputUpdateFromVector(IssmDouble* vector, int name, int type){/*Do nothing*/}
+                void    InputUpdateFromVector(int* vector, int name, int type){_error2_("Not implemented yet!");}
+                void    InputUpdateFromVector(bool* vector, int name, int type){_error2_("Not implemented yet!");}
+                void    InputUpdateFromMatrixDakota(IssmDouble* matrix, int nrows, int ncols, int name, int type){/*Do nothing*/}
+                void    InputUpdateFromVectorDakota(IssmDouble* vector, int name, int type){/*Do nothing*/}
+                void    InputUpdateFromVectorDakota(int* vector, int name, int type){_error2_("Not implemented yet!");}
+                void    InputUpdateFromVectorDakota(bool* vector, int name, int type){_error2_("Not implemented yet!");}
+                void    InputUpdateFromConstant(IssmDouble constant, int name){/*Do nothing*/};
                 void    InputUpdateFromConstant(int constant, int name){/*Do nothing*/};
-                void    InputUpdateFromConstant(bool constant, int name){_error_("Not implemented yet!");}
-                void    InputUpdateFromSolution(double* solution){_error_("Not implemented yet!");}
-                void  InputUpdateFromIoModel(int index, IoModel* iomodel){_error_("not implemented yet");};
+                void    InputUpdateFromConstant(bool constant, int name){_error2_("Not implemented yet!");}
+                void    InputUpdateFromSolution(IssmDouble* solution){_error2_("Not implemented yet!");}
+                void  InputUpdateFromIoModel(int index, IoModel* iomodel){_error2_("not implemented yet");};
                 /*}}}*/
-                /*Load virtual functions definitions: {{{1*/
+                /*Load virtual functions definitions: {{{*/
                 void  Configure(Elements* elements,Loads* loads,Nodes* nodes,Vertices* vertices,Materials* materials,Parameters* parameters);
                 void  SetCurrentConfiguration(Elements* elements,Loads* loads,Nodes* nodes,Vertices* vertices,Materials* materials,Parameters* parameters);
                 void  CreateKMatrix(Matrix* Kff, Matrix* Kfs);
                 void  CreatePVector(Vector* pf);
-                void  CreateJacobianMatrix(Matrix* Jff){_error_("Not implemented yet");};
-                void  PenaltyCreateJacobianMatrix(Matrix* Jff,double kmax){_error_("Not implemented yet");};
-                void  PenaltyCreateKMatrix(Matrix* Kff, Matrix* kfs, double kmax);
-                void  PenaltyCreatePVector(Vector* pf, double kmax);
+                void  CreateJacobianMatrix(Matrix* Jff){_error2_("Not implemented yet");};
+                void  PenaltyCreateJacobianMatrix(Matrix* Jff,IssmDouble kmax){_error2_("Not implemented yet");};
+                void  PenaltyCreateKMatrix(Matrix* Kff, Matrix* kfs, IssmDouble kmax);
+                void  PenaltyCreatePVector(Vector* pf, IssmDouble kmax);
                 bool  InAnalysis(int analysis_type);
                 /*}}}*/
-                /*Numericalflux management:{{{1*/
-                void  GetNormal(double* normal,double xyz_list[4][3]);
+                /*Numericalflux management:{{{*/
+                void  GetNormal(IssmDouble* normal,IssmDouble xyz_list[4][3]);
                 ElementMatrix* CreateKMatrixPrognostic(void);
                 ElementMatrix* CreateKMatrixPrognosticInternal(void);