[Dart-dev] The/ Revision: 11678

[dart at ucar.edu]

thoar at ucar.edu
2017-05-27 16:19:35 -0600 (Sat, 27 May 2017)
115
The lorenz_96_2scale model is now supported in the rma 'world'.
Can now reintegrate the rma_updates_nancy branch.




Modified: DART/branches/rma_updates_nancy/diagnostics/matlab/private/CheckModel.m
===================================================================
--- DART/branches/rma_updates_nancy/diagnostics/matlab/private/CheckModel.m	2017-05-26 22:51:16 UTC (rev 11677)
+++ DART/branches/rma_updates_nancy/diagnostics/matlab/private/CheckModel.m	2017-05-27 22:19:35 UTC (rev 11678)
@@ -114,12 +114,9 @@
 
    case {'lorenz_96_2scale'}
 
-      num_X  = dim_length(fname,'Xdim'); % # of X variables
-      Xdim   =     ncread(fname,'Xdim');
+      num_X  = dim_length(fname,'Xlocation'); % # of X variables
+      num_Y  = dim_length(fname,'Ylocation'); % # of Y variables
 
-      num_Y  = dim_length(fname,'Ydim'); % # of Y variables
-      Ydim   =     ncread(fname,'Ydim');
-
       % The only trick is to pick an equally-spaced subset of state
       % variables for the default.
 
@@ -134,9 +131,9 @@
               'ensemble_indices',ens_indices, ...
               'time',dates, ...
               'time_series_length',num_times, ...
-              'min_state_var',min(Xdim), 'max_state_var',max(Xdim), ...
-              'min_X_var',    min(Xdim), 'max_X_var',    max(Xdim), ...
-              'min_Y_var',    min(Ydim), 'max_Y_var',    max(Ydim), ...
+              'min_state_var',1, 'max_state_var',num_X, ...
+              'min_X_var',    1, 'max_X_var',    num_X, ...
+              'min_Y_var',    1, 'max_Y_var',    num_Y, ...
               'def_state_vars',def_X_inds, ...
               'def_Y_inds', def_Y_inds);
 

Modified: DART/branches/rma_updates_nancy/diagnostics/matlab/private/CheckModelCompatibility.m
===================================================================
--- DART/branches/rma_updates_nancy/diagnostics/matlab/private/CheckModelCompatibility.m	2017-05-26 22:51:16 UTC (rev 11677)
+++ DART/branches/rma_updates_nancy/diagnostics/matlab/private/CheckModelCompatibility.m	2017-05-27 22:19:35 UTC (rev 11678)
@@ -270,7 +270,6 @@
          y = [dnum_lons dnum_lats dnum_lvls];
 
    case {'mpas_atm'}
-
       dnum_cells = dim_length(fname,'nCells');
       dnum_lvls  = dim_length(fname,'nVertLevels');
          x = 2;
@@ -277,8 +276,8 @@
          y = [dnum_cells dnum_lvls];
 
    case {'lorenz_96_2scale'}
-      dnum_X = dim_length(fname,'Xdim');
-      dnum_Y = dim_length(fname,'Ydim');
+      dnum_X = dim_length(fname,'Xlocation');
+      dnum_Y = dim_length(fname,'Ylocation');
 	 x = 2;
          y = [dnum_X dnum_Y];
 
@@ -288,7 +287,6 @@
 
 end
 
-
 % <next few lines under version control, do not edit>
 % $URL$
 % $Revision$

Modified: DART/branches/rma_updates_nancy/diagnostics/matlab/private/GetNCindices.m
===================================================================
--- DART/branches/rma_updates_nancy/diagnostics/matlab/private/GetNCindices.m	2017-05-26 22:51:16 UTC (rev 11677)
+++ DART/branches/rma_updates_nancy/diagnostics/matlab/private/GetNCindices.m	2017-05-27 22:19:35 UTC (rev 11678)
@@ -290,9 +290,9 @@
            case {'tmpi','west','slon','ixrt'}
                start(i) = lon1;
                count(i) = lonN;
-           case {'stat','xdim','ydim','loca'}
+           case {'stat','xloc','yloc','loca'}
                % the lorenz_96_2scale has the unfortunate choice of
-               % 'Xdim' and 'YDim' for their state variable names.
+               % 'XLocation' and 'YLocation' for their state variable names.
                start(i) = state1;
                count(i) = stateN;
            case 'regi'

Modified: DART/branches/rma_updates_nancy/diagnostics/matlab/private/PlotCorrel.m
===================================================================
--- DART/branches/rma_updates_nancy/diagnostics/matlab/private/PlotCorrel.m	2017-05-26 22:51:16 UTC (rev 11677)
+++ DART/branches/rma_updates_nancy/diagnostics/matlab/private/PlotCorrel.m	2017-05-27 22:19:35 UTC (rev 11678)
@@ -37,12 +37,9 @@
 
 switch(lower(pinfo.model))
 
-    case {'lorenz_96_2scale'}
+    case {'9var','lorenz_63','lorenz_84','lorenz_96', 'lorenz_96_2scale', ...
+            'lorenz_04','forced_lorenz_96','ikeda','simple_advection'}
 
-        error('%s not supported yet',pinfo.model)
-
-    case {'9var','lorenz_63','lorenz_84','lorenz_96','lorenz_04','forced_lorenz_96','ikeda','simple_advection'}
-
         % The Base Variable Index must be a valid state variable
         if ( pinfo.base_var_index > pinfo.num_state_vars )
             fprintf('%s only has %d state variables\n', pinfo.fname, pinfo.num_state_vars)