Changeset 5782

Timestamp:

09/13/10 15:22:01 (15 years ago)

Author:

Eric.Larour

Message:

Fixed bug with kmax that could be undefined. Other bug where pg could be NULL

File:

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

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

@@ -42 +42 @@
         fsize=nodes->NumberOfDofs(configuration_type,FsetEnum);
         ssize=nodes->NumberOfDofs(configuration_type,SsetEnum);
+
         numberofdofspernode=nodes->MaxNumDofs(configuration_type,GsetEnum);
 
         /*Checks in debugging mode {{{1*/
-        ISSMASSERT(*pKgg==NULL);
-        ISSMASSERT(*ppg==NULL);
         if(penalty_kflag)ISSMASSERT(kflag);
         if(penalty_pflag)ISSMASSERT(pflag);
@@ -90 +89 @@
         if(pflag){
 
-                pg=NewVec(gsize);
+                if(!buildkff)pg=NewVec(gsize);
+                else         pf=NewVec(fsize);
 
                 /*Fill right hand side vector, from elements: */
@@ -114 +114 @@
         }
 
-        
+        /*Now, figure out maximum value of K_gg, so that we can penalize it correctly: */
+        if(!buildkff)MatNorm(Kgg,NORM_INFINITY,&kmax);
+        else MatNorm(Kff,NORM_INFINITY,&kmax);
+
         /*Now, deal with penalties*/
         if(penalty_kflag){
-
-                /*Now, figure out maximum value of K_gg, so that we can penalize it correctly: */
-                if(!buildkff)MatNorm(Kgg,NORM_INFINITY,&kmax);
-                else MatNorm(Kff,NORM_INFINITY,&kmax);
 
                 /*Fill stiffness matrix from loads: */