flag curved mesh - initial

NonLinearEVP/NonLinearEVP.pro

@@ -132,17 +132,31 @@ Jacobian {
 }
 
 Integration {
-  { Name Int_1 ;
-    Case {
-      { Type Gauss ;
-        Case {
-          { GeoElement Point       ; NumberOfPoints  1 ; }
-          { GeoElement Line        ; NumberOfPoints  4 ; }
-          { GeoElement Triangle    ; NumberOfPoints  6 ; }
+  If (flag_o2g==0)
+    { Name Int_1 ;
+      Case {
+        { Type Gauss ;
+          Case {
+            { GeoElement Point    ; NumberOfPoints  1 ; }
+            { GeoElement Line     ; NumberOfPoints  4 ; }
+            { GeoElement Triangle ; NumberOfPoints  6 ; }
+          }
         }
       }
     }
-  }
+  Else
+    { Name Int_1 ;
+      Case {
+        { Type Gauss ;
+          Case {
+            { GeoElement Point    ; NumberOfPoints  1 ; }
+            { GeoElement Line2    ; NumberOfPoints  4 ; }
+            { GeoElement Triangle2; NumberOfPoints  6 ; }
+          }
+        }
+      }
+    }
+  EndIf
 }
 
 FunctionSpace {

NonLinearEVP/NonLinearEVP_data.geo

@@ -55,12 +55,13 @@ DefineConstant[
 
   paramaille     = {4     , Name StrCat[pp4 , "0number of mesh elements per period []"]  , Highlight Str[colorpp4], Min 2, Max 10} , 
   flag_Tmesh     = {0     , Name StrCat[pp4 , "2locally structured mesh?"] , Choices {0="unstruct",1="struct"} },
-  flag_o2i       = {1     , Name StrCat[pp4 , "3FEM order"] , Choices {0="o1",1="o2"} },
+  flag_o2g       = {1     , Name StrCat[pp4 , "3Geometry order"] , Choices {0="o1 (linear)",1="o2 (curved)"} },
+  flag_o2i       = {1     , Name StrCat[pp4 , "4Interpolation order"] , Choices {0="o1",1="o2"} },
   
   flag_res       = {2     , Name StrCat[pp5  , "0resolution type"], 
                         // Choices {0="Aux_E" ,1="PEP_E" ,2="NEP_E" ,3="Lag_E" ,4="PEP_h", 5="all"},ServerAction "ResetDatabase"},
                         Choices {0="Aux_E" ,1="PEP_E" ,2="NEP_E" ,3="Lag_E" ,4="PEP_h"},ServerAction "ResetDatabase"},
-  flag_outEigvec = {1     , Name StrCat[pp4, "output eigenvector?"], Choices{0,1}}
+  flag_outEigvec = {1     , Name StrCat[pp4, "5output eigenvector?"], Choices{0,1}}
 ];
 
 // Normalized units so that 2*pi*c/a=1