Changeset 4298

Timestamp:

06/29/10 08:38:17 (15 years ago)

Author:

Mathieu Morlighem

Message:

Getting rid of SlopeAnalysis (now either Bed or Surface) 2

Location:

issm/trunk/src/c/modules/ModelProcessorx

Files:

• BedSlope/CreateConstraintsSlopeCompute.cpp (modified) (2 diffs)
• BedSlope/CreateLoadsSlopeCompute.cpp (modified) (2 diffs)
• BedSlope/CreateNodesSlopeCompute.cpp (modified) (3 diffs)
• BedSlope/UpdateElementsSlopeCompute.cpp (modified) (2 diffs)
• ModelProcessorx.h (modified) (1 diff)

issm/trunk/src/c/modules/ModelProcessorx/BedSlope/CreateConstraintsSlopeCompute.cpp

@@ -1 +1 @@
 /*
- * CreateConstraintsSlopeCompute.c:
+ * CreateConstraintsBedSlope.c:
  */
 
@@ -11 +11 @@
 #include "../ModelProcessorx.h"
 
-void    CreateConstraintsSlopeCompute(Constraints** pconstraints, IoModel* iomodel,ConstDataHandle iomodel_handle){
+void    CreateConstraintsBedSlope(Constraints** pconstraints, IoModel* iomodel,ConstDataHandle iomodel_handle){
 
         /*Output*/

issm/trunk/src/c/modules/ModelProcessorx/BedSlope/CreateLoadsSlopeCompute.cpp

@@ -1 @@
-/*! \file CreateLoadsSlopeCompute.c:
+/*! \file CreateLoadsBedSlope.c:
  */
 
@@ -11 +11 @@
 #include "../ModelProcessorx.h"
 
-void    CreateLoadsSlopeCompute(Loads** ploads, IoModel* iomodel,ConstDataHandle iomodel_handle){
+void    CreateLoadsBedSlope(Loads** ploads, IoModel* iomodel,ConstDataHandle iomodel_handle){
 
         /*DataSet*/

issm/trunk/src/c/modules/ModelProcessorx/BedSlope/CreateNodesSlopeCompute.cpp

@@ -1 +1 @@
 /*
- * CreateNodesSlopeCompute.c:
+ * CreateNodesBedSlope.c:
  */
 
@@ -13 +13 @@
 #include "../ModelProcessorx.h"
 
-void    CreateNodesSlopeCompute(Nodes** pnodes, IoModel* iomodel,ConstDataHandle iomodel_handle){
+void    CreateNodesBedSlope(Nodes** pnodes, IoModel* iomodel,ConstDataHandle iomodel_handle){
 
         /*Intermediary*/
@@ -46 +46 @@
                         
                         /*Add node to nodes dataset: */
-                        nodes->AddObject(new Node(iomodel->nodecounter+i+1,i,i+1,i,iomodel,SlopeAnalysisEnum));
+                        nodes->AddObject(new Node(iomodel->nodecounter+i+1,i,i+1,i,iomodel,BedSlopeAnalysisEnum));
 
                 }

issm/trunk/src/c/modules/ModelProcessorx/BedSlope/UpdateElementsSlopeCompute.cpp

@@ -1 +1 @@
 /*
- * UpdateElementsSlopeCompute:
+ * UpdateElementsBedSlope:
  */
 
@@ -13 +13 @@
 #include "../ModelProcessorx.h"
 
-void    UpdateElementsSlopeCompute(Elements* elements, IoModel* iomodel,ConstDataHandle iomodel_handle,int analysis_counter,int analysis_type){
+void    UpdateElementsBedSlope(Elements* elements, IoModel* iomodel,ConstDataHandle iomodel_handle,int analysis_counter,int analysis_type){
 
         /*Intermediary*/

issm/trunk/src/c/modules/ModelProcessorx/ModelProcessorx.h

@@ -48 +48 @@
 void    UpdateElementsDiagnosticStokes(Elements* elements,IoModel* iomodel_handle,ConstDataHandle iomodel_handle,int analysis_counter,int analysis_type);
 
-/*slope compute*/
-void    CreateNodesSlopeCompute(Nodes** pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
-void    CreateConstraintsSlopeCompute(Constraints** pconstraints,IoModel* iomodel,ConstDataHandle iomodel_handle);
-void  CreateLoadsSlopeCompute(Loads** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
-void    UpdateElementsSlopeCompute(Elements* elements,IoModel* iomodel_handle,ConstDataHandle iomodel_handle,int analysis_counter,int analysis_type);
+/*bed slope*/
+void    CreateNodesBedSlope(Nodes** pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
+void    CreateConstraintsBedSlope(Constraints** pconstraints,IoModel* iomodel,ConstDataHandle iomodel_handle);
+void  CreateLoadsBedSlope(Loads** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
+void    UpdateElementsBedSlope(Elements* elements,IoModel* iomodel_handle,ConstDataHandle iomodel_handle,int analysis_counter,int analysis_type);
+
+/*surface slope*/
+void    CreateNodesSurfaceSlope(Nodes** pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
+void    CreateConstraintsSurfaceSlope(Constraints** pconstraints,IoModel* iomodel,ConstDataHandle iomodel_handle);
+void  CreateLoadsSurfaceSlope(Loads** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
+void    UpdateElementsSurfaceSlope(Elements* elements,IoModel* iomodel_handle,ConstDataHandle iomodel_handle,int analysis_counter,int analysis_type);
 
 /*thermal:*/