Changeset 3879

Timestamp:

05/21/10 12:56:28 (15 years ago)

Author:

Eric.Larour

Message:

No need for so many arguments to SystemMatrices

Location:

issm/trunk/src

Files:

• c/SystemMatricesx/SystemMatricesx.cpp (modified) (3 diffs)
• c/SystemMatricesx/SystemMatricesx.h (modified) (1 diff)
• c/parallel/diagnostic_core_linear.cpp (modified) (3 diffs)
• c/parallel/diagnostic_core_nonlinear.cpp (modified) (4 diffs)
• c/parallel/thermal_core_nonlinear.cpp (modified) (4 diffs)
• mex/SystemMatrices/SystemMatrices.cpp (modified) (3 diffs)

issm/trunk/src/c/SystemMatricesx/SystemMatricesx.cpp

@@ -11 +11 @@
 
 void SystemMatricesx(Mat* pKgg, Vec* ppg,DataSet* elements,DataSet* nodes, DataSet* vertices,DataSet* loads,DataSet* materials, Parameters* parameters,
-                int kflag,int pflag,int connectivity,int numberofdofspernode,int analysis_type,int sub_analysis_type){
+                int kflag,int pflag,int analysis_type,int sub_analysis_type){
         
         extern int num_procs;
@@ -18 +18 @@
         /*intermediary: */
         int gsize;
-
+        int connectivity;
+        int numberofdofspernode;
+        
         /*output: */
         Mat Kgg=NULL;
@@ -28 +30 @@
         loads->Configure(elements, loads, nodes,vertices, materials,parameters);
         parameters->Configure(elements,loads, nodes,vertices, materials,parameters);
+
+        /*Recover parameters: */
+        parameters->FindParam(&connectivity,ConnectivityEnum);
+        parameters->FindParam(&numberofdofspernode,NumberOfDofsPerNodeEnum);
 
         /*Get size of matrix: */

issm/trunk/src/c/SystemMatricesx/SystemMatricesx.h

@@ -11 +11 @@
 /* local prototypes: */
 void SystemMatricesx(Mat* pKgg, Vec* ppg,DataSet* elements,DataSet* nodes, DataSet* vertices,DataSet* loads,DataSet* materials, Parameters* parameters,
-                int kflag,int pflag,int connectivity,int numberofdofspernode,int analysis_type,int sub_analysis_type); 
+                int kflag,int pflag,int analysis_type,int sub_analysis_type); 
 
 #endif  /* _SYSTEMMATRICESX_H */

issm/trunk/src/c/parallel/diagnostic_core_linear.cpp

@@ -11 +11 @@
 
         /*parameters:*/
-        int kflag,pflag,connectivity,numberofdofspernode;
+        int kflag,pflag;
         int verbose=0;
         char* solver_string=NULL;
@@ -28 +28 @@
         /*Recover parameters: */
         kflag=1; pflag=1;
-        fem->parameters->FindParam(&connectivity,ConnectivityEnum);
-        fem->parameters->FindParam(&numberofdofspernode,NumberOfDofsPerNodeEnum);
         fem->parameters->FindParam(&verbose,VerboseEnum);
         fem->parameters->FindParam(&solver_string,SolverStringEnum);
@@ -35 +33 @@
         //*Generate system matrices
         if (verbose) _printf_("   Generating matrices\n");
-        SystemMatricesx(&Kgg, &pg,fem->elements,fem->nodes,fem->vertices,fem->loads,fem->materials,fem->parameters,kflag,pflag,connectivity,numberofdofspernode,analysis_type,sub_analysis_type); 
+        SystemMatricesx(&Kgg, &pg,fem->elements,fem->nodes,fem->vertices,fem->loads,fem->materials,fem->parameters,kflag,pflag,analysis_type,sub_analysis_type); 
 
         if (verbose) _printf_("   Generating penalty matrices\n");

issm/trunk/src/c/parallel/diagnostic_core_nonlinear.cpp

@@ -34 +34 @@
 
         /*parameters:*/
-        int kflag,pflag,connectivity,numberofdofspernode;
+        int kflag,pflag;
         char* solver_string=NULL;
         int verbose=0;
@@ -40 +40 @@
         /*Recover parameters: */
         kflag=1; pflag=1;
-        fem->FindParam(&connectivity,ConnectivityEnum);
-        fem->FindParam(&numberofdofspernode,NumberOfDofsPerNodeEnum);
         fem->FindParam(&numberofnodes,NumberOfNodesEnum);
         fem->FindParam(&solver_string,SolverStringEnum);
@@ -71 +69 @@
                 if (verbose) _printf_("   Generating matrices\n");
                 //*Generate system matrices
-                SystemMatricesx(&Kgg, &pg,fem->elements,fem->nodes,fem->vertices,loads,fem->materials,fem->parameters,kflag,pflag,connectivity,numberofdofspernode,analysis_type,sub_analysis_type); 
+                SystemMatricesx(&Kgg, &pg,fem->elements,fem->nodes,fem->vertices,loads,fem->materials,fem->parameters,kflag,pflag,analysis_type,sub_analysis_type); 
 
                 if (verbose) _printf_("   Generating penalty matrices\n");
@@ -138 +136 @@
                 kflag=1; pflag=0; //stiffness generation only
         
-                SystemMatricesx(&Kgg, &pg,fem->elements,fem->nodes,fem->vertices,loads,fem->materials,fem->parameters,kflag,pflag,connectivity,numberofdofspernode,analysis_type,sub_analysis_type); 
+                SystemMatricesx(&Kgg, &pg,fem->elements,fem->nodes,fem->vertices,loads,fem->materials,fem->parameters,kflag,pflag,analysis_type,sub_analysis_type); 
                 Reducematrixfromgtofx(&Kff,&Kfs,Kgg,fem->Gmn,fem->nodesets);
                 MatFree(&Kgg);VecFree(&pg);

issm/trunk/src/c/parallel/thermal_core_nonlinear.cpp

@@ -34 +34 @@
 
         /*parameters:*/
-        int kflag,pflag,connectivity,numberofdofspernode;
+        int kflag,pflag;
         char* solver_string=NULL;
         int verbose=0;
@@ -42 +42 @@
         kflag=1; pflag=1;
 
-        fem->parameters->FindParam(&connectivity,ConnectivityEnum);
-        fem->parameters->FindParam(&numberofdofspernode,NumberOfDofsPerNodeEnum);
         fem->parameters->FindParam(&numberofnodes,NumberOfNodesEnum);
         fem->parameters->FindParam(&solver_string,SolverStringEnum);
@@ -65 +63 @@
                         /*Compute Kgg_nopenalty and pg_nopenalty once for all: */
                         if (count==1){
-                                SystemMatricesx(&Kgg_nopenalty, &pg_nopenalty,fem->elements,fem->nodes,fem->vertices,fem->loads,fem->materials,fem->parameters,kflag,pflag,connectivity,numberofdofspernode,analysis_type,sub_analysis_type); 
+                                SystemMatricesx(&Kgg_nopenalty, &pg_nopenalty,fem->elements,fem->nodes,fem->vertices,fem->loads,fem->materials,fem->parameters,kflag,pflag,analysis_type,sub_analysis_type); 
                         }
 
@@ -76 +74 @@
                 }
                 else{
-                        SystemMatricesx(&Kgg, &pg,fem->elements,fem->nodes,fem->vertices,fem->loads,fem->materials,fem->parameters,kflag,pflag,connectivity,numberofdofspernode,analysis_type,sub_analysis_type); 
+                        SystemMatricesx(&Kgg, &pg,fem->elements,fem->nodes,fem->vertices,fem->loads,fem->materials,fem->parameters,kflag,pflag,analysis_type,sub_analysis_type); 
                         //apply penalties
                         PenaltySystemMatricesx(Kgg, pg,&melting_offset,fem->elements,fem->nodes,fem->vertices,fem->loads,fem->materials,fem->parameters,kflag,pflag,analysis_type,sub_analysis_type); 

issm/trunk/src/mex/SystemMatrices/SystemMatrices.cpp

@@ -18 +18 @@
         Parameters* parameters=NULL;
         int         kflag,pflag;
-        int         connectivity;
-        int         numberofdofspernode;
         int         analysis_type;
         int         sub_analysis_type;
@@ -42 +40 @@
 
         /*parameters: */
-        parameters->FindParam(&connectivity,ConnectivityEnum);
-        parameters->FindParam(&numberofdofspernode,NumberOfDofsPerNodeEnum);
         parameters->FindParam(&kflag,KflagEnum);
         parameters->FindParam(&pflag,PflagEnum);
@@ -51 +47 @@
 
         /*!Generate internal degree of freedom numbers: */
-        SystemMatricesx(&Kgg, &pg,elements,nodes,vertices,loads,materials,parameters,kflag,pflag,connectivity,numberofdofspernode,analysis_type,sub_analysis_type); 
+        SystemMatricesx(&Kgg, &pg,elements,nodes,vertices,loads,materials,parameters,kflag,pflag,analysis_type,sub_analysis_type); 
 
         /*write output datasets: */