Changeset 18949

Timestamp:

12/05/14 11:03:20 (10 years ago)

Author:

seroussi

Message:

BUG: fixed wrong enums in a couple files

Location:

issm/trunk-jpl/src/c

Files:

• classes/Elements/Tria.cpp (modified) (2 diffs)
• modules/SurfaceMassBalancex/SurfaceMassBalancex.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/classes/Elements/Tria.cpp

@@ -2253 +2253 @@
   /*Get material parameters :*/
   rho_ice=matpar->GetMaterialParameter(MaterialsRhoIceEnum);
-  rho_water=matpar->GetMaterialParameter(MaterialsRhoSeawaterEnum);
+  rho_water=matpar->GetMaterialParameter(MaterialsRhoFreshwaterEnum);
 
   /*Get other pdd parameters*/
@@ -2285 +2285 @@
 
         /*material parameters: */
-        rho_water=matpar->GetMaterialParameter(MaterialsRhoIceEnum);
-        rho_ice=matpar->GetMaterialParameter(MaterialsRhoSeawaterEnum);
+        rho_water=matpar->GetMaterialParameter(MaterialsRhoSeawaterEnum);
+        rho_ice=matpar->GetMaterialParameter(MaterialsRhoIceEnum);
         density=rho_ice/rho_water;
         GetInputListOnVertices(&h[0],ThicknessEnum);

issm/trunk-jpl/src/c/modules/SurfaceMassBalancex/SurfaceMassBalancex.cpp

@@ -86 +86 @@
                 /*Get material parameters :*/
                 rho_ice=element->matpar->GetMaterialParameter(MaterialsRhoIceEnum);
-                rho_water=element->matpar->GetMaterialParameter(MaterialsRhoSeawaterEnum);
+                rho_water=element->matpar->GetMaterialParameter(MaterialsRhoFreshwaterEnum);
 
                 // loop over all vertices