Index: /issm/trunk-jpl/src/m/classes/rifts.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/rifts.py	(revision 21244)
+++ /issm/trunk-jpl/src/m/classes/rifts.py	(revision 21245)
@@ -47,5 +47,5 @@
 				md.checkmessage("model should be processed for rifts (run meshprocessrifts)!")
 			for i,rift in enumerate(self.riftstruct):
-				md = checkfield(md,'fieldname',"rifts.riftstruct[%d]['fill']" % i,'values',['Water','Air','Ice','Melange'])
+				md = checkfield(md,'fieldname',"rifts.riftstruct[%d]['fill']" % i,'values',['Water','Air','Ice','Melange',0,1,2,3])
 		else:
 			if self.riftstruct and numpy.any(numpy.logical_not(isnans(self.riftstruct))):
@@ -67,15 +67,11 @@
 
 		# Convert strings in riftstruct to hard coded numbers
-		for i,rift in enumerate(self.riftstruct):
-			if rift['fill'] == 'Air':
-				rift['fill'] = 0;
-			elif rift['fill'] == 'Ice':
-				rift['fill'] = 1;
-			elif rift['fill'] == 'Melange':
-				rift['fill'] = 2;
-			elif rift['fill'] == 'Water':
-				rift['fill'] = 3;
-			else:
-				error('Could not convert strings in riftstruct to integers for marshalling')
+		FillDict={'Air':0,
+							'Ice':1,
+							'Melange':2,
+							'Water':3}
+		for rift in self.riftstruct:
+			if rift['fill'] in ['Air','Ice','Melange','Water']:
+				rift['fill'] = FillDict[rift['fill']]
 
 		# 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.