Index: ../trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.cpp =================================================================== --- ../trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.cpp (revision 17354) +++ ../trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.cpp (revision 17355) @@ -409,7 +409,8 @@ /*Switch between the different transfer methods cases*/ switch(transfermethod){ case 0: - /*Just keepping the transfer to zero, should be OK with the initial value of transfer*/ + /*Just keepping the transfer to zero*/ + transfer=0.0; break; case 1: @@ -455,7 +456,8 @@ /*Switch between the different transfer methods cases*/ switch(transfermethod){ case 0: - /*Just keepping the transfer to zero, should be OK with the initial value of transfer*/ + /*Just keepping the transfer to zero*/ + transfer=0.0; break; case 1: Index: ../trunk-jpl/src/c/analyses/HydrologyDCInefficientAnalysis.cpp =================================================================== --- ../trunk-jpl/src/c/analyses/HydrologyDCInefficientAnalysis.cpp (revision 17354) +++ ../trunk-jpl/src/c/analyses/HydrologyDCInefficientAnalysis.cpp (revision 17355) @@ -512,7 +512,8 @@ /*Switch between the different transfer methods cases*/ switch(transfermethod){ case 0: - /*Just keepping the transfer to zero, should be OK with the initial value of transfer*/ + /*Just keepping the transfer to zero*/ + transfer=0.0; break; case 1: @@ -559,7 +560,8 @@ /*Switch between the different transfer methods cases*/ switch(transfermethod){ case 0: - /*Just keepping the transfer to zero, should be OK with the initial value of transfer*/ + /*Just keepping the transfer to zero*/ + transfer=0.0; break; case 1: Index: ../trunk-jpl/src/c/classes/Elements/Tria.cpp =================================================================== --- ../trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 17354) +++ ../trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 17355) @@ -4391,45 +4391,6 @@ this->inputs->AddInput(new TriaInput(HydrologyWaterVyEnum,vy,P1Enum)); } /*}}}*/ -/*FUNCTION Tria::CreatEPLDomainMassMatrix {{{*/ -ElementMatrix* Tria::CreateEPLDomainMassMatrix(void){ - - /* Intermediaries */ - IssmDouble D,Jdet; - IssmDouble xyz_list[NUMVERTICES][3]; - - /*Fetch number of nodes and dof for this finite element*/ - int numnodes = this->NumberofNodes(); - - /*Initialize Element matrix and vectors*/ - ElementMatrix* Ke = new ElementMatrix(nodes,numnodes,this->parameters,NoneApproximationEnum); - IssmDouble* basis = xNew(numnodes); - - /*Retrieve all inputs and parameters*/ - ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - - /* Start looping on the number of gaussian points: */ - GaussTria* gauss=new GaussTria(2); - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - - GetNodalFunctions(basis,gauss); - GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); - D=gauss->weight*Jdet; - - TripleMultiply(basis,1,numnodes,1, - &D,1,1,0, - basis,1,numnodes,0, - &Ke->values[0],1); - } - - /*Clean up and return*/ - delete gauss; - xDelete(basis); - return Ke; -} -/*}}}*/ /*FUNCTION Tria::GetSolutionFromInputsOneDof{{{*/ void Tria::GetSolutionFromInputsOneDof(Vector* solution, int enum_type){ @@ -4587,7 +4548,6 @@ /*FUNCTION Tria::ComputeEPLThickness{{{*/ void Tria::ComputeEPLThickness(void){ - int i; const int numdof = NDOF1 *NUMVERTICES; bool isefficientlayer; bool active_element; @@ -4595,10 +4555,10 @@ IssmDouble rho_water,rho_ice; IssmDouble gravity,latentheat,EPLgrad2; IssmDouble EPL_N,epl_conductivity; - IssmDouble activeEpl[numdof],thickness[numdof]; - IssmDouble eplhead[numdof],old_eplhead[numdof]; + IssmDouble thickness[numdof]; + IssmDouble eplhead[numdof]; IssmDouble epl_slopeX[numdof],epl_slopeY[numdof]; - IssmDouble preceding_thickness[numdof],old_thickness[numdof]; + IssmDouble old_thickness[numdof]; IssmDouble ice_thickness[numdof],bed[numdof]; Input* active_element_input=NULL; @@ -4636,7 +4596,6 @@ } } else{ - GetInputListOnVertices(&preceding_thickness[0],HydrologydcEplThicknessEnum); for(int i=0;i* active_vec); Index: ../trunk-jpl/src/c/classes/Elements/Penta.cpp =================================================================== --- ../trunk-jpl/src/c/classes/Elements/Penta.cpp (revision 17354) +++ ../trunk-jpl/src/c/classes/Elements/Penta.cpp (revision 17355) @@ -4155,19 +4155,6 @@ /*}}}*/ #endif -/*FUNCTION Penta::CreateEPLDomainMassMatrix {{{*/ -ElementMatrix* Penta::CreateEPLDomainMassMatrix(void){ - - if (!IsOnBed()) return NULL; - - Tria* tria=(Tria*)SpawnTria(0); //lower face is 0, upper face is 1. - ElementMatrix* Ke=tria->CreateEPLDomainMassMatrix(); - delete tria->material; delete tria; - - /*clean up and return*/ - return Ke; -} -/*}}}*/ /*FUNCTION Penta::GetHydrologyDCInefficientHmax{{{*/ void Penta::GetHydrologyDCInefficientHmax(IssmDouble* ph_max, Node* innode){ Index: ../trunk-jpl/src/c/classes/Elements/Penta.h =================================================================== --- ../trunk-jpl/src/c/classes/Elements/Penta.h (revision 17354) +++ ../trunk-jpl/src/c/classes/Elements/Penta.h (revision 17355) @@ -218,9 +218,9 @@ bool IsIceInElement(void); Gauss* NewGauss(void); Gauss* NewGauss(int order); - Gauss* NewGauss(IssmDouble* xyz_list, IssmDouble* xyz_list_front,int order){_error_("not implemented yet");}; - Gauss* NewGauss(IssmDouble* xyz_list, IssmDouble* xyz_list_front,int order_horiz,int order_vert); - Gauss* NewGauss(int point1,IssmDouble fraction1,IssmDouble fraction2,bool mainlyfloating,int order){_error_("not implemented yet");}; + Gauss* NewGauss(IssmDouble* xyz_list, IssmDouble* xyz_list_front,int order){_error_("not implemented yet");}; + Gauss* NewGauss(IssmDouble* xyz_list, IssmDouble* xyz_list_front,int order_horiz,int order_vert); + Gauss* NewGauss(int point1,IssmDouble fraction1,IssmDouble fraction2,bool mainlyfloating,int order){_error_("not implemented yet");}; Gauss* NewGaussBase(int order); Gauss* NewGaussLine(int vertex1,int vertex2,int order); Gauss* NewGaussTop(int order); @@ -240,7 +240,6 @@ Tria* SpawnTria(int location); IssmDouble StabilizationParameter(IssmDouble u, IssmDouble v, IssmDouble w, IssmDouble diameter, IssmDouble kappa); - ElementMatrix* CreateEPLDomainMassMatrix(void); void GetHydrologyDCInefficientHmax(IssmDouble* ph_max, Node* innode); void HydrologyEPLGetActive(Vector* active_vec); void HydrologyEPLGetMask(Vector* vec_mask);