Changeset 4379

Timestamp:

07/01/10 09:19:13 (15 years ago)

Author:

seroussi

Message:

SlopeCOmpute -> Suface,BedSlope in Penta

Location:

issm/trunk/src/c/objects/Elements

Files:

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

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

@@ -337 +337 @@
                 InputUpdateFromSolutionDiagnosticStokes( solution);
         }
-        else if (analysis_type==BedSlopeAnalysisEnum || analysis_type==SurfaceSlopeAnalysisEnum){
-                InputUpdateFromSolutionSlopeCompute( solution);
+        else if (analysis_type==BedSlopeXAnalysisEnum){
+                InputUpdateFromBedSlopeXCompute( solution);
+        }
+        else if (analysis_type==BedSlopeYAnalysisEnum){
+                InputUpdateFromBedSlopeYCompute( solution);
+        }
+        else if (analysis_type==SurfaceSlopeXAnalysisEnum){
+                InputUpdateFromSurfaceSlopeXCompute( solution);
+        }
+        else if (analysis_type==SurfaceSlopeYAnalysisEnum){
+                InputUpdateFromSurfaceSlopeYCompute( solution);
         }
         else if (analysis_type==PrognosticAnalysisEnum){
@@ -2127 +2136 @@
 
 /*}}}*/
-/*FUNCTION Penta::InputUpdateFromSolutionSlopeCompute {{{1*/
-void  Penta::InputUpdateFromSolutionSlopeCompute(double* solution){
+/*FUNCTION Penta::InputUpdateFromBedSlopeXCompute {{{1*/
+void  Penta::InputUpdateFromBedSlopeXCompute(double* solution){
+        ISSMERROR(" not supported yet!");
+}
+/*}}}*/
+/*FUNCTION Penta::InputUpdateFromBedSlopeYCompute {{{1*/
+void  Penta::InputUpdateFromBedSlopeYCompute(double* solution){
+        ISSMERROR(" not supported yet!");
+}
+/*}}}*/
+/*FUNCTION Penta::InputUpdateFromSurfaceSlopeXCompute {{{1*/
+void  Penta::InputUpdateFromSurfaceSlopeXCompute(double* solution){
+        ISSMERROR(" not supported yet!");
+}
+/*}}}*/
+/*FUNCTION Penta::InputUpdateFromSurfaceSlopeYCompute {{{1*/
+void  Penta::InputUpdateFromSurfaceSlopeYCompute(double* solution){
         ISSMERROR(" not supported yet!");
 }

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

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