source: issm/oecreview/Archive/16554-17801/ISSM-16867-16868.diff

Index: ../trunk-jpl/src/c/classes/Elements/Tria.cpp
===================================================================
--- ../trunk-jpl/src/c/classes/Elements/Tria.cpp        (revision 16867)
+++ ../trunk-jpl/src/c/classes/Elements/Tria.cpp        (revision 16868)
@@ -7027,6 +7027,7 @@
        const int  numdof   = NDOF1 *NUMVERTICES;
        int        *doflist = NULL;
        bool       isefficientlayer;
+       bool       active_element;
        int        transfermethod;
        IssmDouble sed_trans,sed_thick;
        IssmDouble leakage,h_max;
@@ -7035,7 +7036,7 @@
        IssmDouble epl_specificstoring[numdof],sedstoring[numdof];
        IssmDouble epl_head[numdof],sed_head[numdof];
 
-       Input* active_element=NULL;
+       Input* active_element_input=NULL;
 
        GetDofList(&doflist,NoneApproximationEnum,GsetEnum);
 
@@ -7053,9 +7054,8 @@
                        break;
                case 1:
 
-                       int analysis_type;
-                       parameters->FindParam(&analysis_type,AnalysisTypeEnum);
-                       active_element=inputs->GetInput(HydrologydcMaskEplactiveEltEnum); _assert_(active_element);
+                       active_element_input=inputs->GetInput(HydrologydcMaskEplactiveEltEnum); _assert_(active_element_input);
+                       active_element_input->GetInputValue(&active_element);
 
                        GetInputListOnVertices(&activeEpl[0],HydrologydcMaskEplactiveNodeEnum);
                        GetInputListOnVertices(&sed_head[0],SedimentHeadEnum); 
@@ -7067,12 +7067,8 @@
                        sed_trans = matpar->GetSedimentTransmitivity();
                        sed_thick = matpar->GetSedimentThickness();
 
-                       //              printf("Which analyse %i \n",analysis_type);
-
                        if(!active_element){
 
-                               //printf("NoneActive\n");
-
                                /*No transfer if the EPL is not active*/
                                for(int i=0;i<numdof;i++){
                                        wh_trans=0.0;
@@ -7100,7 +7096,7 @@
                                        }
                                        /*Assign output pointer*/
                                        transfer->SetValue(doflist[i],wh_trans,INS_VAL);
-                                       //printf("Computing, %e \n",wh_trans);
+
                                }
                        }
                        break;