Changeset 16716

Timestamp:

11/12/13 13:51:16 (11 years ago)

Author:

bdef

Message:

BUG: fixing bug in EPLDomain for L2 computation

Location:

issm/trunk-jpl/src/c

Files:

• classes/Elements/Penta.cpp (modified) (1 diff)
• classes/Elements/Tria.cpp (modified) (1 diff)
• solutionsequences/solutionsequence_hydro_nonlinear.cpp (modified) (1 diff)
• solutionsequences/solutionsequence_linear.cpp (modified) (1 diff)

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

@@ -10988 +10988 @@
                 GetInputListOnVertices(&activeEpl[0],HydrologydcMaskEplactiveEnum);
                 for(int i=0;i<3;i++){
-                        if(!reCast<bool>(activeEpl[i]))this->nodes[i]->Deactivate();
+                        if(!reCast<bool>(activeEpl[i])){
+                                this->nodes[i]->Deactivate();
+                        }
+                        else{
+                                this->nodes[i]->Activate();
+                        }
                 }
         }

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

@@ -2960 +2960 @@
         GetInputListOnVertices(&activeEpl[0],HydrologydcMaskEplactiveEnum);
         for(int i=0;i<NUMVERTICES;i++){
-                if(!reCast<bool>(activeEpl[i]))this->nodes[i]->Deactivate();
+                if(!reCast<bool>(activeEpl[i])){
+                        this->nodes[i]->Deactivate();
+                }
+                else{
+                        this->nodes[i]->Activate();
+                }
         }
 }

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

@@ -146 +146 @@
                                 femmodel->parameters->SetParam(EplHeadSlopeYEnum,InputToL2ProjectEnum);
                                 solutionsequence_linear(femmodel);
+
                                 femmodel->SetCurrentConfiguration(HydrologyDCEfficientAnalysisEnum);
-
                                 femmodel->HydrologyEPLThicknessx();
-                                //updating mask after the computation of the epl thickness
+                                //updating mask after the computation of the epl thickness (Allow to close too thin EPL)
                                 femmodel->HydrologyEPLupdateDomainx();
+
                                 femmodel->HydrologyTransferx();
                                 SystemMatricesx(&Kff,&Kfs,&pf,&df,NULL,femmodel);

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

@@ -23 +23 @@
         femmodel->parameters->FindParam(&configuration_type,ConfigurationTypeEnum);
         femmodel->UpdateConstraintsx();
+        SystemMatricesx(&Kff,&Kfs,&pf,&df,NULL,femmodel);
 
-        SystemMatricesx(&Kff,&Kfs,&pf,&df,NULL,femmodel);
         CreateNodalConstraintsx(&ys,femmodel->nodes,configuration_type);
         Reduceloadx(pf, Kfs, ys); delete Kfs;