Changeset 4272

Timestamp:

06/28/10 14:09:19 (15 years ago)

Author:

seroussi

Message:

create stiffness matrix and load vector only for current analysis type

Location:

issm/trunk/src/c/modules

Files:

• PenaltySystemMatricesx/PenaltySystemMatricesx.cpp (modified) (4 diffs)
• SystemMatricesx/SystemMatricesx.cpp (modified) (2 diffs)

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

@@ -16 +16 @@
         Load* load=NULL;
         
+        int analysis_type;
+
         /*First, get elements and loads configured: */
         elements->  Configure(elements,loads, nodes,vertices, materials,parameters);
@@ -21 +23 @@
         loads->     Configure(elements, loads, nodes,vertices, materials,parameters);
         parameters->Configure(elements,loads, nodes,vertices, materials,parameters);
+
+        /*retrive parameters: */
+        parameters->FindParam(&analysis_type,AnalysisTypeEnum);
 
         /*Now, figure out maximum value of K_gg, so that we can penalize it correctly: */
@@ -31 +36 @@
                 for (i=0;i<loads->Size();i++){
                         load=(Load*)loads->GetObjectByOffset(i);
-                        load->PenaltyCreateKMatrix(Kgg,kmax);
+                        if (load->InAnalysis(analysis_type)) load->PenaltyCreateKMatrix(Kgg,kmax);
                 }
 
@@ -46 +51 @@
                 for (i=0;i<loads->Size();i++){
                         load=(Load*)loads->GetObjectByOffset(i);
-                        load->PenaltyCreatePVector(pg,kmax);
+                        if (load->InAnalysis(analysis_type)) load->PenaltyCreatePVector(pg,kmax);
                 }
 

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

@@ -54 +54 @@
                 }
 
-                /*Fill stiffness matrix from loads: */
+                /*Fill stiffness matrix from loads if loads have the current analysis_type: */
                 for (i=0;i<loads->Size();i++){
                         load=(Load*)loads->GetObjectByOffset(i);
-                        load->CreateKMatrix(Kgg);
+                        if (load->InAnalysis(analysis_type)) load->CreateKMatrix(Kgg);
                 }
 
@@ -78 +78 @@
                 }
 
-                /*Fill right hand side vector, from loads: */
+                /*Fill right hand side from loads if loads have the current analysis_type: */
                 for (i=0;i<loads->Size();i++){
                         load=(Load*)loads->GetObjectByOffset(i);
-                        load->CreatePVector(pg);
+                        if (load->InAnalysis(analysis_type)) load->CreatePVector(pg);
                 }