source: issm/oecreview/Archive/14312-15392/ISSM-14934-14935.diff@ 15393

Index: ../trunk-jpl/src/c/solutions/hydrology_core.cpp
===================================================================
--- ../trunk-jpl/src/c/solutions/hydrology_core.cpp     (revision 14934)
+++ ../trunk-jpl/src/c/solutions/hydrology_core.cpp     (revision 14935)
@@ -20,6 +20,7 @@
        int        output_frequency,hydrology_model;
        bool       save_results;
        bool       modify_loads=true;
+       bool       isefficientlayer;
        IssmDouble starttime,final_time;
        IssmDouble time,dt;
 
@@ -78,13 +79,16 @@
                }
 
                else if (hydrology_model==HydrologydcEnum){
+                       femmodel->parameters->FindParam(&isefficientlayer,HydrologydcIsefficientlayerEnum);
                        if(VerboseSolution()) _pprintLine_("   computing water head");
                        solver_hydro_nonlinear(femmodel);
                        if(save_results && ((i+1)%output_frequency==0 || (i+1)==nsteps)){
                                if(VerboseSolution()) _pprintLine_("   saving results ");
                                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,SedimentHeadEnum);
                                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,SedimentHeadResidualEnum);
-
+                               if(isefficientlayer){
+                                       InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,EplHeadEnum);
+                               }
                                /*unload results*/
                                if(VerboseSolution()) _pprintLine_("   saving temporary results");
                                OutputResultsx(femmodel->elements, femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,femmodel->results);
Index: ../trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCEfficient/UpdateElementsHydrologyDCEfficient.cpp
===================================================================
--- ../trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCEfficient/UpdateElementsHydrologyDCEfficient.cpp      (revision 14934)
+++ ../trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCEfficient/UpdateElementsHydrologyDCEfficient.cpp      (revision 14935)
@@ -49,7 +49,7 @@
        iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum);
        iomodel->FetchDataToInput(elements,MaskElementonwaterEnum);
        iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateEnum);
-       iomodel->FetchDataToInput(elements,SedimentHeadEnum);
+       iomodel->FetchDataToInput(elements,EplHeadEnum);
 
        /*Free data: */
        iomodel->DeleteData(1,MeshElementsEnum);