Changeset 16870

Timestamp:

11/21/13 16:27:40 (11 years ago)

Author:

bdef

Message:

BUG: Fixing issue with the epl mask when we use only one layer

Location:

issm/trunk-jpl/src/c

Files:

• cores/hydrology_core.cpp (modified) (1 diff)
• solutionsequences/solutionsequence_hydro_nonlinear.cpp (modified) (1 diff)

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

@@ -94 +94 @@
                                 if(VerboseSolution()) _printf0_("   saving results \n");
                                 if(isefficientlayer){
-                                        int outputs[8] = {SedimentHeadEnum,SedimentHeadResidualEnum,EplHeadEnum,HydrologydcMaskEplactiveNodeEnum,EplHeadSlopeXEnum,EplHeadSlopeYEnum,HydrologydcEplThicknessEnum,WaterTransferEnum};
-                                        femmodel->RequestedOutputsx(&femmodel->results,&outputs[0],8);
+                                        int outputs[9] = {SedimentHeadEnum,SedimentHeadResidualEnum,EplHeadEnum,HydrologydcMaskEplactiveNodeEnum,HydrologydcMaskEplactiveEltEnum,EplHeadSlopeXEnum,EplHeadSlopeYEnum,HydrologydcEplThicknessEnum,WaterTransferEnum};
+                                        femmodel->RequestedOutputsx(&femmodel->results,&outputs[0],9);
                                 }
                                 else{

issm/trunk-jpl/src/c/solutionsequences/solutionsequence_hydro_nonlinear.cpp

@@ -83 +83 @@
                 sedconverged=false;
                 for(;;){
-                        /*Updating Nodal Mask*/
-                        HydrologyDCInefficientAnalysis* analysis = new HydrologyDCInefficientAnalysis();
-                        analysis->ElementizeEplMask(femmodel);
-                        delete analysis;
-
+                        if(isefficientlayer){
+                                /*Updating Nodal Mask*/
+                                HydrologyDCInefficientAnalysis* analysis = new HydrologyDCInefficientAnalysis();
+                                analysis->ElementizeEplMask(femmodel);
+                                delete analysis;
+                        }
                         femmodel->HydrologyTransferx();
+
                         SystemMatricesx(&Kff,&Kfs,&pf,&df,&sediment_kmax,femmodel);
                         CreateNodalConstraintsx(&ys,femmodel->nodes,HydrologyDCInefficientAnalysisEnum);