Changeset 17459

Timestamp:

03/18/14 09:58:56 (11 years ago)

Author:

Mathieu Morlighem

Message:

NEW: added CuffeyEnum

Location:

issm/trunk-jpl/src/c

Files:

• analyses/EnthalpyAnalysis.cpp (modified) (1 diff)
• analyses/ThermalAnalysis.cpp (modified) (1 diff)
• shared/Enum/EnumDefinitions.h (modified) (1 diff)
• shared/Enum/EnumToStringx.cpp (modified) (1 diff)
• shared/Enum/StringToEnumx.cpp (modified) (1 diff)

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

@@ -814 +814 @@
                                 /*Do nothing: B is not temperature dependent*/
                                 break;
+                        case CuffeyEnum:
+                                for(i=0;i<numnodes;i++) B[i]=Cuffey(temperature[i]);
+                                element->AddInput(MaterialsRheologyBEnum,&B[0],P1Enum);
+                                break;
                         case PatersonEnum:
                                 for(i=0;i<numnodes;i++) B[i]=Paterson(temperature[i]);

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

@@ -683 +683 @@
                                 /*Do nothing: B is not temperature dependent*/
                                 break;
+                        case CuffeyEnum:
+                                for(i=0;i<numnodes;i++) B[i]=Cuffey(values[i]);
+                                element->AddInput(MaterialsRheologyBEnum,&B[0],P1Enum);
+                                break;
                         case PatersonEnum:
                                 for(i=0;i<numnodes;i++) B[i]=Paterson(values[i]);

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

@@ -680 +680 @@
         /*}}}*/
         /*Rheology law (move to Material) {{{*/
+        CuffeyEnum,
         PatersonEnum,
         ArrheniusEnum,

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

@@ -641 +641 @@
                 case OptionCellEnum : return "OptionCell";
                 case OptionStructEnum : return "OptionStruct";
+                case CuffeyEnum : return "Cuffey";
                 case PatersonEnum : return "Paterson";
                 case ArrheniusEnum : return "Arrhenius";

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

@@ -656 +656 @@
               else if (strcmp(name,"OptionCell")==0) return OptionCellEnum;
               else if (strcmp(name,"OptionStruct")==0) return OptionStructEnum;
+              else if (strcmp(name,"Cuffey")==0) return CuffeyEnum;
               else if (strcmp(name,"Paterson")==0) return PatersonEnum;
               else if (strcmp(name,"Arrhenius")==0) return ArrheniusEnum;