Changeset 24669

Timestamp:

03/17/20 06:45:30 (5 years ago)

Author:

bdef

Message:

BUG:fix on case

File:

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

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

@@ -693 +693 @@
         switch(coupled_flag){
                 case 0:{
-                                         element->GetInputValue(&thickness, gauss,ThicknessEnum);
-                                         element->GetInputValue(&base, gauss,BaseEnum);
-                                         element->GetInputValue(&sealevel, gauss,SealevelEnum);
-                                         IssmDouble rho_water = element->FindParam(MaterialsRhoSeawaterEnum);
-                                         IssmDouble rho_ice   = element->FindParam(MaterialsRhoIceEnum);
-                                         IssmDouble gravity   = element->FindParam(ConstantsGEnum);
-                                         p_ice   = gravity*rho_ice*thickness;
-                                         p_water = rho_water*gravity*(sealevel-base);
-                                         Neff = p_ice - p_water;
-                                 }
-                          break;
+                        element->GetInputValue(&thickness, gauss,ThicknessEnum);
+                        element->GetInputValue(&base, gauss,BaseEnum);
+                        element->GetInputValue(&sealevel, gauss,SealevelEnum);
+                        IssmDouble rho_water = element->FindParam(MaterialsRhoSeawaterEnum);
+                        IssmDouble rho_ice   = element->FindParam(MaterialsRhoIceEnum);
+                        IssmDouble gravity   = element->FindParam(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->FindParam(MaterialsRhoIceEnum);
-                                         IssmDouble gravity   = element->FindParam(ConstantsGEnum);
-                                         p_ice   = gravity*rho_ice*thickness;
-                                         p_water = 0.;
-                                         Neff = p_ice - p_water;
-                                 }
-                          break;
+                        element->GetInputValue(&thickness, gauss,ThicknessEnum);
+                        IssmDouble rho_ice   = element->FindParam(MaterialsRhoIceEnum);
+                        IssmDouble gravity   = element->FindParam(ConstantsGEnum);
+                        p_ice   = gravity*rho_ice*thickness;
+                        p_water = 0.;
+                        Neff = p_ice - p_water;
+                }
+                        break;
                 case 2:{
-                                         element->GetInputValue(&thickness, gauss,ThicknessEnum);
-                                         element->GetInputValue(&base, gauss,BaseEnum);
-                                         element->GetInputValue(&sealevel, gauss,SealevelEnum);
-                                         IssmDouble rho_water = element->FindParam(MaterialsRhoSeawaterEnum);
-                                         IssmDouble rho_ice   = element->FindParam(MaterialsRhoIceEnum);
-                                         IssmDouble gravity   = element->FindParam(ConstantsGEnum);
-                                         p_ice   = gravity*rho_ice*thickness;
-                                         p_water = max(0.,rho_water*gravity*(sealevel-base));
-                                         Neff = p_ice - p_water;
-                                 }
-                          break;
-                case 3:
+                        element->GetInputValue(&thickness, gauss,ThicknessEnum);
+                        element->GetInputValue(&base, gauss,BaseEnum);
+                        element->GetInputValue(&sealevel, gauss,SealevelEnum);
+                        IssmDouble rho_water = element->FindParam(MaterialsRhoSeawaterEnum);
+                        IssmDouble rho_ice   = element->FindParam(MaterialsRhoIceEnum);
+                        IssmDouble gravity   = element->FindParam(ConstantsGEnum);
+                        p_ice   = gravity*rho_ice*thickness;
+                        p_water = max(0.,rho_water*gravity*(sealevel-base));
+                        Neff = p_ice - p_water;
+                }
+                        break;
+                case 3:{
                         element->GetInputValue(&Neff,gauss,FrictionEffectivePressureEnum);
                         element->GetInputValue(&thickness, gauss,ThicknessEnum);
@@ -731 +731 @@
                         IssmDouble gravity   = element->FindParam(ConstantsGEnum);
                         p_ice   = gravity*rho_ice*thickness;
-                        break;
-                case 4:
+                }
+                        break;
+                case 4:{
                         element->GetInputValue(&Neff,gauss,EffectivePressureEnum);
                         element->GetInputValue(&thickness, gauss,ThicknessEnum);
@@ -738 +739 @@
                         IssmDouble gravity   = element->FindParam(ConstantsGEnum);
                         p_ice   = gravity*rho_ice*thickness;
+                }
                         break;
                 default: