Changeset 17324

Timestamp:

02/20/14 14:11:43 (11 years ago)

Author:

Mathieu Morlighem

Message:

BUG: fixed node on bed assertion

File:

• issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp (modified) (5 diffs)

issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp

@@ -5 +5 @@
 #include "../modules/modules.h"
 #include "../solutionsequences/solutionsequences.h"
+#include "../cores/cores.h"
 
 //#define FSANALYTICAL 1
@@ -272 +273 @@
                 }
                 iomodel->FetchData(3,FlowequationBorderSSAEnum,FlowequationVertexEquationEnum,StressbalanceReferentialEnum);
-                if(iomodel->meshtype==Mesh3DEnum) iomodel->FetchData(3,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationBorderFSEnum);
+                if(iomodel->meshtype!=Mesh2DhorizontalEnum) iomodel->FetchData(3,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationBorderFSEnum);
                 ::CreateNodes(nodes,iomodel,StressbalanceAnalysisEnum,finiteelement,approximation);
                 iomodel->DeleteData(6,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationBorderSSAEnum,FlowequationBorderFSEnum,
@@ -838 +839 @@
         bool isSSA,isL1L2,isHO,isFS;
         bool conserve_loads = true;
-        int  newton;
+        int  newton,meshtype;
 
         /* recover parameters:*/
@@ -845 +846 @@
         femmodel->parameters->FindParam(&isHO,FlowequationIsHOEnum);
         femmodel->parameters->FindParam(&isFS,FlowequationIsFSEnum);
+        femmodel->parameters->FindParam(&meshtype,MeshTypeEnum);
         femmodel->parameters->FindParam(&newton,StressbalanceIsnewtonEnum);
 
@@ -855 +857 @@
                 else
                  solutionsequence_nonlinear(femmodel,conserve_loads); 
+
+                if(meshtype==Mesh2DverticalEnum && isSSA){
+                        femmodel->parameters->SetParam(VxEnum,InputToExtrudeEnum);
+                        extrudefrombase_core(femmodel);
+                        femmodel->parameters->SetParam(VelEnum,InputToExtrudeEnum);
+                        extrudefrombase_core(femmodel);
+                }
         }