Changeset 9722

Timestamp:

09/09/11 08:05:39 (14 years ago)

Author:

seroussi

Message:

finally got the continous/discontinuous bug

File:

• issm/trunk/src/c/objects/Elements/Tria.cpp (modified) (2 diffs)

issm/trunk/src/c/objects/Elements/Tria.cpp

@@ -5209 +5209 @@
         double nodeinputs[3];
         double yts;
-        int    stabilization;
+        int    progstabilization,balancestabilization;
         bool   dakota_analysis;
 
@@ -5219 +5219 @@
         /*Fetch parameters: */
         iomodel->Constant(&yts,ConstantsYtsEnum);
-        iomodel->Constant(&stabilization,PrognosticStabilizationEnum);
-        iomodel->Constant(&stabilization,BalancethicknessStabilizationEnum);
+        iomodel->Constant(&progstabilization,PrognosticStabilizationEnum);
+        iomodel->Constant(&balancestabilization,BalancethicknessStabilizationEnum);
         iomodel->Constant(&dakota_analysis,QmuIsdakotaEnum);
 
         /*Recover element type*/
-        if ((analysis_type==PrognosticAnalysisEnum || analysis_type==BalancethicknessAnalysisEnum) && stabilization==3){
+        if ((analysis_type==PrognosticAnalysisEnum && progstabilization==3) || (analysis_type==BalancethicknessAnalysisEnum && balancestabilization==3)){
                 /*P1 Discontinuous Galerkin*/
                 tria_type=P1DGEnum;