--- MITgcm_contrib/enderton/Diagnostics/DiagRun.m	2005/01/31 15:43:27	1.1
+++ MITgcm_contrib/enderton/Diagnostics/DiagRun.m	2005/06/28 21:33:51	1.5
@@ -108,13 +108,13 @@
     %              Load data (calls DiagAverage and DiagSlice             %
     %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
     for inplot = 1:nplot
-        nexp = length(page{inplot}); if nexp ~= 1, nexp = nexp - 1; end
-        for inexp = 1:nexp
-            ExpInfo = page{inplot}{inexp};
+        ntrl = length(page{inplot}); if ntrl ~= 1, ntrl = ntrl - 1; end
+        for intrl = 1:ntrl
+            ExpInfo = page{inplot}{intrl};
             
             % Required Fields.
 			fln = ExpInfo{ifln};  % FieldName    (Required)
-			exp = ExpInfo{iexp};  % Experiment   (Required)
+			trl = ExpInfo{itrl};  % Experiment   (Required)
 			dat = ExpInfo{idat};  % DataType     (Required)
 			dad = ExpInfo{idad};  % DataDir      (Required)
 			grd = ExpInfo{igrd};  % GridDir      (Required)
@@ -144,23 +144,23 @@
             
 
             % Make DiagLoad function call.
-            disp(['Loading - Experiment:  ',exp,';  Field:  ',fln]);
-            [data{inplot}{inexp}, xax{inplot}{inexp},...
-              yax{inplot}{inexp},time{inplot}{inexp},...
-              pltslc{inplot}{inexp}] = ...
-                DiagLoad(fln,exp,dat,dad,grd,itr,tst,flu,ddf,gdf,avg,slc,pst,...
-                         LoadGridData,DiagDebug,GridSuffixTemp,ZcordFileTemp,...
-                         IndexTemp,DimTemp,GradsTemp,Year0IterTemp,MonthsTemp);
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%                             Function body                               %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+            disp(['Loading - Experiment:  ',trl,';  Field:  ',fln]);
+            [data{inplot}{intrl}, xax{inplot}{intrl},...
+              yax{inplot}{intrl},time{inplot}{intrl},...
+              pltslc{inplot}{intrl}] = ...
+                DiagLoad(fln,trl,dat,dad,grd,itr,tst,flu,ddf,gdf,avg,...
+                         slc,pst,LoadGridData,DiagDebug,GridSuffixTemp,...
+                         ZcordFileTemp,IndexTemp,DimTemp,VectorTemp,MateTemp,...
+                         GradsTemp,Year0IterTemp,SecPerYearTemp,MonthsTemp,...
+                         FieldNameTemp);
+
             % Save panel data for outside use.
             if DumpData
-                datadump = data{inplot}{inexp};
-                xaxdump = xax{inplot}{inexp};
-                yaxdump = yax{inplot}{inexp};
-                timedump = time{inplot}{inexp};
-                pltslcdump = pltslc{inplot}{inexp};
+                datadump = data{inplot}{intrl};
+                xaxdump = xax{inplot}{intrl};
+                yaxdump = yax{inplot}{intrl};
+                timedump = time{inplot}{intrl};
+                pltslcdump = pltslc{inplot}{intrl};
                 save(['Data',pagename,fln,flu,'.mat'],'datadump',...
                      'xaxdump','yaxdump','timedump','pltslcdump');
             end
@@ -182,4 +182,4 @@
 % scripts will help you to make sense of this as needed.
 disp(['Plotting results:']);
 DiagPlot(pagename,page,data,xax,yax,time,pltslc,...
-         OutputDir,LoadGridData,SavePlots,DiagDebug);
\ No newline at end of file
+         OutputDir,LoadGridData,SavePlots,DiagDebug);