Changeset 6934

Timestamp:

01/05/11 08:31:12 (14 years ago)

Author:

seroussi

Message:

fixed vertical in MacAyealStokes coupling

Location:

issm/trunk/src/c/objects/Elements

Files:

• Penta.cpp (modified) (7 diffs)
• Tria.cpp (modified) (2 diffs)

issm/trunk/src/c/objects/Elements/Penta.cpp

@@ -1752 +1752 @@
 ElementVector* Penta::CreatePVectorCouplingMacAyealStokes(void){
 
-        _error_("coupling MacAyeal Stokes not implemented yet");
         /*compute all load vectors for this element*/
         ElementVector* pe1=CreatePVectorCouplingMacAyealStokesViscous();
@@ -1794 +1793 @@
         Input* vy_input=inputs->GetInput(VyEnum);               _assert_(vy_input);
         Input* vz_input=inputs->GetInput(VzEnum);               _assert_(vz_input);
-        Input* vzpattyn_input=inputs->GetInput(VzMacAyealEnum);   _assert_(vzpattyn_input);
+        Input* vzmacayeal_input=inputs->GetInput(VzMacAyealEnum);   _assert_(vzmacayeal_input);
 
         /* Start  looping on the number of gaussian points: */
@@ -1806 +1805 @@
                 GetNodalFunctionsP1Derivatives(&dh1dh6[0][0],&xyz_list[0][0], gauss);
 
-                vzpattyn_input->GetParameterDerivativeValue(&dw[0],&xyz_list[0][0],gauss);
+                vzmacayeal_input->GetParameterDerivativeValue(&dw[0],&xyz_list[0][0],gauss);
 
                 this->GetStrainRate3d(&epsilon[0],&xyz_list[0][0],gauss,vx_input,vy_input,vz_input);
@@ -1859 +1858 @@
         Input* vy_input=inputs->GetInput(VyEnum);               _assert_(vy_input);
         Input* vz_input=inputs->GetInput(VzEnum);               _assert_(vz_input);
-        Input* vzpattyn_input=inputs->GetInput(VzMacAyealEnum);   _assert_(vzpattyn_input);
+        Input* vzmacayeal_input=inputs->GetInput(VzMacAyealEnum);   _assert_(vzmacayeal_input);
 
         for(i=0;i<NUMVERTICES2D;i++) for(j=0;j<3;j++) xyz_list_tria[i][j]=xyz_list[i][j];
@@ -1875 +1874 @@
                 GetNodalFunctionsP1(l1l6, gauss);
 
-                vzpattyn_input->GetParameterValue(&w, gauss);
-                vzpattyn_input->GetParameterDerivativeValue(&dw[0],&xyz_list[0][0],gauss);
+                vzmacayeal_input->GetParameterValue(&w, gauss);
+                vzmacayeal_input->GetParameterDerivativeValue(&dw[0],&xyz_list[0][0],gauss);
 
                 BedNormal(&bed_normal[0],xyz_list_tria);
@@ -2460 +2459 @@
         Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input);
         Input* vzstokes_input=NULL;
-        if(approximation==PattynStokesApproximationEnum){
+        if(approximation==PattynStokesApproximationEnum || approximation==MacAyealStokesApproximationEnum){
                 vzstokes_input=inputs->GetInput(VzStokesEnum); _assert_(vzstokes_input);
         }
@@ -2475 +2474 @@
                 vx_input->GetParameterDerivativeValue(&du[0],&xyz_list[0][0],gauss);
                 vy_input->GetParameterDerivativeValue(&dv[0],&xyz_list[0][0],gauss);
-                if(approximation==PattynStokesApproximationEnum){
+                if(approximation==PattynStokesApproximationEnum || approximation==MacAyealStokesApproximationEnum){
                         vzstokes_input->GetParameterDerivativeValue(&dw[0],&xyz_list[0][0],gauss);
                         dwdz=dw[2];

issm/trunk/src/c/objects/Elements/Tria.cpp

@@ -1644 +1644 @@
         Input* vy_input=inputs->GetInput(VyEnum);               _assert_(vy_input);
         Input* vzstokes_input=NULL;
-        if(approximation==PattynStokesApproximationEnum){
+        if(approximation==PattynStokesApproximationEnum || approximation==MacAyealStokesApproximationEnum){
                 vzstokes_input=inputs->GetInput(VzStokesEnum);       _assert_(vzstokes_input);
         }
@@ -1658 +1658 @@
                 vx_input->GetParameterValue(&vx, gauss);
                 vy_input->GetParameterValue(&vy, gauss);
-                if(approximation==PattynStokesApproximationEnum){
+                if(approximation==PattynStokesApproximationEnum || approximation==MacAyealStokesApproximationEnum){
                         vzstokes_input->GetParameterValue(&vz, gauss);
                 }