[Dart-dev] DART/branches Revision: 11668

[dart at ucar.edu]

thoar at ucar.edu
2017-05-26 11:00:35 -0600 (Fri, 26 May 2017)
229
The input.nml now has values from the Lanai release, specifically the
num_output_* and perturbation_amplitude.

The PlotTotalErr.m script had not been totally updated to reflect the
changes for the native Matlab netCDF support.




Modified: DART/branches/rma_trunk/diagnostics/matlab/private/PlotTotalErr.m
===================================================================
--- DART/branches/rma_trunk/diagnostics/matlab/private/PlotTotalErr.m	2017-05-26 15:47:11 UTC (rev 11667)
+++ DART/branches/rma_trunk/diagnostics/matlab/private/PlotTotalErr.m	2017-05-26 17:00:35 UTC (rev 11668)
@@ -95,11 +95,13 @@
 
       tim    = get_hyperslab('fname', pinfo.diagn_file, ...
                    'varname', 'X', ...
+                   'permute', 'T', ...
                    'copyindex', ens_mean_index, ...
                    'tindex1', pinfo.diagn_time(1), ...
                    'tcount', pinfo.diagn_time(2));
       tom    = get_hyperslab('fname', pinfo.diagn_file, ...
                    'varname', 'Y', ...
+                   'permute', 'T', ...
                    'copyindex', ens_mean_index, ...
                    'tindex1', pinfo.diagn_time(1), ...
                    'tcount', pinfo.diagn_time(2));
@@ -108,17 +110,19 @@
 
       tim    = get_hyperslab('fname', pinfo.diagn_file, ...
                    'varname', 'X', ...
+                   'permute', 'T', ...
                    'copyindex', ens_spread_index, ...
                    'tindex1', pinfo.diagn_time(1), ...
                    'tcount', pinfo.diagn_time(2));
       tom    = get_hyperslab('fname', pinfo.diagn_file, ...
-                   'varname','Y', ...
+                   'varname', 'Y', ...
+                   'permute', 'T', ...
                    'copyindex', ens_spread_index, ...
                    'tindex1', pinfo.diagn_time(1), ...
                    'tcount', pinfo.diagn_time(2));
 
       spread = [tim tom]; clear tim tom
-      num_vars = size(spread,1);
+      [~,num_vars] = size(spread);
 
       % Also need to compute the spread; zero truth for this and
       % compute distance from 0
@@ -133,7 +137,7 @@
       plot(pinfo.time,err, 'b', pinfo.time,err_spread, 'r');
       legend(string1,string2,0)
       legend boxoff
-      s1 = sprintf('%s Total Error over all %d variables',pinfo.model,num_vars);
+      s1 = sprintf('%s Total Error over all %d variables', pinfo.model, num_vars);
       title({s1,pinfo.diagn_file},'interpreter','none','fontweight','bold')
       xlabel(sprintf('model "days" (%d timesteps)',pinfo.time_series_length))
       ylabel('Total Error')
@@ -149,7 +153,7 @@
 
       Whole_truth  = get_hyperslab('fname', pinfo.truth_file, ...
                    'varname', 'state', ...
-                   'permute', 'T',...
+                   'permute', 'T', ...
                    'squeeze', 'T', ...
                    'tindex1', pinfo.truth_time(1), ...
                    'tcount', pinfo.truth_time(2));
@@ -166,7 +170,7 @@
                    'tindex1', pinfo.diagn_time(1), ...
                    'tcount', pinfo.diagn_time(2));
 
-      num_vars = size(Whole_spread,2);
+      [~,num_vars] = size(Whole_spread);
 
       %--------------------------------------------------------------------------
       % Treat the traditional state variable independent of the forcing variables
@@ -238,7 +242,7 @@
 
          truth  = get_hyperslab('fname', pinfo.truth_file, ...
                    'varname', varlist{ivar}, ...
-                   'permute', 'T',...
+                   'permute', 'T', ...
                    'squeeze', 'T', ...
                    'tindex1', pinfo.truth_time(1), ...
                    'tcount', pinfo.truth_time(2));
@@ -257,7 +261,7 @@
                    'tindex1', pinfo.diagn_time(1), ...
                    'tcount', pinfo.diagn_time(2));
                
-         num_vars = size(spread,1);
+         [~,num_vars] = size(spread);
 
          % Also need to compute the spread; zero truth for this and
          % compute distance from 0
@@ -561,16 +565,20 @@
 
       truth  = get_hyperslab('fname', pinfo.truth_file, ...
                    'varname', pinfo.vars{ivar}, ...
+                   'permute', 'T', ...
+                   'squeeze', 'T', ...
                    'copyindex', truth_index, ...
                    'timeindex', pinfo.truth_time(1)+itime-1);
 
       ens    = get_hyperslab('fname', pinfo.diagn_file, ...
                    'varname', pinfo.vars{ivar}, ...
+                   'permute', 'T', ...
                    'copyindex', ens_mean_index, ...
                    'timeindex', pinfo.diagn_time(1)+itime-1);
 
       spread = get_hyperslab('fname', pinfo.diagn_file, ...