Changeset 3632 for issm/trunk/src/c/objects/Penpair.cpp

Timestamp:

04/27/10 16:44:21 (15 years ago)

Author:

Eric.Larour

Message:

Temporary

File:

• issm/trunk/src/c/objects/Penpair.cpp (modified) (5 diffs)

issm/trunk/src/c/objects/Penpair.cpp

@@ -55 +55 @@
 /*Object marshall*/
 /*FUNCTION Penpair::Configure {{{1*/
-
-void  Penpair::Configure(void* pelementsin,void* pnodesin,void* pmaterialsin){
-
-        DataSet* nodesin=NULL;
-
-        /*Recover pointers :*/
-        nodesin=(DataSet*)pnodesin;
+void  Penpair::Configure(DataSet* elementsin,DataSet* loadsin,DataSet* nodesin,DataSet* verticesin,DataSet* materialsin,Parameters* parametersin){
 
         /*Take care of hooking up all objects for this element, ie links the objects in the hooks to their respective 
@@ -151 +145 @@
 }
 /*}}}1*/
-/*FUNCTION Penpair::UpdateFromInputs {{{1*/
-void  Penpair::UpdateFromInputs(void* inputs){
-        
-}
-/*}}}1*/
 
 /*Object functions*/
 /*FUNCTION Penpair::CreateKMatrix {{{1*/
 
-void  Penpair::CreateKMatrix(Mat Kgg,void* inputs,int analysis_type,int sub_analysis_type){
+void  Penpair::CreateKMatrix(Mat Kgg,int analysis_type,int sub_analysis_type){
 
         /*No loads applied, do nothing: */
@@ -168 +157 @@
 /*}}}1*/
 /*FUNCTION Penpair::CreatePVector {{{1*/
-void  Penpair::CreatePVector(Vec pg, void* inputs, int analysis_type,int sub_analysis_type){
+void  Penpair::CreatePVector(Vec pg, int analysis_type,int sub_analysis_type){
 
         /*No loads applied, do nothing: */
@@ -196 +185 @@
 /*}}}1*/
 /*FUNCTION Penpair::PenaltyCreateKMatrix {{{1*/
-void  Penpair::PenaltyCreateKMatrix(Mat Kgg,void* inputs,double kmax,int analysis_type,int sub_analysis_type){
+void  Penpair::PenaltyCreateKMatrix(Mat Kgg,double kmax,int analysis_type,int sub_analysis_type){
         
         /*If you code this piece, don't forget that a penalty will be inactive if it is dealing with clone nodes*/
@@ -204 +193 @@
 /*}}}1*/
 /*FUNCTION Penpair::PenaltyCreatePVector {{{1*/
-void  Penpair::PenaltyCreatePVector(Vec pg,void* inputs,double kmax,int analysis_type,int sub_analysis_type){
+void  Penpair::PenaltyCreatePVector(Vec pg,double kmax,int analysis_type,int sub_analysis_type){
         /*No loads applied, do nothing: */
         return;