Changeset 15747

Timestamp:

08/08/13 07:45:11 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: spc pressure if not FS

Location:

issm/trunk-jpl/src/c

Files:

• classes/Elements/Penta.cpp (modified) (2 diffs)
• modules/ModelProcessorx/DiagnosticHoriz/CreateNodesDiagnosticHoriz.cpp (modified) (3 diffs)

issm/trunk-jpl/src/c/classes/Elements/Penta.cpp

@@ -5842 +5842 @@
 
                 GetTriaJacobianDeterminant(&Jdet, &xyz_list_tria[0][0],gauss);
-                GetNodalFunctionsP1(basis, gauss);
+                GetNodalFunctionsP1(basis,gauss);
 
                 /*Build alpha_complement_list: */
@@ -5856 +5856 @@
                 /*Build gradje_g_gaussian vector (actually -dJ/ddrag): */
                 for (i=0;i<NUMVERTICES;i++){
-                        grade_g_gaussian[i]=-2*drag*alpha_complement*((lambda*vx+mu*vy))*Jdet*gauss->weight*basis[i]; /*basis are 0 for the 3 upper nodes*/
+                        grade_g_gaussian[i]=-2*drag*alpha_complement*((lambda*vx+mu*vy))*Jdet*gauss->weight*basis[i];
                 }
 

issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateNodesDiagnosticHoriz.cpp

@@ -83 +83 @@
                 /*Coupling: we are going to create P1 Elements only*/
 
-                /*First create nodes*/
-                Nodes* nodes=*pnodes;
+                /*Recover nodes*/
+                Nodes* nodes = *pnodes;
+                Node*  node  = NULL;
                 if(!nodes) nodes = new Nodes();
 
@@ -100 +101 @@
                         for(int i=0;i<iomodel->numberofelements;i++){
                                 if(iomodel->my_elements[i]){
-                                        Node* 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,DiagnosticHorizAnalysisEnum,FSvelocityEnum);
                                         node->Deactivate();
                                         nodes->AddObject(node);
@@ -108 +109 @@
                         for(int i=0;i<iomodel->numberofvertices;i++){
                                 if(iomodel->my_vertices[i]){
-                                        nodes->AddObject(new Node(iomodel->nodecounter+iomodel->numberofvertices+iomodel->numberofelements+i+1,iomodel->numberofvertices+iomodel->numberofelements+i,i,iomodel,DiagnosticHorizAnalysisEnum,FSpressureEnum));
+                                        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);
+                                        if(approximation==HOApproximationEnum || approximation==SSAApproximationEnum){
+                                                node->Deactivate();
+                                        }
+                                        nodes->AddObject(node);
                                 }
                         }