Changeset 17886 for issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp

Timestamp:

04/30/14 08:23:23 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: 1. removed elementonbed elementonsurface (everybody should use vertexonX)

2. added sanity check for bednormal and surface normal
3. merging extrudecore and InputExtrude for Penta

File:

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

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

@@ -220 +220 @@
         if(isdamage)iomodel->FetchDataToInput(elements,DamageDEnum);
 
+        if(iomodel->domaintype!=Domain2DhorizontalEnum){
+                iomodel->FetchDataToInput(elements,MeshVertexonbaseEnum);
+                iomodel->FetchDataToInput(elements,MeshVertexonsurfaceEnum);
+        }
         if(iomodel->domaintype==Domain3DEnum){
-                if(iomodel->meshelementtype==PentaEnum){
-                        iomodel->FetchDataToInput(elements,MeshElementonbaseEnum);
-                        iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum);
-                }
                 iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateEnum);
                 iomodel->FetchDataToInput(elements,FlowequationBorderFSEnum);
@@ -231 +231 @@
                 if(dakota_analysis)elements->InputDuplicate(VzEnum,QmuVzEnum);
         }
-        if(iomodel->domaintype==Domain2DverticalEnum){
-                iomodel->FetchDataToInput(elements,MeshVertexonsurfaceEnum);
-        }
         if(isFS){
-                iomodel->FetchDataToInput(elements,MeshVertexonbaseEnum);
                 iomodel->FetchDataToInput(elements,PressureEnum,0.);
                 if(dakota_analysis)elements->InputDuplicate(PressureEnum,QmuPressureEnum);
@@ -241 +237 @@
         if(islevelset){
                 iomodel->FetchDataToInput(elements,IceMaskNodeActivationEnum);
-                if(iomodel->domaintype!=Domain2DhorizontalEnum)
-                        iomodel->FetchDataToInput(elements,MeshVertexonbaseEnum); // required for updating active nodes
         }