Changeset 12784

Timestamp:

07/27/12 16:10:12 (13 years ago)

Author:

Mathieu Morlighem

Message:

CHG: removed duplicate lines and added a dot to make sure 0 is treated as a double

File:

• issm/trunk-jpl/src/c/objects/Elements/Penta.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/objects/Elements/Penta.cpp

@@ -3246 +3246 @@
         rho_ice=matpar->GetRhoIce();
 
-        if(IsOnWater())return 0;
-        if(IsOnWater() || !IsOnSurface())return 0;
+        if(IsOnWater() || !IsOnSurface()) return 0.;
         
         GetVerticesCoordinates(&xyz_list[0][0], nodes, NUMVERTICES);
@@ -3259 +3258 @@
         Input* smb_input = inputs->GetInput(SurfaceforcingsMassBalanceEnum); _assert_(smb_input);
         smb_input->GetInputAverage(&smb);
-        Total_Smb=rho_ice*base*smb;                                                                                                                                                                                                                     // smb on element in kg s-1
+        Total_Smb=rho_ice*base*smb;// smb on element in kg s-1
         
         /*Process units: */
-        Total_Smb=UnitConversion(Total_Smb,IuToExtEnum,TotalSmbEnum);                                                                                                                           // smb on element in GigaTon yr-1
+        Total_Smb=UnitConversion(Total_Smb,IuToExtEnum,TotalSmbEnum);// smb on element in GigaTon yr-1
         
         /*Return: */