Changeset 17083

Timestamp:

01/09/14 13:32:49 (11 years ago)

Author:

Mathieu Morlighem

Message:

BUG: free surfaces should not try to get the SMB unless smb_model = SMBEnum

File:

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

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

@@ -16 +16 @@
         if (iomodel->meshtype==Mesh2DhorizontalEnum)return;
 
+        int smb_model;
         int finiteelement = P1Enum;
+
+        /*Fetch data needed: */
+        iomodel->Constant(&smb_model,SurfaceforcingsEnum);
 
         /*Update elements: */
@@ -30 +34 @@
         iomodel->FetchDataToInput(elements,SurfaceEnum);
         iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum);
-        iomodel->FetchDataToInput(elements,SurfaceforcingsMassBalanceEnum,0.);
         iomodel->FetchDataToInput(elements,VxEnum);
         iomodel->FetchDataToInput(elements,MeshVertexonsurfaceEnum);
@@ -37 +40 @@
                 iomodel->FetchDataToInput(elements,MeshElementonbedEnum);
                 iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum);
+        }
+        switch(smb_model){
+                case SMBEnum:
+                        iomodel->FetchDataToInput(elements,SurfaceforcingsMassBalanceEnum,0.);
+                        break;
+                default:
+                        /*Nothing for now*/
+                        ;
         }
 }/*}}}*/