[Dart-dev] DART/branches Revision: 12525

[dart at ucar.edu]

nancy at ucar.edu
2018-04-17 09:45:27 -0600 (Tue, 17 Apr 2018)
167
merge trunk into an old branch of mine that may still
have outstanding updates for the original version of dart.  
probably not, but commit them anyway just in case.




Index: DART/branches/nancy_new
===================================================================
--- DART/branches/nancy_new	2018-04-16 21:58:43 UTC (rev 12524)
+++ DART/branches/nancy_new	2018-04-17 15:45:27 UTC (rev 12525)

Property changes on: DART/branches/nancy_new
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +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
\ No newline at end of property
+/DART/branches/helen:5995-6161
+/DART/branches/trunk_with_cam_style:9473-9540
+/DART/trunk:8029-12524
\ No newline at end of property
Modified: DART/branches/nancy_new/DART_LAB/DART_LAB.html
===================================================================
--- DART/branches/nancy_new/DART_LAB/DART_LAB.html	2018-04-16 21:58:43 UTC (rev 12524)
+++ DART/branches/nancy_new/DART_LAB/DART_LAB.html	2018-04-17 15:45:27 UTC (rev 12525)
@@ -26,7 +26,7 @@
 </table>
 
 <A HREF="#Presentations">Presentations</A> /
-<A HREF="#Matlab">Matlab Programs</A> /
+<A HREF="#Matlab">Matlab® Programs</A> /
 <A HREF="#Legalese">TERMS OF USE</A>
 
 <H2>Overview</H2>
@@ -33,7 +33,7 @@
 
 <P>
 The files in this directory contain PDF tutorial
-materials on DART, and Matlab exercises.  See below for links to the
+materials on DART, and Matlab® exercises.  See below for links to the
 PDF files and a list of the corresponding matlab scripts.
 </P>
 <P>
@@ -59,11 +59,19 @@
 <LI><A HREF="presentation/DART_LAB_Section04.pdf">Section 4:</A> The Ensemble Kalman Filter (Perturbed Observations).</LI>
 </UL>
 
+<P><strong>Please note:</strong> as Matlab continues to develop its 
+GUI capabilities, some features change and the GUIs we have written 
+may behave slightly differently with different Matlab versions.  In 
+early 2016, I rewrote the GUIs such that they (should) work with 
+almost all(?) versions of Matlab available at the time. I also chose to consolidate the multiple-figure GUIs into a single, 
+rescalable figure so some of the presentation materials may look slightly different than the new tools.
+</P>
+
 <!--==================================================================-->
 
 <A NAME="Matlab"></A>
 <HR>
-<H2>Matlab Hands-On Exercises</H2>
+<H2>Matlab® Hands-On Exercises</H2>
 
 <P>
 In the <em class=file>matlab</em> subdirectory are a set of

Deleted: DART/branches/nancy_new/DART_LAB/matlab/advance_oned.m
===================================================================
--- DART/branches/nancy_new/DART_LAB/matlab/advance_oned.m	2018-04-16 21:58:43 UTC (rev 12524)
+++ DART/branches/nancy_new/DART_LAB/matlab/advance_oned.m	2018-04-17 15:45:27 UTC (rev 12525)
@@ -1,28 +0,0 @@
-function x_new = advance_oned(x, alpha, model_bias)
-%% advance_oned(x, alpha, model_bias)
-
-%% 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
-% http://www.image.ucar.edu/DAReS/DART/DART_download
-%
-% DART $Id$
-
-x_new = x + comp_dt(x, alpha, model_bias);
-end
-
-%---------------------------------------------------
-
-% Internal function comp_dt
-function dx = comp_dt(x, alpha, model_bias)
-
-% Compute the time tendency; alpha controls nonlinearity
-% model_bias controls a shift in the model dynamics
-dx = (x + model_bias) + alpha .* x .* abs(x);
-
-end
-
-% <next few lines under version control, do not edit>
-% $URL$
-% $Revision$
-% $Date$
-

Deleted: DART/branches/nancy_new/DART_LAB/matlab/comp_cov_factor.m
===================================================================
--- DART/branches/nancy_new/DART_LAB/matlab/comp_cov_factor.m	2018-04-16 21:58:43 UTC (rev 12524)
+++ DART/branches/nancy_new/DART_LAB/matlab/comp_cov_factor.m	2018-04-17 15:45:27 UTC (rev 12525)