[Dart-dev] DART/branches Revision: 11532

[dart at ucar.edu]

hendric at ucar.edu
2017-04-27 09:47:33 -0600 (Thu, 27 Apr 2017)
54
merging changes from rma_trunk onto rma_output_files




Index: DART/branches/rma_output_files
===================================================================
--- DART/branches/rma_output_files	2017-04-27 15:25:17 UTC (rev 11531)
+++ DART/branches/rma_output_files	2017-04-27 15:47:33 UTC (rev 11532)

Property changes on: DART/branches/rma_output_files
___________________________________________________________________
Modified: svn:mergeinfo
## -28,7 +28,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:11447-11500
+/DART/branches/rma_trunk:11447-11531
 /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/rma_output_files/assimilation_code/modules/observations/obs_kind_mod.html
===================================================================
--- DART/branches/rma_output_files/assimilation_code/modules/observations/obs_kind_mod.html	2017-04-27 15:25:17 UTC (rev 11531)
+++ DART/branches/rma_output_files/assimilation_code/modules/observations/obs_kind_mod.html	2017-04-27 15:47:33 UTC (rev 11532)
@@ -159,8 +159,9 @@
 <div class=namelist>
 <pre>
 &amp;obs_kind_nml
-   assimilate_these_obs_types = 'null',
-   evaluate_these_obs_types   = 'null'  
+   assimilate_these_obs_types          = 'null',
+   evaluate_these_obs_types            = 'null'  
+   use_precomputed_FOs_these_obs_types = 'null'
  /
 </pre>
 </div>
@@ -193,13 +194,21 @@
 <TBODY valign=top>
 
 <TR><TD>assimilate_these_obs_types</TD>
-    <TD>character(len=129), dimension(:)</TD>
+    <TD>character(len=31), dimension(:)</TD>
     <TD>Names of observation types to be assimilated.</TD></TR>
 
 <TR><TD>evaluate_these_obs_types</TD>
-    <TD>character(len=129), dimension(:)</TD>
+    <TD>character(len=31), dimension(:)</TD>
     <TD>Names of observation types to be evaluated only.</TD></TR>
 
+<TR><TD>use_precomputed_FOs_these_obs_types</TD>
+    <TD>character(len=31), dimension(:)</TD>
+    <TD>If the forward operator values have been precomputed outside of
+filter, for example for radiances or other compute intensive computations,
+the ensemble of forward operator values can be stored in the observation
+sequence file.  For any type listed here, the forward operator interpolation
+code will not be called and the values in the file will be used instead.</TD></TR>
+
 </TBODY> 
 </TABLE>
 </div>

Modified: DART/branches/rma_output_files/assimilation_code/modules/observations/obs_kind_mod.nml
===================================================================
--- DART/branches/rma_output_files/assimilation_code/modules/observations/obs_kind_mod.nml	2017-04-27 15:25:17 UTC (rev 11531)
+++ DART/branches/rma_output_files/assimilation_code/modules/observations/obs_kind_mod.nml	2017-04-27 15:47:33 UTC (rev 11532)
@@ -1,5 +1,6 @@
 &obs_kind_nml
-   assimilate_these_obs_types = 'null',
-   evaluate_these_obs_types   = 'null'  
+   assimilate_these_obs_types          = 'null',
+   evaluate_these_obs_types            = 'null'  
+   use_precomputed_FOs_these_obs_types = 'null'
 /
 

Modified: DART/branches/rma_output_files/assimilation_code/modules/utilities/obs_impact_mod.f90
===================================================================
--- DART/branches/rma_output_files/assimilation_code/modules/utilities/obs_impact_mod.f90	2017-04-27 15:25:17 UTC (rev 11531)
+++ DART/branches/rma_output_files/assimilation_code/modules/utilities/obs_impact_mod.f90	2017-04-27 15:47:33 UTC (rev 11532)
@@ -8,7 +8,7 @@
 !> table at runtime for use during the assimilation phase, to
 !> alter the impact of observations on the state vector.
 !>
-!> these routines build a table(ntypes, nkinds) which can be
+!> these routines build a table(ntypes, nqtys) which can be
 !> indexed quickly at runtime.  this happens in the assimilation
 !> loop so performance matters.
 
@@ -19,7 +19,7 @@
                            open_file, close_file, nc_check, get_next_filename, &
                            find_namelist_in_file, check_namelist_read,         &
                            do_nml_file, do_nml_term, nmlfileunit, to_upper
-use  obs_kind_mod        ! all kinds/types, so impossible to enumerate them here
+use  obs_kind_mod        ! all qtys/types, so impossible to enumerate them here
 use parse_args_mod, only : get_args_from_string
 
 implicit none
@@ -56,12 +56,12 @@
 
 ! table of contents entry types
 integer, parameter :: ENTRY_UNKNOWN  = 0
-integer, parameter :: ENTRY_DARTKIND = 1
+integer, parameter :: ENTRY_DARTQTY  = 1
 integer, parameter :: ENTRY_DARTTYPE = 2