Changeset 23207

Timestamp:

08/31/18 14:37:15 (7 years ago)

Author:

wester

Message:

CHG: Combined 2D & 3D case for MassMatrix & SchurPrecond into one

File:

• issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp

@@ -3272 +3272 @@
                 element->NodalFunctionsPressure(pbasis,gauss);
 
-                if(dim==3){
+                if(dim==3 || dim==2){
                         /*Pressure mass matrix*/
                         for(int k=0;k<pnumnodes;k++){
                                 for(int j=0;j<pnumnodes;j++){
-                                        Ke->values[(3*vnumnodes+k)*numdof+3*vnumnodes+j] += gauss->weight*Jdet*(pbasis[j]*pbasis[k]);
+                                        Ke->values[(dim*vnumnodes+k)*numdof+dim*vnumnodes+j] += gauss->weight*Jdet*(pbasis[j]*pbasis[k]);
                                 }
                         }
-                }else if(dim==2){
-                        /*Pressure mass matrix*/
-                        for(int k=0;k<pnumnodes;k++){
-                                for(int j=0;j<pnumnodes;j++){
-                                        Ke->values[(2*vnumnodes+k)*numdof+2*vnumnodes+j] += gauss->weight*Jdet*(pbasis[j]*pbasis[k]);
-                                }
-                        }
-                }
-                else{
+                }else{
                         _error_("STOP");
                 }
@@ -3336 +3328 @@
 
 
-                if(dim==3){
+                if(dim==3 || dim==2){
                         /*Pressure mass matrix*/
                         for(int k=0;k<pnumnodes;k++){
                                 for(int j=0;j<pnumnodes;j++){
-                                        Ke->values[(3*vnumnodes+k)*numdof+3*vnumnodes+j] += gauss->weight*1./viscosity*Jdet*(pbasis[j]*pbasis[k]);
+                                        Ke->values[(dim*vnumnodes+k)*numdof+dim*vnumnodes+j] += gauss->weight*1./viscosity*Jdet*(pbasis[j]*pbasis[k]);
                                 }
                         }
-                }else if(dim==2){
-                        /*Pressure mass matrix*/
-                        for(int k=0;k<pnumnodes;k++){
-                                for(int j=0;j<pnumnodes;j++){
-                                        Ke->values[(2*vnumnodes+k)*numdof+2*vnumnodes+j] += gauss->weight*1./viscosity*Jdet*(pbasis[j]*pbasis[k]);
-                                }
-                        }
-                }
-                else{
+                }else{
                         _error_("STOP");
                 }