Index: /issm/trunk-jpl/src/m/classes/stochasticforcing.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/stochasticforcing.m	(revision 26531)
+++ /issm/trunk-jpl/src/m/classes/stochasticforcing.m	(revision 26532)
@@ -64,6 +64,7 @@
 			fielddisplay(self,'randomflag','whether to apply real randomness (true) or pseudo-randomness with fixed seed (false)');
 			disp('Available fields:');
-			disp('   SMBautoregression');
-			disp('   FrontalForcingsRignotAutoregression (thermal forcing)');
+			for field=supportedstochforcings()
+				fprintf('   %s \n',string(field));
+			end
 		end % }}}
 		function marshall(self,prefix,md,fid) % {{{
@@ -71,17 +72,4 @@
 			yts=md.constants.yts;
 			num_fields = numel(self.fields);
-			%Scaling covariance matrix (scale column-by-column and row-by-row)
-			scaledfields = {'SMBautoregression'}; %list of fields that need scaling *1/yts
-			for i=1:num_fields
-            if any(strcmp(scaledfields,self.fields(i)))
-               inds = [1+sum(self.dimensions(1:i-1)):1:sum(self.dimensions(1:i))];
-               for row=inds %scale rows corresponding to scaled field
-                  self.covariance(row,:) = 1./yts*self.covariance(row,:);
-               end
-               for col=inds %scale columns corresponding to scaled field
-                  self.covariance(:,col) = 1./yts*self.covariance(:,col);
-               end
-            end
-         end
 
 			WriteData(fid,prefix,'object',self,'fieldname','isstochasticforcing','format','Boolean');
@@ -89,8 +77,22 @@
 				return
 			else
+				%Scaling covariance matrix (scale column-by-column and row-by-row)
+				scaledfields = {'SMBautoregression'}; %list of fields that need scaling *1/yts
+				tempcovariance = self.covariance; %copy of covariance to avoid writing back in member variable
+				for i=1:num_fields
+					if any(strcmp(scaledfields,self.fields(i)))
+						inds = [1+sum(self.dimensions(1:i-1)):1:sum(self.dimensions(1:i))];
+						for row=inds %scale rows corresponding to scaled field
+							tempcovariance(row,:) = 1./yts*self.covariance(row,:);
+						end
+						for col=inds %scale columns corresponding to scaled field
+							tempcovariance(:,col) = 1./yts*self.covariance(:,col);
+						end
+					end
+				end
 				WriteData(fid,prefix,'data',num_fields,'name','md.stochasticforcing.num_fields','format','Integer');
 				WriteData(fid,prefix,'object',self,'fieldname','fields','format','StringArray');
 				WriteData(fid,prefix,'object',self,'fieldname','dimensions','format','IntMat');
-				WriteData(fid,prefix,'object',self,'fieldname','covariance','format','DoubleMat');
+				WriteData(fid,prefix,'data',tempcovariance,'name','md.stochasticforcing.covariance','format','DoubleMat');
 				WriteData(fid,prefix,'object',self,'fieldname','randomflag','format','Boolean');
 			end
@@ -98,2 +100,11 @@
 	end
 end
+function list = supportedstochforcings() % {{{
+   % Defines list of fields supported
+   % by the class md.stochasticforcing
+
+   list = {...
+      'SMBautoregression',...
+      'FrontalForcingsRignotAutoregression'
+      };
+end % }}}
Index: /issm/trunk-jpl/test/NightlyRun/test257.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test257.m	(revision 26531)
+++ /issm/trunk-jpl/test/NightlyRun/test257.m	(revision 26532)
@@ -64,27 +64,18 @@
 	(md.results.TransientSolution(1).Vy),...
 	(md.results.TransientSolution(1).Vel),...
-	(md.results.TransientSolution(1).Pressure),...
-	(md.results.TransientSolution(1).Base),...
-	(md.results.TransientSolution(1).Surface),...
 	(md.results.TransientSolution(1).Thickness),...
 	(md.results.TransientSolution(1).IceVolume),...
-    (md.results.TransientSolution(1).SmbMassBalance),...
+   (md.results.TransientSolution(1).SmbMassBalance),...
 	(md.results.TransientSolution(2).Vx),...
 	(md.results.TransientSolution(2).Vy),...
 	(md.results.TransientSolution(2).Vel),...
-	(md.results.TransientSolution(2).Pressure),...
-	(md.results.TransientSolution(2).Base),...
-	(md.results.TransientSolution(2).Surface),...
 	(md.results.TransientSolution(2).Thickness),...
 	(md.results.TransientSolution(2).IceVolume),...
-    (md.results.TransientSolution(2).SmbMassBalance),...
+   (md.results.TransientSolution(2).SmbMassBalance),...
 	(md.results.TransientSolution(3).Vx),...
 	(md.results.TransientSolution(3).Vy),...
 	(md.results.TransientSolution(3).Vel),...
-	(md.results.TransientSolution(3).Pressure),...
-	(md.results.TransientSolution(3).Base),...
-	(md.results.TransientSolution(3).Surface),...
 	(md.results.TransientSolution(3).Thickness),...
 	(md.results.TransientSolution(3).IceVolume),...
-    (md.results.TransientSolution(3).SmbMassBalance),...
+   (md.results.TransientSolution(3).SmbMassBalance),...
 	};
Index: /issm/trunk-jpl/test/NightlyRun/test542.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test542.m	(revision 26531)
+++ /issm/trunk-jpl/test/NightlyRun/test542.m	(revision 26532)
@@ -61,6 +61,6 @@
    (md.results.TransientSolution(1).Surface),...
    (md.results.TransientSolution(1).Thickness),...
+   (md.results.TransientSolution(1).MaskIceLevelset),...
    (md.results.TransientSolution(1).CalvingMeltingrate),...
-   (md.results.TransientSolution(1).MaskIceLevelset),...
    (md.results.TransientSolution(2).Vx),...
    (md.results.TransientSolution(2).Vy),...
Index: /issm/trunk-jpl/test/NightlyRun/test543.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test543.m	(revision 26531)
+++ /issm/trunk-jpl/test/NightlyRun/test543.m	(revision 26532)
@@ -70,6 +70,6 @@
    (md.results.TransientSolution(1).Surface),...
    (md.results.TransientSolution(1).Thickness),...
+   (md.results.TransientSolution(1).MaskIceLevelset),...
    (md.results.TransientSolution(1).CalvingMeltingrate),...
-   (md.results.TransientSolution(1).MaskIceLevelset),...
    (md.results.TransientSolution(2).Vx),...
    (md.results.TransientSolution(2).Vy),...