[Dart-dev] DART/branches Revision: 11777

[dart at ucar.edu]

hendric at ucar.edu
2017-06-27 13:15:41 -0600 (Tue, 27 Jun 2017)
44

merging latest changes from the rma_trunk




Index: DART/branches/rma_par_single_file
===================================================================
--- DART/branches/rma_par_single_file	2017-06-27 18:52:27 UTC (rev 11776)
+++ DART/branches/rma_par_single_file	2017-06-27 19:15:41 UTC (rev 11777)

Property changes on: DART/branches/rma_par_single_file
___________________________________________________________________
Modified: svn:mergeinfo
## -31,7 +31,7 ##
 /DART/branches/rma_sprint:8101-8172
 /DART/branches/rma_state_structure_test_dir:9478-9682
 /DART/branches/rma_state_structure_unit_test:9697-10274
-/DART/branches/rma_trunk:11685-11773
+/DART/branches/rma_trunk:11685-11776
 /DART/branches/rma_trunk_clamping:8792-8807
 /DART/branches/rma_trunk_filename:8017-8163
 /DART/branches/rma_trunk_get_state_fun:8574-8602
\ No newline at end of property
Modified: DART/branches/rma_par_single_file/diagnostics/matlab/private/PlotEnsErrSpread.m
===================================================================
--- DART/branches/rma_par_single_file/diagnostics/matlab/private/PlotEnsErrSpread.m	2017-06-27 18:52:27 UTC (rev 11776)
+++ DART/branches/rma_par_single_file/diagnostics/matlab/private/PlotEnsErrSpread.m	2017-06-27 19:15:41 UTC (rev 11777)
@@ -96,7 +96,7 @@
                     pinfo.time,ens_spread(:, ivar), 'r');
                 s1 = sprintf('%s model Var %d Ensemble Error Spread', pinfo.model, ivar);
                 title({s1,pinfo.diagn_file},'interpreter','none','fontweight','bold')
-                legend(string1,string2,0)
+                legend(string1,string2,'Location','NorthEast')
                 legend boxoff
                 xlabel(sprintf('model "days" (%d timesteps)',pinfo.time_series_length))
                 ylabel('distance')
@@ -140,7 +140,7 @@
                 pinfo.time,ens_spread(:,ivar), 'r');
             s1 = sprintf('%s model Var %d Ensemble Error Spread', pinfo.model, ivar);
             title({s1,pinfo.diagn_file},'interpreter','none','fontweight','bold')
-            legend(string1,string2,0)
+            legend(string1,string2,'Location','NorthEast')
             legend boxoff
             xlabel(sprintf('model "days" (%d timesteps)',pinfo.time_series_length))
             ylabel('distance')
@@ -196,7 +196,7 @@
             pinfo.level, pinfo.latitude, pinfo.longitude);
         title({s1, s2, pinfo.diagn_file},'interpreter','none','fontweight','bold');
         
-        legend(string1,string2,0);
+        legend(string1,string2,'Location','NorthEast');
         legend boxoff
         xdates(pinfo.time);
         ylabel('distance');
@@ -248,7 +248,7 @@
             pinfo.level, pinfo.latCell(pinfo.cellindex), pinfo.lonCell(pinfo.cellindex));
         title({s1, s2, pinfo.diagn_file},'interpreter','none','fontweight','bold');
         
-        legend(string1,string2,0);
+        legend(string1,string2,'Location','NorthEast');
         legend boxoff
         xdates(pinfo.time);
         ylabel('distance');

Modified: DART/branches/rma_par_single_file/diagnostics/matlab/private/PlotEnsMeanTimeSeries.m
===================================================================
--- DART/branches/rma_par_single_file/diagnostics/matlab/private/PlotEnsMeanTimeSeries.m	2017-06-27 18:52:27 UTC (rev 11776)
+++ DART/branches/rma_par_single_file/diagnostics/matlab/private/PlotEnsMeanTimeSeries.m	2017-06-27 19:15:41 UTC (rev 11777)
@@ -83,9 +83,9 @@
             plot(pinfo.time,ens_mean,'r','LineWidth',1.0)
 
             if (exist('legendstr','var'))
-               legend(legendstr,'Ensemble Mean',0)
+               legend(legendstr,'Ensemble Mean','Location','NorthEast')
             else
-               legend('Ensemble Mean',0)
+               legend('Ensemble Mean','Location','NorthEast')
             end
 
             title(sprintf('%s Variable %d of %s',pinfo.model,ivar,pinfo.diagn_file), ...
@@ -111,7 +111,7 @@
                            'tindex1',pinfo.diagn_time(1),...
                            'tcount',pinfo.diagn_time(2));
             plot(pinfo.time, ens_mean, 'r');
-            legend(sprintf('Ensemble Mean %f',mean(ens_mean)),0)
+            legend(sprintf('Ensemble Mean %f',mean(ens_mean)),'Location','NorthEast')
 
             if ( have_truth )
                truth = get_hyperslab('fname',pinfo.truth_file, ...
@@ -122,7 +122,7 @@
                            'tcount',pinfo.truth_time(2));
                hold on; plot(pinfo.time,truth,'b'); hold off;
                legend(sprintf('Ensemble Mean %f',mean(ens_mean)),...
-                      sprintf('True State %f',mean(truth)),0)
+                      sprintf('True State %f',mean(truth)),'Location','NorthEast')
             end
 
             s1 = sprintf('%s Variable %d',pinfo.model,ivar);
@@ -138,7 +138,7 @@
                  'tindex1',pinfo.diagn_time(1), ...
                  'tcount',pinfo.diagn_time(2));
       plot3(ens(1,:), ens(2,:), ens(3,:), 'r')
-      legend('Ensemble Mean',0)
+      legend('Ensemble Mean','Location','NorthEast')
 
       if (have_truth)