Changeset 17693

Timestamp:

04/09/14 13:21:19 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: minor adjustements for Tets

Location:

issm/trunk-jpl/src/c/analyses

Files:

• L2ProjectionBaseAnalysis.cpp (modified) (1 diff)
• StressbalanceAnalysis.cpp (modified) (1 diff)
• StressbalanceVerticalAnalysis.cpp (modified) (1 diff)

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

@@ -27 +27 @@
         iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum);
         if(iomodel->domaintype==Mesh3DEnum){
-                iomodel->FetchDataToInput(elements,MeshElementonbaseEnum);
-                iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum);
+                if(iomodel->meshelementtype==PentaEnum){
+                        iomodel->FetchDataToInput(elements,MeshElementonbaseEnum);
+                        iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum);
+                }
+                iomodel->FetchDataToInput(elements,MeshVertexonbaseEnum);
         }
         if(iomodel->domaintype==Mesh2DverticalEnum){

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

@@ -215 +215 @@
 
         if(iomodel->domaintype==Mesh3DEnum){
-                iomodel->FetchDataToInput(elements,MeshElementonbaseEnum);
-                iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum);
+                if(iomodel->meshelementtype==PentaEnum){
+                        iomodel->FetchDataToInput(elements,MeshElementonbaseEnum);
+                        iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum);
+                }
                 iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateEnum);
                 iomodel->FetchDataToInput(elements,FlowequationBorderFSEnum);

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

@@ -34 +34 @@
         iomodel->FetchDataToInput(elements,BaseEnum);
         iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum);
-        iomodel->FetchDataToInput(elements,MeshElementonbaseEnum);
-        iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum);
+        if(iomodel->meshelementtype==PentaEnum){
+                iomodel->FetchDataToInput(elements,MeshElementonbaseEnum);
+                iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum);
+        }
         iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateEnum);
         iomodel->FetchDataToInput(elements,VxEnum,0.);