Hasanlocal

NonLinearSolver/internalPoints/ipField.cpp

@@ -294,12 +294,12 @@ std::string IPField::ToString(const int i){
   else if (i == FPG_YZ) return "FPG_YZ";
   else if (i == FPG_ZX) return "FPG_ZX";
 
-  else if (i == FG_XX) return "FG_XX";
-  else if (i == FG_YY) return "FG_YY";
-  else if (i == FG_ZZ) return "FG_ZZ";
-  else if (i == FG_XY) return "FG_XY";
-  else if (i == FG_YZ) return "FG_YZ";
-  else if (i == FG_ZX) return "FG_ZX";
+  else if (i == FeG_XX) return "FeG_XX";
+  else if (i == FeG_YY) return "FeG_YY";
+  else if (i == FeG_ZZ) return "FeG_ZZ";
+  else if (i == FeG_XY) return "FeG_XY";
+  else if (i == FeG_YZ) return "FeG_YZ";
+  else if (i == FeG_ZX) return "FeG_ZX";
 
   else if (i == FP_XX) return "FP_XX";
   else if (i == FP_YY) return "FP_YY";
@@ -311,17 +311,40 @@ std::string IPField::ToString(const int i){
   else if (i == FP_ZX) return "FP_ZX";
   else if (i == FP_XZ) return "FP_XZ";
 
-  else if (i == FR_XX) return "FR_XX";
-  else if (i == FR_YY) return "FR_YY";
-  else if (i == FR_ZZ) return "FR_ZZ";
-  else if (i == FR_XY) return "FR_XY";
-  else if (i == FR_YZ) return "FR_YZ";
-  else if (i == FR_ZX) return "FR_ZX";
+  else if (i == FeR_XX) return "FeR_XX";
+  else if (i == FeR_YY) return "FeR_YY";
+  else if (i == FeR_ZZ) return "FeR_ZZ";
+  else if (i == FeR_XY) return "FeR_XY";
+  else if (i == FeR_YZ) return "FeR_YZ";
+  else if (i == FeR_ZX) return "FeR_ZX";
 
   else if (i == ZG) return "ZG";
   else if (i == TIG) return "TIG";
   else if (i == TIR) return "TIR";
   else if (i == TT) return "TT";
+
+  else if (i == FfAM_XX) return "FfAM_XX";
+  else if (i == FfAM_YY) return "FfAM_YY";
+  else if (i == FfAM_ZZ) return "FfAM_ZZ";
+  else if (i == FfAM_XY) return "FfAM_XY";
+  else if (i == FfAM_YZ) return "FfAM_YZ";
+  else if (i == FfAM_ZX) return "FfAM_ZX";
+
+  else if (i == FpAM_XX) return "FpAM_XX";
+  else if (i == FpAM_YY) return "FpAM_YY";
+  else if (i == FpAM_ZZ) return "FpAM_ZZ";
+  else if (i == FpAM_XY) return "FpAM_XY";
+  else if (i == FpAM_YZ) return "FpAM_YZ";
+  else if (i == FpAM_ZX) return "FpAM_ZX";
+  else if (i == FeAM_XX) return "FeAM_XX";
+  else if (i == FeAM_YY) return "FeAM_YY";
+  else if (i == FeAM_ZZ) return "FeAM_ZZ";
+  else if (i == FeAM_XY) return "FeAM_XY";
+  else if (i == FeAM_YZ) return "FeAM_YZ";
+  else if (i == FeAM_ZX) return "FeAM_ZX";
+
+  else if (i == epsAM)   return "epsAM";
+  //phenomenologicalSMP
   else if (i == USER1) return "USER1";
   else if (i == USER2) return "USER2";
   else if (i == USER3) return "USER3";
@@ -331,7 +354,6 @@ std::string IPField::ToString(const int i){
   else if (i == USER7) return "USER7";
   else if (i == USER8) return "USER8";
   else if (i == USER9) return "USER9";
-  //phenomenologicalSMP
 
   else{
     Msg::Warning("This IP field %d is not defined in IPField::ToString(%d)",i,i);