Changeset 16351

Timestamp:

10/09/13 13:51:07 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: done with 2d FS

Location:

issm/trunk-jpl/src/c

Files:

• classes/Elements/Tria.cpp (modified) (2 diffs)
• modules/ModelProcessorx/Stressbalance/UpdateElementsStressbalance.cpp (modified) (1 diff)

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

@@ -2063 +2063 @@
                                 name==EplHeadEnum ||
                                 name==HydrologydcMaskEplactiveEnum ||
+                                name==MeshVertexonbedEnum ||
                                 name==WaterTransferEnum ||
                                 name==QmuVxEnum ||
@@ -2113 +2114 @@
 void Tria::EdgeOnBedIndices(int* pindex1,int* pindex2){
 
-        bool found=false;
         IssmDouble values[NUMVERTICES];
+        int        indices[3][2] = {{1,2},{2,0},{0,1}};
 
         /*Retrieve all inputs and parameters*/
         GetInputListOnVertices(&values[0],MeshVertexonbedEnum);
 
-        for(int i=0;i<NUMVERTICES;i++){
-                if(values[i]==1.){
-                        if(found){
-                                *pindex2 = i;
-                                return;
-                        }
-                        else{
-                                *pindex1 = i;
-                        }
-                }
-        }
-
+        for(int i=0;i<3;i++){
+                if(values[indices[i][0]] == 1. && values[indices[i][1]] == 1.){
+                        *pindex1 = indices[i][0];
+                        *pindex2 = indices[i][1];
+                        return;
+                }
+        }
+
+        _printf_("list of vertices on bed: "<<values[0]<<" "<<values[1]<<" "<<values[2]);
         _error_("Could not find 2 vertices on bed");
 }

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

@@ -114 +114 @@
         }
         if(isFS){
+                iomodel->FetchDataToInput(elements,MeshVertexonbedEnum);
                 iomodel->FetchDataToInput(elements,PressureEnum,0.);
                 if(dakota_analysis)elements->InputDuplicate(PressureEnum,QmuPressureEnum);