Changeset 4395

Timestamp:

07/01/10 11:49:55 (15 years ago)

Author:

Mathieu Morlighem

Message:

No more SlopeCompute

Location:

issm/trunk/src/c/objects/Elements

Files:

• Penta.cpp (modified) (5 diffs)
• Penta.h (modified) (1 diff)

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

@@ -338 +338 @@
         }
         else if (analysis_type==BedSlopeXAnalysisEnum){
-                InputUpdateFromBedSlopeXCompute( solution);
+                InputUpdateFromBedSlopeX( solution);
         }
         else if (analysis_type==BedSlopeYAnalysisEnum){
-                InputUpdateFromBedSlopeYCompute( solution);
+                InputUpdateFromBedSlopeY( solution);
         }
         else if (analysis_type==SurfaceSlopeXAnalysisEnum){
-                InputUpdateFromSurfaceSlopeXCompute( solution);
+                InputUpdateFromSurfaceSlopeX( solution);
         }
         else if (analysis_type==SurfaceSlopeYAnalysisEnum){
-                InputUpdateFromSurfaceSlopeYCompute( solution);
+                InputUpdateFromSurfaceSlopeY( solution);
         }
         else if (analysis_type==PrognosticAnalysisEnum){
@@ -2140 +2140 @@
 
 /*}}}*/
-/*FUNCTION Penta::InputUpdateFromBedSlopeXCompute {{{1*/
-void  Penta::InputUpdateFromBedSlopeXCompute(double* solution){
+/*FUNCTION Penta::InputUpdateFromBedSlopeX{{{1*/
+void  Penta::InputUpdateFromBedSlopeX(double* solution){
 
         int i;
@@ -2166 +2166 @@
 }
 /*}}}*/
-/*FUNCTION Penta::InputUpdateFromBedSlopeYCompute {{{1*/
-void  Penta::InputUpdateFromBedSlopeYCompute(double* solution){
+/*FUNCTION Penta::InputUpdateFromBedSlopeY{{{1*/
+void  Penta::InputUpdateFromBedSlopeY(double* solution){
 
         int i;
@@ -2192 +2192 @@
 }
 /*}}}*/
-/*FUNCTION Penta::InputUpdateFromSurfaceSlopeXCompute {{{1*/
-void  Penta::InputUpdateFromSurfaceSlopeXCompute(double* solution){
+/*FUNCTION Penta::InputUpdateFromSurfaceSlopeX{{{1*/
+void  Penta::InputUpdateFromSurfaceSlopeX(double* solution){
 
         int i;
@@ -2218 +2218 @@
 }
 /*}}}*/
-/*FUNCTION Penta::InputUpdateFromSurfaceSlopeYCompute {{{1*/
-void  Penta::InputUpdateFromSurfaceSlopeYCompute(double* solution){
+/*FUNCTION Penta::InputUpdateFromSurfaceSlopeY{{{1*/
+void  Penta::InputUpdateFromSurfaceSlopeY(double* solution){
 
         int i;

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

@@ -174 +174 @@
                 void    InputUpdateFromSolutionPrognostic( double* solutiong);
                 void    InputUpdateFromSolutionPrognostic2(double* solutiong);
-                void    InputUpdateFromBedSlopeXCompute( double* solutiong);
-                void    InputUpdateFromBedSlopeYCompute( double* solutiong);
-                void    InputUpdateFromSurfaceSlopeXCompute( double* solutiong);
-                void    InputUpdateFromSurfaceSlopeYCompute( double* solutiong);
+                void    InputUpdateFromBedSlopeX( double* solutiong);
+                void    InputUpdateFromBedSlopeY( double* solutiong);
+                void    InputUpdateFromSurfaceSlopeX( double* solutiong);
+                void    InputUpdateFromSurfaceSlopeY( double* solutiong);
                 bool      IsInput(int name);
                 bool      IsOnSurface(void);