Changeset 4043 for issm/trunk/src/c/modules/PenaltySystemMatricesx/PenaltySystemMatricesx.cpp

Timestamp:

06/14/10 18:08:59 (15 years ago)

Author:

Eric.Larour

Message:

Changing to new framework where analysis_type and sub_analysis_type are picked up in the parameters, whenever needed.
This greatly simplifies the API of the code -> don't have to carry along analysis_type and sub_analysis_type.

File:

• issm/trunk/src/c/modules/PenaltySystemMatricesx/PenaltySystemMatricesx.cpp (modified) (3 diffs)

issm/trunk/src/c/modules/PenaltySystemMatricesx/PenaltySystemMatricesx.cpp

@@ -10 +10 @@
 #include "../../EnumDefinitions/EnumDefinitions.h"
 
-void PenaltySystemMatricesx(Mat Kgg, Vec pg,double* pkmax,DataSet* elements,DataSet* nodes, DataSet* vertices,DataSet* loads,DataSet* materials, Parameters* parameters,
-                int kflag,int pflag,int analysis_type,int sub_analysis_type){
+void PenaltySystemMatricesx(Mat Kgg, Vec pg,double* pkmax,DataSet* elements,DataSet* nodes, DataSet* vertices,DataSet* loads,DataSet* materials, Parameters* parameters, int kflag,int pflag){
         
         int i;
@@ -32 +31 @@
                 for (i=0;i<loads->Size();i++){
                         load=(Load*)loads->GetObjectByOffset(i);
-                        load->PenaltyCreateKMatrix(Kgg,kmax,analysis_type,sub_analysis_type);
+                        load->PenaltyCreateKMatrix(Kgg,kmax);
                 }
 
@@ -47 +46 @@
                 for (i=0;i<loads->Size();i++){
                         load=(Load*)loads->GetObjectByOffset(i);
-                        load->PenaltyCreatePVector(pg,kmax,analysis_type,sub_analysis_type);
+                        load->PenaltyCreatePVector(pg,kmax);
                 }