Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Control/UpdateElementsAndMaterialsControl.cpp
===================================================================
--- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Control/UpdateElementsAndMaterialsControl.cpp	(revision 27677)
+++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Control/UpdateElementsAndMaterialsControl.cpp	(revision 27678)
@@ -250,9 +250,9 @@
 			IssmDouble*	independents_max = NULL;
 
+			/*Fetch required data*/
 			FieldAndEnumFromCode(&input_enum,&iofieldname,names[i]);
-
-			/*Fetch required data*/
 			iomodel->FetchData(&independent,&M,&N,iofieldname);
 			_assert_(independent && N==control_sizes[i]);
+			xDelete<char>(iofieldname);
 
 			independents_min = NULL; independents_min = xNew<IssmDouble>(M*N);
@@ -266,22 +266,26 @@
 			if(N!=1) M_all[i]=M-1;
 
-			if(M_all[i]==iomodel->numberofvertices){
-				Interp_all[i] = P1Enum;
+			if(IsInputEnum(input_enum)){
+				if(M_all[i]==iomodel->numberofvertices){
+					Interp_all[i] = P1Enum;
+				}
+				else if(M_all[i]==iomodel->numberofelements){
+					Interp_all[i] = P0Enum;
+				}
+				else{
+					_error_("Control size not supported");
+				}
+
+				for(Object* & object : elements->objects){
+					Element* element=xDynamicCast<Element*>(object);
+					element->ControlInputCreate(independent,independents_min,independents_max,inputs,iomodel,M,N,1.,input_enum,i+1);
+				}
 			}
-			else if(M_all[i]==iomodel->numberofelements){
-				Interp_all[i] = P0Enum;
-			}
-			else{
-				_error_("Control size not supported");
-			}
-
-			for(Object* & object : elements->objects){
-				Element* element=xDynamicCast<Element*>(object);
-				element->ControlInputCreate(independent,independents_min,independents_max,inputs,iomodel,M,N,1.,input_enum,i+1);
+			else if(IsParamEnum(input_enum)){
+				_error_("not supported yet");
 			}
 			xDelete<IssmDouble>(independent);
 			xDelete<IssmDouble>(independents_min);
 			xDelete<IssmDouble>(independents_max);
-			xDelete<char>(iofieldname);
 
 		}