Changeset 22850

Timestamp:

06/18/18 13:52:57 (7 years ago)

Author:

Mathieu Morlighem

Message:

BUG: fixed ordering

File:

• issm/trunk-jpl/src/c/classes/Loads/Friction.cpp (modified) (3 diffs)

issm/trunk-jpl/src/c/classes/Loads/Friction.cpp

@@ -687 +687 @@
                 case 0:{
                                          element->GetInputValue(&thickness, gauss,ThicknessEnum);
+                                         element->GetInputValue(&base, gauss,BaseEnum);
+                                         element->GetInputValue(&sealevel, gauss,SealevelEnum);
+                                         IssmDouble rho_water = element->GetMaterialParameter(MaterialsRhoSeawaterEnum);
+                                         IssmDouble rho_ice   = element->GetMaterialParameter(MaterialsRhoIceEnum);
+                                         IssmDouble gravity   = element->GetMaterialParameter(ConstantsGEnum);
+                                         p_ice   = gravity*rho_ice*thickness;
+                                         p_water = rho_water*gravity*(sealevel-base);
+                                         Neff = p_ice - p_water;
+                                 }
+                          break;
+                case 1:{
+                                         element->GetInputValue(&thickness, gauss,ThicknessEnum);
                                          IssmDouble rho_ice   = element->GetMaterialParameter(MaterialsRhoIceEnum);
                                          IssmDouble gravity   = element->GetMaterialParameter(ConstantsGEnum);
@@ -694 +706 @@
                                  }
                           break;
-                case 1:{
+                case 2:{
                                          element->GetInputValue(&thickness, gauss,ThicknessEnum);
                                          element->GetInputValue(&base, gauss,BaseEnum);
@@ -706 +718 @@
                                  }
                           break;
-                case 2:{
-                                         element->GetInputValue(&thickness, gauss,ThicknessEnum);
-                                         element->GetInputValue(&base, gauss,BaseEnum);
-                                         element->GetInputValue(&sealevel, gauss,SealevelEnum);
-                                         IssmDouble rho_water = element->GetMaterialParameter(MaterialsRhoSeawaterEnum);
-                                         IssmDouble rho_ice   = element->GetMaterialParameter(MaterialsRhoIceEnum);
-                                         IssmDouble gravity   = element->GetMaterialParameter(ConstantsGEnum);
-                                         p_ice   = gravity*rho_ice*thickness;
-                                         p_water = rho_water*gravity*(sealevel-base);
-                                         Neff = p_ice - p_water;
-                                 }
-                          break;
                 case 3:
                         element->GetInputValue(&Neff,gauss,FrictionEffectivePressureEnum);