Changeset 4350

Timestamp:

06/30/10 12:23:44 (15 years ago)

Author:

seroussi

Message:

changed AnalysisEnum for Slope solutions

Location:

issm/trunk/src/c/objects/Elements

Files:

• Penta.cpp (modified) (2 diffs)
• Tria.cpp (modified) (3 diffs)

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

@@ -664 +664 @@
                 CreateKMatrixDiagnosticStokes( Kgg);
         }
-        else if (analysis_type==BedSlopeAnalysisEnum || analysis_type==SurfaceSlopeAnalysisEnum){
+        else if (analysis_type==BedSlopeXAnalysisEnum || analysis_type==SurfaceSlopeXAnalysisEnum || analysis_type==BedSlopeYAnalysisEnum || analysis_type==SurfaceSlopeYAnalysisEnum){
                 CreateKMatrixSlopeCompute( Kgg);
         }
@@ -714 +714 @@
                 CreatePVectorDiagnosticStokes( pg);
         }
-        else if (analysis_type==BedSlopeAnalysisEnum || analysis_type==SurfaceSlopeAnalysisEnum){
+        else if (analysis_type==BedSlopeXAnalysisEnum || analysis_type==SurfaceSlopeXAnalysisEnum || analysis_type==BedSlopeYAnalysisEnum || analysis_type==SurfaceSlopeYAnalysisEnum){
                 CreatePVectorSlopeCompute( pg);
         }

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

@@ -598 +598 @@
                 CreateKMatrixDiagnosticHutter( Kgg);
         }
-        else if (analysis_type==BedSlopeAnalysisEnum || analysis_type==SurfaceSlopeAnalysisEnum){
+        else if (analysis_type==BedSlopeXAnalysisEnum || analysis_type==SurfaceSlopeXAnalysisEnum || analysis_type==BedSlopeYAnalysisEnum || analysis_type==SurfaceSlopeYAnalysisEnum){
                 CreateKMatrixSlopeCompute( Kgg);
         }
@@ -645 +645 @@
                 CreatePVectorDiagnosticHutter( pg);
         }
-        else if (analysis_type==BedSlopeAnalysisEnum || analysis_type==SurfaceSlopeAnalysisEnum){
+        else if (analysis_type==BedSlopeXAnalysisEnum || analysis_type==SurfaceSlopeXAnalysisEnum || analysis_type==BedSlopeYAnalysisEnum || analysis_type==SurfaceSlopeYAnalysisEnum){
                 CreatePVectorSlopeCompute( pg);
         }
@@ -3600 +3600 @@
         MatSetValues(Kgg,numdof,doflist,numdof,doflist,(const double*)Ke_gg,ADD_VALUES);
                 
+        ISSMERROR("stop tris");
         cleanup_and_return: 
         xfree((void**)&first_gauss_area_coord);