Changeset 16922

Timestamp:

11/25/13 10:24:32 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: ViscosityFS now requires dim

Location:

issm/trunk-jpl/src/c

Files:

• analyses/StressbalanceAnalysis.cpp (modified) (1 diff)
• classes/Elements/Element.cpp (modified) (4 diffs)
• classes/Elements/Element.h (modified) (1 diff)

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

@@ -2271 +2271 @@
                 this->GetBFSprime(Bprime,element,dim,xyz_list,gauss);
 
-                element->ViscosityFS(&viscosity,xyz_list,gauss,vx_input,vy_input,vz_input);
+                element->ViscosityFS(&viscosity,dim,xyz_list,gauss,vx_input,vy_input,vz_input);
                 for(i=0;i<epssize;i++)     D[i*bsize+i] = + 2.*viscosity*gauss->weight*Jdet;
                 for(i=epssize;i<bsize;i++) D[i*bsize+i] = - FSreconditioning*gauss->weight*Jdet;

issm/trunk-jpl/src/c/classes/Elements/Element.cpp

@@ -109 +109 @@
 }/*}}}*/
 
-void Element::ViscosityFS(IssmDouble* pviscosity,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input,Input* vz_input){/*{{{*/
+void Element::ViscosityFS(IssmDouble* pviscosity,int dim,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input,Input* vz_input){/*{{{*/
 
         /*Intermediaries*/
@@ -116 +116 @@
         IssmDouble epsilon2d[3]; /* epsilon=[exx,eyy,exy];            */
 
-        if(vz_input){
+        if(dim==3){
                 /*3D*/
                 this->StrainRateFS(&epsilon3d[0],xyz_list,gauss,vx_input,vy_input,vz_input);
@@ -207 +207 @@
         *pviscosity=viscosity;
 }/*}}}*/
+void Element::ViscositySSA(IssmDouble* pviscosity,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input){/*{{{*/
+
+        /*Intermediaries*/
+        IssmDouble viscosity;
+        IssmDouble epsilon[3];/* epsilon=[exx,eyy,exy];    */
+
+        this->StrainRateSSA(&epsilon[0],xyz_list,gauss,vx_input,vy_input);
+        material->GetViscosity2d(&viscosity, &epsilon[0]);
+
+        /*Assign output pointer*/
+        *pviscosity=viscosity;
+}/*}}}*/
+void Element::ViscositySSADerivativeEpsSquare(IssmDouble* pmu_prime,IssmDouble* epsilon){/*{{{*/
+        this->material->GetViscosity2dDerivativeEpsSquare(pmu_prime,epsilon);
+}/*}}}*/
 void Element::ViscosityHODerivativeEpsSquare(IssmDouble* pmu_prime,IssmDouble* epsilon){/*{{{*/
         this->material->GetViscosityDerivativeEpsSquare(pmu_prime,epsilon);
-}/*}}}*/
-void Element::StrainRateHO(IssmDouble* epsilon,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input){/*{{{*/
-        /*Compute the 3d Blatter/HOStrain Rate (5 components):
-         *
-         * epsilon=[exx eyy exy exz eyz]
-         *
-         * with exz=1/2 du/dz
-         *      eyz=1/2 dv/dz
-         *
-         * the contribution of vz is neglected
-         */
-
-        int i;
-        IssmDouble epsilonvx[5];
-        IssmDouble epsilonvy[5];
-
-        /*Check that both inputs have been found*/
-        if (!vx_input || !vy_input){
-                _error_("Input missing. Here are the input pointers we have for vx: " << vx_input << ", vy: " << vy_input << "\n");
-        }
-
-        /*Get strain rate assuming that epsilon has been allocated*/
-        vx_input->GetVxStrainRate3dHO(epsilonvx,xyz_list,gauss);
-        vy_input->GetVyStrainRate3dHO(epsilonvy,xyz_list,gauss);
-
-        /*Sum all contributions*/
-        for(i=0;i<5;i++) epsilon[i]=epsilonvx[i]+epsilonvy[i];
 }/*}}}*/
 void Element::ViscosityFSDerivativeEpsSquare(IssmDouble* pmu_prime,IssmDouble* epsilon){/*{{{*/
@@ -263 +251 @@
         for(int i=0;i<6;i++) epsilon[i]=epsilonvx[i]+epsilonvy[i]+epsilonvz[i];
 }/*}}}*/
-void Element::ViscositySSA(IssmDouble* pviscosity,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input){/*{{{*/
-
-        /*Intermediaries*/
-        IssmDouble viscosity;
-        IssmDouble epsilon[3];/* epsilon=[exx,eyy,exy];    */
-
-        this->StrainRateSSA(&epsilon[0],xyz_list,gauss,vx_input,vy_input);
-        material->GetViscosity2d(&viscosity, &epsilon[0]);
-
-        /*Assign output pointer*/
-        *pviscosity=viscosity;
-}/*}}}*/
-void Element::ViscositySSADerivativeEpsSquare(IssmDouble* pmu_prime,IssmDouble* epsilon){/*{{{*/
-        this->material->GetViscosity2dDerivativeEpsSquare(pmu_prime,epsilon);
+void Element::StrainRateHO(IssmDouble* epsilon,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input){/*{{{*/
+        /*Compute the 3d Blatter/HOStrain Rate (5 components):
+         *
+         * epsilon=[exx eyy exy exz eyz]
+         *
+         * with exz=1/2 du/dz
+         *      eyz=1/2 dv/dz
+         *
+         * the contribution of vz is neglected
+         */
+
+        int i;
+        IssmDouble epsilonvx[5];
+        IssmDouble epsilonvy[5];
+
+        /*Check that both inputs have been found*/
+        if (!vx_input || !vy_input){
+                _error_("Input missing. Here are the input pointers we have for vx: " << vx_input << ", vy: " << vy_input << "\n");
+        }
+
+        /*Get strain rate assuming that epsilon has been allocated*/
+        vx_input->GetVxStrainRate3dHO(epsilonvx,xyz_list,gauss);
+        vy_input->GetVyStrainRate3dHO(epsilonvy,xyz_list,gauss);
+
+        /*Sum all contributions*/
+        for(i=0;i<5;i++) epsilon[i]=epsilonvx[i]+epsilonvy[i];
 }/*}}}*/
 void Element::StrainRateSSA(IssmDouble* epsilon,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input){/*{{{*/

issm/trunk-jpl/src/c/classes/Elements/Element.h

@@ -66 +66 @@
                 void       StrainRateFS(IssmDouble* epsilon,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input,Input* vz_input);
                 IssmDouble TMeltingPoint(IssmDouble pressure);
-                void       ViscosityFS(IssmDouble* pviscosity,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input,Input* vz_input);
+                void       ViscosityFS(IssmDouble* pviscosity,int dim,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input,Input* vz_input);
                 void       ViscosityHO(IssmDouble* pviscosity,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input);
                 void       ViscosityL1L2(IssmDouble* pviscosity,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input,Input* surf);