Changeset 18778

Timestamp:

11/13/14 09:55:15 (10 years ago)

Author:

bdef

Message:

NEW:Adding FrictionEffectivPressureEnum

Location:

issm/trunk-jpl/src/c

Files:

• analyses/EnthalpyAnalysis.cpp (modified) (1 diff)
• analyses/StressbalanceAnalysis.cpp (modified) (1 diff)
• analyses/ThermalAnalysis.cpp (modified) (1 diff)
• classes/Loads/Friction.cpp (modified) (1 diff)
• shared/Enum/EnumDefinitions.h (modified) (1 diff)
• shared/Enum/EnumToStringx.cpp (modified) (1 diff)
• shared/Enum/StringToEnumx.cpp (modified) (7 diffs)

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

@@ -100 +100 @@
                         iomodel->FetchDataToInput(elements,FrictionCEnum);
                         iomodel->FetchDataToInput(elements,FrictionMEnum);
+                        break;
+                case 3:
+                        iomodel->FetchDataToInput(elements,FrictionCEnum);
+                        iomodel->FetchDataToInput(elements,FrictionAsEnum);
+                        iomodel->FetchDataToInput(elements,FrictionQEnum);
+                        iomodel->FetchDataToInput(elements,FrictionEffectivePressureEnum);
                         break;
                 case 4:

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

@@ -271 +271 @@
                         iomodel->FetchDataToInput(elements,FrictionAsEnum);
                         iomodel->FetchDataToInput(elements,FrictionQEnum);
+                        iomodel->FetchDataToInput(elements,FrictionEffectivePressureEnum);
                         break;
                 case 4:

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

@@ -88 +88 @@
                         iomodel->FetchDataToInput(elements,FrictionCEnum);
                         iomodel->FetchDataToInput(elements,FrictionMEnum);
+                        break;
+                case 3:
+                        iomodel->FetchDataToInput(elements,FrictionCEnum);
+                        iomodel->FetchDataToInput(elements,FrictionAsEnum);
+                        iomodel->FetchDataToInput(elements,FrictionQEnum);
+                        iomodel->FetchDataToInput(elements,FrictionEffectivePressureEnum);
+                        break;
+                case 4:
+                        iomodel->FetchDataToInput(elements,FrictionCoefficientEnum);
+                        iomodel->FetchDataToInput(elements,FrictionPEnum);
+                        iomodel->FetchDataToInput(elements,FrictionQEnum);
+                        iomodel->FetchDataToInput(elements,PressureEnum);
+                        iomodel->FetchDataToInput(elements,TemperatureEnum);
                         break;
                 case 5:

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

@@ -192 +192 @@
         element->GetInputValue(&As,FrictionAsEnum);
 
-        element->GetInputValue(&Neff,gauss,EffectivePressureEnum);
+        element->GetInputValue(&Neff,gauss,FrictionEffectivePressureEnum);
         element->GetInputValue(&n,gauss,MaterialsRheologyNEnum);
         

issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h

@@ -97 +97 @@
         FrictionGammaEnum,
         FrictionWaterLayerEnum,
+        FrictionEffectivePressureEnum,
         GeometryHydrostaticRatioEnum,
         HydrologyModelEnum,

issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp

@@ -105 +105 @@
                 case FrictionGammaEnum : return "FrictionGamma";
                 case FrictionWaterLayerEnum : return "FrictionWaterLayer";
+                case FrictionEffectivePressureEnum : return "FrictionEffectivePressure";
                 case GeometryHydrostaticRatioEnum : return "GeometryHydrostaticRatio";
                 case HydrologyModelEnum : return "HydrologyModel";

issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp

@@ -105 +105 @@
               else if (strcmp(name,"FrictionGamma")==0) return FrictionGammaEnum;
               else if (strcmp(name,"FrictionWaterLayer")==0) return FrictionWaterLayerEnum;
+              else if (strcmp(name,"FrictionEffectivePressure")==0) return FrictionEffectivePressureEnum;
               else if (strcmp(name,"GeometryHydrostaticRatio")==0) return GeometryHydrostaticRatioEnum;
               else if (strcmp(name,"HydrologyModel")==0) return HydrologyModelEnum;
@@ -136 +137 @@
               else if (strcmp(name,"HydrologydcEplColapseThickness")==0) return HydrologydcEplColapseThicknessEnum;
               else if (strcmp(name,"HydrologydcEplMaxThickness")==0) return HydrologydcEplMaxThicknessEnum;
-              else if (strcmp(name,"HydrologydcEplThickness")==0) return HydrologydcEplThicknessEnum;
          else stage=2;
    }
    if(stage==2){
-              if (strcmp(name,"HydrologydcEplThicknessOld")==0) return HydrologydcEplThicknessOldEnum;
+              if (strcmp(name,"HydrologydcEplThickness")==0) return HydrologydcEplThicknessEnum;
+              else if (strcmp(name,"HydrologydcEplThicknessOld")==0) return HydrologydcEplThicknessOldEnum;
               else if (strcmp(name,"HydrologydcEplConductivity")==0) return HydrologydcEplConductivityEnum;
               else if (strcmp(name,"HydrologydcIsefficientlayer")==0) return HydrologydcIsefficientlayerEnum;
@@ -259 +260 @@
               else if (strcmp(name,"MeshX")==0) return MeshXEnum;
               else if (strcmp(name,"MeshY")==0) return MeshYEnum;
-              else if (strcmp(name,"MeshZ")==0) return MeshZEnum;
          else stage=3;
    }
    if(stage==3){
-              if (strcmp(name,"MeshElementtype")==0) return MeshElementtypeEnum;
+              if (strcmp(name,"MeshZ")==0) return MeshZEnum;
+              else if (strcmp(name,"MeshElementtype")==0) return MeshElementtypeEnum;
               else if (strcmp(name,"DomainType")==0) return DomainTypeEnum;
               else if (strcmp(name,"DomainDimension")==0) return DomainDimensionEnum;
@@ -382 +383 @@
               else if (strcmp(name,"ConfigurationType")==0) return ConfigurationTypeEnum;
               else if (strcmp(name,"AdjointBalancethicknessAnalysis")==0) return AdjointBalancethicknessAnalysisEnum;
-              else if (strcmp(name,"AdjointBalancethickness2Analysis")==0) return AdjointBalancethickness2AnalysisEnum;
          else stage=4;
    }
    if(stage==4){
-              if (strcmp(name,"AdjointHorizAnalysis")==0) return AdjointHorizAnalysisEnum;
+              if (strcmp(name,"AdjointBalancethickness2Analysis")==0) return AdjointBalancethickness2AnalysisEnum;
+              else if (strcmp(name,"AdjointHorizAnalysis")==0) return AdjointHorizAnalysisEnum;
               else if (strcmp(name,"AnalysisCounter")==0) return AnalysisCounterEnum;
               else if (strcmp(name,"DefaultAnalysis")==0) return DefaultAnalysisEnum;
@@ -505 +506 @@
               else if (strcmp(name,"SpcStatic")==0) return SpcStaticEnum;
               else if (strcmp(name,"SpcTransient")==0) return SpcTransientEnum;
-              else if (strcmp(name,"StringArrayParam")==0) return StringArrayParamEnum;
          else stage=5;
    }
    if(stage==5){
-              if (strcmp(name,"StringParam")==0) return StringParamEnum;
+              if (strcmp(name,"StringArrayParam")==0) return StringArrayParamEnum;
+              else if (strcmp(name,"StringParam")==0) return StringParamEnum;
               else if (strcmp(name,"Seg")==0) return SegEnum;
               else if (strcmp(name,"SegInput")==0) return SegInputEnum;
@@ -628 +629 @@
               else if (strcmp(name,"P1bubblecondensed")==0) return P1bubblecondensedEnum;
               else if (strcmp(name,"P2")==0) return P2Enum;
-              else if (strcmp(name,"P2bubble")==0) return P2bubbleEnum;
          else stage=6;
    }
    if(stage==6){
-              if (strcmp(name,"P2bubblecondensed")==0) return P2bubblecondensedEnum;
+              if (strcmp(name,"P2bubble")==0) return P2bubbleEnum;
+              else if (strcmp(name,"P2bubblecondensed")==0) return P2bubblecondensedEnum;
               else if (strcmp(name,"P2xP1")==0) return P2xP1Enum;
               else if (strcmp(name,"P1xP2")==0) return P1xP2Enum;
@@ -751 +752 @@
               else if (strcmp(name,"Paterson")==0) return PatersonEnum;
               else if (strcmp(name,"Arrhenius")==0) return ArrheniusEnum;
-              else if (strcmp(name,"LliboutryDuval")==0) return LliboutryDuvalEnum;
          else stage=7;
    }
    if(stage==7){
-              if (strcmp(name,"TransientIslevelset")==0) return TransientIslevelsetEnum;
+              if (strcmp(name,"LliboutryDuval")==0) return LliboutryDuvalEnum;
+              else if (strcmp(name,"TransientIslevelset")==0) return TransientIslevelsetEnum;
               else if (strcmp(name,"ExtrapolationVariable")==0) return ExtrapolationVariableEnum;
               else if (strcmp(name,"IceMaskNodeActivation")==0) return IceMaskNodeActivationEnum;