Changeset 14935

Timestamp:

05/06/13 15:56:59 (12 years ago)

Author:

bdef

Message:

BUG: adding the epl solution to the results

Location:

issm/trunk-jpl/src/c

Files:

• modules/ModelProcessorx/HydrologyDCEfficient/UpdateElementsHydrologyDCEfficient.cpp (modified) (1 diff)
• solutions/hydrology_core.cpp (modified) (3 diffs)

issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCEfficient/UpdateElementsHydrologyDCEfficient.cpp

@@ -50 +50 @@
         iomodel->FetchDataToInput(elements,MaskElementonwaterEnum);
         iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateEnum);
-        iomodel->FetchDataToInput(elements,SedimentHeadEnum);
+        iomodel->FetchDataToInput(elements,EplHeadEnum);
 
         /*Free data: */

issm/trunk-jpl/src/c/solutions/hydrology_core.cpp

@@ -21 +21 @@
         bool       save_results;
         bool       modify_loads=true;
+        bool       isefficientlayer;
         IssmDouble starttime,final_time;
         IssmDouble time,dt;
@@ -79 +80 @@
 
                 else if (hydrology_model==HydrologydcEnum){
+                        femmodel->parameters->FindParam(&isefficientlayer,HydrologydcIsefficientlayerEnum);
                         if(VerboseSolution()) _pprintLine_("   computing water head");
                         solver_hydro_nonlinear(femmodel);
@@ -85 +87 @@
                                 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");