[Dart-dev] DART/branches Revision: 11892

[dart at ucar.edu]

hendric at ucar.edu
2017-08-09 09:44:42 -0600 (Wed, 09 Aug 2017)
56
merging in the most recent changes from the rma trunk.




Index: DART/branches/rma_fix_clm_restarts
===================================================================
--- DART/branches/rma_fix_clm_restarts	2017-08-08 22:10:37 UTC (rev 11891)
+++ DART/branches/rma_fix_clm_restarts	2017-08-09 15:44:42 UTC (rev 11892)

Property changes on: DART/branches/rma_fix_clm_restarts
___________________________________________________________________
Modified: svn:mergeinfo
## -33,7 +33,7 ##
 /DART/branches/rma_sprint:8095-8166
 /DART/branches/rma_state_structure_test_dir:9472-9676
 /DART/branches/rma_state_structure_unit_test:9691-10268
-/DART/branches/rma_trunk:9634-11883
+/DART/branches/rma_trunk:9634-11891
 /DART/branches/rma_trunk_clamping:8786-8801
 /DART/branches/rma_trunk_filename:8011-8157
 /DART/branches/rma_trunk_get_state_fun:8568-8596
Modified: DART/branches/rma_fix_clm_restarts/documentation/DART_LAB/DART_LAB.html
===================================================================
--- DART/branches/rma_fix_clm_restarts/documentation/DART_LAB/DART_LAB.html	2017-08-08 22:10:37 UTC (rev 11891)
+++ DART/branches/rma_fix_clm_restarts/documentation/DART_LAB/DART_LAB.html	2017-08-09 15:44:42 UTC (rev 11892)
@@ -57,6 +57,7 @@
 <LI><A HREF="presentation/DART_LAB_Section02.pdf">Section 2:</A> How should observations of a state variable impact an unobserved state variable? Multivariate assimilation.</LI>
 <LI><A HREF="presentation/DART_LAB_Section03.pdf">Section 3:</A> Sampling error and localization.</LI>
 <LI><A HREF="presentation/DART_LAB_Section04.pdf">Section 4:</A> The Ensemble Kalman Filter (Perturbed Observations).</LI>
+<LI><A HREF="presentation/DART_LAB_Section05.pdf">Section 5:</A> Adaptive Inflation.</LI>
 </UL>
 
 <!--==================================================================-->

Modified: DART/branches/rma_fix_clm_restarts/documentation/DART_LAB/presentation/DART_LAB_Section01.pdf
===================================================================
(Binary files differ)

Modified: DART/branches/rma_fix_clm_restarts/documentation/DART_LAB/presentation/DART_LAB_Section02.pdf
===================================================================
(Binary files differ)

Modified: DART/branches/rma_fix_clm_restarts/documentation/DART_LAB/presentation/DART_LAB_Section03.pdf
===================================================================
(Binary files differ)

Copied: DART/branches/rma_fix_clm_restarts/documentation/DART_LAB/presentation/DART_LAB_Section05.pdf (from rev 11891, DART/branches/rma_trunk/documentation/DART_LAB/presentation/DART_LAB_Section05.pdf)
===================================================================
(Binary files differ)

Modified: DART/branches/rma_fix_clm_restarts/documentation/doxygen/README
===================================================================
--- DART/branches/rma_fix_clm_restarts/documentation/doxygen/README	2017-08-08 22:10:37 UTC (rev 11891)
+++ DART/branches/rma_fix_clm_restarts/documentation/doxygen/README	2017-08-09 15:44:42 UTC (rev 11892)
@@ -22,7 +22,7 @@
   generate a single index.html main page plus separate documentation pages 
   for each executable that has a mkmf_xxx and path_names_xxx pair of files 
   in the work directory.  All documentation will be created and put under 
-  $DART/doc/doxygen/model_name.
+  $DART/documentation/doxygen/model_name.
 
   To create documentation with diagrams of 'used by' and 'uses', run
   './gendocs -devel' to enable the development diagrams.
@@ -30,7 +30,7 @@
 
 To use the documentation:
 
-- Open $DART/doc/doxygen/model_name/index.html in a browser and click
+- Open $DART/documentation/doxygen/model_name/index.html in a browser and click
   on any executable name.
 
 - Click on the triangle in front of 'Data Types List' to open the list.

Modified: DART/branches/rma_fix_clm_restarts/documentation/doxygen/gendocs
===================================================================
--- DART/branches/rma_fix_clm_restarts/documentation/doxygen/gendocs	2017-08-08 22:10:37 UTC (rev 11891)
+++ DART/branches/rma_fix_clm_restarts/documentation/doxygen/gendocs	2017-08-09 15:44:42 UTC (rev 11892)
@@ -26,7 +26,7 @@
 umodel=`echo $model | tr '[a-z]' '[A-Z]' `
 toppath=`cd ../../../; pwd`
 
-destdir=$toppath/doc/doxygen/$model
+destdir=$toppath/documentation/doxygen/$model
 
 echo Generating documentation for all executables in the current directory
 echo for the model ${model}.   All html files will be located under the directory