Changeset 4304

Timestamp:

06/29/10 08:50:39 (15 years ago)

Author:

Mathieu Morlighem

Message:

getting rid of SlopeAnalysis

Location:

issm/trunk/src/c

Files:

• Makefile.am (modified) (2 diffs)
• solutions/bedslope_core.cpp (modified) (1 diff)
• solutions/surfaceslope_core.cpp (modified) (1 diff)

issm/trunk/src/c/Makefile.am

@@ -361 +361 @@
                                         ./modules/ModelProcessorx/DiagnosticStokes/CreateConstraintsDiagnosticStokes.cpp \
                                         ./modules/ModelProcessorx/DiagnosticStokes/CreateLoadsDiagnosticStokes.cpp\
-                                        ./modules/ModelProcessorx/SlopeCompute/UpdateElementsSlopeCompute.cpp\
-                                        ./modules/ModelProcessorx/SlopeCompute/CreateNodesSlopeCompute.cpp \
-                                        ./modules/ModelProcessorx/SlopeCompute/CreateConstraintsSlopeCompute.cpp\
-                                        ./modules/ModelProcessorx/SlopeCompute/CreateLoadsSlopeCompute.cpp\
+                                        ./modules/ModelProcessorx/BedSlope/UpdateElementsBedSlope.cpp\
+                                        ./modules/ModelProcessorx/BedSlope/CreateNodesBedSlope.cpp \
+                                        ./modules/ModelProcessorx/BedSlope/CreateConstraintsBedSlope.cpp\
+                                        ./modules/ModelProcessorx/BedSlope/CreateLoadsBedSlope.cpp\
+                                        ./modules/ModelProcessorx/SurfaceSlope/UpdateElementsSurfaceSlope.cpp\
+                                        ./modules/ModelProcessorx/SurfaceSlope/CreateNodesSurfaceSlope.cpp \
+                                        ./modules/ModelProcessorx/SurfaceSlope/CreateConstraintsSurfaceSlope.cpp\
+                                        ./modules/ModelProcessorx/SurfaceSlope/CreateLoadsSurfaceSlope.cpp\
                                         ./modules/ModelProcessorx/Control/CreateParametersControl.cpp\
                                         ./modules/ModelProcessorx/Thermal/UpdateElementsThermal.cpp\
@@ -901 +905 @@
                                         ./modules/ModelProcessorx/DiagnosticStokes/CreateConstraintsDiagnosticStokes.cpp \
                                         ./modules/ModelProcessorx/DiagnosticStokes/CreateLoadsDiagnosticStokes.cpp\
-                                        ./modules/ModelProcessorx/SlopeCompute/UpdateElementsSlopeCompute.cpp\
-                                        ./modules/ModelProcessorx/SlopeCompute/CreateNodesSlopeCompute.cpp \
-                                        ./modules/ModelProcessorx/SlopeCompute/CreateConstraintsSlopeCompute.cpp\
-                                        ./modules/ModelProcessorx/SlopeCompute/CreateLoadsSlopeCompute.cpp\
+                                        ./modules/ModelProcessorx/BedSlope/UpdateElementsBedSlope.cpp\
+                                        ./modules/ModelProcessorx/BedSlope/CreateNodesBedSlope.cpp \
+                                        ./modules/ModelProcessorx/BedSlope/CreateConstraintsBedSlope.cpp\
+                                        ./modules/ModelProcessorx/BedSlope/CreateLoadsBedSlope.cpp\
+                                        ./modules/ModelProcessorx/SurfaceSlope/UpdateElementsSurfaceSlope.cpp\
+                                        ./modules/ModelProcessorx/SurfaceSlope/CreateNodesSurfaceSlope.cpp \
+                                        ./modules/ModelProcessorx/SurfaceSlope/CreateConstraintsSurfaceSlope.cpp\
+                                        ./modules/ModelProcessorx/SurfaceSlope/CreateLoadsSurfaceSlope.cpp\
                                         ./modules/ModelProcessorx/Control/CreateParametersControl.cpp\
                                         ./modules/ModelProcessorx/Thermal/UpdateElementsThermal.cpp\

issm/trunk/src/c/solutions/bedslope_core.cpp

@@ -27 +27 @@
 
         /*Call on core computations: */
-        femmodel->SetCurrentAnalysisAlias(SlopeAnalysisEnum,BedSlopeXAnalysisEnum);
+        femmodel->SetCurrentAnalysisAlias(BedSlopeAnalysisEnum,BedSlopeXAnalysisEnum);
         solver_linear(NULL,femmodel);
-        femmodel->SetCurrentAnalysisAlias(SlopeAnalysisEnum,BedSlopeYAnalysisEnum);
+        femmodel->SetCurrentAnalysisAlias(BedSlopeAnalysisEnum,BedSlopeYAnalysisEnum);
         solver_linear(NULL,femmodel);
         

issm/trunk/src/c/solutions/surfaceslope_core.cpp

@@ -27 +27 @@
 
         /*Call on core computations: */
-        femmodel->SetCurrentAnalysisAlias(SlopeAnalysisEnum,SurfaceSlopeXAnalysisEnum);
+        femmodel->SetCurrentAnalysisAlias(SurfaceSlopeAnalysisEnum,SurfaceSlopeXAnalysisEnum);
         solver_linear(NULL,femmodel);
-        femmodel->SetCurrentAnalysisAlias(SlopeAnalysisEnum,SurfaceSlopeYAnalysisEnum);
+        femmodel->SetCurrentAnalysisAlias(SurfaceSlopeAnalysisEnum,SurfaceSlopeYAnalysisEnum);
         solver_linear(NULL,femmodel);