source: issm/oecreview/Archive/16554-17801/ISSM-17354-17355.diff@ 17802

../trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.cpp

@@ -409 +409 @@
         /*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 +456 @@
         /*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:
 

../trunk-jpl/src/c/analyses/HydrologyDCInefficientAnalysis.cpp

@@ -512 +512 @@
         /*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 +560 @@
         /*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:
 

../trunk-jpl/src/c/classes/Elements/Tria.cpp

@@ -4391 +4391 @@
         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<IssmDouble>(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();ig<gauss->end();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<IssmDouble>(basis);
-        return Ke;
-}
-/*}}}*/
 /*FUNCTION Tria::GetSolutionFromInputsOneDof{{{*/
 void  Tria::GetSolutionFromInputsOneDof(Vector<IssmDouble>* solution, int enum_type){
 
@@ -4587 +4548 @@
 /*FUNCTION Tria::ComputeEPLThickness{{{*/
 void  Tria::ComputeEPLThickness(void){
 
-        int         i;
         const int   numdof         = NDOF1 *NUMVERTICES;
         bool        isefficientlayer;
         bool        active_element;
@@ -4595 +4555 @@
         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 +4596 @@
                         }
                 }
                 else{
-                        GetInputListOnVertices(&preceding_thickness[0],HydrologydcEplThicknessEnum);
                         for(int i=0;i<numdof;i++){
                                 
                                 /*Compute first the effective pressure in the EPL*/

../trunk-jpl/src/c/classes/Elements/Tria.h

@@ -251 +251 @@
                 void UpdateConstraintsExtrudeFromBase(void);
                 void UpdateConstraintsExtrudeFromTop(void);
 
-                ElementMatrix* CreateEPLDomainMassMatrix(void);
                 void           CreateHydrologyWaterVelocityInput(void);
                 void           GetHydrologyDCInefficientHmax(IssmDouble* ph_max, Node* innode);
                 void           HydrologyEPLGetActive(Vector<IssmDouble>* active_vec);

../trunk-jpl/src/c/classes/Elements/Penta.cpp

@@ -4155 +4155 @@
 /*}}}*/
 #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){
 

../trunk-jpl/src/c/classes/Elements/Penta.h

@@ -218 +218 @@
                 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 +240 @@
                 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<IssmDouble>* active_vec);
                 void           HydrologyEPLGetMask(Vector<IssmDouble>* vec_mask);