Index: /issm/trunk/src/m/classes/public/BuildQueueingScriptGeneric.m
===================================================================
--- /issm/trunk/src/m/classes/public/BuildQueueingScriptGeneric.m	(revision 1789)
+++ /issm/trunk/src/m/classes/public/BuildQueueingScriptGeneric.m	(revision 1790)
@@ -15,4 +15,4 @@
 fprintf(fid,'#!/bin/sh\n');
 fprintf(fid,'rm -rf %s/%s.lock\n',executionpath,md.name);
-fprintf(fid,'mpirun -np %i %s/%s.exe %s %s.bin %s.outbin %s.lock  2> %s.errlog >%s.outlog & ',md.np,codepath,AnalysisTypeAsEnum(md.analysis_type),executionpath,md.name,md.name,md.name,md.name,md.name);
+fprintf(fid,'mpirun -np %i %s/%s.exe %s %s.bin %s.outbin %s.lock  2> %s.errlog >%s.outlog & ',md.np,codepath,AnalysisTypeFromEnum(md.analysis_type),executionpath,md.name,md.name,md.name,md.name,md.name);
 fclose(fid);
Index: /issm/trunk/src/m/classes/public/loadresultsfromdisk.m
===================================================================
--- /issm/trunk/src/m/classes/public/loadresultsfromdisk.m	(revision 1789)
+++ /issm/trunk/src/m/classes/public/loadresultsfromdisk.m	(revision 1790)
@@ -27,6 +27,6 @@
 
 %convert analysis type to string
-md.analysis_type=AnalysisTypeAsEnum(md.analysis_type);
-md.sub_analysis_type=AnalysisTypeAsEnum(md.sub_analysis_type);
+md.analysis_type=AnalysisTypeFromEnum(md.analysis_type);
+md.sub_analysis_type=AnalysisTypeFromEnum(md.sub_analysis_type);
 
 %post processes qmu results if necessary
Index: /issm/trunk/src/m/classes/public/solve.m
===================================================================
--- /issm/trunk/src/m/classes/public/solve.m	(revision 1789)
+++ /issm/trunk/src/m/classes/public/solve.m	(revision 1790)
@@ -96,6 +96,6 @@
 
 %convert analysis type to string finally
-md.analysis_type=AnalysisTypeAsEnum(options.analysis_type);
-md.sub_analysis_type=AnalysisTypeAsEnum(options.sub_analysis_type);
+md.analysis_type=AnalysisTypeFronEnum(options.analysis_type);
+md.sub_analysis_type=AnalysisTypeFromEnum(options.sub_analysis_type);
 
 %re-add the paths