Index: /issm/trunk/src/c/objects/Elements/Penta.cpp =================================================================== --- /issm/trunk/src/c/objects/Elements/Penta.cpp (revision 5735) +++ /issm/trunk/src/c/objects/Elements/Penta.cpp (revision 5736) @@ -4509,35 +4509,4 @@ /*}}}*/ /*FUNCTION Penta::GetStrainRate3dPattyn{{{1*/ -void Penta::GetStrainRate3dPattyn(double* epsilon,double* xyz_list, double* gauss, Input* vx_input, Input* vy_input){ - /*Compute the 3d Blatter/PattynStrain 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; - - double epsilonvx[5]; - double epsilonvy[5]; - - /*Check that both inputs have been found*/ - if (!vx_input || !vy_input){ - ISSMERROR("Input missing. Here are the input pointers we have for vx: %p, vy: %p\n",vx_input,vy_input); - } - - /*Get strain rate assuming that epsilon has been allocated*/ - vx_input->GetVxStrainRate3dPattyn(epsilonvx,xyz_list,gauss); - vy_input->GetVyStrainRate3dPattyn(epsilonvy,xyz_list,gauss); - - /*Sum all contributions*/ - for(i=0;i<5;i++) epsilon[i]=epsilonvx[i]+epsilonvy[i]; - -} -/*}}}*/ -/*FUNCTION Penta::GetStrainRate3dPattyn{{{1*/ void Penta::GetStrainRate3dPattyn(double* epsilon,double* xyz_list, GaussPenta* gauss, Input* vx_input, Input* vy_input){ /*Compute the 3d Blatter/PattynStrain Rate (5 components): @@ -4567,32 +4536,4 @@ /*Sum all contributions*/ for(i=0;i<5;i++) epsilon[i]=epsilonvx[i]+epsilonvy[i]; - -} -/*}}}*/ -/*FUNCTION Penta::GetStrainRate3d{{{1*/ -void Penta::GetStrainRate3d(double* epsilon,double* xyz_list, double* gauss, Input* vx_input, Input* vy_input, Input* vz_input){ - /*Compute the 3d Strain Rate (6 components): - * - * epsilon=[exx eyy ezz exy exz eyz] - */ - - int i; - - double epsilonvx[6]; - double epsilonvy[6]; - double epsilonvz[6]; - - /*Check that both inputs have been found*/ - if (!vx_input || !vy_input || !vz_input){ - ISSMERROR("Input missing. Here are the input pointers we have for vx: %p, vy: %p, vz: %p\n",vx_input,vy_input,vz_input); - } - - /*Get strain rate assuming that epsilon has been allocated*/ - vx_input->GetVxStrainRate3d(epsilonvx,xyz_list,gauss); - vy_input->GetVyStrainRate3d(epsilonvy,xyz_list,gauss); - vz_input->GetVzStrainRate3d(epsilonvz,xyz_list,gauss); - - /*Sum all contributions*/ - for(i=0;i<6;i++) epsilon[i]=epsilonvx[i]+epsilonvy[i]+epsilonvz[i]; } Index: /issm/trunk/src/c/objects/Elements/Penta.h =================================================================== --- /issm/trunk/src/c/objects/Elements/Penta.h (revision 5735) +++ /issm/trunk/src/c/objects/Elements/Penta.h (revision 5736) @@ -158,5 +158,5 @@ void GetParameterListOnVertices(double* pvalue,int enumtype); void GetParameterListOnVertices(double* pvalue,int enumtype,double defaultvalue); - void GetParameterValue(double* pvalue,Node* node,int enumtype); + void GetParameterValue(double* pvalue,Node* node,int enumtype); void GetPhi(double* phi, double* epsilon, double viscosity); void GetSolutionFromInputsDiagnosticHoriz(Vec solutiong); @@ -165,7 +165,5 @@ void GetSolutionFromInputsDiagnosticVert(Vec solutiong); void GetSolutionFromInputsThermal(Vec solutiong); - void GetStrainRate3dPattyn(double* epsilon,double* xyz_list, double* gauss, Input* vx_input, Input* vy_input); void GetStrainRate3dPattyn(double* epsilon,double* xyz_list, GaussPenta* gauss, Input* vx_input, Input* vy_input); - void GetStrainRate3d(double* epsilon,double* xyz_list, double* gauss, Input* vx_input, Input* vy_input, Input* vz_input); void GetStrainRate3d(double* epsilon,double* xyz_list, GaussPenta* gauss, Input* vx_input, Input* vy_input, Input* vz_input); Penta* GetUpperElement(void); Index: /issm/trunk/src/c/objects/Inputs/BoolInput.h =================================================================== --- /issm/trunk/src/c/objects/Inputs/BoolInput.h (revision 5735) +++ /issm/trunk/src/c/objects/Inputs/BoolInput.h (revision 5736) @@ -54,11 +54,4 @@ void GetParameterDerivativeValue(double* derivativevalues, double* xyz_list, GaussPenta* gauss); void GetParameterAverage(double* pvalue){ISSMERROR("not implemented yet");}; - void GetVxStrainRate2d(double* epsilonvx,double* xyz_list, double* gauss){ISSMERROR("not implemented yet");}; - void GetVyStrainRate2d(double* epsilonvy,double* xyz_list, double* gauss){ISSMERROR("not implemented yet");}; - void GetVxStrainRate3d(double* epsilonvx,double* xyz_list, double* gauss){ISSMERROR("not implemented yet");}; - void GetVyStrainRate3d(double* epsilonvy,double* xyz_list, double* gauss){ISSMERROR("not implemented yet");}; - void GetVzStrainRate3d(double* epsilonvz,double* xyz_list, double* gauss){ISSMERROR("not implemented yet");}; - void GetVxStrainRate3dPattyn(double* epsilonvx,double* xyz_list, double* gauss){ISSMERROR("not implemented yet");}; - void GetVyStrainRate3dPattyn(double* epsilonvy,double* xyz_list, double* gauss){ISSMERROR("not implemented yet");}; void GetVxStrainRate2d(double* epsilonvx,double* xyz_list, GaussTria* gauss){ISSMERROR("not implemented yet");}; void GetVyStrainRate2d(double* epsilonvy,double* xyz_list, GaussTria* gauss){ISSMERROR("not implemented yet");}; Index: /issm/trunk/src/c/objects/Inputs/DoubleInput.h =================================================================== --- /issm/trunk/src/c/objects/Inputs/DoubleInput.h (revision 5735) +++ /issm/trunk/src/c/objects/Inputs/DoubleInput.h (revision 5736) @@ -53,11 +53,4 @@ void GetParameterDerivativeValue(double* derivativevalues, double* xyz_list, GaussPenta* gauss); void GetParameterAverage(double* pvalue); - void GetVxStrainRate2d(double* epsilonvx,double* xyz_list, double* gauss){ISSMERROR("not implemented yet");}; - void GetVyStrainRate2d(double* epsilonvy,double* xyz_list, double* gauss){ISSMERROR("not implemented yet");}; - void GetVxStrainRate3d(double* epsilonvx,double* xyz_list, double* gauss){ISSMERROR("not implemented yet");}; - void GetVyStrainRate3d(double* epsilonvy,double* xyz_list, double* gauss){ISSMERROR("not implemented yet");}; - void GetVzStrainRate3d(double* epsilonvz,double* xyz_list, double* gauss){ISSMERROR("not implemented yet");}; - void GetVxStrainRate3dPattyn(double* epsilonvx,double* xyz_list, double* gauss){ISSMERROR("not implemented yet");}; - void GetVyStrainRate3dPattyn(double* epsilonvy,double* xyz_list, double* gauss){ISSMERROR("not implemented yet");}; void GetVxStrainRate2d(double* epsilonvx,double* xyz_list, GaussTria* gauss){ISSMERROR("not implemented yet");}; void GetVyStrainRate2d(double* epsilonvy,double* xyz_list, GaussTria* gauss){ISSMERROR("not implemented yet");}; Index: /issm/trunk/src/c/objects/Inputs/Input.h =================================================================== --- /issm/trunk/src/c/objects/Inputs/Input.h (revision 5735) +++ /issm/trunk/src/c/objects/Inputs/Input.h (revision 5736) @@ -32,11 +32,4 @@ virtual void GetParameterDerivativeValue(double* derivativevalues, double* xyz_list, GaussPenta* gauss)=0; virtual void GetParameterAverage(double* pvalue)=0; - virtual void GetVxStrainRate2d(double* epsilonvx,double* xyz_list, double* gauss)=0; - virtual void GetVyStrainRate2d(double* epsilonvy,double* xyz_list, double* gauss)=0; - virtual void GetVxStrainRate3d(double* epsilonvx,double* xyz_list, double* gauss)=0; - virtual void GetVyStrainRate3d(double* epsilonvy,double* xyz_list, double* gauss)=0; - virtual void GetVzStrainRate3d(double* epsilonvz,double* xyz_list, double* gauss)=0; - virtual void GetVxStrainRate3dPattyn(double* epsilonvx,double* xyz_list, double* gauss)=0; - virtual void GetVyStrainRate3dPattyn(double* epsilonvy,double* xyz_list, double* gauss)=0; virtual void GetVxStrainRate2d(double* epsilonvx,double* xyz_list, GaussTria* gauss)=0; virtual void GetVyStrainRate2d(double* epsilonvy,double* xyz_list, GaussTria* gauss)=0; Index: /issm/trunk/src/c/objects/Inputs/IntInput.h =================================================================== --- /issm/trunk/src/c/objects/Inputs/IntInput.h (revision 5735) +++ /issm/trunk/src/c/objects/Inputs/IntInput.h (revision 5736) @@ -54,11 +54,4 @@ void GetParameterDerivativeValue(double* derivativevalues, double* xyz_list, GaussPenta* gauss); void GetParameterAverage(double* pvalue){ISSMERROR("not implemented yet");}; - void GetVxStrainRate2d(double* epsilonvx,double* xyz_list, double* gauss){ISSMERROR("not implemented yet");}; - void GetVyStrainRate2d(double* epsilonvy,double* xyz_list, double* gauss){ISSMERROR("not implemented yet");}; - void GetVxStrainRate3d(double* epsilonvx,double* xyz_list, double* gauss){ISSMERROR("not implemented yet");}; - void GetVyStrainRate3d(double* epsilonvy,double* xyz_list, double* gauss){ISSMERROR("not implemented yet");}; - void GetVzStrainRate3d(double* epsilonvz,double* xyz_list, double* gauss){ISSMERROR("not implemented yet");}; - void GetVxStrainRate3dPattyn(double* epsilonvx,double* xyz_list, double* gauss){ISSMERROR("not implemented yet");}; - void GetVyStrainRate3dPattyn(double* epsilonvy,double* xyz_list, double* gauss){ISSMERROR("not implemented yet");}; void GetVxStrainRate2d(double* epsilonvx,double* xyz_list, GaussTria* gauss){ISSMERROR("not implemented yet");}; void GetVyStrainRate2d(double* epsilonvy,double* xyz_list, GaussTria* gauss){ISSMERROR("not implemented yet");}; Index: /issm/trunk/src/c/objects/Inputs/PentaVertexInput.cpp =================================================================== --- /issm/trunk/src/c/objects/Inputs/PentaVertexInput.cpp (revision 5735) +++ /issm/trunk/src/c/objects/Inputs/PentaVertexInput.cpp (revision 5736) @@ -207,190 +207,4 @@ /*}}}*/ /*FUNCTION PentaVertexInput::GetVxStrainRate3d{{{1*/ -void PentaVertexInput::GetVxStrainRate3d(double* epsilonvx,double* xyz_list, double* gauss){ - int i,j; - - const int numgrids=6; - const int DOFVELOCITY=3; - double B[8][27]; - double B_reduced[6][DOFVELOCITY*numgrids]; - double velocity[numgrids][DOFVELOCITY]; - - /*Get B matrix: */ - GetBStokes(&B[0][0], xyz_list, gauss); - /*Create a reduced matrix of B to get rid of pressure */ - for (i=0;i<6;i++){ - for (j=0;j<3;j++){ - B_reduced[i][j]=B[i][j]; - } - for (j=4;j<7;j++){ - B_reduced[i][j-1]=B[i][j]; - } - for (j=8;j<11;j++){ - B_reduced[i][j-2]=B[i][j]; - } - for (j=12;j<15;j++){ - B_reduced[i][j-3]=B[i][j]; - } - for (j=16;j<19;j++){ - B_reduced[i][j-4]=B[i][j]; - } - for (j=20;j<23;j++){ - B_reduced[i][j-5]=B[i][j]; - } - } - - /*Here, we are computing the strain rate of (vx,0,0)*/ - for(i=0;ivalues[i]; - velocity[i][1]=0.0; - velocity[i][2]=0.0; - } - /*Multiply B by velocity, to get strain rate: */ - MatrixMultiply(&B_reduced[0][0],6,DOFVELOCITY*numgrids,0,&velocity[0][0],DOFVELOCITY*numgrids,1,0,epsilonvx,0); - -} -/*}}}*/ -/*FUNCTION PentaVertexInput::GetVyStrainRate3d{{{1*/ -void PentaVertexInput::GetVyStrainRate3d(double* epsilonvy,double* xyz_list, double* gauss){ - int i,j; - - const int numgrids=6; - const int DOFVELOCITY=3; - double B[8][27]; - double B_reduced[6][DOFVELOCITY*numgrids]; - double velocity[numgrids][DOFVELOCITY]; - - /*Get B matrix: */ - GetBStokes(&B[0][0], xyz_list, gauss); - /*Create a reduced matrix of B to get rid of pressure */ - for (i=0;i<6;i++){ - for (j=0;j<3;j++){ - B_reduced[i][j]=B[i][j]; - } - for (j=4;j<7;j++){ - B_reduced[i][j-1]=B[i][j]; - } - for (j=8;j<11;j++){ - B_reduced[i][j-2]=B[i][j]; - } - for (j=12;j<15;j++){ - B_reduced[i][j-3]=B[i][j]; - } - for (j=16;j<19;j++){ - B_reduced[i][j-4]=B[i][j]; - } - for (j=20;j<23;j++){ - B_reduced[i][j-5]=B[i][j]; - } - } - - /*Here, we are computing the strain rate of (0,vy,0)*/ - for(i=0;ivalues[i]; - velocity[i][2]=0.0; - } - /*Multiply B by velocity, to get strain rate: */ - MatrixMultiply(&B_reduced[0][0],6,DOFVELOCITY*numgrids,0,&velocity[0][0],DOFVELOCITY*numgrids,1,0,epsilonvy,0); - -} -/*}}}*/ -/*FUNCTION PentaVertexInput::GetVzStrainRate3d{{{1*/ -void PentaVertexInput::GetVzStrainRate3d(double* epsilonvz,double* xyz_list, double* gauss){ - int i,j; - - const int numgrids=6; - const int DOFVELOCITY=3; - double B[8][27]; - double B_reduced[6][DOFVELOCITY*numgrids]; - double velocity[numgrids][DOFVELOCITY]; - - /*Get B matrix: */ - GetBStokes(&B[0][0], xyz_list, gauss); - /*Create a reduced matrix of B to get rid of pressure */ - for (i=0;i<6;i++){ - for (j=0;j<3;j++){ - B_reduced[i][j]=B[i][j]; - } - for (j=4;j<7;j++){ - B_reduced[i][j-1]=B[i][j]; - } - for (j=8;j<11;j++){ - B_reduced[i][j-2]=B[i][j]; - } - for (j=12;j<15;j++){ - B_reduced[i][j-3]=B[i][j]; - } - for (j=16;j<19;j++){ - B_reduced[i][j-4]=B[i][j]; - } - for (j=20;j<23;j++){ - B_reduced[i][j-5]=B[i][j]; - } - } - - /*Here, we are computing the strain rate of (0,0,vz)*/ - for(i=0;ivalues[i]; - } - - /*Multiply B by velocity, to get strain rate: */ - MatrixMultiply(&B_reduced[0][0],6,DOFVELOCITY*numgrids,0,&velocity[0][0],DOFVELOCITY*numgrids,1,0,epsilonvz,0); - -} -/*}}}*/ -/*FUNCTION PentaVertexInput::GetVxStrainRate3dPattyn{{{1*/ -void PentaVertexInput::GetVxStrainRate3dPattyn(double* epsilonvx,double* xyz_list, double* gauss){ - - int i; - const int numgrids=6; - const int NDOF2=2; - double B[5][NDOF2*numgrids]; - double velocity[numgrids][NDOF2]; - - /*Get B matrix: */ - GetBPattyn(&B[0][0], xyz_list, gauss); - - /*Here, we are computing the strain rate of (vx,0)*/ - for(i=0;ivalues[i]; - velocity[i][1]=0.0; - } - - /*Multiply B by velocity, to get strain rate: */ - MatrixMultiply( &B[0][0],5,NDOF2*numgrids,0, - &velocity[0][0],NDOF2*numgrids,1,0, - epsilonvx,0); - -} -/*}}}*/ -/*FUNCTION PentaVertexInput::GetVyStrainRate3dPattyn{{{1*/ -void PentaVertexInput::GetVyStrainRate3dPattyn(double* epsilonvy,double* xyz_list, double* gauss){ - - int i; - const int numgrids=6; - const int NDOF2=2; - double B[5][NDOF2*numgrids]; - double velocity[numgrids][NDOF2]; - - /*Get B matrix: */ - GetBPattyn(&B[0][0], xyz_list, gauss); - - /*Here, we are computing the strain rate of (0,vy)*/ - for(i=0;ivalues[i]; - } - - /*Multiply B by velocity, to get strain rate: */ - MatrixMultiply( &B[0][0],5,NDOF2*numgrids,0, - &velocity[0][0],NDOF2*numgrids,1,0, - epsilonvy,0); - -} -/*}}}*/ -/*FUNCTION PentaVertexInput::GetVxStrainRate3d{{{1*/ void PentaVertexInput::GetVxStrainRate3d(double* epsilonvx,double* xyz_list, GaussPenta* gauss){ int i,j; Index: /issm/trunk/src/c/objects/Inputs/PentaVertexInput.h =================================================================== --- /issm/trunk/src/c/objects/Inputs/PentaVertexInput.h (revision 5735) +++ /issm/trunk/src/c/objects/Inputs/PentaVertexInput.h (revision 5736) @@ -54,11 +54,4 @@ void GetParameterDerivativeValue(double* derivativevalues, double* xyz_list, GaussPenta* gauss); void GetParameterAverage(double* pvalue); - void GetVxStrainRate2d(double* epsilonvx,double* xyz_list, double* gauss){ISSMERROR("not implemented yet");}; - void GetVyStrainRate2d(double* epsilonvy,double* xyz_list, double* gauss){ISSMERROR("not implemented yet");}; - void GetVxStrainRate3d(double* epsilonvx,double* xyz_list, double* gauss); - void GetVyStrainRate3d(double* epsilonvy,double* xyz_list, double* gauss); - void GetVzStrainRate3d(double* epsilonvz,double* xyz_list, double* gauss); - void GetVxStrainRate3dPattyn(double* epsilonvx,double* xyz_list, double* gauss); - void GetVyStrainRate3dPattyn(double* epsilonvy,double* xyz_list, double* gauss); void GetVxStrainRate2d(double* epsilonvx,double* xyz_list, GaussTria* gauss){ISSMERROR("not implemented yet");}; void GetVyStrainRate2d(double* epsilonvy,double* xyz_list, GaussTria* gauss){ISSMERROR("not implemented yet");}; Index: /issm/trunk/src/c/objects/Inputs/TriaVertexInput.cpp =================================================================== --- /issm/trunk/src/c/objects/Inputs/TriaVertexInput.cpp (revision 5735) +++ /issm/trunk/src/c/objects/Inputs/TriaVertexInput.cpp (revision 5736) @@ -196,52 +196,4 @@ /*}}}*/ /*FUNCTION TriaVertexInput::GetVxStrainRate2d{{{1*/ -void TriaVertexInput::GetVxStrainRate2d(double* epsilonvx,double* xyz_list, double* gauss){ - - /*Intermediary*/ - int i; - const int numgrids=3; - const int NDOF2=2; - double B[3][NDOF2*numgrids]; - double velocity[3][NDOF2]; - - /*Get B matrix: */ - GetBMacAyeal(&B[0][0], xyz_list, gauss); - - /*Here, we are computing the strain rate of (vx,0)*/ - for(i=0;i<3;i++){ - velocity[i][0]=this->values[i]; - velocity[i][1]=0.0; - } - /*Get epsilon(vx) = B*velocity*/ - MatrixMultiply( &B[0][0],3,NDOF2*numgrids,0, - &velocity[0][0],NDOF2*numgrids,1,0, - epsilonvx,0); -} -/*}}}*/ -/*FUNCTION TriaVertexInput::GetVyStrainRate2d{{{1*/ -void TriaVertexInput::GetVyStrainRate2d(double* epsilonvy,double* xyz_list, double* gauss){ - - /*Intermediary*/ - int i; - const int numgrids=3; - const int NDOF2=2; - double B[3][NDOF2*numgrids]; - double velocity[3][NDOF2]; - - /*Get B matrix: */ - GetBMacAyeal(&B[0][0], xyz_list, gauss); - - /*Here, we are computing the strain rate of (0,vy)*/ - for(i=0;i<3;i++){ - velocity[i][0]=0.0; - velocity[i][1]=this->values[i]; - } - /*Get epsilon(vy) = B*velocity*/ - MatrixMultiply( &B[0][0],3,NDOF2*numgrids,0, - &velocity[0][0],NDOF2*numgrids,1,0, - epsilonvy,0); -} -/*}}}*/ -/*FUNCTION TriaVertexInput::GetVxStrainRate2d{{{1*/ void TriaVertexInput::GetVxStrainRate2d(double* epsilonvx,double* xyz_list, GaussTria* gauss){ Index: /issm/trunk/src/c/objects/Inputs/TriaVertexInput.h =================================================================== --- /issm/trunk/src/c/objects/Inputs/TriaVertexInput.h (revision 5735) +++ /issm/trunk/src/c/objects/Inputs/TriaVertexInput.h (revision 5736) @@ -54,11 +54,4 @@ void GetParameterDerivativeValue(double* derivativevalues, double* xyz_list, GaussPenta* gauss){ISSMERROR("not implemented yet");}; void GetParameterAverage(double* pvalue); - void GetVxStrainRate2d(double* epsilonvx,double* xyz_list, double* gauss); - void GetVyStrainRate2d(double* epsilonvy,double* xyz_list, double* gauss); - void GetVxStrainRate3d(double* epsilonvx,double* xyz_list, double* gauss){ISSMERROR("not implemented yet");}; - void GetVyStrainRate3d(double* epsilonvy,double* xyz_list, double* gauss){ISSMERROR("not implemented yet");}; - void GetVzStrainRate3d(double* epsilonvz,double* xyz_list, double* gauss){ISSMERROR("not implemented yet");}; - void GetVxStrainRate3dPattyn(double* epsilonvx,double* xyz_list, double* gauss){ISSMERROR("not implemented yet");}; - void GetVyStrainRate3dPattyn(double* epsilonvy,double* xyz_list, double* gauss){ISSMERROR("not implemented yet");}; void GetVxStrainRate2d(double* epsilonvx,double* xyz_list, GaussTria* gauss); void GetVyStrainRate2d(double* epsilonvy,double* xyz_list, GaussTria* gauss);