Changeset 5420

Timestamp:

08/19/10 11:45:33 (15 years ago)

Author:

Mathieu Morlighem

Message:

Less restrictive in Load selection

Location:

issm/trunk/src/c/modules

Files:

• ConfigureObjectsx/ConfigureObjectsx.cpp (modified) (3 diffs)
• PenaltyConstraintsx/MeltingConstraints.cpp (modified) (2 diffs)
• PenaltyConstraintsx/MeltingIsPresent.cpp (modified) (2 diffs)
• PenaltyConstraintsx/RiftConstraints.cpp (modified) (11 diffs)
• PenaltySystemMatricesx/PenaltySystemMatricesx.cpp (modified) (3 diffs)
• SystemMatricesx/SystemMatricesx.cpp (modified) (3 diffs)

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

@@ -19 +19 @@
         Node* node=NULL;
         Material* material=NULL;
-        int analysis_type;
+        int configuration_type;
 
         /*Get analysis type: */
-        parameters->FindParam(&analysis_type,AnalysisTypeEnum);
+        parameters->FindParam(&configuration_type,ConfigurationTypeEnum);
         
         //_printf_("      Configuring elements...\n");
@@ -32 +32 @@
         for (i=0;i<loads->Size();i++){
                 load=(Load*)loads->GetObjectByOffset(i);
-                if (load->InAnalysis(analysis_type)){
+                if (load->InAnalysis(configuration_type)){
                         load->Configure(elements,loads,nodes,vertices,materials,parameters);
                 }
@@ -39 +39 @@
         for (i=0;i<nodes->Size();i++){
                 node=(Node*)nodes->GetObjectByOffset(i);
-                if(node->InAnalysis(analysis_type)){
+                if(node->InAnalysis(configuration_type)){
                         node->Configure(nodes,vertices);
                 }

issm/trunk/src/c/modules/PenaltyConstraintsx/MeltingConstraints.cpp

@@ -11 +11 @@
 #include "./PenaltyConstraintsLocal.h"
 
-void  MeltingConstraints(Loads* loads, int* pconverged, int* pnum_unstable_constraints,int analysis_type){
+void  MeltingConstraints(Loads* loads, int* pconverged, int* pnum_unstable_constraints,int configuration_type){
 
         int i;
@@ -26 +26 @@
                 Object* object=(Object*)loads->GetObjectByOffset(i);
                 Load* load=(Load*)object;
-                if(load->InAnalysis(analysis_type)){
+                if(load->InAnalysis(configuration_type)){
                         if(object->Enum()==PengridEnum){
 

issm/trunk/src/c/modules/PenaltyConstraintsx/MeltingIsPresent.cpp

@@ -11 +11 @@
 #include "./PenaltyConstraintsLocal.h"
 
-int MeltingIsPresent(Loads* loads,int analysis_type){
+int MeltingIsPresent(Loads* loads,int configuration_type){
 
         int i;
@@ -20 +20 @@
                 Object* object=(Object*)loads->GetObjectByOffset(i);
                 Load* load=(Load*)object;
-                if(load->InAnalysis(analysis_type)){
+                if(load->InAnalysis(configuration_type)){
                         if (object->Enum()==PengridEnum){
                                 found=1;

issm/trunk/src/c/modules/PenaltyConstraintsx/RiftConstraints.cpp

@@ -11 +11 @@
 
 /*current module: */
-/*RiftIsPresent(Loads* loads,int analysis_type){{{1*/
-int RiftIsPresent(Loads* loads,int analysis_type){
+/*RiftIsPresent(Loads* loads,int configuration_type){{{1*/
+int RiftIsPresent(Loads* loads,int configuration_type){
 
 
@@ -23 +23 @@
         for (i=0;i<loads->Size();i++){
                 Load* load=(Load*)loads->GetObjectByOffset(i);
-                if(load->InAnalysis(analysis_type)){
+                if(load->InAnalysis(configuration_type)){
                         if(RiftfrontEnum==loads->GetEnum(i)){
                                 found=1;
@@ -40 +40 @@
 }
 /*}}}*/
-/*RiftConstraints(int* pconverged, int* pnum_unstable_constraints,Loads* loads,int min_mechanical_constraints,int analysis_type){{{1*/
-void RiftConstraints(int* pconverged, int* pnum_unstable_constraints,Loads* loads,int min_mechanical_constraints,int analysis_type){
+/*RiftConstraints(int* pconverged, int* pnum_unstable_constraints,Loads* loads,int min_mechanical_constraints,int configuration_type){{{1*/
+void RiftConstraints(int* pconverged, int* pnum_unstable_constraints,Loads* loads,int min_mechanical_constraints,int configuration_type){
 
         int num_unstable_constraints=0;
@@ -47 +47 @@
         int potential;
 
-        RiftConstrain(&num_unstable_constraints,loads,analysis_type);
+        RiftConstrain(&num_unstable_constraints,loads,configuration_type);
         if(num_unstable_constraints==0)converged=1;
         
-        if(RiftIsFrozen(loads,analysis_type)){
+        if(RiftIsFrozen(loads,configuration_type)){
                 converged=1;
                 num_unstable_constraints=0;
@@ -56 +56 @@
         else if(num_unstable_constraints<=min_mechanical_constraints){
                 _printf_("   freezing constraints\n");
-                RiftFreezeConstraints(loads,analysis_type);
+                RiftFreezeConstraints(loads,configuration_type);
         }
 
@@ -64 +64 @@
 }
 /*}}}*/
-/*RiftConstrain(int* pnum_unstable_constraints,Loads* loads,int analysis_type){{{1*/
-void RiftConstrain(int* pnum_unstable_constraints,Loads* loads,int analysis_type){
+/*RiftConstrain(int* pnum_unstable_constraints,Loads* loads,int configuration_type){{{1*/
+void RiftConstrain(int* pnum_unstable_constraints,Loads* loads,int configuration_type){
 
         int                     i;
@@ -83 +83 @@
 
                         load=(Load*)loads->GetObjectByOffset(i);
-                        if(load->InAnalysis(analysis_type)){
+                        if(load->InAnalysis(configuration_type)){
 
                                 riftfront=(Riftfront*)load;
@@ -105 +105 @@
 }
 /*}}}*/
-/*RiftIsFrozen(Loads* loads,int analysis_type){{{1*/
-int RiftIsFrozen(Loads* loads,int analysis_type){
+/*RiftIsFrozen(Loads* loads,int configuration_type){{{1*/
+int RiftIsFrozen(Loads* loads,int configuration_type){
 
         int                     i;
@@ -122 +122 @@
                         
                         load=(Load*)loads->GetObjectByOffset(i);
-                        if(load->InAnalysis(analysis_type)){
+                        if(load->InAnalysis(configuration_type)){
 
                                 riftfront=(Riftfront*)load;
@@ -143 +143 @@
 }
 /*}}}*/
-/*RiftFreezeConstraints(Loads* loads,int analysis_type){{{1*/
-void RiftFreezeConstraints(Loads* loads,int analysis_type){
+/*RiftFreezeConstraints(Loads* loads,int configuration_type){{{1*/
+void RiftFreezeConstraints(Loads* loads,int configuration_type){
 
         int                     i;
@@ -158 +158 @@
 
                         load=(Load*)loads->GetObjectByOffset(i);
-                        if(load->InAnalysis(analysis_type)){
+                        if(load->InAnalysis(configuration_type)){
                                 
                                 riftfront=(Riftfront*)load;

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

@@ -16 +16 @@
         Load* load=NULL;
         
-        int analysis_type;
+        int configuration_type;
 
         /*retrive parameters: */
-        parameters->FindParam(&analysis_type,AnalysisTypeEnum);
+        parameters->FindParam(&configuration_type,ConfigurationTypeEnum);
 
         /*Now, figure out maximum value of K_gg, so that we can penalize it correctly: */
@@ -30 +30 @@
                 for (i=0;i<loads->Size();i++){
                         load=(Load*)loads->GetObjectByOffset(i);
-                        if (load->InAnalysis(analysis_type)) load->PenaltyCreateKMatrix(Kgg,kmax);
+                        if (load->InAnalysis(configuration_type)) load->PenaltyCreateKMatrix(Kgg,kmax);
                 }
 
@@ -45 +45 @@
                 for (i=0;i<loads->Size();i++){
                         load=(Load*)loads->GetObjectByOffset(i);
-                        if (load->InAnalysis(analysis_type)) load->PenaltyCreatePVector(pg,kmax);
+                        if (load->InAnalysis(configuration_type)) load->PenaltyCreatePVector(pg,kmax);
                 }
 

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

@@ -38 +38 @@
 
         /*Get numberofdofspernode: */
-        numberofdofspernode=nodes->MaxNumDofs(analysis_type);
+        numberofdofspernode=nodes->MaxNumDofs(configuration_type);
 
         /*Compute stiffness matrix*/
@@ -52 +52 @@
                 }
 
-                /*Fill stiffness matrix from loads if loads have the current analysis_type: */
+                /*Fill stiffness matrix from loads if loads have the current configuration_type: */
                 for (i=0;i<loads->Size();i++){
                         load=(Load*)loads->GetObjectByOffset(i);
-                        if (load->InAnalysis(analysis_type)) load->CreateKMatrix(Kgg);
+                        if (load->InAnalysis(configuration_type)) load->CreateKMatrix(Kgg);
                 }
 
@@ -76 +76 @@
                 }
 
-                /*Fill right hand side from loads if loads have the current analysis_type: */
+                /*Fill right hand side from loads if loads have the current configuration_type: */
                 for (i=0;i<loads->Size();i++){
                         load=(Load*)loads->GetObjectByOffset(i);
-                        if (load->InAnalysis(analysis_type)) load->CreatePVector(pg);
+                        if (load->InAnalysis(configuration_type)) load->CreatePVector(pg);
                 }