Index: /issm/branches/trunk-larour-GRL2017/src/c/modules/ModelProcessorx/CreateOutputDefinitions.cpp
===================================================================
--- /issm/branches/trunk-larour-GRL2017/src/c/modules/ModelProcessorx/CreateOutputDefinitions.cpp	(revision 21601)
+++ /issm/branches/trunk-larour-GRL2017/src/c/modules/ModelProcessorx/CreateOutputDefinitions.cpp	(revision 21602)
@@ -211,5 +211,5 @@
 				/*masscon variables: */
 				char**       masscon_name_s             = NULL;    
-				int*         masscon_definitionenum_s             = NULL;    
+				char**		 masscon_definitionstring_s		= NULL;    
 				char**       masscon_namex_s             = NULL;    
 				char**       masscon_namey_s             = NULL;    
@@ -220,5 +220,5 @@
 				/*Fetch names and multiplicators, etc ... (see src/m/classes/masscon_axpby.m): */
 				iomodel->FetchMultipleData(&masscon_name_s,&num,          "md.massconaxpby.name");
-				iomodel->FetchMultipleData(&masscon_definitionenum_s,&num,"md.massconaxpby.definitionenum");
+				iomodel->FetchMultipleData(&masscon_definitionstring_s,&num,"md.massconaxpby.definitionstring");
 				iomodel->FetchMultipleData(&masscon_namex_s,&num,         "md.massconaxpby.namex");
 				iomodel->FetchMultipleData(&masscon_namey_s,&num,         "md.massconaxpby.namey");
@@ -228,5 +228,5 @@
 
 					/*Create a masscon axpyb object: */
-					output_definitions->AddObject(new Massconaxpby(masscon_name_s[j],masscon_definitionenum_s[j],masscon_namex_s[j],masscon_namey_s[j],masscon_alpha_s[j],masscon_beta_s[j]));
+					output_definitions->AddObject(new Massconaxpby(masscon_name_s[j],StringToEnumx(masscon_definitionstring_s[j]),masscon_namex_s[j],masscon_namey_s[j],masscon_alpha_s[j],masscon_beta_s[j]));
 
 				}
@@ -235,12 +235,13 @@
 				for(j=0;j<num;j++){
 					char* string=NULL;
+					string = masscon_definitionstring_s[j];    xDelete<char>(string);
 					string = masscon_name_s[j];    xDelete<char>(string);
 					string = masscon_namex_s[j];    xDelete<char>(string);
 					string = masscon_namey_s[j];    xDelete<char>(string);
 				}
+				xDelete<char*>(masscon_definitionstring_s);
 				xDelete<char*>(masscon_name_s);
 				xDelete<char*>(masscon_namex_s);
 				xDelete<char*>(masscon_namey_s);
-				xDelete<int>(masscon_definitionenum_s);
 				xDelete<IssmDouble>(masscon_alpha_s);
 				xDelete<IssmDouble>(masscon_beta_s);