Changeset 15192

Timestamp:

06/05/13 16:02:06 (12 years ago)

Author:

bdef

Message:

BUG:fixing issues with the EPL mask

Location:

issm/trunk-jpl/src/c

Files:

• classes/Elements/Tria.cpp (modified) (3 diffs)
• modules/ModelProcessorx/HydrologyDCInefficient/UpdateElementsHydrologyDCInefficient.cpp (modified) (3 diffs)

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

@@ -2137 +2137 @@
                                 name==EplHeadOldEnum ||
                                 name==EplHeadEnum ||
+                                name==HydrologydcMaskEplactiveEnum ||
                                 name==WaterTransferEnum ||
                                 name==BasisIntegralEnum ||
@@ -6421 +6422 @@
                 this->parameters->FindParam(&kmax,HydrologySedimentKmaxEnum);
                 this->parameters->FindParam(&penalty_factor,HydrologydcPenaltyFactorEnum);
-                
+
                 if(isefficientlayer)GetInputListOnVertices(&activeEpl[0],HydrologydcMaskEplactiveEnum);
                 
@@ -6541 +6542 @@
                         break;
                 case 1:
-                        
+
                         GetInputListOnVertices(&activeEpl[0],HydrologydcMaskEplactiveEnum);
                         GetInputListOnVertices(&sed_head[0],SedimentHeadEnum);

issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCInefficient/UpdateElementsHydrologyDCInefficient.cpp

@@ -11 +11 @@
 void    UpdateElementsHydrologyDCInefficient(Elements* elements, IoModel* iomodel,int analysis_counter,int analysis_type){
 
+        bool   isefficientlayer;
         int    hydrology_model;
         int    numberofelements;
@@ -17 +18 @@
         iomodel->Constant(&hydrology_model,HydrologyModelEnum);
         iomodel->Constant(&numberofelements,MeshNumberofelementsEnum);
+        iomodel->Constant(&isefficientlayer,HydrologydcIsefficientlayerEnum);
 
         /*Now, do we really want DC?*/
@@ -43 +45 @@
         iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateEnum);
         iomodel->FetchDataToInput(elements,SedimentHeadEnum);
+        if(isefficientlayer)iomodel->FetchDataToInput(elements,HydrologydcMaskEplactiveEnum);
 
         /*Free data: */