Changeset 18570

Timestamp:

10/03/14 13:32:22 (10 years ago)

Author:

seroussi

Message:

CHG: simplifying the augmentation

File:

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

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

@@ -248 +248 @@
         iomodel->Constant(&fe_FS,FlowequationFeFSEnum);
         if(fe_FS==LATaylorHoodEnum || fe_FS==LACrouzeixRaviartEnum){
-                iomodel->FetchDataToInput(elements,PressureEnum,0.);
                 InputUpdateFromConstantx(elements,0.,SigmaNNEnum);
         }
@@ -3029 +3028 @@
         }
 
+        /*The pressure augmentation should not be transformed*/
+        MatrixMultiply(BtBUzawa,pnumdof,numdof,1,
+                                BtBUzawa,pnumdof,numdof,0,
+                                &Ke->values[0],1);
+
         if(element->IsOnBase() && 0){ 
                 element->FindParam(&rl,AugmentedLagrangianRlambdaEnum);
@@ -3069 +3073 @@
         /*Transform Coordinate System*/
         element->TransformStiffnessMatrixCoord(Ke,cs_list);
-
-        /*The pressure augmentation should not be transformed*/
-        MatrixMultiply(BtBUzawa,pnumdof,numdof,1,
-                                BtBUzawa,pnumdof,numdof,0,
-                                &Ke->values[0],1);
 
         /*Clean up and return*/
@@ -3445 +3444 @@
                 return pe3;
         }
-        else if(fe_FS==LATaylorHoodEnum){
-                ElementVector* pe2=CreatePVectorFSViscousLATH(element);
-                ElementVector* pe3 = new ElementVector(pe,pe2);
-                delete pe;
-                delete pe2;
-                return pe3;
-        }
-        else if(fe_FS==LACrouzeixRaviartEnum){
-                ElementVector* pe2=CreatePVectorFSViscousLACR(element);
+        else if(fe_FS==LATaylorHoodEnum || fe_FS==LACrouzeixRaviartEnum){
+                ElementVector* pe2=CreatePVectorFSViscousLA(element);
                 ElementVector* pe3 = new ElementVector(pe,pe2);
                 delete pe;
@@ -3775 +3767 @@
 
         int         i,dim;
-        IssmDouble  Jdet,r,pressure;
+        IssmDouble  Jdet,pressure;
         IssmDouble  bed_normal[3];
         IssmDouble *xyz_list      = NULL;
@@ -3797 +3789 @@
 
         /*Retrieve all inputs and parameters*/
-        element->FindParam(&r,AugmentedLagrangianREnum);
         element->GetVerticesCoordinates(&xyz_list);
 
@@ -3846 +3837 @@
 
         /*Transform coordinate system*/
-        //element->TransformLoadVectorCoord(pe,cs_list); Do not transform augmentation
+        element->TransformLoadVectorCoord(pe,cs_list);
 
         /*Clean up and return*/