[Dart-dev] DART/branches Revision: 11978

[dart at ucar.edu]

thoar at ucar.edu
2017-10-12 14:08:24 -0600 (Thu, 12 Oct 2017)
168
Updating WRfHydro branch to be consistent with trunk.
The WrfHydro/DART group uses a GIT version of this,
so there is no chance of modifying something they are using.




Index: DART/branches/wrfHydro
===================================================================
--- DART/branches/wrfHydro	2017-10-12 19:52:50 UTC (rev 11977)
+++ DART/branches/wrfHydro	2017-10-12 20:08:24 UTC (rev 11978)

Property changes on: DART/branches/wrfHydro
___________________________________________________________________
Modified: svn:mergeinfo
## -1,5 +1,7 ##
+/DART/branches/NOGAPS:6328-10846
 /DART/branches/development:4680-6255
 /DART/branches/gitm:5143-6215
 /DART/branches/gitm_lanai:6571-6652
 /DART/branches/helen:5995-6161
-/DART/trunk:7071-7242
\ No newline at end of property
+/DART/branches/trunk_with_cam_style:9473-9540
+/DART/trunk:7071-11976
\ No newline at end of property
Modified: DART/branches/wrfHydro/DART_LAB/matlab/gaussian_product.m
===================================================================
--- DART/branches/wrfHydro/DART_LAB/matlab/gaussian_product.m	2017-10-12 19:52:50 UTC (rev 11977)
+++ DART/branches/wrfHydro/DART_LAB/matlab/gaussian_product.m	2017-10-12 20:08:24 UTC (rev 11978)
@@ -10,11 +10,11 @@
 %    If the parameters of the two gaussians are known, the parameters of the
 %    resulting gaussian can be calculated.
 %
-% See also: oned_model, oned_ensemble, twod_ensemble,
-%           run_lorenz_63, run_lorenz_96
+% See also: oned_model.m oned_model_inf.m oned_ensemble.m
+%           twod_ensemble.m run_lorenz_63.m run_lorenz_96.m run_lorenz_96_inf.m
 
-%% DART software - Copyright 2004 - 2016 UCAR. This open source software is
-% provided by UCAR, "as is", without charge, subject to all terms of use at
+%% DART software - Copyright UCAR. This open source software is provided
+% by UCAR, "as is", without charge, subject to all terms of use at
 % http://www.image.ucar.edu/DAReS/DART/DART_download
 %
 % DART $Id$
@@ -190,7 +190,7 @@
     'FontUnits', 'normalized', ...
     'FontName', atts.fontname, ...
     'FontSize', 0.2);
-     
+
 text_xstart = 0.01;
 text_dy     = 0.25;
 text_y      = 0.925 - text_dy - 0.05;
@@ -255,9 +255,9 @@
         %This function plots the graph using the inputs in the 4 edit boxes. It
         %makes changes to handles, so the function must return an update to
         %handles. This is done through the function definition.
-        
+
         [prior_mean, prior_sd, obs_mean, obs_err_sd, is_err] = g_prod_plot(handles);
-        
+
         % If there is an error, zero out the posterior text values
         % don't try to do posterior computation
         if(is_err)
@@ -264,13 +264,13 @@
             reset_Posterior();
             return;
         end
-        
+
         % Compute the posterior mean, sd and weight
         [post_mean, post_sd, weight] = ...
             product_of_gaussians(prior_mean, prior_sd, obs_mean, obs_err_sd);
         post_handle = plot_gaussian(post_mean, post_sd, 1);
-        set(post_handle, 'Color', 'b', 'LineWidth', 2);
-        
+        set(post_handle, 'Color', atts.blue, 'LineWidth', 2);
+
         %Round post_mean, post_sd and weight to 4 decimal places
         post_mean = round(post_mean * 10000);
         post_mean = post_mean/10000;
@@ -278,22 +278,22 @@
         post_sd = post_sd/10000;
         weight = round(weight * 10000);
         weight = weight/10000;
-        
+
         % Print values
         str1 = sprintf('Mean = %.4f',post_mean);
         set(handles.ui_text_posterior_mean, 'String', str1);
         str1 = sprintf('SD = %.4f',post_sd);
         set(handles.ui_text_posterior_sd, 'String', str1);
-        
+
         % Also plot the weighted posterior as dashed
         post_handle = plot_gaussian(post_mean, post_sd, weight);
-        set(post_handle, 'Color', 'b', 'LineStyle', '--');
+        set(post_handle, 'Color', atts.blue, 'LineStyle', '--');
         str1 = sprintf('Weight = %.4f',weight);
         set(handles.ui_text_posterior_weight, 'String', str1);
-        
+
         h = legend('Prior', 'Obs. Likelihood', 'Posterior', 'Weighted Posterior');
         set(h, 'box', 'on', 'Location', 'NorthWest')
-