Index: /issm/trunk/src/m/classes/public/ismodelselfconsistent.m
===================================================================
--- /issm/trunk/src/m/classes/public/ismodelselfconsistent.m	(revision 3757)
+++ /issm/trunk/src/m/classes/public/ismodelselfconsistent.m	(revision 3758)
@@ -93,27 +93,27 @@
 
 %NO NAN
-fields={'numberofelements','numberofgrids','x','y','z','drag','drag_type','p','q',...
-	'rho_ice','rho_water','B','elementoniceshelf','surface','thickness','bed','g','lowmem','sparsity','nsteps','maxiter',...
-	'tolx','np','eps_res','max_nonlinear_iterations','exclusive','n','gridonbed','gridonsurface','elementonbed','elementonsurface','deltaH','DeltaH','timeacc','timedec'};
+fields={'numberofelements','numberofgrids','x','y','z','drag_coefficient','drag_type','drag_p','drag_q',...
+	'rho_ice','rho_water','rheology_B','elementoniceshelf','surface','thickness','bed','g','lowmem','sparsity','nsteps','maxiter',...
+	'tolx','np','eps_res','max_nonlinear_iterations','exclusive','rheology_n','gridonbed','gridonsurface','elementonbed','elementonsurface','deltaH','DeltaH','timeacc','timedec'};
 checknan(md,fields);
 
 %FIELDS >= 0 
-fields={'numberofelements','numberofgrids','elements','drag','drag_type','p','q',...
-	'rho_ice','rho_water','B','elementoniceshelf','thickness','g','eps_res','max_nonlinear_iterations','eps_rel','eps_abs','nsteps','maxiter','tolx','exclusive',...
-	'sparsity','lowmem','n','gridonbed','gridonsurface','elementonbed','elementonsurface','deltaH','DeltaH','timeacc','timedec'};
+fields={'numberofelements','numberofgrids','elements','drag_coefficient','drag_type','drag_p','drag_q',...
+	'rho_ice','rho_water','rheology_B','elementoniceshelf','thickness','g','eps_res','max_nonlinear_iterations','eps_rel','eps_abs','nsteps','maxiter','tolx','exclusive',...
+	'sparsity','lowmem','rheology_n','gridonbed','gridonsurface','elementonbed','elementonsurface','deltaH','DeltaH','timeacc','timedec'};
 checkgreater(md,fields,0);
 
 %FIELDS > 0
-fields={'numberofelements','numberofgrids','elements','drag_type','p',...
-	'rho_ice','rho_water','B','thickness','g','max_nonlinear_iterations','eps_res','eps_rel','eps_abs','maxiter','tolx',...
+fields={'numberofelements','numberofgrids','elements','drag_type','drag_p',...
+	'rho_ice','rho_water','rheology_B','thickness','g','max_nonlinear_iterations','eps_res','eps_rel','eps_abs','maxiter','tolx',...
 	'sparsity','deltaH','DeltaH','timeacc','timedec'};
 checkgreaterstrict(md,fields,0);
 
 %SIZE NUMBEROFELEMENTS
-fields={'p','q','elementoniceshelf','n','elementonbed'};
+fields={'drag_p','drag_q','elementoniceshelf','n','elementonbed'};
 checksize(md,fields,[md.numberofelements 1]);
 
 %SIZE NUMBEROFGRIDS
-fields={'x','y','z','B','drag','melting','accumulation','surface','thickness','bed','gridonbed','gridonsurface'};
+fields={'x','y','z','rheology_B','drag_coefficient','melting_rate','accumulation_rate','surface','thickness','bed','gridonbed','gridonsurface'};
 checksize(md,fields,[md.numberofgrids 1]);
 
@@ -326,5 +326,5 @@
 
 	%INITIAL TEMPERATURE, MELTING AND ACCUMULATION
-	fields={'temperature','accumulation','melting'};
+	fields={'temperature','accumulation_rate','melting_rate'};
 	checksize(md,fields,[md.numberofgrids 1]);
 	checknan(md,fields);
@@ -340,5 +340,5 @@
 
 	%VELOCITIES MELTING AND ACCUMULATION
-	fields={'vx','vy','accumulation','melting'};
+	fields={'vx','vy','accumulation_rate','melting_rate'};
 	checksize(md,fields,[md.numberofgrids 1]);
 	checknan(md,fields);
@@ -354,5 +354,5 @@
 
 	%VELOCITIES MELTING AND ACCUMULATION
-	fields={'vx','vy','accumulation','melting','dhdt'};
+	fields={'vx','vy','accumulation_rate','melting_rate','dhdt'};
 	checksize(md,fields,[md.numberofgrids 1]);
 	checknan(md,fields);
@@ -368,5 +368,5 @@
 
 	%VELOCITIES MELTING AND ACCUMULATION
-	fields={'vx','vy','accumulation','melting'};
+	fields={'vx','vy','accumulation_rate','melting_rate'};
 	checksize(md,fields,[md.numberofgrids 1]);
 	checknan(md,fields);