[Dart-dev] svn:mergeinfo/ Revision: 11553

[dart at ucar.edu]

nancy at ucar.edu
2017-04-27 15:25:38 -0600 (Thu, 27 Apr 2017)
34
merge in changes from rma_trunk.




Index: DART/branches/model_mod_changes
===================================================================
--- DART/branches/model_mod_changes	2017-04-27 20:08:09 UTC (rev 11552)
+++ DART/branches/model_mod_changes	2017-04-27 21:25:38 UTC (rev 11553)

Property changes on: DART/branches/model_mod_changes
___________________________________________________________________
Modified: svn:mergeinfo
## -17,6 +17,7 ##
 /DART/branches/rma_mpas_fold_mean_fwd:9348-9458
 /DART/branches/rma_mpas_get_state_meta_data:8871-8890
 /DART/branches/rma_obs_defs:8923-9067
+/DART/branches/rma_output_files:11447-11544
 /DART/branches/rma_par_msg:9472-9511
 /DART/branches/rma_pop_variable_namelist:8824-9156
 /DART/branches/rma_qc_fwd_op:9650-9723
## -28,7 +29,7 ##
 /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:11409-11491
+/DART/branches/rma_trunk:11409-11552
 /DART/branches/rma_trunk_clamping:8792-8807
 /DART/branches/rma_trunk_filename:8017-8163
 /DART/branches/rma_trunk_get_state_fun:8574-8602
Modified: DART/branches/model_mod_changes/CHANGELOG
===================================================================
--- DART/branches/model_mod_changes/CHANGELOG	2017-04-27 20:08:09 UTC (rev 11552)
+++ DART/branches/model_mod_changes/CHANGELOG	2017-04-27 21:25:38 UTC (rev 11553)
@@ -254,11 +254,44 @@
 
 has_cycling           -- REMOVED for low order models
 
-
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+ Month Day 2017 :: change $Revision$
++ April 27th 2017 :: change $Revision$
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
+Two additional Diagnostic Files (forecast and analysis) in Filter 
+which can be set with the namelist option (stages_to_write)
+
+  input    - writes out mean and sd if requested. for low order models
+             mean and sd are only inserted into restart files with a 
+             single time step.
+
+  forecast - contains the forecast and potentially the mean and sd for the,
+             this is mostly important for lower order models which cycle
+
+  preassim - before assimilation
+     * No Inflation:       same as forecast
+     * Prior Inf:          the inflated ensemble and damped prior inf
+     * Post Inf:           same as forecast
+     * Prior and Post Inf: the inflated ensemble and damped prior inf
+
+  postassim - after assimilation (before posterior infation)
+     * No Inflation:       same as analysis
+     * Prior Inf:          same as analysis
+     * Post Inf:           assimilated ensemble and damped posterior inflation
+     * Prior and Post Inf: assimilated ensemble and damped posterior inflation
+
+  analysis - after assimilation and before potentially update posterior inflation ensemble 
+             and updated prior inf
+     * No Inflation:       assimilated ensemble
+     * Prior Inf:          assimilated ensemble and updated prior inf
+     * Post Inf:           post inflated ensemble and updated posterior inflation
+     * Prior and Post Inf: post inflated ensemble and updated prior inf and posterior 
+                           inflation
+
+  output - a single time step of the output ensemble and potentially updated prior inf 
+           and posterior inflation
+
+
 # <next few lines under version control, do not edit>
 # $URL$
 # $Revision$

Index: DART/branches/model_mod_changes/assimilation_code/modules/assimilation/assim_tools_mod.f90
===================================================================
--- DART/branches/model_mod_changes/assimilation_code/modules/assimilation/assim_tools_mod.f90	2017-04-27 20:08:09 UTC (rev 11552)
+++ DART/branches/model_mod_changes/assimilation_code/modules/assimilation/assim_tools_mod.f90	2017-04-27 21:25:38 UTC (rev 11553)

Property changes on: DART/branches/model_mod_changes/assimilation_code/modules/assimilation/assim_tools_mod.f90
___________________________________________________________________
Modified: svn:mergeinfo
## -16,6 +16,7 ##
 /DART/branches/rma_kinds_to_state_strucutre/assim_tools/assim_tools_mod.f90:8909-8957
 /DART/branches/rma_model_mod_check/assim_tools/assim_tools_mod.f90:8965-9178
 /DART/branches/rma_obs_defs/assim_tools/assim_tools_mod.f90:8923-9067
+/DART/branches/rma_output_files/assimilation_code/modules/assimilation/assim_tools_mod.f90:11447-11544
 /DART/branches/rma_pop_variable_namelist/assim_tools/assim_tools_mod.f90:8824-9156
 /DART/branches/rma_qc_fwd_op/assim_tools/assim_tools_mod.f90:9650-9723
 /DART/branches/rma_refac_io/assim_tools/assim_tools_mod.f90:9123-9546
## -25,7 +26,7 ##
 /DART/branches/rma_sprint/assim_tools/assim_tools_mod.f90:8101-8172
 /DART/branches/rma_state_structure_test_dir/assim_tools/assim_tools_mod.f90:9478-9682
 /DART/branches/rma_state_structure_unit_test/assim_tools/assim_tools_mod.f90:9697-10274
-/DART/branches/rma_trunk/assimilation_code/modules/assimilation/assim_tools_mod.f90:11409-11491
+/DART/branches/rma_trunk/assimilation_code/modules/assimilation/assim_tools_mod.f90:11409-11552
 /DART/branches/rma_trunk_filename/assim_tools/assim_tools_mod.f90:8017-8163
 /DART/branches/rma_trunk_mean_ens/assim_tools/assim_tools_mod.f90:8522-8534