[Dart-dev] DART/branches Revision: 11104

[dart at ucar.edu]

thoar at ucar.edu
2017-02-13 15:24:07 -0700 (Mon, 13 Feb 2017)
508
lorenz_83, lorenz_96, 9var all work.
extended get_hyperslab.m to be able to do an N-dimensional permute
as well as a squeeze. This means the variables have the same storage order
as on the trunk when using the 3rd party tools - I don't have to reverse
the order of the indices _everywhere_ ... 

Consequently, had to back out r11076 of total_err.m and could revert to r11005.

Removed all references to True_State.nc etc. from low-order test scripts.
Removing more references to third-party netCDF support.




Modified: DART/branches/rma_single_file/io/dart_time_io_mod.f90
===================================================================
--- DART/branches/rma_single_file/io/dart_time_io_mod.f90	2017-02-13 19:01:17 UTC (rev 11103)
+++ DART/branches/rma_single_file/io/dart_time_io_mod.f90	2017-02-13 22:24:07 UTC (rev 11104)
@@ -10,6 +10,7 @@
 !> Netcdf reading and writing dart model time.
 !> Temporary module for dart time.
 !>@todo should this go in state_vector_io_mod or io_filename_mod?
+!>@todo some synergy with state_space_diag_mod.f90 routines ... nc_get_tindex, etc
 !> @{
 
 use types_mod,        only : r8, digits12

Modified: DART/branches/rma_single_file/matlab/PlotEnsErrSpread.m
===================================================================
--- DART/branches/rma_single_file/matlab/PlotEnsErrSpread.m	2017-02-13 19:01:17 UTC (rev 11103)
+++ DART/branches/rma_single_file/matlab/PlotEnsErrSpread.m	2017-02-13 22:24:07 UTC (rev 11104)
@@ -65,15 +65,15 @@
    case '9var'
 
       truth      = get_hyperslab('fname',pinfo.truth_file, ...
-                       'varname','state','squeeze','true',  ...
+                       'varname','state','permute','true','squeeze','true',  ...
                        'tindex1',pinfo.truth_time(1), 'tcount',pinfo.truth_time(2)) ;
 
       ens_mean   = get_hyperslab('fname',pinfo.diagn_file, ...
-                       'varname','state_mean', ...
+                       'varname','state_mean','permute','true', ...
                        'tindex1',pinfo.diagn_time(1), 'tcount',pinfo.diagn_time(2)) ;
 
       ens_spread = get_hyperslab('fname',pinfo.diagn_file, ...
-                       'varname','state_sd', ...
+                       'varname','state_sd','permute','true', ...
                        'tindex1',pinfo.diagn_time(1), 'tcount',pinfo.diagn_time(2)) ;
 
       % Use three different figures with three subplots each
@@ -105,34 +105,34 @@
 
    case {'lorenz_96_2scale', 'simple_advection'}
       % The variable names are not simply 'state', 'state_mean', 'state_sd'
-      disp('not supported yet')
+      error('not supported yet')
 
    case {'lorenz_63','lorenz_84','lorenz_96','lorenz_04','forced_lorenz_96','ikeda'}
 
       truth      = get_hyperslab('fname',pinfo.truth_file, ...
-                       'varname','state','squeeze','true', ...
+                       'varname','state','permute','true','squeeze','true', ...
                        'tindex1',pinfo.truth_time(1), 'tcount',pinfo.truth_time(2)) ;
 
       ens_mean   = get_hyperslab('fname',pinfo.diagn_file, ...
-                       'varname','state_mean', ...
+                       'varname','state_mean','permute','true', ...
                        'tindex1',pinfo.diagn_time(1), 'tcount',pinfo.diagn_time(2)) ;
 
       ens_spread = get_hyperslab('fname',pinfo.diagn_file, ...
-                       'varname','state_sd', ...
+                       'varname','state_sd','permute','true', ...
                        'tindex1',pinfo.diagn_time(1), 'tcount',pinfo.diagn_time(2)) ;
 
       clf; iplot = 0;
       for ivar = pinfo.var_inds,
             iplot = iplot + 1;
-            err         = total_err(ens_mean(ivar,:) , truth(ivar,:));
+            err         = total_err(ens_mean(:,ivar) , truth(:,ivar));
             errTotal    = sum(err)                / pinfo.time_series_length;
-            spreadTotal = sum(ens_spread(ivar,:)) / pinfo.time_series_length;
+            spreadTotal = sum(ens_spread(:,ivar)) / pinfo.time_series_length;
             string1 = ['time-mean Ensemble Mean Total Error = ' num2str(errTotal)];
             string2 = ['time-mean Ensemble Spread = ' num2str(spreadTotal)];
 
             subplot(length(pinfo.var_inds), 1, iplot);
                plot(pinfo.time,err, 'b', ...
-                    pinfo.time,ens_spread(ivar,:), 'r');
+                    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)
@@ -142,7 +142,7 @@
       end
 
    case {'fms_bgrid','pe2lyr','mitgcm_ocean','cam','wrf','sqg','pop'}
-
+      error('not supported yet')
       clf;
 
       truth      = get_hyperslab('fname',pinfo.truth_file, 'varname', pinfo.var, ...
@@ -183,7 +183,7 @@
          ylabel('distance');
 
    case {'mpas_atm'}
-
+      error('not supported yet')
       clf;
 
       truth      = get_hyperslab('fname',pinfo.truth_file, 'varname', pinfo.var, ...

Modified: DART/branches/rma_single_file/matlab/PlotJeffCorrel.m
===================================================================
--- DART/branches/rma_single_file/matlab/PlotJeffCorrel.m	2017-02-13 19:01:17 UTC (rev 11103)
+++ DART/branches/rma_single_file/matlab/PlotJeffCorrel.m	2017-02-13 22:24:07 UTC (rev 11104)