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

Timestamp:

11/21/19 14:16:34 (5 years ago)

Author:

Mathieu Morlighem

Message:

CHG: cleaning up old inputs

File:

• issm/trunk-jpl/src/c/classes/Elements/Element.cpp (modified) (2 diffs)

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

@@ -1106 +1106 @@
 }
 /*}}}*/
-Input*     Element::GetInput(int inputenum){/*{{{*/
-        return inputs->GetInput(inputenum);
-}/*}}}*/
 void       Element::GetInputListOnNodes(IssmDouble* pvalue,int enumtype,IssmDouble defaultvalue){/*{{{*/
 
@@ -4032 +4029 @@
 }
 /*}}}*/
-void       Element::StrainRateESA(IssmDouble* epsilon,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input){/*{{{*/
-
-        /*Intermediaries*/
-        IssmDouble dvx[3];
-        IssmDouble dvy[3];
-
-        /*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->GetInputDerivativeValue(&dvx[0],xyz_list,gauss);
-        vy_input->GetInputDerivativeValue(&dvy[0],xyz_list,gauss);
-        epsilon[0] = dvx[0];    // normal strain rate x-direction
-        epsilon[1] = dvy[1]; // normal strain rate y-direction
-        epsilon[2] = 0.5*(dvx[1] + dvy[0]); // shear strain rate
-        epsilon[3] = 0.5*(dvx[1] - dvy[0]); // rotation rate
-
-}/*}}}*/
-void       Element::StrainRateFS(IssmDouble* epsilon,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input,Input* vz_input){/*{{{*/
-        /*Compute the 3d Strain Rate (6 components):
-         *
-         * epsilon=[exx eyy ezz exy exz eyz]
-         */
-
-        /*Intermediaries*/
-        IssmDouble dvx[3];
-        IssmDouble dvy[3];
-        IssmDouble dvz[3];
-
-        /*Check that both inputs have been found*/
-        if (!vx_input || !vy_input || !vz_input){
-                _error_("Input missing. Here are the input pointers we have for vx: " << vx_input << ", vy: " << vy_input << ", vz: " << vz_input << "\n");
-        }
-
-        /*Get strain rate assuming that epsilon has been allocated*/
-        vx_input->GetInputDerivativeValue(&dvx[0],xyz_list,gauss);
-        vy_input->GetInputDerivativeValue(&dvy[0],xyz_list,gauss);
-        vz_input->GetInputDerivativeValue(&dvz[0],xyz_list,gauss);
-        epsilon[0] = dvx[0];
-        epsilon[1] = dvy[1];
-        epsilon[2] = dvz[2];
-        epsilon[3] = 0.5*(dvx[1] + dvy[0]);
-        epsilon[4] = 0.5*(dvx[2] + dvz[0]);
-        epsilon[5] = 0.5*(dvy[2] + dvz[1]);
-
-}/*}}}*/
-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
-         */
-
-        /*Intermediaries*/
-        IssmDouble dvx[3];
-        IssmDouble dvy[3];
-
-        /*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->GetInputDerivativeValue(&dvx[0],xyz_list,gauss);
-        vy_input->GetInputDerivativeValue(&dvy[0],xyz_list,gauss);
-        epsilon[0] = dvx[0];
-        epsilon[1] = dvy[1];
-        epsilon[2] = 0.5*(dvx[1] + dvy[0]);
-        epsilon[3] = 0.5*dvx[2];
-        epsilon[4] = 0.5*dvy[2];
-
-}/*}}}*/
-void       Element::StrainRateHO2dvertical(IssmDouble* epsilon,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input){/*{{{*/
-        /*Compute the 2d Blatter/HOStrain Rate (2 components):
-         *
-         * epsilon=[exx exz]
-         *
-         * with exz=1/2 du/dz
-         *
-         * the contribution of vz is neglected
-         */
-
-        /*Intermediaries*/
-        IssmDouble dvx[3];
-
-        /*Check that both inputs have been found*/
-        if (!vx_input){
-                _error_("Input missing. Here are the input pointers we have for vx: " << vx_input <<"\n");
-        }
-
-        /*Get strain rate assuming that epsilon has been allocated*/
-        vx_input->GetInputDerivativeValue(&dvx[0],xyz_list,gauss);
-        epsilon[0] = dvx[0];
-        epsilon[1] = 0.5*dvx[1];
-
-}/*}}}*/
-void       Element::StrainRateSSA(IssmDouble* epsilon,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input){/*{{{*/
-
-        /*Intermediaries*/
-        IssmDouble dvx[3];
-        IssmDouble dvy[3];
-
-        /*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->GetInputDerivativeValue(&dvx[0],xyz_list,gauss);
-        vy_input->GetInputDerivativeValue(&dvy[0],xyz_list,gauss);
-        epsilon[0] = dvx[0];
-        epsilon[1] = dvy[1];
-        epsilon[2] = 0.5*(dvx[1] + dvy[0]);
-
-}/*}}}*/
-void       Element::StrainRateSSA1d(IssmDouble* epsilon,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input){/*{{{*/
-
-        /*Intermediaries*/
-        IssmDouble dvx[3];
-
-        /*Check that both inputs have been found*/
-        if (!vx_input){
-                _error_("Input missing. Here are the input pointers we have for vx: " << vx_input << "\n");
-        }
-
-        /*Get strain rate assuming that epsilon has been allocated*/
-        vx_input->GetInputDerivativeValue(&dvx[0],xyz_list,gauss);
-        *epsilon = dvx[0];
-
-}/*}}}*/
 void       Element::StrainRateESA(IssmDouble* epsilon,IssmDouble* xyz_list,Gauss* gauss,Input2* vx_input,Input2* vy_input){/*{{{*/