Changeset 13043

Timestamp:

08/15/12 15:34:20 (13 years ago)

Author:

jschierm

Message:

NEW: Bunches of changes to get Python checkconsistency and marshall running (plus corresponding Matlab changes).

Location:

issm/trunk-jpl/src/m

Files:

• classes/clusters/generic.py (modified) (5 diffs)
• classes/diagnostic.py (modified) (3 diffs)
• classes/geometry.py (modified) (1 diff)
• classes/groundingline.py (modified) (2 diffs)
• classes/inversion.py (modified) (2 diffs)
• classes/materials.py (modified) (5 diffs)
• classes/model/model.m (modified) (1 diff)
• classes/model/model.py (modified) (2 diffs)
• classes/model/planet.m (modified) (1 diff)
• classes/planetmesh.m (modified) (1 diff)
• classes/prognostic.py (modified) (2 diffs)
• classes/rifts.py (modified) (1 diff)
• classes/solver.m (modified) (1 diff)
• classes/solver.py (modified) (3 diffs)
• classes/verbose.py (modified) (1 diff)
• consistency/checkfield.py (modified) (5 diffs)
• consistency/ismodelselfconsistent.m (modified) (1 diff)
• consistency/ismodelselfconsistent.py (modified) (2 diffs)
• enum/EnumDefinitions.py (modified) (459 diffs)
• miscellaneous/issmdoc.m (modified) (2 diffs)
• os/flaimdir.m (modified) (1 diff)
• os/issmscpout.py (modified) (1 diff)
• solve/MatlabProcessPatch.m (modified) (1 diff)
• solve/WriteData.py (modified) (12 diffs)
• solve/loadresultsfromdisk.py (modified) (2 diffs)
• solve/marshall.py (modified) (2 diffs)
• solve/process_solve_options.m (modified) (1 diff)
• solve/process_solve_options.py (modified) (2 diffs)
• solve/solve.m (modified) (4 diffs)
• solve/solve.py (modified) (5 diffs)

issm/trunk-jpl/src/m/classes/clusters/generic.py

@@ -4 +4 @@
 import platform
 import subprocess
+from EnumToString import EnumToString
 from issmdir import *
 from pairoptions import *
@@ -79 +80 @@
                         if not isvalgrind:
                                 if self.interactive:
-                                        fid.write('mpiexec -np %i %s/issm.exe %s %s %s ' % (self.np,self.codepath,EnumToString(solution),self.executionpath,modelname))
+                                        fid.write('mpiexec -np %i %s/issm.exe %s %s %s ' % (self.np,self.codepath,EnumToString(solution)[0],self.executionpath,modelname))
                                 else:
-                                        fid.write('mpiexec -np %i %s/issm.exe %s %s %s 2> %s.errlog >%s.outlog ' % (self.np,self.codepath,EnumToString(solution),self.executionpath,modelname,modelname,modelname))
+                                        fid.write('mpiexec -np %i %s/issm.exe %s %s %s 2> %s.errlog >%s.outlog ' % (self.np,self.codepath,EnumToString(solution)[0],self.executionpath,modelname,modelname,modelname))
                         elif isgprof:
                                 fid.write('\n gprof %s/issm.exe gmon.out > %s.performance' % (self.codepath,modelname))
@@ -88 +89 @@
                                 fid.write('LD_PRELOAD=%s \\\n' % self.valgrindlib)
                                 fid.write('mpiexec -np %i %s --leak-check=full --suppressions=%s %s/issm.exe %s %s %s 2> %s.errlog >%s.outlog ' % \
-                                        (self.np,self.valgrind,self.valgrindsup,self.codepath,EnumToString(solution),self.executionpath,modelname,modelname,modelname))
+                                        (self.np,self.valgrind,self.valgrindsup,self.codepath,EnumToString(solution)[0],self.executionpath,modelname,modelname,modelname))
                         if not io_gather:    #concatenate the output files:
                                 fid.write('\ncat %s.outbin.* > %s.outbin' % (modelname,modelname))
@@ -98 +99 @@
                         fid.write('@echo off\n')
                         if self.interactive:
-                                fid.write('"%s/issm.exe" %s "%s" %s ' % (self.codepath,EnumToString(solution),self.executionpath,modelname))
+                                fid.write('"%s/issm.exe" %s "%s" %s ' % (self.codepath,EnumToString(solution)[0],self.executionpath,modelname))
                         else:
                                 fid.write('"%s/issm.exe" %s "%s" %s 2> %s.errlog >%s.outlog' % \
-                                        (self.codepath,EnumToString(solution),self.executionpath,modelname,modelname,modelname))
+                                        (self.codepath,EnumToString(solution)[0],self.executionpath,modelname,modelname,modelname))
                         fid.close()
 
@@ -140 +141 @@
                         fid.write('@echo off\n')
                         if self.interactive:
-                                fid.write('"%s/issm.exe" %s "%s" %s ' % (self.codepath,EnumToString(solution),self.executionpath,modelname))
+                                fid.write('"%s/issm.exe" %s "%s" %s ' % (self.codepath,EnumToString(solution)[0],self.executionpath,modelname))
                         else:
                                 fid.write('"%s/issm.exe" %s "%s" %s 2> %s.errlog >%s.outlog' % \
-                                        (self.codepath,EnumToString(solution),self.executionpath,modelname,modelname,modelname))
+                                        (self.codepath,EnumToString(solution)[0],self.executionpath,modelname,modelname,modelname))
                         fid.close()
 

issm/trunk-jpl/src/m/classes/diagnostic.py

@@ -126 +126 @@
                 md = checkfield(md,'diagnostic.abstol','size',[1])
                 md = checkfield(md,'diagnostic.isnewton','numel',[1],'values',[0,1])
-                md = checkfield(md,'diagnostic.stokesreconditioning','size',[1,1],'NaN',1)
-                md = checkfield(md,'diagnostic.viscosity_overshoot','size',[1,1],'NaN',1)
+                md = checkfield(md,'diagnostic.stokesreconditioning','size',[1],'NaN',1)
+                md = checkfield(md,'diagnostic.viscosity_overshoot','size',[1],'NaN',1)
                 if md.mesh.dimension==2:
                         md = checkfield(md,'diagnostic.icefront','size',[float('NaN'),4],'NaN',1)
@@ -139 +139 @@
 
                 #singular solution
+#               if ~any((~isnan(md.diagnostic.spcvx)+~isnan(md.diagnostic.spcvy))==2),
                 if not numpy.any(numpy.logical_and(numpy.logical_not(numpy.isnan(md.diagnostic.spcvx)),numpy.logical_not(numpy.isnan(md.diagnostic.spcvy)))):
                         md.checkmessage("model is not well posed (singular). You need at least one node with fixed velocity!")
                 #CHECK THAT EACH LINES CONTAINS ONLY NAN VALUES OR NO NAN VALUES
-                if any(not numpy.sum(numpy.isnan(md.diagnostic.referential),axis=1)==0 and not numpy.sum(numpy.isnan(md.diagnostic.referential),axis=1)==6):
+#               if any(sum(isnan(md.diagnostic.referential),2)~=0 & sum(isnan(md.diagnostic.referential),2)~=6),
+                if numpy.any(numpy.logical_and(numpy.sum(numpy.isnan(md.diagnostic.referential),axis=1)!=0,numpy.sum(numpy.isnan(md.diagnostic.referential),axis=1)!=6)):
                         md.checkmessage("Each line of diagnostic.referential should contain either only NaN values or no NaN values")
                 #CHECK THAT THE TWO VECTORS PROVIDED ARE ORTHOGONAL
-                if any(numpy.sum(numpy.isnan(md.diagnostic.referential),axis=1)==0):
+#               if any(sum(isnan(md.diagnostic.referential),2)==0),
+                if numpy.any(numpy.sum(numpy.isnan(md.diagnostic.referential),axis=1)==0):
                         pos=[i for i,item in enumerate(numpy.sum(numpy.isnan(md.diagnostic.referential),axis=1)) if item==0]
 #                       numpy.inner (and numpy.dot) calculate all the dot product permutations, resulting in a full matrix multiply
@@ -154 +157 @@
                                         md.checkmessage("Vectors in diagnostic.referential (columns 1 to 3 and 4 to 6) must be orthogonal")
                 #CHECK THAT NO rotation specified for FS Grounded ice at base
+#               if md.mesh.dimension==3 & md.flowequation.isstokes,
                 if md.mesh.dimension==3 and md.flowequation.isstokes:
                         pos=numpy.nonzero(numpy.logical_and(md.mask.vertexongroundedice,md.mesh.vertexonbed))

issm/trunk-jpl/src/m/classes/geometry.py

@@ -51 +51 @@
                 if any((self.thickness-self.surface+self.bed)>10**-9):
                         md.checkmessage("equality thickness=surface-bed violated")
-                end 
                 if solution==TransientSolutionEnum() and md.transient.isgroundingline:
                         md = checkfield(md,'geometry.bathymetry','NaN',1,'size',[md.mesh.numberofvertices])

issm/trunk-jpl/src/m/classes/groundingline.py

@@ -3 +3 @@
 from fielddisplay import fielddisplay
 from EnumDefinitions import *
+from StringToEnum import StringToEnum
 from checkfield import *
 from WriteData import *
@@ -63 +64 @@
 
         def marshall(self,fid):    # {{{
-                WriteData(fid,'data',StringToEnum(self.migration),'enum',GroundinglineMigrationEnum(),'format','Integer')
+                WriteData(fid,'data',StringToEnum(self.migration)[0],'enum',GroundinglineMigrationEnum(),'format','Integer')
                 WriteData(fid,'object',self,'fieldname','melting_rate','format','Double')
         # }}}

issm/trunk-jpl/src/m/classes/inversion.py

@@ -3 +3 @@
 from fielddisplay import fielddisplay
 from EnumDefinitions import *
+from StringToEnum import StringToEnum
 from checkfield import *
 from WriteData import *
@@ -167 +168 @@
                 #process control parameters
                 num_control_parameters=numpy.size(self.control_parameters)
-                data=[StringToEnum(self.control_parameters[i]) for i in xrange(0,num_control_parameters)]
+                data=[StringToEnum(self.control_parameters[i])[0] for i in xrange(0,num_control_parameters)]
                 WriteData(fid,'data',data,'enum',InversionControlParametersEnum(),'format','DoubleMat','mattype',3)
                 WriteData(fid,'data',num_control_parameters,'enum',InversionNumControlParametersEnum(),'format','Integer')

issm/trunk-jpl/src/m/classes/materials.py

@@ -2 +2 @@
 from fielddisplay import fielddisplay
 from EnumDefinitions import *
+from StringToEnum import StringToEnum
 from checkfield import *
 from WriteData import *
@@ -18 +19 @@
                 self.rho_ice                    = 0
                 self.rho_water                  = 0
+                self.rho_freshwater             = 0
                 self.mu_water                   = 0
                 self.heatcapacity               = 0
@@ -38 +40 @@
                 string="%s\n\n%s"%(string,fielddisplay(self,"rho_ice","ice density [kg/m^3]"))
                 string="%s\n%s"%(string,fielddisplay(self,"rho_water","water density [kg/m^3]"))
+                string="%s\n%s"%(string,fielddisplay(self,"rho_freshwater","fresh water density [kg/m^3]"))
                 string="%s\n%s"%(string,fielddisplay(self,"mu_water","water viscosity [N s/m^2]"))
                 string="%s\n%s"%(string,fielddisplay(self,"heatcapacity","heat capacity [J/kg/K]"))
@@ -57 +60 @@
                 self.rho_ice=917
 
-                #water density (kg/m^3)
+                #ocean water density (kg/m^3)
                 self.rho_water=1023
+
+                #fresh water density (kg/m^3)
+                self.rho_freshwater=1000
 
                 #water viscosity (N.s/m^2)
@@ -115 +121 @@
                 WriteData(fid,'object',self,'fieldname','rheology_B','format','DoubleMat','mattype',1)
                 WriteData(fid,'object',self,'fieldname','rheology_n','format','DoubleMat','mattype',2)
-                WriteData(fid,'data',StringToEnum(self.rheology_law),'enum',MaterialsRheologyLawEnum(),'format','Integer')
+                WriteData(fid,'data',StringToEnum(self.rheology_law)[0],'enum',MaterialsRheologyLawEnum(),'format','Integer')
         # }}}
 

issm/trunk-jpl/src/m/classes/model/model.m

@@ -1046 +1046 @@
                          md.settings         = settings();
                          md.solver           = solver();
-                         if ismumps,
-                                 md.solver           = addoptions(md.solver,DiagnosticVertAnalysisEnum(),mumpsoptions);
+                         if ismumps(),
+                                 md.solver           = addoptions(md.solver,DiagnosticVertAnalysisEnum(),mumpsoptions());
                          else
-                                 md.solver           = addoptions(md.solver,DiagnosticVertAnalysisEnum(),iluasmoptions);
+                                 md.solver           = addoptions(md.solver,DiagnosticVertAnalysisEnum(),iluasmoptions());
                          end
                          md.cluster          = generic();

issm/trunk-jpl/src/m/classes/model/model.py

@@ -33 +33 @@
 from private import private
 from EnumDefinitions import *
+from ismumps import *
+from mumpsoptions import *
+from iluasmoptions import *
 #}}}
 
@@ -56 +59 @@
                 self.settings         = settings()
                 self.solver           = solver()
-#               need EnumToString for these to work
-#               if ismumps:
-#                       md.solver.addoptions(DiagnosticVertAnalysisEnum(),mumpsoptions)
-#               else:
-#                       md.solver.addoptions(DiagnosticVertAnalysisEnum(),iluasmoptions)
+                if ismumps():
+                        self.solver.addoptions(DiagnosticVertAnalysisEnum(),mumpsoptions())
+                else:
+                        self.solver.addoptions(DiagnosticVertAnalysisEnum(),iluasmoptions())
                 self.cluster          = generic()
 

issm/trunk-jpl/src/m/classes/model/planet.m

@@ -38 +38 @@
                          md.settings         = settings();
                          md.solver           = solver();
-                         if ismumps,
-                                 md.solver           = addoptions(md.solver,DiagnosticVertAnalysisEnum,mumpsoptions);
+                         if ismumps(),
+                                 md.solver           = addoptions(md.solver,DiagnosticVertAnalysisEnum(),mumpsoptions());
                          else
-                                 md.solver           = addoptions(md.solver,DiagnosticVertAnalysisEnum,iluasmoptions);
+                                 md.solver           = addoptions(md.solver,DiagnosticVertAnalysisEnum(),iluasmoptions());
                          end
                          md.cluster          = generic();

issm/trunk-jpl/src/m/classes/planetmesh.m

@@ -74 +74 @@
                         %Solution specific checks
                         switch(solution),
-                                case PrognosticSolutionEnum,
+                                case PrognosticSolutionEnum(),
                                         if md.prognostic.stabilization==3,
                                                 md = checkfield(md,'planetmesh.dimension','values',2,'message','Discontinuous Galerkin only supported for 2d planetmeshes');
                                         end
-                                case TransientSolutionEnum,
+                                case TransientSolutionEnum(),
                                         if md.transient.isprognostic & md.prognostic.stabilization==3,
                                                 md = checkfield(md,'planetmesh.dimension','values',2,'message','Discontinuous Galerkin only supported for 2d planetmeshes');
                                         end
-                                case ThermalSolutionEnum,
+                                case ThermalSolutionEnum(),
                                         md = checkfield(md,'planetmesh.dimension','values',3,'message','thermal solution only supported on 3d planetmeshes');
                         end

issm/trunk-jpl/src/m/classes/prognostic.py

@@ -2 +2 @@
 from fielddisplay import fielddisplay
 from EnumDefinitions import *
+from StringToEnum import StringToEnum
 from checkfield import *
 from WriteData import *
@@ -73 +74 @@
                 WriteData(fid,'object',self,'fieldname','spcthickness','format','DoubleMat','mattype',1)
                 WriteData(fid,'object',self,'fieldname','min_thickness','format','Double')
-                WriteData(fid,'data',StringToEnum(self.hydrostatic_adjustment),'format','Integer','enum',PrognosticHydrostaticAdjustmentEnum())
+                WriteData(fid,'data',StringToEnum(self.hydrostatic_adjustment)[0],'format','Integer','enum',PrognosticHydrostaticAdjustmentEnum())
                 WriteData(fid,'object',self,'fieldname','stabilization','format','Integer')
                 WriteData(fid,'object',self,'fieldname','vertex_pairing','format','DoubleMat','mattype',3)

issm/trunk-jpl/src/m/classes/rifts.py

@@ -74 +74 @@
 
                 # 2 for nodes + 2 for elements+ 2 for  normals + 1 for length + 1 for fill + 1 for friction + 1 for fraction + 1 for fractionincrement + 1 for state.
-                data=numpy.zeros(numpairs,12)
+                data=numpy.zeros((numpairs,12))
                 count=0
                 for i in xrange(0,numrifts):

issm/trunk-jpl/src/m/classes/solver.m

@@ -38 +38 @@
 
                          %MUMPS is the default solver
-                         if ismumps,
-                                 obj.NoneAnalysis=mumpsoptions;
+                         if ismumps(),
+                                 obj.NoneAnalysis=mumpsoptions();
                          else
-                                 obj.NoneAnalysis=iluasmoptions;
+                                 obj.NoneAnalysis=iluasmoptions();
                          end
 

issm/trunk-jpl/src/m/classes/solver.py

@@ -2 +2 @@
 from mumpsoptions import *
 from iluasmoptions import *
+from EnumToString import EnumToString
 from MatlabFuncs import *
 from EnumDefinitions import *
@@ -16 +17 @@
         def __init__(self):    # {{{
                 #MUMPS is the default solver
-                if ismumps:
+                if ismumps():
                         self.NoneAnalysis=mumpsoptions()
                 else:
@@ -30 +31 @@
 
                 #Convert analysis from enum to string
-#               need EnumToString
-#               analysis=EnumToString(analysis)
+                [analysis]=EnumToString(analysis)
 
                 #Create dynamic property if property does not exist yet

issm/trunk-jpl/src/m/classes/verbose.py

@@ -125 +125 @@
 
         def marshall(self,fid):    # {{{
-                        WriteData(fid,'data',VerboseToBinary(self),'enum',VerboseEnum(),'format','Integer')
+                        WriteData(fid,'data',self.VerboseToBinary(),'enum',VerboseEnum(),'format','Integer')
         # }}}
 

issm/trunk-jpl/src/m/consistency/checkfield.py

@@ -39 +39 @@
 #       field=getattr(md,fieldname)
         exec("field=md.%s" % fieldname)
+        if isinstance(field,(bool,int,long,float)):
+                field=numpy.array([field])
 
         #check empty
@@ -85 +87 @@
         #check NaN
         if options.getfieldvalue('NaN',0):
-                if True in numpy.isnan(field):
+                if numpy.any(numpy.isnan(field)):
                         md = md.checkmessage(options.getfieldvalue('message',\
                                 "NaN values found in field '%s'" % fieldname))
@@ -112 +114 @@
         if options.exist('>='):
                 lowerbound=options.getfieldvalue('>=')
-                if any(field<lowerbound):
+                if numpy.any(field<lowerbound):
                         md = md.checkmessage(options.getfieldvalue('message',\
                                 "field '%s' should have values above %d" % (fieldname,lowerbound)))
         if options.exist('>'):
                 lowerbound=options.getfieldvalue('>')
-                if any(field<=lowerbound):
+                if numpy.any(field<=lowerbound):
                         md = md.checkmessage(options.getfieldvalue('message',\
                                 "field '%s' should have values above %d" % (fieldname,lowerbound)))
@@ -124 +126 @@
         if options.exist('<='):
                 upperbound=options.getfieldvalue('<=')
-                if any(field>upperbound):
+                if numpy.any(field>upperbound):
                         md = md.checkmessage(options.getfieldvalue('message',\
                                 "field '%s' should have values below %d" % (fieldname,upperbound)))
         if options.exist('<'):
                 upperbound=options.getfieldvalue('<')
-                if any(field>=upperbound):
+                if numpy.any(field>=upperbound):
                         md = md.checkmessage(options.getfieldvalue('message',\
                                 "field '%s' should have values below %d" % (fieldname,upperbound)))
@@ -141 +143 @@
         if options.getfieldvalue('forcing',0):
                 if   numpy.size(field,0)==md.mesh.numberofvertices:
-                        if not numpy.size(field,1)==1:
+                        if len(numpy.shape(field))>1 and not numpy.size(field,1)==1:
                                 md = md.checkmessage(options.getfieldvalue('message',\
                                         "field '%s' should have only one column as there are md.mesh.numberofvertices lines" % fieldname))

issm/trunk-jpl/src/m/consistency/ismodelselfconsistent.m

@@ -51 +51 @@
 switch solutiontype,
 
-        case DiagnosticSolutionEnum,
+        case DiagnosticSolutionEnum(),
                 numanalyses=5;
-                analyses=[DiagnosticHorizAnalysisEnum;DiagnosticVertAnalysisEnum;DiagnosticHutterAnalysisEnum;SurfaceSlopeAnalysisEnum;BedSlopeAnalysisEnum];
+                analyses=[DiagnosticHorizAnalysisEnum();DiagnosticVertAnalysisEnum();DiagnosticHutterAnalysisEnum();SurfaceSlopeAnalysisEnum();BedSlopeAnalysisEnum()];
 
-        case SteadystateSolutionEnum,
+        case SteadystateSolutionEnum(),
                 numanalyses=7; 
-                analyses=[DiagnosticHorizAnalysisEnum;DiagnosticVertAnalysisEnum;DiagnosticHutterAnalysisEnum;SurfaceSlopeAnalysisEnum;BedSlopeAnalysisEnum;ThermalAnalysisEnum;MeltingAnalysisEnum];
+                analyses=[DiagnosticHorizAnalysisEnum();DiagnosticVertAnalysisEnum();DiagnosticHutterAnalysisEnum();SurfaceSlopeAnalysisEnum();BedSlopeAnalysisEnum();ThermalAnalysisEnum();MeltingAnalysisEnum()];
 
-        case ThermalSolutionEnum,
+        case ThermalSolutionEnum(),
                 numanalyses=2; 
-                analyses=[ThermalAnalysisEnum;MeltingAnalysisEnum];
+                analyses=[ThermalAnalysisEnum();MeltingAnalysisEnum()];
 
-        case EnthalpySolutionEnum,
+        case EnthalpySolutionEnum(),
                 numanalyses=1; 
-                analyses=[EnthalpyAnalysisEnum];
+                analyses=[EnthalpyAnalysisEnum()];
 
-        case PrognosticSolutionEnum,
+        case PrognosticSolutionEnum(),
                 numanalyses=1; 
-                analyses=[PrognosticAnalysisEnum];
+                analyses=[PrognosticAnalysisEnum()];
 
-        case BalancethicknessSolutionEnum,
+        case BalancethicknessSolutionEnum(),
                 numanalyses=1; 
-                analyses=[BalancethicknessAnalysisEnum];
+                analyses=[BalancethicknessAnalysisEnum()];
 
-        case SurfaceSlopeSolutionEnum,
+        case SurfaceSlopeSolutionEnum(),
                 numanalyses=1; 
-                analyses=[SurfaceSlopeAnalysisEnum];
+                analyses=[SurfaceSlopeAnalysisEnum()];
 
-        case BedSlopeSolutionEnum,
+        case BedSlopeSolutionEnum(),
                 numanalyses=1; 
-                analyses=[BedSlopeAnalysisEnum];
+                analyses=[BedSlopeAnalysisEnum()];
 
-        case TransientSolutionEnum,
+        case TransientSolutionEnum(),
                 numanalyses=9; 
-                analyses=[DiagnosticHorizAnalysisEnum;DiagnosticVertAnalysisEnum;DiagnosticHutterAnalysisEnum;SurfaceSlopeAnalysisEnum;BedSlopeAnalysisEnum;ThermalAnalysisEnum;MeltingAnalysisEnum;EnthalpyAnalysisEnum;PrognosticAnalysisEnum];
+                analyses=[DiagnosticHorizAnalysisEnum();DiagnosticVertAnalysisEnum();DiagnosticHutterAnalysisEnum();SurfaceSlopeAnalysisEnum();BedSlopeAnalysisEnum();ThermalAnalysisEnum();MeltingAnalysisEnum();EnthalpyAnalysisEnum();PrognosticAnalysisEnum()];
 
-        case FlaimSolutionEnum,
+        case FlaimSolutionEnum(),
                 numanalyses=1; 
-                analyses=[FlaimAnalysisEnum];
+                analyses=[FlaimAnalysisEnum()];
 
-        case HydrologySolutionEnum,
+        case HydrologySolutionEnum(),
                 numanalyses=3; 
-                analyses=[BedSlopeAnalysisEnum;SurfaceSlopeAnalysisEnum;HydrologyAnalysisEnum];
+                analyses=[BedSlopeAnalysisEnum();SurfaceSlopeAnalysisEnum();HydrologyAnalysisEnum()];
 
         otherwise

issm/trunk-jpl/src/m/consistency/ismodelselfconsistent.py

@@ -1 +1 @@
 from EnumDefinitions import *
+from EnumToString import EnumToString
 
 def AnalysisConfiguration(solutiontype): #{{{
@@ -9 +10 @@
         """
 
-        if   solutiontype == DiagnosticSolutionEnum:
+        if   solutiontype == DiagnosticSolutionEnum():
                 numanalyses=5
-                analyses=[DiagnosticHorizAnalysisEnum,DiagnosticVertAnalysisEnum,DiagnosticHutterAnalysisEnum,SurfaceSlopeAnalysisEnum,BedSlopeAnalysisEnum]
+                analyses=[DiagnosticHorizAnalysisEnum(),DiagnosticVertAnalysisEnum(),DiagnosticHutterAnalysisEnum(),SurfaceSlopeAnalysisEnum(),BedSlopeAnalysisEnum()]
 
-        elif solutiontype == SteadystateSolutionEnum:
+        elif solutiontype == SteadystateSolutionEnum():
                 numanalyses=7 
-                analyses=[DiagnosticHorizAnalysisEnum,DiagnosticVertAnalysisEnum,DiagnosticHutterAnalysisEnum,SurfaceSlopeAnalysisEnum,BedSlopeAnalysisEnum,ThermalAnalysisEnum,MeltingAnalysisEnum]
+                analyses=[DiagnosticHorizAnalysisEnum(),DiagnosticVertAnalysisEnum(),DiagnosticHutterAnalysisEnum(),SurfaceSlopeAnalysisEnum(),BedSlopeAnalysisEnum(),ThermalAnalysisEnum(),MeltingAnalysisEnum()]
 
-        elif solutiontype == ThermalSolutionEnum:
+        elif solutiontype == ThermalSolutionEnum():
                 numanalyses=2 
-                analyses=[ThermalAnalysisEnum,MeltingAnalysisEnum]
+                analyses=[ThermalAnalysisEnum(),MeltingAnalysisEnum()]
 
-        elif solutiontype == EnthalpySolutionEnum:
+        elif solutiontype == EnthalpySolutionEnum():
                 numanalyses=1 
-                analyses=[EnthalpyAnalysisEnum]
+                analyses=[EnthalpyAnalysisEnum()]
 
-        elif solutiontype == PrognosticSolutionEnum:
+        elif solutiontype == PrognosticSolutionEnum():
                 numanalyses=1 
-                analyses=[PrognosticAnalysisEnum]
+                analyses=[PrognosticAnalysisEnum()]
 
-        elif solutiontype == BalancethicknessSolutionEnum:
+        elif solutiontype == BalancethicknessSolutionEnum():
                 numanalyses=1 
-                analyses=[BalancethicknessAnalysisEnum]
+                analyses=[BalancethicknessAnalysisEnum()]
 
-        elif solutiontype == SurfaceSlopeSolutionEnum:
+        elif solutiontype == SurfaceSlopeSolutionEnum():
                 numanalyses=1 
-                analyses=[SurfaceSlopeAnalysisEnum]
+                analyses=[SurfaceSlopeAnalysisEnum()]
 
-        elif solutiontype == BedSlopeSolutionEnum:
+        elif solutiontype == BedSlopeSolutionEnum():
                 numanalyses=1 
-                analyses=[BedSlopeAnalysisEnum]
+                analyses=[BedSlopeAnalysisEnum()]
 
-        elif solutiontype == TransientSolutionEnum:
+        elif solutiontype == TransientSolutionEnum():
                 numanalyses=9 
-                analyses=[DiagnosticHorizAnalysisEnum,DiagnosticVertAnalysisEnum,DiagnosticHutterAnalysisEnum,SurfaceSlopeAnalysisEnum,BedSlopeAnalysisEnum,ThermalAnalysisEnum,MeltingAnalysisEnum,EnthalpyAnalysisEnum,PrognosticAnalysisEnum]
+                analyses=[DiagnosticHorizAnalysisEnum(),DiagnosticVertAnalysisEnum(),DiagnosticHutterAnalysisEnum(),SurfaceSlopeAnalysisEnum(),BedSlopeAnalysisEnum(),ThermalAnalysisEnum(),MeltingAnalysisEnum(),EnthalpyAnalysisEnum(),PrognosticAnalysisEnum()]
 
-        elif solutiontype == FlaimSolutionEnum:
+        elif solutiontype == FlaimSolutionEnum():
                 numanalyses=1 
-                analyses=[FlaimAnalysisEnum]
+                analyses=[FlaimAnalysisEnum()]
 
-        elif solutiontype == HydrologySolutionEnum:
+        elif solutiontype == HydrologySolutionEnum():
                 numanalyses=3 
-                analyses=[BedSlopeAnalysisEnum,SurfaceSlopeAnalysisEnum,HydrologyAnalysisEnum]
+                analyses=[BedSlopeAnalysisEnum(),SurfaceSlopeAnalysisEnum(),HydrologyAnalysisEnum()]
 
         else:
-                raise TypeError("solution type: '%s' not supported yet!" % EnumToString(solutiontype))
+                raise TypeError("solution type: '%s' not supported yet!" % EnumToString(solutiontype)[0])
 
         return analyses,numanalyses

issm/trunk-jpl/src/m/enum/EnumDefinitions.py

@@ +1 @@
+from StringToEnum import StringToEnum
+
 """
 
@@ -15 +17 @@
         """
 
-        return StringToEnum('AutodiffForward')
+        return StringToEnum('AutodiffForward')[0]
 
 def AutodiffIsautodiffEnum():
@@ -25 +27 @@
         """
 
-        return StringToEnum('AutodiffIsautodiff')
+        return StringToEnum('AutodiffIsautodiff')[0]
 
 def AutodiffReverseEnum():
@@ -35 +37 @@
         """
 
-        return StringToEnum('AutodiffReverse')
+        return StringToEnum('AutodiffReverse')[0]
 
 def BalancethicknessSpcthicknessEnum():
@@ -45 +47 @@
         """
 
-        return StringToEnum('BalancethicknessSpcthickness')
+        return StringToEnum('BalancethicknessSpcthickness')[0]
 
 def BalancethicknessStabilizationEnum():
@@ -55 +57 @@
         """
 
-        return StringToEnum('BalancethicknessStabilization')
+        return StringToEnum('BalancethicknessStabilization')[0]
 
 def BalancethicknessThickeningRateEnum():
@@ -65 +67 @@
         """
 
-        return StringToEnum('BalancethicknessThickeningRate')
+        return StringToEnum('BalancethicknessThickeningRate')[0]
 
 def BasalforcingsGeothermalfluxEnum():
@@ -75 +77 @@
         """
 
-        return StringToEnum('BasalforcingsGeothermalflux')
+        return StringToEnum('BasalforcingsGeothermalflux')[0]
 
 def BasalforcingsMeltingRateCorrectionEnum():
@@ -85 +87 @@
         """
 
-        return StringToEnum('BasalforcingsMeltingRateCorrection')
+        return StringToEnum('BasalforcingsMeltingRateCorrection')[0]
 
 def BasalforcingsMeltingRateEnum():
@@ -95 +97 @@
         """
 
-        return StringToEnum('BasalforcingsMeltingRate')
+        return StringToEnum('BasalforcingsMeltingRate')[0]
 
 def BathymetryEnum():
@@ -105 +107 @@
         """
 
-        return StringToEnum('Bathymetry')
+        return StringToEnum('Bathymetry')[0]
 
 def BedEnum():
@@ -115 +117 @@
         """
 
-        return StringToEnum('Bed')
+        return StringToEnum('Bed')[0]
 
 def ConstantsGEnum():
@@ -125 +127 @@
         """
 
-        return StringToEnum('ConstantsG')
+        return StringToEnum('ConstantsG')[0]
 
 def ConstantsReferencetemperatureEnum():
@@ -135 +137 @@
         """
 
-        return StringToEnum('ConstantsReferencetemperature')
+        return StringToEnum('ConstantsReferencetemperature')[0]
 
 def ConstantsYtsEnum():
@@ -145 +147 @@
         """
 
-        return StringToEnum('ConstantsYts')
+        return StringToEnum('ConstantsYts')[0]
 
 def DiagnosticAbstolEnum():
@@ -155 +157 @@
         """
 
-        return StringToEnum('DiagnosticAbstol')
+        return StringToEnum('DiagnosticAbstol')[0]
 
 def DiagnosticIcefrontEnum():
@@ -165 +167 @@
         """
 
-        return StringToEnum('DiagnosticIcefront')
+        return StringToEnum('DiagnosticIcefront')[0]
 
 def DiagnosticIsnewtonEnum():
@@ -175 +177 @@
         """
 
-        return StringToEnum('DiagnosticIsnewton')
+        return StringToEnum('DiagnosticIsnewton')[0]
 
 def DiagnosticMaxiterEnum():
@@ -185 +187 @@
         """
 
-        return StringToEnum('DiagnosticMaxiter')
+        return StringToEnum('DiagnosticMaxiter')[0]
 
 def DiagnosticNumRequestedOutputsEnum():
@@ -195 +197 @@
         """
 
-        return StringToEnum('DiagnosticNumRequestedOutputs')
+        return StringToEnum('DiagnosticNumRequestedOutputs')[0]
 
 def DiagnosticPenaltyFactorEnum():
@@ -205 +207 @@
         """
 
-        return StringToEnum('DiagnosticPenaltyFactor')
+        return StringToEnum('DiagnosticPenaltyFactor')[0]
 
 def DiagnosticReferentialEnum():
@@ -215 +217 @@
         """
 
-        return StringToEnum('DiagnosticReferential')
+        return StringToEnum('DiagnosticReferential')[0]
 
 def DiagnosticReltolEnum():
@@ -225 +227 @@
         """
 
-        return StringToEnum('DiagnosticReltol')
+        return StringToEnum('DiagnosticReltol')[0]
 
 def DiagnosticRequestedOutputsEnum():
@@ -235 +237 @@
         """
 
-        return StringToEnum('DiagnosticRequestedOutputs')
+        return StringToEnum('DiagnosticRequestedOutputs')[0]
 
 def DiagnosticRestolEnum():
@@ -245 +247 @@
         """
 
-        return StringToEnum('DiagnosticRestol')
+        return StringToEnum('DiagnosticRestol')[0]
 
 def DiagnosticRiftPenaltyLockEnum():
@@ -255 +257 @@
         """
 
-        return StringToEnum('DiagnosticRiftPenaltyLock')
+        return StringToEnum('DiagnosticRiftPenaltyLock')[0]
 
 def DiagnosticRiftPenaltyThresholdEnum():
@@ -265 +267 @@
         """
 
-        return StringToEnum('DiagnosticRiftPenaltyThreshold')
+        return StringToEnum('DiagnosticRiftPenaltyThreshold')[0]
 
 def DiagnosticShelfDampeningEnum():
@@ -275 +277 @@
         """
 
-        return StringToEnum('DiagnosticShelfDampening')
+        return StringToEnum('DiagnosticShelfDampening')[0]
 
 def DiagnosticSpcvxEnum():
@@ -285 +287 @@
         """
 
-        return StringToEnum('DiagnosticSpcvx')
+        return StringToEnum('DiagnosticSpcvx')[0]
 
 def DiagnosticSpcvyEnum():
@@ -295 +297 @@
         """
 
-        return StringToEnum('DiagnosticSpcvy')
+        return StringToEnum('DiagnosticSpcvy')[0]
 
 def DiagnosticSpcvzEnum():
@@ -305 +307 @@
         """
 
-        return StringToEnum('DiagnosticSpcvz')
+        return StringToEnum('DiagnosticSpcvz')[0]
 
 def DiagnosticStokesreconditioningEnum():
@@ -315 +317 @@
         """
 
-        return StringToEnum('DiagnosticStokesreconditioning')
+        return StringToEnum('DiagnosticStokesreconditioning')[0]
 
 def DiagnosticVertexPairingEnum():
@@ -325 +327 @@
         """
 
-        return StringToEnum('DiagnosticVertexPairing')
+        return StringToEnum('DiagnosticVertexPairing')[0]
 
 def DiagnosticViscosityOvershootEnum():
@@ -335 +337 @@
         """
 
-        return StringToEnum('DiagnosticViscosityOvershoot')
+        return StringToEnum('DiagnosticViscosityOvershoot')[0]
 
 def FlowequationBordermacayealEnum():
@@ -345 +347 @@
         """
 
-        return StringToEnum('FlowequationBordermacayeal')
+        return StringToEnum('FlowequationBordermacayeal')[0]
 
 def FlowequationBorderpattynEnum():
@@ -355 +357 @@
         """
 
-        return StringToEnum('FlowequationBorderpattyn')
+        return StringToEnum('FlowequationBorderpattyn')[0]
 
 def FlowequationBorderstokesEnum():
@@ -365 +367 @@
         """
 
-        return StringToEnum('FlowequationBorderstokes')
+        return StringToEnum('FlowequationBorderstokes')[0]
 
 def FlowequationElementEquationEnum():
@@ -375 +377 @@
         """
 
-        return StringToEnum('FlowequationElementEquation')
+        return StringToEnum('FlowequationElementEquation')[0]
 
 def FlowequationIshutterEnum():
@@ -385 +387 @@
         """
 
-        return StringToEnum('FlowequationIshutter')
+        return StringToEnum('FlowequationIshutter')[0]
 
 def FlowequationIsmacayealpattynEnum():
@@ -395 +397 @@
         """
 
-        return StringToEnum('FlowequationIsmacayealpattyn')
+        return StringToEnum('FlowequationIsmacayealpattyn')[0]
 
 def FlowequationIsstokesEnum():
@@ -405 +407 @@
         """
 
-        return StringToEnum('FlowequationIsstokes')
+        return StringToEnum('FlowequationIsstokes')[0]
 
 def FlowequationVertexEquationEnum():
@@ -415 +417 @@
         """
 
-        return StringToEnum('FlowequationVertexEquation')
+        return StringToEnum('FlowequationVertexEquation')[0]
 
 def FrictionCoefficientEnum():
@@ -425 +427 @@
         """
 
-        return StringToEnum('FrictionCoefficient')
+        return StringToEnum('FrictionCoefficient')[0]
 
 def FrictionPEnum():
@@ -435 +437 @@
         """
 
-        return StringToEnum('FrictionP')
+        return StringToEnum('FrictionP')[0]
 
 def FrictionQEnum():
@@ -445 +447 @@
         """
 
-        return StringToEnum('FrictionQ')
+        return StringToEnum('FrictionQ')[0]
 
 def GeometryHydrostaticRatioEnum():
@@ -455 +457 @@
         """
 
-        return StringToEnum('GeometryHydrostaticRatio')
+        return StringToEnum('GeometryHydrostaticRatio')[0]
 
 def HydrologyCREnum():
@@ -465 +467 @@
         """
 
-        return StringToEnum('HydrologyCR')
+        return StringToEnum('HydrologyCR')[0]
 
 def HydrologyKnEnum():
@@ -475 +477 @@
         """
 
-        return StringToEnum('HydrologyKn')
+        return StringToEnum('HydrologyKn')[0]
 
 def HydrologyNEnum():
@@ -485 +487 @@
         """
 
-        return StringToEnum('HydrologyN')
+        return StringToEnum('HydrologyN')[0]
 
 def HydrologyPEnum():
@@ -495 +497 @@
         """
 
-        return StringToEnum('HydrologyP')
+        return StringToEnum('HydrologyP')[0]
 
 def HydrologyQEnum():
@@ -505 +507 @@
         """
 
-        return StringToEnum('HydrologyQ')
+        return StringToEnum('HydrologyQ')[0]
 
 def HydrologySpcwatercolumnEnum():
@@ -515 +517 @@
         """
 
-        return StringToEnum('HydrologySpcwatercolumn')
+        return StringToEnum('HydrologySpcwatercolumn')[0]
 
 def HydrologyStabilizationEnum():
@@ -525 +527 @@
         """
 
-        return StringToEnum('HydrologyStabilization')
+        return StringToEnum('HydrologyStabilization')[0]
 
 def InversionControlParametersEnum():
@@ -535 +537 @@
         """
 
-        return StringToEnum('InversionControlParameters')
+        return StringToEnum('InversionControlParameters')[0]
 
 def InversionCostFunctionEnum():
@@ -545 +547 @@
         """
 
-        return StringToEnum('InversionCostFunction')
+        return StringToEnum('InversionCostFunction')[0]
 
 def InversionCostFunctionThresholdEnum():
@@ -555 +557 @@
         """
 
-        return StringToEnum('InversionCostFunctionThreshold')
+        return StringToEnum('InversionCostFunctionThreshold')[0]
 
 def InversionCostFunctionsCoefficientsEnum():
@@ -565 +567 @@
         """
 
-        return StringToEnum('InversionCostFunctionsCoefficients')
+        return StringToEnum('InversionCostFunctionsCoefficients')[0]
 
 def InversionCostFunctionsEnum():
@@ -575 +577 @@
         """
 
-        return StringToEnum('InversionCostFunctions')
+        return StringToEnum('InversionCostFunctions')[0]
 
 def InversionGradientOnlyEnum():
@@ -585 +587 @@
         """
 
-        return StringToEnum('InversionGradientOnly')
+        return StringToEnum('InversionGradientOnly')[0]
 
 def InversionGradientScalingEnum():
@@ -595 +597 @@
         """
 
-        return StringToEnum('InversionGradientScaling')
+        return StringToEnum('InversionGradientScaling')[0]
 
 def InversionIscontrolEnum():
@@ -605 +607 @@
         """
 
-        return StringToEnum('InversionIscontrol')
+        return StringToEnum('InversionIscontrol')[0]
 
 def InversionTaoEnum():
@@ -615 +617 @@
         """
 
-        return StringToEnum('InversionTao')
+        return StringToEnum('InversionTao')[0]
 
 def InversionIncompleteAdjointEnum():
@@ -625 +627 @@
         """
 
-        return StringToEnum('InversionIncompleteAdjoint')
+        return StringToEnum('InversionIncompleteAdjoint')[0]
 
 def InversionMaxParametersEnum():
@@ -635 +637 @@
         """
 
-        return StringToEnum('InversionMaxParameters')
+        return StringToEnum('InversionMaxParameters')[0]
 
 def InversionMaxiterPerStepEnum():
@@ -645 +647 @@
         """
 
-        return StringToEnum('InversionMaxiterPerStep')
+        return StringToEnum('InversionMaxiterPerStep')[0]
 
 def InversionMinParametersEnum():
@@ -655 +657 @@
         """
 
-        return StringToEnum('InversionMinParameters')
+        return StringToEnum('InversionMinParameters')[0]
 
 def InversionNstepsEnum():
@@ -665 +667 @@
         """
 
-        return StringToEnum('InversionNsteps')
+        return StringToEnum('InversionNsteps')[0]
 
 def InversionNumControlParametersEnum():
@@ -675 +677 @@
         """
 
-        return StringToEnum('InversionNumControlParameters')
+        return StringToEnum('InversionNumControlParameters')[0]
 
 def InversionNumCostFunctionsEnum():
@@ -685 +687 @@
         """
 
-        return StringToEnum('InversionNumCostFunctions')
+        return StringToEnum('InversionNumCostFunctions')[0]
 
 def InversionStepThresholdEnum():
@@ -695 +697 @@
         """
 
-        return StringToEnum('InversionStepThreshold')
+        return StringToEnum('InversionStepThreshold')[0]
 
 def InversionThicknessObsEnum():
@@ -705 +707 @@
         """
 
-        return StringToEnum('InversionThicknessObs')
+        return StringToEnum('InversionThicknessObs')[0]
 
 def InversionVelObsEnum():
@@ -715 +717 @@
         """
 
-        return StringToEnum('InversionVelObs')
+        return StringToEnum('InversionVelObs')[0]
 
 def InversionVxObsEnum():
@@ -725 +727 @@
         """
 
-        return StringToEnum('InversionVxObs')
+        return StringToEnum('InversionVxObs')[0]
 
 def InversionVyObsEnum():
@@ -735 +737 @@
         """
 
-        return StringToEnum('InversionVyObs')
+        return StringToEnum('InversionVyObs')[0]
 
 def InversionVzObsEnum():
@@ -745 +747 @@
         """
 
-        return StringToEnum('InversionVzObs')
+        return StringToEnum('InversionVzObs')[0]
 
 def MaskElementonfloatingiceEnum():
@@ -755 +757 @@
         """
 
-        return StringToEnum('MaskElementonfloatingice')
+        return StringToEnum('MaskElementonfloatingice')[0]
 
 def MaskElementongroundediceEnum():
@@ -765 +767 @@
         """
 
-        return StringToEnum('MaskElementongroundedice')
+        return StringToEnum('MaskElementongroundedice')[0]
 
 def MaskElementonwaterEnum():
@@ -775 +777 @@
         """
 
-        return StringToEnum('MaskElementonwater')
+        return StringToEnum('MaskElementonwater')[0]
 
 def MaskVertexonfloatingiceEnum():
@@ -785 +787 @@
         """
 
-        return StringToEnum('MaskVertexonfloatingice')
+        return StringToEnum('MaskVertexonfloatingice')[0]
 
 def MaskVertexongroundediceEnum():
@@ -795 +797 @@
         """
 
-        return StringToEnum('MaskVertexongroundedice')
+        return StringToEnum('MaskVertexongroundedice')[0]
 
 def MaskVertexonwaterEnum():
@@ -805 +807 @@
         """
 
-        return StringToEnum('MaskVertexonwater')
+        return StringToEnum('MaskVertexonwater')[0]
 
 def MaterialsBetaEnum():
@@ -815 +817 @@
         """
 
-        return StringToEnum('MaterialsBeta')
+        return StringToEnum('MaterialsBeta')[0]
 
 def MaterialsHeatcapacityEnum():
@@ -825 +827 @@
         """
 
-        return StringToEnum('MaterialsHeatcapacity')
+        return StringToEnum('MaterialsHeatcapacity')[0]
 
 def MaterialsLatentheatEnum():
@@ -835 +837 @@
         """
 
-        return StringToEnum('MaterialsLatentheat')
+        return StringToEnum('MaterialsLatentheat')[0]
 
 def MaterialsMeltingpointEnum():
@@ -845 +847 @@
         """
 
-        return StringToEnum('MaterialsMeltingpoint')
+        return StringToEnum('MaterialsMeltingpoint')[0]
 
 def MaterialsMixedLayerCapacityEnum():
@@ -855 +857 @@
         """
 
-        return StringToEnum('MaterialsMixedLayerCapacity')
+        return StringToEnum('MaterialsMixedLayerCapacity')[0]
 
 def MaterialsRheologyBEnum():
@@ -865 +867 @@
         """
 
-        return StringToEnum('MaterialsRheologyB')
+        return StringToEnum('MaterialsRheologyB')[0]
 
 def MaterialsRheologyBbarEnum():
@@ -875 +877 @@
         """
 
-        return StringToEnum('MaterialsRheologyBbar')
+        return StringToEnum('MaterialsRheologyBbar')[0]
 
 def MaterialsRheologyLawEnum():
@@ -885 +887 @@
         """
 
-        return StringToEnum('MaterialsRheologyLaw')
+        return StringToEnum('MaterialsRheologyLaw')[0]
 
 def MaterialsRheologyNEnum():
@@ -895 +897 @@
         """
 
-        return StringToEnum('MaterialsRheologyN')
+        return StringToEnum('MaterialsRheologyN')[0]
 
 def MaterialsRhoIceEnum():
@@ -905 +907 @@
         """
 
-        return StringToEnum('MaterialsRhoIce')
+        return StringToEnum('MaterialsRhoIce')[0]
 
 def MaterialsRhoWaterEnum():
@@ -915 +917 @@
         """
 
-        return StringToEnum('MaterialsRhoWater')
+        return StringToEnum('MaterialsRhoWater')[0]
 
 def MaterialsRhoFreshwaterEnum():
@@ -925 +927 @@
         """
 
-        return StringToEnum('MaterialsRhoFreshwater')
+        return StringToEnum('MaterialsRhoFreshwater')[0]
 
 def MaterialsMuWaterEnum():
@@ -935 +937 @@
         """
 
-        return StringToEnum('MaterialsMuWater')
+        return StringToEnum('MaterialsMuWater')[0]
 
 def MaterialsThermalExchangeVelocityEnum():
@@ -945 +947 @@
         """
 
-        return StringToEnum('MaterialsThermalExchangeVelocity')
+        return StringToEnum('MaterialsThermalExchangeVelocity')[0]
 
 def MaterialsThermalconductivityEnum():
@@ -955 +957 @@
         """
 
-        return StringToEnum('MaterialsThermalconductivity')
+        return StringToEnum('MaterialsThermalconductivity')[0]
 
 def MeshAverageVertexConnectivityEnum():
@@ -965 +967 @@
         """
 
-        return StringToEnum('MeshAverageVertexConnectivity')
+        return StringToEnum('MeshAverageVertexConnectivity')[0]
 
 def MeshDimensionEnum():
@@ -975 +977 @@
         """
 
-        return StringToEnum('MeshDimension')
+        return StringToEnum('MeshDimension')[0]
 
 def MeshEdgesEnum():
@@ -985 +987 @@
         """
 
-        return StringToEnum('MeshEdges')
+        return StringToEnum('MeshEdges')[0]
 
 def MeshElementconnectivityEnum():
@@ -995 +997 @@
         """
 
-        return StringToEnum('MeshElementconnectivity')
+        return StringToEnum('MeshElementconnectivity')[0]
 
 def MeshElementonbedEnum():
@@ -1005 +1007 @@
         """
 
-        return StringToEnum('MeshElementonbed')
+        return StringToEnum('MeshElementonbed')[0]
 
 def MeshElementonsurfaceEnum():
@@ -1015 +1017 @@
         """
 
-        return StringToEnum('MeshElementonsurface')
+        return StringToEnum('MeshElementonsurface')[0]
 
 def MeshElements2dEnum():
@@ -1025 +1027 @@
         """
 
-        return StringToEnum('MeshElements2d')
+        return StringToEnum('MeshElements2d')[0]
 
 def MeshElementsEnum():
@@ -1035 +1037 @@
         """
 
-        return StringToEnum('MeshElements')
+        return StringToEnum('MeshElements')[0]
 
 def MeshLowerelementsEnum():
@@ -1045 +1047 @@
         """
 
-        return StringToEnum('MeshLowerelements')
+        return StringToEnum('MeshLowerelements')[0]
 
 def MeshNumberofedgesEnum():
@@ -1055 +1057 @@
         """
 
-        return StringToEnum('MeshNumberofedges')
+        return StringToEnum('MeshNumberofedges')[0]
 
 def MeshNumberofelements2dEnum():
@@ -1065 +1067 @@
         """
 
-        return StringToEnum('MeshNumberofelements2d')
+        return StringToEnum('MeshNumberofelements2d')[0]
 
 def MeshNumberofelementsEnum():
@@ -1075 +1077 @@
         """
 
-        return StringToEnum('MeshNumberofelements')
+        return StringToEnum('MeshNumberofelements')[0]
 
 def MeshNumberoflayersEnum():
@@ -1085 +1087 @@
         """
 
-        return StringToEnum('MeshNumberoflayers')
+        return StringToEnum('MeshNumberoflayers')[0]
 
 def MeshNumberofvertices2dEnum():
@@ -1095 +1097 @@
         """
 
-        return StringToEnum('MeshNumberofvertices2d')
+        return StringToEnum('MeshNumberofvertices2d')[0]
 
 def MeshNumberofverticesEnum():
@@ -1105 +1107 @@
         """
 
-        return StringToEnum('MeshNumberofvertices')
+        return StringToEnum('MeshNumberofvertices')[0]
 
 def MeshUpperelementsEnum():
@@ -1115 +1117 @@
         """
 
-        return StringToEnum('MeshUpperelements')
+        return StringToEnum('MeshUpperelements')[0]
 
 def MeshVertexonbedEnum():
@@ -1125 +1127 @@
         """
 
-        return StringToEnum('MeshVertexonbed')
+        return StringToEnum('MeshVertexonbed')[0]
 
 def MeshVertexonsurfaceEnum():
@@ -1135 +1137 @@
         """
 
-        return StringToEnum('MeshVertexonsurface')
+        return StringToEnum('MeshVertexonsurface')[0]
 
 def MeshXEnum():
@@ -1145 +1147 @@
         """
 
-        return StringToEnum('MeshX')
+        return StringToEnum('MeshX')[0]
 
 def MeshYEnum():
@@ -1155 +1157 @@
         """
 
-        return StringToEnum('MeshY')
+        return StringToEnum('MeshY')[0]
 
 def MeshZEnum():
@@ -1165 +1167 @@
         """
 
-        return StringToEnum('MeshZ')
+        return StringToEnum('MeshZ')[0]
 
 def MiscellaneousNameEnum():
@@ -1175 +1177 @@
         """
 
-        return StringToEnum('MiscellaneousName')
+        return StringToEnum('MiscellaneousName')[0]
 
 def PrognosticHydrostaticAdjustmentEnum():
@@ -1185 +1187 @@
         """
 
-        return StringToEnum('PrognosticHydrostaticAdjustment')
+        return StringToEnum('PrognosticHydrostaticAdjustment')[0]
 
 def PrognosticMinThicknessEnum():
@@ -1195 +1197 @@
         """
 
-        return StringToEnum('PrognosticMinThickness')
+        return StringToEnum('PrognosticMinThickness')[0]
 
 def PrognosticPenaltyFactorEnum():
@@ -1205 +1207 @@
         """
 
-        return StringToEnum('PrognosticPenaltyFactor')
+        return StringToEnum('PrognosticPenaltyFactor')[0]
 
 def PrognosticSpcthicknessEnum():
@@ -1215 +1217 @@
         """
 
-        return StringToEnum('PrognosticSpcthickness')
+        return StringToEnum('PrognosticSpcthickness')[0]
 
 def PrognosticStabilizationEnum():
@@ -1225 +1227 @@
         """
 
-        return StringToEnum('PrognosticStabilization')
+        return StringToEnum('PrognosticStabilization')[0]
 
 def PrognosticVertexPairingEnum():
@@ -1235 +1237 @@
         """
 
-        return StringToEnum('PrognosticVertexPairing')
+        return StringToEnum('PrognosticVertexPairing')[0]
 
 def QmuIsdakotaEnum():
@@ -1245 +1247 @@
         """
 
-        return StringToEnum('QmuIsdakota')
+        return StringToEnum('QmuIsdakota')[0]
 
 def QmuMassFluxSegmentsEnum():
@@ -1255 +1257 @@
         """
 
-        return StringToEnum('QmuMassFluxSegments')
+        return StringToEnum('QmuMassFluxSegments')[0]
 
 def QmuNumberofpartitionsEnum():
@@ -1265 +1267 @@
         """
 
-        return StringToEnum('QmuNumberofpartitions')
+        return StringToEnum('QmuNumberofpartitions')[0]
 
 def QmuNumberofresponsesEnum():
@@ -1275 +1277 @@
         """
 
-        return StringToEnum('QmuNumberofresponses')
+        return StringToEnum('QmuNumberofresponses')[0]
 
 def QmuPartitionEnum():
@@ -1285 +1287 @@
         """
 
-        return StringToEnum('QmuPartition')
+        return StringToEnum('QmuPartition')[0]
 
 def QmuResponsedescriptorsEnum():
@@ -1295 +1297 @@
         """
 
-        return StringToEnum('QmuResponsedescriptors')
+        return StringToEnum('QmuResponsedescriptors')[0]
 
 def QmuVariabledescriptorsEnum():
@@ -1305 +1307 @@
         """
 
-        return StringToEnum('QmuVariabledescriptors')
+        return StringToEnum('QmuVariabledescriptors')[0]
 
 def RiftsNumriftsEnum():
@@ -1315 +1317 @@
         """
 
-        return StringToEnum('RiftsNumrifts')
+        return StringToEnum('RiftsNumrifts')[0]
 
 def RiftsRiftstructEnum():
@@ -1325 +1327 @@
         """
 
-        return StringToEnum('RiftsRiftstruct')
+        return StringToEnum('RiftsRiftstruct')[0]
 
 def SettingsIoGatherEnum():
@@ -1335 +1337 @@
         """
 
-        return StringToEnum('SettingsIoGather')
+        return StringToEnum('SettingsIoGather')[0]
 
 def SettingsLowmemEnum():
@@ -1345 +1347 @@
         """
 
-        return StringToEnum('SettingsLowmem')
+        return StringToEnum('SettingsLowmem')[0]
 
 def SettingsOutputFrequencyEnum():
@@ -1355 +1357 @@
         """
 
-        return StringToEnum('SettingsOutputFrequency')
+        return StringToEnum('SettingsOutputFrequency')[0]
 
 def SettingsResultsAsPatchesEnum():
@@ -1365 +1367 @@
         """
 
-        return StringToEnum('SettingsResultsAsPatches')
+        return StringToEnum('SettingsResultsAsPatches')[0]
 
 def SettingsWaitonlockEnum():
@@ -1375 +1377 @@
         """
 
-        return StringToEnum('SettingsWaitonlock')
+        return StringToEnum('SettingsWaitonlock')[0]
 
 def SurfaceforcingsDelta18oEnum():
@@ -1385 +1387 @@
         """
 
-        return StringToEnum('SurfaceforcingsDelta18o')
+        return StringToEnum('SurfaceforcingsDelta18o')[0]
 
 def SurfaceforcingsDelta18oSurfaceEnum():
@@ -1395 +1397 @@
         """
 
-        return StringToEnum('SurfaceforcingsDelta18oSurface')
+        return StringToEnum('SurfaceforcingsDelta18oSurface')[0]
 
 def SurfaceforcingsIsdelta18oEnum():
@@ -1405 +1407 @@
         """
 
-        return StringToEnum('SurfaceforcingsIsdelta18o')
+        return StringToEnum('SurfaceforcingsIsdelta18o')[0]
 
 def SurfaceforcingsPrecipitationsPresentdayEnum():
@@ -1415 +1417 @@
         """
 
-        return StringToEnum('SurfaceforcingsPrecipitationsPresentday')
+        return StringToEnum('SurfaceforcingsPrecipitationsPresentday')[0]
 
 def SurfaceforcingsTemperaturesPresentdayEnum():
@@ -1425 +1427 @@
         """
 
-        return StringToEnum('SurfaceforcingsTemperaturesPresentday')
+        return StringToEnum('SurfaceforcingsTemperaturesPresentday')[0]
 
 def SurfaceforcingsTemperaturesLgmEnum():
@@ -1435 +1437 @@
         """
 
-        return StringToEnum('SurfaceforcingsTemperaturesLgm')
+        return StringToEnum('SurfaceforcingsTemperaturesLgm')[0]
 
 def DebugProfilingEnum():
@@ -1445 +1447 @@
         """
 
-        return StringToEnum('DebugProfiling')
+        return StringToEnum('DebugProfiling')[0]
 
 def ProfilingCurrentMemEnum():
@@ -1455 +1457 @@
         """
 
-        return StringToEnum('ProfilingCurrentMem')
+        return StringToEnum('ProfilingCurrentMem')[0]
 
 def ProfilingCurrentFlopsEnum():
@@ -1465 +1467 @@
         """
 
-        return StringToEnum('ProfilingCurrentFlops')
+        return StringToEnum('ProfilingCurrentFlops')[0]
 
 def ProfilingSolutionTimeEnum():
@@ -1475 +1477 @@
         """
 
-        return StringToEnum('ProfilingSolutionTime')
+        return StringToEnum('ProfilingSolutionTime')[0]
 
 def MaxIterationConvergenceFlagEnum():
@@ -1485 +1487 @@
         """
 
-        return StringToEnum('MaxIterationConvergenceFlag')
+        return StringToEnum('MaxIterationConvergenceFlag')[0]
 
 def SteadystateMaxiterEnum():
@@ -1495 +1497 @@
         """
 
-        return StringToEnum('SteadystateMaxiter')
+        return StringToEnum('SteadystateMaxiter')[0]
 
 def SteadystateNumRequestedOutputsEnum():
@@ -1505 +1507 @@
         """
 
-        return StringToEnum('SteadystateNumRequestedOutputs')
+        return StringToEnum('SteadystateNumRequestedOutputs')[0]
 
 def SteadystateReltolEnum():
@@ -1515 +1517 @@
         """
 
-        return StringToEnum('SteadystateReltol')
+        return StringToEnum('SteadystateReltol')[0]
 
 def SteadystateRequestedOutputsEnum():
@@ -1525 +1527 @@
         """
 
-        return StringToEnum('SteadystateRequestedOutputs')
+        return StringToEnum('SteadystateRequestedOutputs')[0]
 
 def SurfaceEnum():
@@ -1535 +1537 @@
         """
 
-        return StringToEnum('Surface')
+        return StringToEnum('Surface')[0]
 
 def SurfaceforcingsPrecipitationEnum():
@@ -1545 +1547 @@
         """
 
-        return StringToEnum('SurfaceforcingsPrecipitation')
+        return StringToEnum('SurfaceforcingsPrecipitation')[0]
 
 def SurfaceforcingsMassBalanceEnum():
@@ -1555 +1557 @@
         """
 
-        return StringToEnum('SurfaceforcingsMassBalance')
+        return StringToEnum('SurfaceforcingsMassBalance')[0]
 
 def SurfaceforcingsIspddEnum():
@@ -1565 +1567 @@
         """
 
-        return StringToEnum('SurfaceforcingsIspdd')
+        return StringToEnum('SurfaceforcingsIspdd')[0]
 
 def SurfaceforcingsIssmbgradientsEnum():
@@ -1575 +1577 @@
         """
 
-        return StringToEnum('SurfaceforcingsIssmbgradients')
+        return StringToEnum('SurfaceforcingsIssmbgradients')[0]
 
 def SurfaceforcingsMonthlytemperaturesEnum():
@@ -1585 +1587 @@
         """
 
-        return StringToEnum('SurfaceforcingsMonthlytemperatures')
+        return StringToEnum('SurfaceforcingsMonthlytemperatures')[0]
 
 def SurfaceforcingsHcEnum():
@@ -1595 +1597 @@
         """
 
-        return StringToEnum('SurfaceforcingsHc')
+        return StringToEnum('SurfaceforcingsHc')[0]
 
 def SurfaceforcingsSmbPosMaxEnum():
@@ -1605 +1607 @@
         """
 
-        return StringToEnum('SurfaceforcingsSmbPosMax')
+        return StringToEnum('SurfaceforcingsSmbPosMax')[0]
 
 def SurfaceforcingsSmbPosMinEnum():
@@ -1615 +1617 @@
         """
 
-        return StringToEnum('SurfaceforcingsSmbPosMin')
+        return StringToEnum('SurfaceforcingsSmbPosMin')[0]
 
 def SurfaceforcingsAPosEnum():
@@ -1625 +1627 @@
         """
 
-        return StringToEnum('SurfaceforcingsAPos')
+        return StringToEnum('SurfaceforcingsAPos')[0]
 
 def SurfaceforcingsBPosEnum():
@@ -1635 +1637 @@
         """
 
-        return StringToEnum('SurfaceforcingsBPos')
+        return StringToEnum('SurfaceforcingsBPos')[0]
 
 def SurfaceforcingsANegEnum():
@@ -1645 +1647 @@
         """
 
-        return StringToEnum('SurfaceforcingsANeg')
+        return StringToEnum('SurfaceforcingsANeg')[0]
 
 def SurfaceforcingsBNegEnum():
@@ -1655 +1657 @@
         """
 
-        return StringToEnum('SurfaceforcingsBNeg')
+        return StringToEnum('SurfaceforcingsBNeg')[0]
 
 def ThermalMaxiterEnum():
@@ -1665 +1667 @@
         """
 
-        return StringToEnum('ThermalMaxiter')
+        return StringToEnum('ThermalMaxiter')[0]
 
 def ThermalPenaltyFactorEnum():
@@ -1675 +1677 @@
         """
 
-        return StringToEnum('ThermalPenaltyFactor')
+        return StringToEnum('ThermalPenaltyFactor')[0]
 
 def ThermalPenaltyLockEnum():
@@ -1685 +1687 @@
         """
 
-        return StringToEnum('ThermalPenaltyLock')
+        return StringToEnum('ThermalPenaltyLock')[0]
 
 def ThermalPenaltyThresholdEnum():
@@ -1695 +1697 @@
         """
 
-        return StringToEnum('ThermalPenaltyThreshold')
+        return StringToEnum('ThermalPenaltyThreshold')[0]
 
 def ThermalSpctemperatureEnum():
@@ -1705 +1707 @@
         """
 
-        return StringToEnum('ThermalSpctemperature')
+        return StringToEnum('ThermalSpctemperature')[0]
 
 def ThermalStabilizationEnum():
@@ -1715 +1717 @@
         """
 
-        return StringToEnum('ThermalStabilization')
+        return StringToEnum('ThermalStabilization')[0]
 
 def ThermalIsenthalpyEnum():
@@ -1725 +1727 @@
         """
 
-        return StringToEnum('ThermalIsenthalpy')
+        return StringToEnum('ThermalIsenthalpy')[0]
 
 def ThicknessEnum():
@@ -1735 +1737 @@
         """
 
-        return StringToEnum('Thickness')
+        return StringToEnum('Thickness')[0]
 
 def TimesteppingStartTimeEnum():
@@ -1745 +1747 @@
         """
 
-        return StringToEnum('TimesteppingStartTime')
+        return StringToEnum('TimesteppingStartTime')[0]
 
 def TimesteppingFinalTimeEnum():
@@ -1755 +1757 @@
         """
 
-        return StringToEnum('TimesteppingFinalTime')
+        return StringToEnum('TimesteppingFinalTime')[0]
 
 def TimesteppingCflCoefficientEnum():
@@ -1765 +1767 @@
         """
 
-        return StringToEnum('TimesteppingCflCoefficient')
+        return StringToEnum('TimesteppingCflCoefficient')[0]
 
 def TimesteppingTimeAdaptEnum():
@@ -1775 +1777 @@
         """
 
-        return StringToEnum('TimesteppingTimeAdapt')
+        return StringToEnum('TimesteppingTimeAdapt')[0]
 
 def TimesteppingTimeStepEnum():
@@ -1785 +1787 @@
         """
 
-        return StringToEnum('TimesteppingTimeStep')
+        return StringToEnum('TimesteppingTimeStep')[0]
 
 def TransientIsdiagnosticEnum():
@@ -1795 +1797 @@
         """
 
-        return StringToEnum('TransientIsdiagnostic')
+        return StringToEnum('TransientIsdiagnostic')[0]
 
 def TransientIsgroundinglineEnum():
@@ -1805 +1807 @@
         """
 
-        return StringToEnum('TransientIsgroundingline')
+        return StringToEnum('TransientIsgroundingline')[0]
 
 def TransientIsprognosticEnum():
@@ -1815 +1817 @@
         """
 
-        return StringToEnum('TransientIsprognostic')
+        return StringToEnum('TransientIsprognostic')[0]
 
 def TransientIsthermalEnum():
@@ -1825 +1827 @@
         """
 
-        return StringToEnum('TransientIsthermal')
+        return StringToEnum('TransientIsthermal')[0]
 
 def TransientNumRequestedOutputsEnum():
@@ -1835 +1837 @@
         """
 
-        return StringToEnum('TransientNumRequestedOutputs')
+        return StringToEnum('TransientNumRequestedOutputs')[0]
 
 def TransientRequestedOutputsEnum():
@@ -1845 +1847 @@
         """
 
-        return StringToEnum('TransientRequestedOutputs')
+        return StringToEnum('TransientRequestedOutputs')[0]
 
 def SolutionTypeEnum():
@@ -1855 +1857 @@
         """
 
-        return StringToEnum('SolutionType')
+        return StringToEnum('SolutionType')[0]
 
 def AnalysisTypeEnum():
@@ -1865 +1867 @@
         """
 
-        return StringToEnum('AnalysisType')
+        return StringToEnum('AnalysisType')[0]
 
 def ConfigurationTypeEnum():
@@ -1875 +1877 @@
         """
 
-        return StringToEnum('ConfigurationType')
+        return StringToEnum('ConfigurationType')[0]
 
 def AdjointBalancethicknessAnalysisEnum():
@@ -1885 +1887 @@
         """
 
-        return StringToEnum('AdjointBalancethicknessAnalysis')
+        return StringToEnum('AdjointBalancethicknessAnalysis')[0]
 
 def AdjointHorizAnalysisEnum():
@@ -1895 +1897 @@
         """
 
-        return StringToEnum('AdjointHorizAnalysis')
+        return StringToEnum('AdjointHorizAnalysis')[0]
 
 def AdjointSolutionEnum():
@@ -1905 +1907 @@
         """
 
-        return StringToEnum('AdjointSolution')
+        return StringToEnum('AdjointSolution')[0]
 
 def AnalysisCounterEnum():
@@ -1915 +1917 @@
         """
 
-        return StringToEnum('AnalysisCounter')
+        return StringToEnum('AnalysisCounter')[0]
 
 def BalancethicknessAnalysisEnum():
@@ -1925 +1927 @@
         """
 
-        return StringToEnum('BalancethicknessAnalysis')
+        return StringToEnum('BalancethicknessAnalysis')[0]
 
 def BalancethicknessSolutionEnum():
@@ -1935 +1937 @@
         """
 
-        return StringToEnum('BalancethicknessSolution')
+        return StringToEnum('BalancethicknessSolution')[0]
 
 def BedSlopeAnalysisEnum():
@@ -1945 +1947 @@
         """
 
-        return StringToEnum('BedSlopeAnalysis')
+        return StringToEnum('BedSlopeAnalysis')[0]
 
 def BedSlopeSolutionEnum():
@@ -1955 +1957 @@
         """
 
-        return StringToEnum('BedSlopeSolution')
+        return StringToEnum('BedSlopeSolution')[0]
 
 def BedSlopeXAnalysisEnum():
@@ -1965 +1967 @@
         """
 
-        return StringToEnum('BedSlopeXAnalysis')
+        return StringToEnum('BedSlopeXAnalysis')[0]
 
 def BedSlopeYAnalysisEnum():
@@ -1975 +1977 @@
         """
 
-        return StringToEnum('BedSlopeYAnalysis')
+        return StringToEnum('BedSlopeYAnalysis')[0]
 
 def DiagnosticHorizAnalysisEnum():
@@ -1985 +1987 @@
         """
 
-        return StringToEnum('DiagnosticHorizAnalysis')
+        return StringToEnum('DiagnosticHorizAnalysis')[0]
 
 def DiagnosticHutterAnalysisEnum():
@@ -1995 +1997 @@
         """
 
-        return StringToEnum('DiagnosticHutterAnalysis')
+        return StringToEnum('DiagnosticHutterAnalysis')[0]
 
 def DiagnosticSolutionEnum():
@@ -2005 +2007 @@
         """
 
-        return StringToEnum('DiagnosticSolution')
+        return StringToEnum('DiagnosticSolution')[0]
 
 def DiagnosticVertAnalysisEnum():
@@ -2015 +2017 @@
         """
 
-        return StringToEnum('DiagnosticVertAnalysis')
+        return StringToEnum('DiagnosticVertAnalysis')[0]
 
 def EnthalpyAnalysisEnum():
@@ -2025 +2027 @@
         """
 
-        return StringToEnum('EnthalpyAnalysis')
+        return StringToEnum('EnthalpyAnalysis')[0]
 
 def EnthalpySolutionEnum():
@@ -2035 +2037 @@
         """
 
-        return StringToEnum('EnthalpySolution')
+        return StringToEnum('EnthalpySolution')[0]
 
 def FlaimAnalysisEnum():
@@ -2045 +2047 @@
         """
 
-        return StringToEnum('FlaimAnalysis')
+        return StringToEnum('FlaimAnalysis')[0]
 
 def FlaimSolutionEnum():
@@ -2055 +2057 @@
         """
 
-        return StringToEnum('FlaimSolution')
+        return StringToEnum('FlaimSolution')[0]
 
 def HydrologyAnalysisEnum():
@@ -2065 +2067 @@
         """
 
-        return StringToEnum('HydrologyAnalysis')
+        return StringToEnum('HydrologyAnalysis')[0]
 
 def HydrologySolutionEnum():
@@ -2075 +2077 @@
         """
 
-        return StringToEnum('HydrologySolution')
+        return StringToEnum('HydrologySolution')[0]
 
 def MeltingAnalysisEnum():
@@ -2085 +2087 @@
         """
 
-        return StringToEnum('MeltingAnalysis')
+        return StringToEnum('MeltingAnalysis')[0]
 
 def NoneAnalysisEnum():
@@ -2095 +2097 @@
         """
 
-        return StringToEnum('NoneAnalysis')
+        return StringToEnum('NoneAnalysis')[0]
 
 def PrognosticAnalysisEnum():
@@ -2105 +2107 @@
         """
 
-        return StringToEnum('PrognosticAnalysis')
+        return StringToEnum('PrognosticAnalysis')[0]
 
 def PrognosticSolutionEnum():
@@ -2115 +2117 @@
         """
 
-        return StringToEnum('PrognosticSolution')
+        return StringToEnum('PrognosticSolution')[0]
 
 def SteadystateSolutionEnum():
@@ -2125 +2127 @@
         """
 
-        return StringToEnum('SteadystateSolution')
+        return StringToEnum('SteadystateSolution')[0]
 
 def SurfaceSlopeAnalysisEnum():
@@ -2135 +2137 @@
         """
 
-        return StringToEnum('SurfaceSlopeAnalysis')
+        return StringToEnum('SurfaceSlopeAnalysis')[0]
 
 def SurfaceSlopeSolutionEnum():
@@ -2145 +2147 @@
         """
 
-        return StringToEnum('SurfaceSlopeSolution')
+        return StringToEnum('SurfaceSlopeSolution')[0]
 
 def SurfaceSlopeXAnalysisEnum():
@@ -2155 +2157 @@
         """
 
-        return StringToEnum('SurfaceSlopeXAnalysis')
+        return StringToEnum('SurfaceSlopeXAnalysis')[0]
 
 def SurfaceSlopeYAnalysisEnum():
@@ -2165 +2167 @@
         """
 
-        return StringToEnum('SurfaceSlopeYAnalysis')
+        return StringToEnum('SurfaceSlopeYAnalysis')[0]
 
 def ThermalAnalysisEnum():
@@ -2175 +2177 @@
         """
 
-        return StringToEnum('ThermalAnalysis')
+        return StringToEnum('ThermalAnalysis')[0]
 
 def ThermalSolutionEnum():
@@ -2185 +2187 @@
         """
 
-        return StringToEnum('ThermalSolution')
+        return StringToEnum('ThermalSolution')[0]
 
 def TransientSolutionEnum():
@@ -2195 +2197 @@
         """
 
-        return StringToEnum('TransientSolution')
+        return StringToEnum('TransientSolution')[0]
 
 def ApproximationEnum():
@@ -2205 +2207 @@
         """
 
-        return StringToEnum('Approximation')
+        return StringToEnum('Approximation')[0]
 
 def HutterApproximationEnum():
@@ -2215 +2217 @@
         """
 
-        return StringToEnum('HutterApproximation')
+        return StringToEnum('HutterApproximation')[0]
 
 def MacAyealApproximationEnum():
@@ -2225 +2227 @@
         """
 
-        return StringToEnum('MacAyealApproximation')
+        return StringToEnum('MacAyealApproximation')[0]
 
 def MacAyealPattynApproximationEnum():
@@ -2235 +2237 @@
         """
 
-        return StringToEnum('MacAyealPattynApproximation')
+        return StringToEnum('MacAyealPattynApproximation')[0]
 
 def MacAyealStokesApproximationEnum():
@@ -2245 +2247 @@
         """
 
-        return StringToEnum('MacAyealStokesApproximation')
+        return StringToEnum('MacAyealStokesApproximation')[0]
 
 def NoneApproximationEnum():
@@ -2255 +2257 @@
         """
 
-        return StringToEnum('NoneApproximation')
+        return StringToEnum('NoneApproximation')[0]
 
 def PattynApproximationEnum():
@@ -2265 +2267 @@
         """
 
-        return StringToEnum('PattynApproximation')
+        return StringToEnum('PattynApproximation')[0]
 
 def PattynStokesApproximationEnum():
@@ -2275 +2277 @@
         """
 
-        return StringToEnum('PattynStokesApproximation')
+        return StringToEnum('PattynStokesApproximation')[0]
 
 def StokesApproximationEnum():
@@ -2285 +2287 @@
         """
 
-        return StringToEnum('StokesApproximation')
+        return StringToEnum('StokesApproximation')[0]
 
 def ConstraintsEnum():
@@ -2295 +2297 @@
         """
 
-        return StringToEnum('Constraints')
+        return StringToEnum('Constraints')[0]
 
 def LoadsEnum():
@@ -2305 +2307 @@
         """
 
-        return StringToEnum('Loads')
+        return StringToEnum('Loads')[0]
 
 def MaterialsEnum():
@@ -2315 +2317 @@
         """
 
-        return StringToEnum('Materials')
+        return StringToEnum('Materials')[0]
 
 def NodesEnum():
@@ -2325 +2327 @@
         """
 
-        return StringToEnum('Nodes')
+        return StringToEnum('Nodes')[0]
 
 def ParametersEnum():
@@ -2335 +2337 @@
         """
 
-        return StringToEnum('Parameters')
+        return StringToEnum('Parameters')[0]
 
 def VerticesEnum():
@@ -2345 +2347 @@
         """
 
-        return StringToEnum('Vertices')
+        return StringToEnum('Vertices')[0]
 
 def ResultsEnum():
@@ -2355 +2357 @@
         """
 
-        return StringToEnum('Results')
+        return StringToEnum('Results')[0]
 
 def BoolInputEnum():
@@ -2365 +2367 @@
         """
 
-        return StringToEnum('BoolInput')
+        return StringToEnum('BoolInput')[0]
 
 def BoolParamEnum():
@@ -2375 +2377 @@
         """
 
-        return StringToEnum('BoolParam')
+        return StringToEnum('BoolParam')[0]
 
 def ContourEnum():
@@ -2385 +2387 @@
         """
 
-        return StringToEnum('Contour')
+        return StringToEnum('Contour')[0]
 
 def ControlInputEnum():
@@ -2395 +2397 @@
         """
 
-        return StringToEnum('ControlInput')
+        return StringToEnum('ControlInput')[0]
 
 def DatasetInputEnum():
@@ -2405 +2407 @@
         """
 
-        return StringToEnum('DatasetInput')
+        return StringToEnum('DatasetInput')[0]
 
 def DofIndexingEnum():
@@ -2415 +2417 @@
         """
 
-        return StringToEnum('DofIndexing')
+        return StringToEnum('DofIndexing')[0]
 
 def DoubleInputEnum():
@@ -2425 +2427 @@
         """
 
-        return StringToEnum('DoubleInput')
+        return StringToEnum('DoubleInput')[0]
 
 def DoubleMatArrayParamEnum():
@@ -2435 +2437 @@
         """
 
-        return StringToEnum('DoubleMatArrayParam')
+        return StringToEnum('DoubleMatArrayParam')[0]
 
 def DoubleMatParamEnum():
@@ -2445 +2447 @@
         """
 
-        return StringToEnum('DoubleMatParam')
+        return StringToEnum('DoubleMatParam')[0]
 
 def DoubleParamEnum():
@@ -2455 +2457 @@
         """
 
-        return StringToEnum('DoubleParam')
+        return StringToEnum('DoubleParam')[0]
 
 def DoubleVecParamEnum():
@@ -2465 +2467 @@
         """
 
-        return StringToEnum('DoubleVecParam')
+        return StringToEnum('DoubleVecParam')[0]
 
 def ElementEnum():
@@ -2475 +2477 @@
         """
 
-        return StringToEnum('Element')
+        return StringToEnum('Element')[0]
 
 def ElementResultEnum():
@@ -2485 +2487 @@
         """
 
-        return StringToEnum('ElementResult')
+        return StringToEnum('ElementResult')[0]
 
 def ExternalResultEnum():
@@ -2495 +2497 @@
         """
 
-        return StringToEnum('ExternalResult')
+        return StringToEnum('ExternalResult')[0]
 
 def FileParamEnum():
@@ -2505 +2507 @@
         """
 
-        return StringToEnum('FileParam')
+        return StringToEnum('FileParam')[0]
 
 def HookEnum():
@@ -2515 +2517 @@
         """
 
-        return StringToEnum('Hook')
+        return StringToEnum('Hook')[0]
 
 def IcefrontEnum():
@@ -2525 +2527 @@
         """
 
-        return StringToEnum('Icefront')
+        return StringToEnum('Icefront')[0]
 
 def InputEnum():
@@ -2535 +2537 @@
         """
 
-        return StringToEnum('Input')
+        return StringToEnum('Input')[0]
 
 def IntInputEnum():
@@ -2545 +2547 @@
         """
 
-        return StringToEnum('IntInput')
+        return StringToEnum('IntInput')[0]
 
 def IntParamEnum():
@@ -2555 +2557 @@
         """
 
-        return StringToEnum('IntParam')
+        return StringToEnum('IntParam')[0]
 
 def IntVecParamEnum():
@@ -2565 +2567 @@
         """
 
-        return StringToEnum('IntVecParam')
+        return StringToEnum('IntVecParam')[0]
 
 def TransientParamEnum():
@@ -2575 +2577 @@
         """
 
-        return StringToEnum('TransientParam')
+        return StringToEnum('TransientParam')[0]
 
 def MacAyeal2dIceFrontEnum():
@@ -2585 +2587 @@
         """
 
-        return StringToEnum('MacAyeal2dIceFront')
+        return StringToEnum('MacAyeal2dIceFront')[0]
 
 def MacAyeal3dIceFrontEnum():
@@ -2595 +2597 @@
         """
 
-        return StringToEnum('MacAyeal3dIceFront')
+        return StringToEnum('MacAyeal3dIceFront')[0]
 
 def MaticeEnum():
@@ -2605 +2607 @@
         """
 
-        return StringToEnum('Matice')
+        return StringToEnum('Matice')[0]
 
 def MatparEnum():
@@ -2615 +2617 @@
         """
 
-        return StringToEnum('Matpar')
+        return StringToEnum('Matpar')[0]
 
 def NodeEnum():
@@ -2625 +2627 @@
         """
 
-        return StringToEnum('Node')
+        return StringToEnum('Node')[0]
 
 def NumericalfluxEnum():
@@ -2635 +2637 @@
         """
 
-        return StringToEnum('Numericalflux')
+        return StringToEnum('Numericalflux')[0]
 
 def ParamEnum():
@@ -2645 +2647 @@
         """
 
-        return StringToEnum('Param')
+        return StringToEnum('Param')[0]
 
 def PattynIceFrontEnum():
@@ -2655 +2657 @@
         """
 
-        return StringToEnum('PattynIceFront')
+        return StringToEnum('PattynIceFront')[0]
 
 def PengridEnum():
@@ -2665 +2667 @@
         """
 
-        return StringToEnum('Pengrid')
+        return StringToEnum('Pengrid')[0]
 
 def PenpairEnum():
@@ -2675 +2677 @@
         """
 
-        return StringToEnum('Penpair')
+        return StringToEnum('Penpair')[0]
 
 def PentaEnum():
@@ -2685 +2687 @@
         """
 
-        return StringToEnum('Penta')
+        return StringToEnum('Penta')[0]
 
 def PentaP1InputEnum():
@@ -2695 +2697 @@
         """
 
-        return StringToEnum('PentaP1Input')
+        return StringToEnum('PentaP1Input')[0]
 
 def MatrixParamEnum():
@@ -2705 +2707 @@
         """
 
-        return StringToEnum('MatrixParam')
+        return StringToEnum('MatrixParam')[0]
 
 def VectorParamEnum():
@@ -2715 +2717 @@
         """
 
-        return StringToEnum('VectorParam')
+        return StringToEnum('VectorParam')[0]
 
 def RiftfrontEnum():
@@ -2725 +2727 @@
         """
 
-        return StringToEnum('Riftfront')
+        return StringToEnum('Riftfront')[0]
 
 def SegmentEnum():
@@ -2735 +2737 @@
         """
 
-        return StringToEnum('Segment')
+        return StringToEnum('Segment')[0]
 
 def SegmentRiftfrontEnum():
@@ -2745 +2747 @@
         """
 
-        return StringToEnum('SegmentRiftfront')
+        return StringToEnum('SegmentRiftfront')[0]
 
 def SpcDynamicEnum():
@@ -2755 +2757 @@
         """
 
-        return StringToEnum('SpcDynamic')
+        return StringToEnum('SpcDynamic')[0]
 
 def SpcStaticEnum():
@@ -2765 +2767 @@
         """
 
-        return StringToEnum('SpcStatic')
+        return StringToEnum('SpcStatic')[0]
 
 def SpcTransientEnum():
@@ -2775 +2777 @@
         """
 
-        return StringToEnum('SpcTransient')
+        return StringToEnum('SpcTransient')[0]
 
 def StokesIceFrontEnum():
@@ -2785 +2787 @@
         """
 
-        return StringToEnum('StokesIceFront')
+        return StringToEnum('StokesIceFront')[0]
 
 def StringArrayParamEnum():
@@ -2795 +2797 @@
         """
 
-        return StringToEnum('StringArrayParam')
+        return StringToEnum('StringArrayParam')[0]
 
 def StringParamEnum():
@@ -2805 +2807 @@
         """
 
-        return StringToEnum('StringParam')
+        return StringToEnum('StringParam')[0]
 
 def TriaEnum():
@@ -2815 +2817 @@
         """
 
-        return StringToEnum('Tria')
+        return StringToEnum('Tria')[0]
 
 def TriaP1InputEnum():
@@ -2825 +2827 @@
         """
 
-        return StringToEnum('TriaP1Input')
+        return StringToEnum('TriaP1Input')[0]
 
 def VertexEnum():
@@ -2835 +2837 @@
         """
 
-        return StringToEnum('Vertex')
+        return StringToEnum('Vertex')[0]
 
 def AirEnum():
@@ -2845 +2847 @@
         """
 
-        return StringToEnum('Air')
+        return StringToEnum('Air')[0]
 
 def IceEnum():
@@ -2855 +2857 @@
         """
 
-        return StringToEnum('Ice')
+        return StringToEnum('Ice')[0]
 
 def MelangeEnum():
@@ -2865 +2867 @@
         """
 
-        return StringToEnum('Melange')
+        return StringToEnum('Melange')[0]
 
 def WaterEnum():
@@ -2875 +2877 @@
         """
 
-        return StringToEnum('Water')
+        return StringToEnum('Water')[0]
 
 def ClosedEnum():
@@ -2885 +2887 @@
         """
 
-        return StringToEnum('Closed')
+        return StringToEnum('Closed')[0]
 
 def FreeEnum():
@@ -2895 +2897 @@
         """
 
-        return StringToEnum('Free')
+        return StringToEnum('Free')[0]
 
 def OpenEnum():
@@ -2905 +2907 @@
         """
 
-        return StringToEnum('Open')
+        return StringToEnum('Open')[0]
 
 def AdjointpEnum():
@@ -2915 +2917 @@
         """
 
-        return StringToEnum('Adjointp')
+        return StringToEnum('Adjointp')[0]
 
 def AdjointxEnum():
@@ -2925 +2927 @@
         """
 
-        return StringToEnum('Adjointx')
+        return StringToEnum('Adjointx')[0]
 
 def AdjointyEnum():
@@ -2935 +2937 @@
         """
 
-        return StringToEnum('Adjointy')
+        return StringToEnum('Adjointy')[0]
 
 def AdjointzEnum():
@@ -2945 +2947 @@
         """
 
-        return StringToEnum('Adjointz')
+        return StringToEnum('Adjointz')[0]
 
 def BedSlopeXEnum():
@@ -2955 +2957 @@
         """
 
-        return StringToEnum('BedSlopeX')
+        return StringToEnum('BedSlopeX')[0]
 
 def BedSlopeYEnum():
@@ -2965 +2967 @@
         """
 
-        return StringToEnum('BedSlopeY')
+        return StringToEnum('BedSlopeY')[0]
 
 def BoundaryEnum():
@@ -2975 +2977 @@
         """
 
-        return StringToEnum('Boundary')
+        return StringToEnum('Boundary')[0]
 
 def ConstantEnum():
@@ -2985 +2987 @@
         """
 
-        return StringToEnum('Constant')
+        return StringToEnum('Constant')[0]
 
 def ConvergedEnum():
@@ -2995 +2997 @@
         """
 
-        return StringToEnum('Converged')
+        return StringToEnum('Converged')[0]
 
 def ExtToIuEnum():
@@ -3005 +3007 @@
         """
 
-        return StringToEnum('ExtToIu')
+        return StringToEnum('ExtToIu')[0]
 
 def FillEnum():
@@ -3015 +3017 @@
         """
 
-        return StringToEnum('Fill')
+        return StringToEnum('Fill')[0]
 
 def FractionIncrementEnum():
@@ -3025 +3027 @@
         """
 
-        return StringToEnum('FractionIncrement')
+        return StringToEnum('FractionIncrement')[0]
 
 def FrictionEnum():
@@ -3035 +3037 @@
         """
 
-        return StringToEnum('Friction')
+        return StringToEnum('Friction')[0]
 
 def GroundinglineMeltingRateEnum():
@@ -3045 +3047 @@
         """
 
-        return StringToEnum('GroundinglineMeltingRate')
+        return StringToEnum('GroundinglineMeltingRate')[0]
 
 def InternalEnum():
@@ -3055 +3057 @@
         """
 
-        return StringToEnum('Internal')
+        return StringToEnum('Internal')[0]
 
 def IuToExtEnum():
@@ -3065 +3067 @@
         """
 
-        return StringToEnum('IuToExt')
+        return StringToEnum('IuToExt')[0]
 
 def MassFluxEnum():
@@ -3075 +3077 @@
         """
 
-        return StringToEnum('MassFlux')
+        return StringToEnum('MassFlux')[0]
 
 def MaxPenetrationEnum():
@@ -3085 +3087 @@
         """
 
-        return StringToEnum('MaxPenetration')
+        return StringToEnum('MaxPenetration')[0]
 
 def MeltingOffsetEnum():
@@ -3095 +3097 @@
         """
 
-        return StringToEnum('MeltingOffset')
+        return StringToEnum('MeltingOffset')[0]
 
 def MisfitEnum():
@@ -3105 +3107 @@
         """
 
-        return StringToEnum('Misfit')
+        return StringToEnum('Misfit')[0]
 
 def NumberNodeToElementConnectivityEnum():
@@ -3115 +3117 @@
         """
 
-        return StringToEnum('NumberNodeToElementConnectivity')
+        return StringToEnum('NumberNodeToElementConnectivity')[0]
 
 def PressureEnum():
@@ -3125 +3127 @@
         """
 
-        return StringToEnum('Pressure')
+        return StringToEnum('Pressure')[0]
 
 def PressurePicardEnum():
@@ -3135 +3137 @@
         """
 
-        return StringToEnum('PressurePicard')
+        return StringToEnum('PressurePicard')[0]
 
 def QmuPressureEnum():
@@ -3145 +3147 @@
         """
 
-        return StringToEnum('QmuPressure')
+        return StringToEnum('QmuPressure')[0]
 
 def QmuVxEnum():
@@ -3155 +3157 @@
         """
 
-        return StringToEnum('QmuVx')
+        return StringToEnum('QmuVx')[0]
 
 def QmuVyEnum():
@@ -3165 +3167 @@
         """
 
-        return StringToEnum('QmuVy')
+        return StringToEnum('QmuVy')[0]
 
 def QmuVzEnum():
@@ -3175 +3177 @@
         """
 
-        return StringToEnum('QmuVz')
+        return StringToEnum('QmuVz')[0]
 
 def QmuThicknessEnum():
@@ -3185 +3187 @@
         """
 
-        return StringToEnum('QmuThickness')
+        return StringToEnum('QmuThickness')[0]
 
 def QmuBedEnum():
@@ -3195 +3197 @@
         """
 
-        return StringToEnum('QmuBed')
+        return StringToEnum('QmuBed')[0]
 
 def QmuSurfaceEnum():
@@ -3205 +3207 @@
         """
 
-        return StringToEnum('QmuSurface')
+        return StringToEnum('QmuSurface')[0]
 
 def QmuMeltingEnum():
@@ -3215 +3217 @@
         """
 
-        return StringToEnum('QmuMelting')
+        return StringToEnum('QmuMelting')[0]
 
 def ResetPenaltiesEnum():
@@ -3225 +3227 @@
         """
 
-        return StringToEnum('ResetPenalties')
+        return StringToEnum('ResetPenalties')[0]
 
 def SegmentOnIceShelfEnum():
@@ -3235 +3237 @@
         """
 
-        return StringToEnum('SegmentOnIceShelf')
+        return StringToEnum('SegmentOnIceShelf')[0]
 
 def SurfaceAbsVelMisfitEnum():
@@ -3245 +3247 @@
         """
 
-        return StringToEnum('SurfaceAbsVelMisfit')
+        return StringToEnum('SurfaceAbsVelMisfit')[0]
 
 def SurfaceAreaEnum():
@@ -3255 +3257 @@
         """
 
-        return StringToEnum('SurfaceArea')
+        return StringToEnum('SurfaceArea')[0]
 
 def SurfaceAverageVelMisfitEnum():
@@ -3265 +3267 @@
         """
 
-        return StringToEnum('SurfaceAverageVelMisfit')
+        return StringToEnum('SurfaceAverageVelMisfit')[0]
 
 def SurfaceLogVelMisfitEnum():
@@ -3275 +3277 @@
         """
 
-        return StringToEnum('SurfaceLogVelMisfit')
+        return StringToEnum('SurfaceLogVelMisfit')[0]
 
 def SurfaceLogVxVyMisfitEnum():
@@ -3285 +3287 @@
         """
 
-        return StringToEnum('SurfaceLogVxVyMisfit')
+        return StringToEnum('SurfaceLogVxVyMisfit')[0]
 
 def SurfaceRelVelMisfitEnum():
@@ -3295 +3297 @@
         """
 
-        return StringToEnum('SurfaceRelVelMisfit')
+        return StringToEnum('SurfaceRelVelMisfit')[0]
 
 def SurfaceSlopeXEnum():
@@ -3305 +3307 @@
         """
 
-        return StringToEnum('SurfaceSlopeX')
+        return StringToEnum('SurfaceSlopeX')[0]
 
 def SurfaceSlopeYEnum():
@@ -3315 +3317 @@
         """
 
-        return StringToEnum('SurfaceSlopeY')
+        return StringToEnum('SurfaceSlopeY')[0]
 
 def TemperatureEnum():
@@ -3325 +3327 @@
         """
 
-        return StringToEnum('Temperature')
+        return StringToEnum('Temperature')[0]
 
 def TemperatureOldEnum():
@@ -3335 +3337 @@
         """
 
-        return StringToEnum('TemperatureOld')
+        return StringToEnum('TemperatureOld')[0]
 
 def TemperaturePicardEnum():
@@ -3345 +3347 @@
         """
 
-        return StringToEnum('TemperaturePicard')
+        return StringToEnum('TemperaturePicard')[0]
 
 def ThicknessAbsMisfitEnum():
@@ -3355 +3357 @@
         """
 
-        return StringToEnum('ThicknessAbsMisfit')
+        return StringToEnum('ThicknessAbsMisfit')[0]
 
 def TypeEnum():
@@ -3365 +3367 @@
         """
 
-        return StringToEnum('Type')
+        return StringToEnum('Type')[0]
 
 def VelEnum():
@@ -3375 +3377 @@
         """
 
-        return StringToEnum('Vel')
+        return StringToEnum('Vel')[0]
 
 def VelocityEnum():
@@ -3385 +3387 @@
         """
 
-        return StringToEnum('Velocity')
+        return StringToEnum('Velocity')[0]
 
 def VxAverageEnum():
@@ -3395 +3397 @@
         """
 
-        return StringToEnum('VxAverage')
+        return StringToEnum('VxAverage')[0]
 
 def VxEnum():
@@ -3405 +3407 @@
         """
 
-        return StringToEnum('Vx')
+        return StringToEnum('Vx')[0]
 
 def VxPicardEnum():
@@ -3415 +3417 @@
         """
 
-        return StringToEnum('VxPicard')
+        return StringToEnum('VxPicard')[0]
 
 def VyAverageEnum():
@@ -3425 +3427 @@
         """
 
-        return StringToEnum('VyAverage')
+        return StringToEnum('VyAverage')[0]
 
 def VyEnum():
@@ -3435 +3437 @@
         """
 
-        return StringToEnum('Vy')
+        return StringToEnum('Vy')[0]
 
 def VyPicardEnum():
@@ -3445 +3447 @@
         """
 
-        return StringToEnum('VyPicard')
+        return StringToEnum('VyPicard')[0]
 
 def VzEnum():
@@ -3455 +3457 @@
         """
 
-        return StringToEnum('Vz')
+        return StringToEnum('Vz')[0]
 
 def VzMacAyealEnum():
@@ -3465 +3467 @@
         """
 
-        return StringToEnum('VzMacAyeal')
+        return StringToEnum('VzMacAyeal')[0]
 
 def VzPattynEnum():
@@ -3475 +3477 @@
         """
 
-        return StringToEnum('VzPattyn')
+        return StringToEnum('VzPattyn')[0]
 
 def VzPicardEnum():
@@ -3485 +3487 @@
         """
 
-        return StringToEnum('VzPicard')
+        return StringToEnum('VzPicard')[0]
 
 def VzStokesEnum():
@@ -3495 +3497 @@
         """
 
-        return StringToEnum('VzStokes')
+        return StringToEnum('VzStokes')[0]
 
 def VxMeshEnum():
@@ -3505 +3507 @@
         """
 
-        return StringToEnum('VxMesh')
+        return StringToEnum('VxMesh')[0]
 
 def VyMeshEnum():
@@ -3515 +3517 @@
         """
 
-        return StringToEnum('VyMesh')
+        return StringToEnum('VyMesh')[0]
 
 def VzMeshEnum():
@@ -3525 +3527 @@
         """
 
-        return StringToEnum('VzMesh')
+        return StringToEnum('VzMesh')[0]
 
 def EnthalpyEnum():
@@ -3535 +3537 @@
         """
 
-        return StringToEnum('Enthalpy')
+        return StringToEnum('Enthalpy')[0]
 
 def EnthalpyPicardEnum():
@@ -3545 +3547 @@
         """
 
-        return StringToEnum('EnthalpyPicard')
+        return StringToEnum('EnthalpyPicard')[0]
 
 def ThicknessAbsGradientEnum():
@@ -3555 +3557 @@
         """
 
-        return StringToEnum('ThicknessAbsGradient')
+        return StringToEnum('ThicknessAbsGradient')[0]
 
 def StepResponsesEnum():
@@ -3565 +3567 @@
         """
 
-        return StringToEnum('StepResponses')
+        return StringToEnum('StepResponses')[0]
 
 def IntMatParamEnum():
@@ -3575 +3577 @@
         """
 
-        return StringToEnum('IntMatParam')
+        return StringToEnum('IntMatParam')[0]
 
 def RheologyBbarAbsGradientEnum():
@@ -3585 +3587 @@
         """
 
-        return StringToEnum('RheologyBbarAbsGradient')
+        return StringToEnum('RheologyBbarAbsGradient')[0]
 
 def DragCoefficientAbsGradientEnum():
@@ -3595 +3597 @@
         """
 
-        return StringToEnum('DragCoefficientAbsGradient')
+        return StringToEnum('DragCoefficientAbsGradient')[0]
 
 def TransientInputEnum():
@@ -3605 +3607 @@
         """
 
-        return StringToEnum('TransientInput')
+        return StringToEnum('TransientInput')[0]
 
 def OutputfilenameEnum():
@@ -3615 +3617 @@
         """
 
-        return StringToEnum('Outputfilename')
+        return StringToEnum('Outputfilename')[0]
 
 def WaterfractionEnum():
@@ -3625 +3627 @@
         """
 
-        return StringToEnum('Waterfraction')
+        return StringToEnum('Waterfraction')[0]
 
 def WatercolumnEnum():
@@ -3635 +3637 @@
         """
 
-        return StringToEnum('Watercolumn')
+        return StringToEnum('Watercolumn')[0]
 
 def BasalFrictionEnum():
@@ -3645 +3647 @@
         """
 
-        return StringToEnum('BasalFriction')
+        return StringToEnum('BasalFriction')[0]
 
 def ViscousHeatingEnum():
@@ -3655 +3657 @@
         """
 
-        return StringToEnum('ViscousHeating')
+        return StringToEnum('ViscousHeating')[0]
 
 def QmuTemperatureEnum():
@@ -3665 +3667 @@
         """
 
-        return StringToEnum('QmuTemperature')
+        return StringToEnum('QmuTemperature')[0]
 
 def HydrologyWaterVxEnum():
@@ -3675 +3677 @@
         """
 
-        return StringToEnum('HydrologyWaterVx')
+        return StringToEnum('HydrologyWaterVx')[0]
 
 def HydrologyWaterVyEnum():
@@ -3685 +3687 @@
         """
 
-        return StringToEnum('HydrologyWaterVy')
+        return StringToEnum('HydrologyWaterVy')[0]
 
 def StressTensorEnum():
@@ -3695 +3697 @@
         """
 
-        return StringToEnum('StressTensor')
+        return StringToEnum('StressTensor')[0]
 
 def StressTensorxxEnum():
@@ -3705 +3707 @@
         """
 
-        return StringToEnum('StressTensorxx')
+        return StringToEnum('StressTensorxx')[0]
 
 def StressTensorxyEnum():
@@ -3715 +3717 @@
         """
 
-        return StringToEnum('StressTensorxy')
+        return StringToEnum('StressTensorxy')[0]
 
 def StressTensorxzEnum():
@@ -3725 +3727 @@
         """
 
-        return StringToEnum('StressTensorxz')
+        return StringToEnum('StressTensorxz')[0]
 
 def StressTensoryyEnum():
@@ -3735 +3737 @@
         """
 
-        return StringToEnum('StressTensoryy')
+        return StringToEnum('StressTensoryy')[0]
 
 def StressTensoryzEnum():
@@ -3745 +3747 @@
         """
 
-        return StringToEnum('StressTensoryz')
+        return StringToEnum('StressTensoryz')[0]
 
 def StressTensorzzEnum():
@@ -3755 +3757 @@
         """
 
-        return StringToEnum('StressTensorzz')
+        return StringToEnum('StressTensorzz')[0]
 
 def IceVolumeEnum():
@@ -3765 +3767 @@
         """
 
-        return StringToEnum('IceVolume')
+        return StringToEnum('IceVolume')[0]
 
 def TotalSmbEnum():
@@ -3775 +3777 @@
         """
 
-        return StringToEnum('TotalSmb')
+        return StringToEnum('TotalSmb')[0]
 
 def ThicknessAlongGradientEnum():
@@ -3785 +3787 @@
         """
 
-        return StringToEnum('ThicknessAlongGradient')
+        return StringToEnum('ThicknessAlongGradient')[0]
 
 def ThicknessAcrossGradientEnum():
@@ -3795 +3797 @@
         """
 
-        return StringToEnum('ThicknessAcrossGradient')
+        return StringToEnum('ThicknessAcrossGradient')[0]
 
 def P0Enum():
@@ -3805 +3807 @@
         """
 
-        return StringToEnum('P0')
+        return StringToEnum('P0')[0]
 
 def P1Enum():
@@ -3815 +3817 @@
         """
 
-        return StringToEnum('P1')
+        return StringToEnum('P1')[0]
 
 def P1DGEnum():
@@ -3825 +3827 @@
         """
 
-        return StringToEnum('P1DG')
+        return StringToEnum('P1DG')[0]
 
 def SaveResultsEnum():
@@ -3835 +3837 @@
         """
 
-        return StringToEnum('SaveResults')
+        return StringToEnum('SaveResults')[0]
 
 def BoolElementResultEnum():
@@ -3845 +3847 @@
         """
 
-        return StringToEnum('BoolElementResult')
+        return StringToEnum('BoolElementResult')[0]
 
 def BoolExternalResultEnum():
@@ -3855 +3857 @@
         """
 
-        return StringToEnum('BoolExternalResult')
+        return StringToEnum('BoolExternalResult')[0]
 
 def DoubleElementResultEnum():
@@ -3865 +3867 @@
         """
 
-        return StringToEnum('DoubleElementResult')
+        return StringToEnum('DoubleElementResult')[0]
 
 def DoubleExternalResultEnum():
@@ -3875 +3877 @@
         """
 
-        return StringToEnum('DoubleExternalResult')
+        return StringToEnum('DoubleExternalResult')[0]
 
 def DoubleMatExternalResultEnum():
@@ -3885 +3887 @@
         """
 
-        return StringToEnum('DoubleMatExternalResult')
+        return StringToEnum('DoubleMatExternalResult')[0]
 
 def DoubleVecExternalResultEnum():
@@ -3895 +3897 @@
         """
 
-        return StringToEnum('DoubleVecExternalResult')
+        return StringToEnum('DoubleVecExternalResult')[0]
 
 def IntExternalResultEnum():
@@ -3905 +3907 @@
         """
 
-        return StringToEnum('IntExternalResult')
+        return StringToEnum('IntExternalResult')[0]
 
 def JEnum():
@@ -3915 +3917 @@
         """
 
-        return StringToEnum('J')
+        return StringToEnum('J')[0]
 
 def PatchEnum():
@@ -3925 +3927 @@
         """
 
-        return StringToEnum('Patch')
+        return StringToEnum('Patch')[0]
 
 def PatchNodesEnum():
@@ -3935 +3937 @@
         """
 
-        return StringToEnum('PatchNodes')
+        return StringToEnum('PatchNodes')[0]
 
 def PatchVerticesEnum():
@@ -3945 +3947 @@
         """
 
-        return StringToEnum('PatchVertices')
+        return StringToEnum('PatchVertices')[0]
 
 def PentaP1ElementResultEnum():
@@ -3955 +3957 @@
         """
 
-        return StringToEnum('PentaP1ElementResult')
+        return StringToEnum('PentaP1ElementResult')[0]
 
 def PetscVecExternalResultEnum():
@@ -3965 +3967 @@
         """
 
-        return StringToEnum('PetscVecExternalResult')
+        return StringToEnum('PetscVecExternalResult')[0]
 
 def StringExternalResultEnum():
@@ -3975 +3977 @@
         """
 
-        return StringToEnum('StringExternalResult')
+        return StringToEnum('StringExternalResult')[0]
 
 def StepEnum():
@@ -3985 +3987 @@
         """
 
-        return StringToEnum('Step')
+        return StringToEnum('Step')[0]
 
 def TimeEnum():
@@ -3995 +3997 @@
         """
 
-        return StringToEnum('Time')
+        return StringToEnum('Time')[0]
 
 def TriaP1ElementResultEnum():
@@ -4005 +4007 @@
         """
 
-        return StringToEnum('TriaP1ElementResult')
+        return StringToEnum('TriaP1ElementResult')[0]
 
 def WaterColumnOldEnum():
@@ -4015 +4017 @@
         """
 
-        return StringToEnum('WaterColumnOld')
+        return StringToEnum('WaterColumnOld')[0]
 
 def MinVelEnum():
@@ -4025 +4027 @@
         """
 
-        return StringToEnum('MinVel')
+        return StringToEnum('MinVel')[0]
 
 def MaxVelEnum():
@@ -4035 +4037 @@
         """
 
-        return StringToEnum('MaxVel')
+        return StringToEnum('MaxVel')[0]
 
 def MinVxEnum():
@@ -4045 +4047 @@
         """
 
-        return StringToEnum('MinVx')
+        return StringToEnum('MinVx')[0]
 
 def MaxVxEnum():
@@ -4055 +4057 @@
         """
 
-        return StringToEnum('MaxVx')
+        return StringToEnum('MaxVx')[0]
 
 def MaxAbsVxEnum():
@@ -4065 +4067 @@
         """
 
-        return StringToEnum('MaxAbsVx')
+        return StringToEnum('MaxAbsVx')[0]
 
 def MinVyEnum():
@@ -4075 +4077 @@
         """
 
-        return StringToEnum('MinVy')
+        return StringToEnum('MinVy')[0]
 
 def MaxVyEnum():
@@ -4085 +4087 @@
         """
 
-        return StringToEnum('MaxVy')
+        return StringToEnum('MaxVy')[0]
 
 def MaxAbsVyEnum():
@@ -4095 +4097 @@
         """
 
-        return StringToEnum('MaxAbsVy')
+        return StringToEnum('MaxAbsVy')[0]
 
 def MinVzEnum():
@@ -4105 +4107 @@
         """
 
-        return StringToEnum('MinVz')
+        return StringToEnum('MinVz')[0]
 
 def MaxVzEnum():
@@ -4115 +4117 @@
         """
 
-        return StringToEnum('MaxVz')
+        return StringToEnum('MaxVz')[0]
 
 def MaxAbsVzEnum():
@@ -4125 +4127 @@
         """
 
-        return StringToEnum('MaxAbsVz')
+        return StringToEnum('MaxAbsVz')[0]
 
 def RelativeEnum():
@@ -4135 +4137 @@
         """
 
-        return StringToEnum('Relative')
+        return StringToEnum('Relative')[0]
 
 def AbsoluteEnum():
@@ -4145 +4147 @@
         """
 
-        return StringToEnum('Absolute')
+        return StringToEnum('Absolute')[0]
 
 def IncrementalEnum():
@@ -4155 +4157 @@
         """
 
-        return StringToEnum('Incremental')
+        return StringToEnum('Incremental')[0]
 
 def AgressiveMigrationEnum():
@@ -4165 +4167 @@
         """
 
-        return StringToEnum('AgressiveMigration')
+        return StringToEnum('AgressiveMigration')[0]
 
 def NoneEnum():
@@ -4175 +4177 @@
         """
 
-        return StringToEnum('None')
+        return StringToEnum('None')[0]
 
 def SoftMigrationEnum():
@@ -4185 +4187 @@
         """
 
-        return StringToEnum('SoftMigration')
+        return StringToEnum('SoftMigration')[0]
 
 def StokesSolverEnum():
@@ -4195 +4197 @@
         """
 
-        return StringToEnum('StokesSolver')
+        return StringToEnum('StokesSolver')[0]
 
 def AdjointEnum():
@@ -4205 +4207 @@
         """
 
-        return StringToEnum('Adjoint')
+        return StringToEnum('Adjoint')[0]
 
 def ColinearEnum():
@@ -4215 +4217 @@
         """
 
-        return StringToEnum('Colinear')
+        return StringToEnum('Colinear')[0]
 
 def ControlSteadyEnum():
@@ -4225 +4227 @@
         """
 
-        return StringToEnum('ControlSteady')
+        return StringToEnum('ControlSteady')[0]
 
 def FsetEnum():
@@ -4235 +4237 @@
         """
 
-        return StringToEnum('Fset')
+        return StringToEnum('Fset')[0]
 
 def Gradient1Enum():
@@ -4245 +4247 @@
         """
 
-        return StringToEnum('Gradient1')
+        return StringToEnum('Gradient1')[0]
 
 def Gradient2Enum():
@@ -4255 +4257 @@
         """
 
-        return StringToEnum('Gradient2')
+        return StringToEnum('Gradient2')[0]
 
 def Gradient3Enum():
@@ -4265 +4267 @@
         """
 
-        return StringToEnum('Gradient3')
+        return StringToEnum('Gradient3')[0]
 
 def GradientEnum():
@@ -4275 +4277 @@
         """
 
-        return StringToEnum('Gradient')
+        return StringToEnum('Gradient')[0]
 
 def GroundinglineMigrationEnum():
@@ -4285 +4287 @@
         """
 
-        return StringToEnum('GroundinglineMigration')
+        return StringToEnum('GroundinglineMigration')[0]
 
 def GsetEnum():
@@ -4295 +4297 @@
         """
 
-        return StringToEnum('Gset')
+        return StringToEnum('Gset')[0]
 
 def IndexEnum():
@@ -4305 +4307 @@
         """
 
-        return StringToEnum('Index')
+        return StringToEnum('Index')[0]
 
 def IndexedEnum():
@@ -4315 +4317 @@
         """
 
-        return StringToEnum('Indexed')
+        return StringToEnum('Indexed')[0]
 
 def IntersectEnum():
@@ -4325 +4327 @@
         """
 
-        return StringToEnum('Intersect')
+        return StringToEnum('Intersect')[0]
 
 def NodalEnum():
@@ -4335 +4337 @@
         """
 
-        return StringToEnum('Nodal')
+        return StringToEnum('Nodal')[0]
 
 def OldGradientEnum():
@@ -4345 +4347 @@
         """
 
-        return StringToEnum('OldGradient')
+        return StringToEnum('OldGradient')[0]
 
 def OutputFilePointerEnum():
@@ -4355 +4357 @@
         """
 
-        return StringToEnum('OutputFilePointer')
+        return StringToEnum('OutputFilePointer')[0]
 
 def PetscOptionsAnalysesEnum():
@@ -4365 +4367 @@
         """
 
-        return StringToEnum('PetscOptionsAnalyses')
+        return StringToEnum('PetscOptionsAnalyses')[0]
 
 def PetscOptionsStringsEnum():
@@ -4375 +4377 @@
         """
 
-        return StringToEnum('PetscOptionsStrings')
+        return StringToEnum('PetscOptionsStrings')[0]
 
 def QmuErrNameEnum():
@@ -4385 +4387 @@
         """
 
-        return StringToEnum('QmuErrName')
+        return StringToEnum('QmuErrName')[0]
 
 def QmuInNameEnum():
@@ -4395 +4397 @@
         """
 
-        return StringToEnum('QmuInName')
+        return StringToEnum('QmuInName')[0]
 
 def QmuOutNameEnum():
@@ -4405 +4407 @@
         """
 
-        return StringToEnum('QmuOutName')
+        return StringToEnum('QmuOutName')[0]
 
 def RegularEnum():
@@ -4415 +4417 @@
         """
 
-        return StringToEnum('Regular')
+        return StringToEnum('Regular')[0]
 
 def ScaledEnum():
@@ -4425 +4427 @@
         """
 
-        return StringToEnum('Scaled')
+        return StringToEnum('Scaled')[0]
 
 def SeparateEnum():
@@ -4435 +4437 @@
         """
 
-        return StringToEnum('Separate')
+        return StringToEnum('Separate')[0]
 
 def SsetEnum():
@@ -4445 +4447 @@
         """
 
-        return StringToEnum('Sset')
+        return StringToEnum('Sset')[0]
 
 def VerboseEnum():
@@ -4455 +4457 @@
         """
 
-        return StringToEnum('Verbose')
+        return StringToEnum('Verbose')[0]
 
 def TriangleInterpEnum():
@@ -4465 +4467 @@
         """
 
-        return StringToEnum('TriangleInterp')
+        return StringToEnum('TriangleInterp')[0]
 
 def BilinearInterpEnum():
@@ -4475 +4477 @@
         """
 
-        return StringToEnum('BilinearInterp')
+        return StringToEnum('BilinearInterp')[0]
 
 def NearestInterpEnum():
@@ -4485 +4487 @@
         """
 
-        return StringToEnum('NearestInterp')
+        return StringToEnum('NearestInterp')[0]
 
 def XYEnum():
@@ -4495 +4497 @@
         """
 
-        return StringToEnum('XY')
+        return StringToEnum('XY')[0]
 
 def XYZPEnum():
@@ -4505 +4507 @@
         """
 
-        return StringToEnum('XYZP')
+        return StringToEnum('XYZP')[0]
 
 def OptionEnum():
@@ -4515 +4517 @@
         """
 
-        return StringToEnum('Option')
+        return StringToEnum('Option')[0]
 
 def OptionCellEnum():
@@ -4525 +4527 @@
         """
 
-        return StringToEnum('OptionCell')
+        return StringToEnum('OptionCell')[0]
 
 def OptionCharEnum():
@@ -4535 +4537 @@
         """
 
-        return StringToEnum('OptionChar')
+        return StringToEnum('OptionChar')[0]
 
 def OptionStructEnum():
@@ -4545 +4547 @@
         """
 
-        return StringToEnum('OptionStruct')
+        return StringToEnum('OptionStruct')[0]
 
 def OptionDoubleEnum():
@@ -4555 +4557 @@
         """
 
-        return StringToEnum('OptionDouble')
+        return StringToEnum('OptionDouble')[0]
 
 def OptionLogicalEnum():
@@ -4565 +4567 @@
         """
 
-        return StringToEnum('OptionLogical')
+        return StringToEnum('OptionLogical')[0]
 
 def PatersonEnum():
@@ -4575 +4577 @@
         """
 
-        return StringToEnum('Paterson')
+        return StringToEnum('Paterson')[0]
 
 def ArrheniusEnum():
@@ -4585 +4587 @@
         """
 
-        return StringToEnum('Arrhenius')
+        return StringToEnum('Arrhenius')[0]
 
 def MaximumNumberOfEnums():

issm/trunk-jpl/src/m/miscellaneous/issmdoc.m

@@ -2 +2 @@
 
 %First get ISSM tier: 
-ISSM_DIR=issmdir;
+ISSM_DIR=issmdir();
 
 disp(sprintf('\n%s','  A comprehensive documentation is available on http://issm.jpl.nasa.gov'));
@@ -12 +12 @@
 disp(sprintf('%s','        md=parameterize(md,''Square.par'');        %fills all the other fields of the model'));
 disp(sprintf('%s','        md=setflowequation(md,''macayeal'',''all''); %defines all elements as MacAyeal''s'));
-disp(sprintf('%s','        md=solve(md,DiagnosticSolutionEnum);   %generate the velocity field'));
+disp(sprintf('%s','        md=solve(md,DiagnosticSolutionEnum());   %generate the velocity field'));
 disp(sprintf('%s','        plotmodel(md,''data'',md.results.DiagnosticSolution.Vel);    %displays the velocity (type plotdoc for plotmodel help)'));

issm/trunk-jpl/src/m/os/flaimdir.m

@@ -5 +5 @@
 %      FLAIM_DIR=flaimdir()
 
-FLAIM_DIR=[issmdir '/externalpackages/flaim/install'];
+FLAIM_DIR=[issmdir() '/externalpackages/flaim/install'];

issm/trunk-jpl/src/m/os/issmscpout.py

@@ -12 +12 @@
            usage: scpout(host,path,packages)
         """
+
+        print "host=",host
+        print "path=",path
+        print "login=",login
+        print "port=",port
+        print "packages=",packages
 
         #get hostname

issm/trunk-jpl/src/m/solve/MatlabProcessPatch.m

@@ -49 +49 @@
                         structure(step).(fieldname).interpolation=temporarypatch(pos,5);
                         structure(step).(fieldname).index=temporarypatch(pos,6:5+numvertices);
-                        if structure(step).(fieldname).interpolation==P1Enum,
+                        if structure(step).(fieldname).interpolation==P1Enum(),
                                 structure(step).(fieldname).value=temporarypatch(pos,6+numvertices:end);
                         end
-                        if structure(step).(fieldname).interpolation==P0Enum,
+                        if structure(step).(fieldname).interpolation==P0Enum(),
                                 structure(step).(fieldname).value=temporarypatch(pos,6+numvertices);
                         end

issm/trunk-jpl/src/m/solve/WriteData.py

@@ -2 +2 @@
 import math
 import struct
+from pairoptions import *
 from MatlabFuncs import *
+from EnumDefinitions import *
+from EnumToString import EnumToString
 
 def WriteData(fid,*args):
@@ -13 +16 @@
 
         #process options
+        #  the import above the function level doesn't work?
+        from pairoptions import *
         options=pairoptions(*args)
 
@@ -20 +25 @@
                 obj       = options.getfieldvalue('object')
                 fieldname = options.getfieldvalue('fieldname')
-                classname = type(obj)
+                classname = str(type(obj)).rsplit('.')[-1].split("'")[0]
 
                 enum      = BuildEnum(classname+'_'+fieldname)
@@ -41 +46 @@
         #Step 2: write the data itself.
         if   strcmpi(format,'Boolean'):    # {{{
-                if len(data) !=1:
-                        raise ValueError('field %s cannot be marshalled as it has more than one element!' % EnumToString(enum))
+#               if len(data) !=1:
+#                       raise ValueError('field %s cannot be marshalled as it has more than one element!' % EnumToString(enum)[0])
 
                 #first write length of record
@@ -51 +56 @@
 
                 #now write integer
-                fid.write(struct.pack('i',data))  #send an int, not easy to send a bool
+                fid.write(struct.pack('i',int(data)))  #send an int, not easy to send a bool
                 # }}}
 
         elif strcmpi(format,'Integer'):    # {{{
-                if len(data) !=1:
-                        raise ValueError('field %s cannot be marshalled as it has more than one element!' % EnumToString(enum))
+#               if len(data) !=1:
+#                       raise ValueError('field %s cannot be marshalled as it has more than one element!' % EnumToString(enum)[0])
 
                 #first write length of record
@@ -69 +74 @@
 
         elif strcmpi(format,'Double'):    # {{{
-                if len(data) !=1:
-                        raise ValueError('field %s cannot be marshalled as it has more than one element!' % EnumToString(enum))
+#               if len(data) !=1:
+#                       raise ValueError('field %s cannot be marshalled as it has more than one element!' % EnumToString(enum)[0])
 
                 #first write length of record
@@ -95 +100 @@
 
         elif strcmpi(format,'BooleanMat'):    # {{{
+
+                if isinstance(data,bool):
+                        data=numpy.array([data])
+                if len(data.shape) == 1:
+                        data=data.reshape(numpy.size(data,0),1)
 
                 #Get size
@@ -100 +110 @@
                 #if matrix = NaN, then do not write anything
                 if s[0]==1 and s[1]==1 and math.isnan(data[0][0]):
-                        s[0]=0
-                        s[1]=0
+                        s=(0,0)
 
                 #first write length of record
@@ -120 +129 @@
         elif strcmpi(format,'IntMat'):    # {{{
 
+                if isinstance(data,int):
+                        data=numpy.array([data])
+                if len(data.shape) == 1:
+                        data=data.reshape(numpy.size(data,0),1)
+
                 #Get size
                 s=data.shape
                 #if matrix = NaN, then do not write anything
                 if s[0]==1 and s[1]==1 and math.isnan(data[0][0]):
-                        s[0]=0
-                        s[1]=0
+                        s=(0,0)
 
                 #first write length of record
@@ -144 +157 @@
         elif strcmpi(format,'DoubleMat'):    # {{{
 
+                if isinstance(data,(int,long,float)):
+                        data=numpy.array([data])
+                if len(data.shape) == 1:
+                        data=data.reshape(numpy.size(data,0),1)
+
                 #Get size
                 s=data.shape
                 #if matrix = NaN, then do not write anything
                 if s[0]==1 and s[1]==1 and math.isnan(data[0][0]):
-                        s[0]=0
-                        s[1]=0
+                        s=(0,0)
 
                 #first write length of record
@@ -216 +233 @@
 
         else:    # {{{
-                raise TypeError('WriteData error message: data type: %d not supported yet! (%s)' % (format,EnumToString(enum)))
+                raise TypeError('WriteData error message: data type: %d not supported yet! (%s)' % (format,EnumToString(enum)[0]))
         # }}}
 
@@ -230 +247 @@
                 substrs=string.split('_')
                 string=''
-                for str in substrs:
-                        string+=str[0].upper()+str[1:]
+                for substr in substrs:
+                        string+=substr[0].upper()+substr[1:]
         else:
                 #take first letter of string and make it uppercase: 
-                string=str[0].upper()+str[1:]
+                string=string[0].upper()+string[1:]
 
         #Get Enum

issm/trunk-jpl/src/m/solve/loadresultsfromdisk.py

@@ -1 +1 @@
 import os
+from EnumToString import EnumToString
 
 def loadresultsfromdisk(md,filename):
@@ -53 +54 @@
 
                 if not isinstance(md.private.solution,str):
-                        md.private.solution=EnumToString(md.private.solution)
+                        [md.private.solution]=EnumToString(md.private.solution)
                 md=postqmu(md)
                 os.chdir('..')

issm/trunk-jpl/src/m/solve/marshall.py

@@ -1 +1 @@
 from WriteData import *
+from EnumDefinitions import *
 
 def marshall(md):
@@ -37 +38 @@
 
                 #Marshall current object
-                #print "marshalling %s ..." % field
+                print "marshalling %s ..." % field
                 exec("md.%s.marshall(fid)" % field)
 
         #close file
         try:
-                f.close(fid)
+                fid.close()
         except IOError as e:
                 raise IOError("marshall error message: could not close file '%s.bin'." % md.miscellaneous.name)

issm/trunk-jpl/src/m/solve/process_solve_options.m

@@ -9 +9 @@
 %solution_type: check on this option, error out otherwise
 solution_type=getfieldvalue(options,'solution_type');
-if ~ismember(solution_type,[DiagnosticSolutionEnum,PrognosticSolutionEnum,ThermalSolutionEnum,...
-                SteadystateSolutionEnum,TransientSolutionEnum,EnthalpySolutionEnum,...
-                BalancethicknessSolutionEnum,BedSlopeSolutionEnum,SurfaceSlopeSolutionEnum,HydrologySolutionEnum,FlaimSolutionEnum]),
+if ~ismember(solution_type,[DiagnosticSolutionEnum(),PrognosticSolutionEnum(),ThermalSolutionEnum(),...
+                SteadystateSolutionEnum(),TransientSolutionEnum(),EnthalpySolutionEnum(),...
+                BalancethicknessSolutionEnum(),BedSlopeSolutionEnum(),SurfaceSlopeSolutionEnum(),HydrologySolutionEnum(),FlaimSolutionEnum()]),
         error(['process_solve_options error message: solution_type ' EnumToString(solution_type) ' not supported yet!']);
 end

issm/trunk-jpl/src/m/solve/process_solve_options.py

@@ -1 +1 @@
 import os
 from EnumDefinitions import *
+from EnumToString import EnumToString
 
 def process_solve_options(options):
@@ -16 +17 @@
         #solution_type: check on this option, error out otherwise
         solution_type=options.getfieldvalue('solution_type')
-        if solution_type not in (DiagnosticSolutionEnum,PrognosticSolutionEnum,ThermalSolutionEnum,\
-                        SteadystateSolutionEnum,TransientSolutionEnum,EnthalpySolutionEnum,\
-                        BalancethicknessSolutionEnum,BedSlopeSolutionEnum,SurfaceSlopeSolutionEnum,HydrologySolutionEnum,FlaimSolutionEnum):
-                raise ValueError("process_solve_options error message: solution_type '%s' not supported yet!" % EnumToString(solution_type))
+        if solution_type not in (DiagnosticSolutionEnum(),PrognosticSolutionEnum(),ThermalSolutionEnum(),\
+                        SteadystateSolutionEnum(),TransientSolutionEnum(),EnthalpySolutionEnum(),\
+                        BalancethicknessSolutionEnum(),BedSlopeSolutionEnum(),SurfaceSlopeSolutionEnum(),HydrologySolutionEnum(),FlaimSolutionEnum()):
+                raise ValueError("process_solve_options error message: solution_type '%s' not supported yet!" % EnumToString(solution_type)[0])
         outoptions['solution_type']=solution_type
 

issm/trunk-jpl/src/m/solve/solve.m

@@ -34 +34 @@
 %check model consistency
 disp('checking model consistency');
-if (solutionenum == FlaimSolutionEnum)
+if (solutionenum == FlaimSolutionEnum())
         md.private.isconsistent=true;
         md=checkconsistency(md.mesh,md,solutionenum);
@@ -56 +56 @@
 
 %flaim analysis
-if (options.solution_type == FlaimSolutionEnum)
+if (options.solution_type == FlaimSolutionEnum())
         md=flaim_sol(md,options);
         md.private.solution=EnumToString(options.solution_type);
@@ -69 +69 @@
 
 %we need to make sure we have PETSC support, otherwise, we run with only one cpu: 
-if ~ispetsc,
+if ~ispetsc(),
         disp('PETSC support not included, running on 1 cpu only!');
         cluster.np=1;
@@ -75 +75 @@
 
 
-%Wite all input files
+%Write all input files
 marshall(md);                                          % bin file
 PetscFile(md.solver,[md.miscellaneous.name '.petsc']); % petsc file

issm/trunk-jpl/src/m/solve/solve.py

@@ -5 +5 @@
 from process_solve_options import *
 from EnumDefinitions import *
+from EnumToString import EnumToString
 from ismodelselfconsistent import *
+from marshall import *
+from ispetsc import *
 
 def solve(md,solutionenum,*args):
@@ -44 +47 @@
         #check model consistency
         print "checking model consistency"
-        if solutionenum == FlaimSolutionEnum:
+        if solutionenum == FlaimSolutionEnum():
                 md.private.isconsistent=True
                 md.mesh.checkconsistency(md,solutionenum)
@@ -63 +66 @@
 
         #flaim analysis
-        if options['solution_type'] == FlaimSolutionEnum:
+        if options['solution_type'] == FlaimSolutionEnum():
                 md=flaim_sol(md,options)
-                md.private.solution=EnumToString(options['solution_type'])
+                [md.private.solution]=EnumToString(options['solution_type'])
                 return md
 
@@ -73 +76 @@
                 return md
 
-        #Wite all input files
+        #Write all input files
         marshall(md)                                           # bin file
         md.solver.PetscFile(md.miscellaneous.name+'.petsc')    # petsc file
@@ -79 +82 @@
 
         #we need to make sure we have PETSC support, otherwise, we run with only one cpu: 
-        if not ispetsc:
+        if not ispetsc():
                 print "PETSC support not included, running on 1 cpu only!"
                 cluster.np=1