[Dart-dev] DART/branches Revision: 11635

[dart at ucar.edu]

thoar at ucar.edu
2017-05-15 15:18:50 -0600 (Mon, 15 May 2017)
235
Making the rma_openggcm branch consistent with rma_trunk 11262
in the hopes that the mergeinfo properties for some of the directories
will be updated so I can ultimately merge the HEAD of the trunk
to get the new directory structure.




Index: DART/branches/rma_openggcm
===================================================================
--- DART/branches/rma_openggcm	2017-05-13 15:14:15 UTC (rev 11634)
+++ DART/branches/rma_openggcm	2017-05-15 21:18:50 UTC (rev 11635)

Property changes on: DART/branches/rma_openggcm
___________________________________________________________________
Modified: svn:mergeinfo
## -1,3 +1,4 ##
+/DART/branches/CM1:8575-10322
 /DART/branches/bgrid_sprint:8194-8243
 /DART/branches/bgrid_sprint_state_reorder:8214-8256
 /DART/branches/development:4680-6255
## -5,8 +6,11 ##
 /DART/branches/gitm_lanai:6571-6652
 /DART/branches/helen:5995-6161
 /DART/branches/rma_cam_fv:9558-9734
+/DART/branches/rma_cf_conventions:9733-10092
+/DART/branches/rma_cice:10655-10858
 /DART/branches/rma_clm:8911-9132
 /DART/branches/rma_diag:9629-9743
+/DART/branches/rma_fixed_filenames:10708-10901
 /DART/branches/rma_kinds_to_state_structure:8958-9437
 /DART/branches/rma_kinds_to_state_strucutre:8909-8957
 /DART/branches/rma_model_mod_check:8965-9178
## -18,9 +22,13 ##
 /DART/branches/rma_qc_fwd_op:9650-9723
 /DART/branches/rma_refac_io:9123-9546
 /DART/branches/rma_remove_groups_from_transpose:9327-9455
+/DART/branches/rma_roms:10157-10381
 /DART/branches/rma_set_filenames:8385-8391
+/DART/branches/rma_single_file:10904-11113
 /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:9832-11262
 /DART/branches/rma_trunk_clamping:8792-8807
 /DART/branches/rma_trunk_filename:8017-8163
 /DART/branches/rma_trunk_get_state_fun:8574-8602
## -31,5 +39,6 ##
 /DART/branches/rma_trunk_posterior:9774-9787
 /DART/branches/rma_trunk_read_transpose:9214-9256
 /DART/branches/rma_trunk_vert_loc:8538-8543
+/DART/branches/rma_types_kinds:11208-11242
 /DART/branches/trunk_with_cam_style:9473-9540
 /DART/trunk:6306-9556
\ No newline at end of property
Modified: DART/branches/rma_openggcm/DART_LAB/DART_LAB.html
===================================================================
--- DART/branches/rma_openggcm/DART_LAB/DART_LAB.html	2017-05-13 15:14:15 UTC (rev 11634)
+++ DART/branches/rma_openggcm/DART_LAB/DART_LAB.html	2017-05-15 21:18:50 UTC (rev 11635)
@@ -99,9 +99,8 @@
 <H2>Terms of Use</H2>
 
 <P>
-DART software - Copyright 2004 - 2013 UCAR.<br>
-This open source software is provided by UCAR, "as is",<br>
-without charge, subject to all terms of use at<br>
+DART software - Copyright UCAR. This open source software is provided
+by UCAR, "as is", without charge, subject to all terms of use at
 <a href="http://www.image.ucar.edu/DAReS/DART/DART_download">
 http://www.image.ucar.edu/DAReS/DART/DART_download</a>
 </P>

Deleted: DART/branches/rma_openggcm/DART_LAB/matlab/gaussian_product.fig
===================================================================
(Binary files differ)

Modified: DART/branches/rma_openggcm/DART_LAB/matlab/gaussian_product.m
===================================================================
--- DART/branches/rma_openggcm/DART_LAB/matlab/gaussian_product.m	2017-05-13 15:14:15 UTC (rev 11634)
+++ DART/branches/rma_openggcm/DART_LAB/matlab/gaussian_product.m	2017-05-15 21:18:50 UTC (rev 11635)
@@ -1,4 +1,4 @@
-function varargout = gaussian_product(varargin)
+function gaussian_product
 %% GAUSSIAN_PRODUCT demonstrates the product of two gaussian distributions.
 %
 %    This is fundamental to Kalman filters and to ensemble
@@ -7,211 +7,326 @@
 %    and click on 'Plot Posterior'.
 %
 %    The product (in this case, the 'Posterior') of two gaussians is a gaussian.
-%    If the parameters of the two gaussians are known, the parameters of the 
+%    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
 
-%% DART software - Copyright 2004 - 2013 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$
 
-% Begin initialization code - DO NOT EDIT
-gui_Singleton = 1;
-gui_State = struct('gui_Name',       mfilename, ...
-                   'gui_Singleton',  gui_Singleton, ...