Changeset 15771 for issm/trunk-jpl/src/c/modules/ModelProcessorx/Stressbalance/CreateNodesStressbalance.cpp

Timestamp:

08/09/13 10:59:47 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: Diagnostic is now Stressbalance

Location:

issm/trunk-jpl/src/c/modules/ModelProcessorx/Stressbalance

Files:

• . (moved) (moved from issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz )
• CreateNodesStressbalance.cpp (moved) (moved from issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateNodesDiagnosticHoriz.cpp ) (7 diffs)

issm/trunk-jpl/src/c/modules/ModelProcessorx/Stressbalance/CreateNodesStressbalance.cpp

@@ -1 +1 @@
 /*
- * CreateNodesDiagnosticHoriz.c:
+ * CreateNodesStressbalance.c:
  */
 
@@ -9 +9 @@
 #include "../ModelProcessorx.h"
 
-void    CreateNodesDiagnosticHoriz(Nodes** pnodes, IoModel* iomodel){
+void    CreateNodesStressbalance(Nodes** pnodes, IoModel* iomodel){
 
         /*Intermediary*/
@@ -75 +75 @@
                 }
                 iomodel->FetchData(8,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationBorderSSAEnum,FlowequationBorderFSEnum,
-                                        MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,DiagnosticReferentialEnum);
-                CreateNodes(pnodes,iomodel,DiagnosticHorizAnalysisEnum,finiteelement,approximation);
+                                        MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,StressbalanceReferentialEnum);
+                CreateNodes(pnodes,iomodel,StressbalanceAnalysisEnum,finiteelement,approximation);
                 iomodel->DeleteData(8,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationBorderSSAEnum,FlowequationBorderFSEnum,
-                                        MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,DiagnosticReferentialEnum);
+                                        MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,StressbalanceReferentialEnum);
         }
         else{
@@ -89 +89 @@
 
                 iomodel->FetchData(8,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationBorderSSAEnum,FlowequationBorderFSEnum,
-                                        MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,DiagnosticReferentialEnum);
+                                        MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,StressbalanceReferentialEnum);
                 if(isFS){
                         /*P1+ velocity*/
@@ -96 +96 @@
                                         approximation=reCast<int>(iomodel->Data(FlowequationVertexEquationEnum)[i]);
                                         if(approximation==FSApproximationEnum)  approximation=FSvelocityEnum;
-                                        nodes->AddObject(new Node(iomodel->nodecounter+i+1,i,i,iomodel,DiagnosticHorizAnalysisEnum,approximation));
+                                        nodes->AddObject(new Node(iomodel->nodecounter+i+1,i,i,iomodel,StressbalanceAnalysisEnum,approximation));
                                 }
                         }
                         for(int i=0;i<iomodel->numberofelements;i++){
                                 if(iomodel->my_elements[i]){
-                                        node = new Node(iomodel->nodecounter+iomodel->numberofvertices+i+1,iomodel->numberofvertices+i,0,iomodel,DiagnosticHorizAnalysisEnum,FSvelocityEnum);
+                                        node = new Node(iomodel->nodecounter+iomodel->numberofvertices+i+1,iomodel->numberofvertices+i,0,iomodel,StressbalanceAnalysisEnum,FSvelocityEnum);
                                         node->Deactivate();
                                         nodes->AddObject(node);
@@ -110 +110 @@
                                 if(iomodel->my_vertices[i]){
                                         approximation=reCast<int>(iomodel->Data(FlowequationVertexEquationEnum)[i]);
-                                        node = new Node(iomodel->nodecounter+iomodel->numberofvertices+iomodel->numberofelements+i+1,iomodel->numberofvertices+iomodel->numberofelements+i,i,iomodel,DiagnosticHorizAnalysisEnum,FSpressureEnum);
+                                        node = new Node(iomodel->nodecounter+iomodel->numberofvertices+iomodel->numberofelements+i+1,iomodel->numberofvertices+iomodel->numberofelements+i,i,iomodel,StressbalanceAnalysisEnum,FSpressureEnum);
                                         if(approximation==HOApproximationEnum || approximation==SSAApproximationEnum){
                                                 node->Deactivate();
@@ -121 +121 @@
                         for(int i=0;i<iomodel->numberofvertices;i++){
                                 if(iomodel->my_vertices[i]){
-                                        nodes->AddObject(new Node(iomodel->nodecounter+i+1,i,i,iomodel,DiagnosticHorizAnalysisEnum,reCast<int>(iomodel->Data(FlowequationVertexEquationEnum)[i])));
+                                        nodes->AddObject(new Node(iomodel->nodecounter+i+1,i,i,iomodel,StressbalanceAnalysisEnum,reCast<int>(iomodel->Data(FlowequationVertexEquationEnum)[i])));
                                 }
                         }
                 }
                 iomodel->DeleteData(8,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationBorderSSAEnum,FlowequationBorderFSEnum,
-                                        MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,DiagnosticReferentialEnum);
+                                        MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,StressbalanceReferentialEnum);
 
                 /*Assign output pointer: */