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

[dart at ucar.edu]

nancy at ucar.edu
2017-12-07 14:32:15 -0700 (Thu, 07 Dec 2017)
311
merge in all recent changes from the manhattan release.

remove the GIGG_type subtype item from the namelist.
the code will determine the subtype on a per-observation
basis.   pass in the obs quantity to the increment routine.

update the lorenz_96/input.nml files to set filter type 10
(GIGG) on this branch.




Index: DART/branches/gigg
===================================================================
--- DART/branches/gigg	2017-12-06 23:57:41 UTC (rev 12185)
+++ DART/branches/gigg	2017-12-07 21:32:15 UTC (rev 12186)

Property changes on: DART/branches/gigg
___________________________________________________________________
Modified: svn:mergeinfo
## -1,50 +1,52 ##
-/DART/branches/CM1:8569-10316
-/DART/branches/bgrid_sprint:8188-8237
-/DART/branches/bgrid_sprint_state_reorder:8208-8250
-/DART/branches/development:4674-6249
-/DART/branches/gitm:5137-6209
-/DART/branches/gitm_lanai:6565-6646
-/DART/branches/helen:5989-6155
-/DART/branches/model_mod_changes:11403-11604
+/DART/branches/CM1:8567-10314
+/DART/branches/bgrid_sprint:8186-8235
+/DART/branches/bgrid_sprint_state_reorder:8206-8248
+/DART/branches/development:4672-6247
+/DART/branches/gitm:5135-6207
+/DART/branches/gitm_lanai:6563-6644
+/DART/branches/helen:5987-6153
+/DART/branches/model_mod_changes:11401-11602
 /DART/branches/rma_array_nml:11814-11839
-/DART/branches/rma_cam_fv:9552-9728
-/DART/branches/rma_cf_conventions:9727-10086
-/DART/branches/rma_cice:10649-10852
-/DART/branches/rma_clm:8905-9126
-/DART/branches/rma_diag:9623-9737
-/DART/branches/rma_fixed_filenames:10702-10895
-/DART/branches/rma_kinds_to_state_structure:8952-9431
-/DART/branches/rma_kinds_to_state_strucutre:8903-8951
-/DART/branches/rma_mmc:11725-11731,11735-11751
-/DART/branches/rma_model_mod_check:8959-9172
-/DART/branches/rma_mpas_fold_mean_fwd:9342-9452
-/DART/branches/rma_mpas_get_state_meta_data:8865-8884
-/DART/branches/rma_obs_defs:8917-9061
-/DART/branches/rma_output_files:11441-11538
-/DART/branches/rma_par_msg:9466-9505
-/DART/branches/rma_par_single_file:11679-11731,11735-11773
-/DART/branches/rma_pop_variable_namelist:8818-9150
-/DART/branches/rma_qc_fwd_op:9644-9717
-/DART/branches/rma_refac_io:9117-9540
-/DART/branches/rma_remove_groups_from_transpose:9321-9449
-/DART/branches/rma_roms:10151-10375
-/DART/branches/rma_set_filenames:8379-8385
-/DART/branches/rma_single_file:10898-11107
-/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:11851-11864
-/DART/branches/rma_trunk_clamping:8786-8801
-/DART/branches/rma_trunk_filename:8011-8157
-/DART/branches/rma_trunk_get_state_fun:8568-8596
-/DART/branches/rma_trunk_mean_ens:8516-8528
-/DART/branches/rma_trunk_mmc_fix:9320-9337
-/DART/branches/rma_trunk_mpi_get_in_utils:8561-8817
-/DART/branches/rma_trunk_pathnames:8015-8028
-/DART/branches/rma_trunk_posterior:9768-9781
-/DART/branches/rma_trunk_read_transpose:9208-9250
-/DART/branches/rma_trunk_vert_loc:8532-8537
-/DART/branches/rma_types_kinds:11202-11236
-/DART/branches/rma_updates_nancy:11615-11676
-/DART/branches/trunk_with_cam_style:9467-9534
-/DART/trunk:6306-9550
\ No newline at end of property
+/DART/branches/rma_cam_fv:9550-9726
+/DART/branches/rma_cf_conventions:9725-10084
+/DART/branches/rma_cice:10647-10850
+/DART/branches/rma_clm:8903-9124
+/DART/branches/rma_diag:9621-9735
+/DART/branches/rma_fix_clm_restarts:9634-11919
+/DART/branches/rma_fixed_filenames:10700-10893
+/DART/branches/rma_kinds_to_state_structure:8950-9429
+/DART/branches/rma_kinds_to_state_strucutre:8901-8949
+/DART/branches/rma_mmc:11723-11747
+/DART/branches/rma_model_mod_check:8957-9170
+/DART/branches/rma_mpas_fold_mean_fwd:9340-9450
+/DART/branches/rma_mpas_get_state_meta_data:8863-8882
+/DART/branches/rma_obs_defs:8915-9059
+/DART/branches/rma_output_files:11439-11536
+/DART/branches/rma_par_msg:9464-9503
+/DART/branches/rma_par_single_file:11677-11771
+/DART/branches/rma_pop_variable_namelist:8816-9148
+/DART/branches/rma_qc_fwd_op:9642-9715
+/DART/branches/rma_refac_io:9115-9538
+/DART/branches/rma_remove_groups_from_transpose:9319-9447
+/DART/branches/rma_roms:10149-10373
+/DART/branches/rma_set_filenames:8377-8383
+/DART/branches/rma_single_file:10896-11105
+/DART/branches/rma_sprint:8093-8164
+/DART/branches/rma_state_structure_test_dir:9470-9674
+/DART/branches/rma_state_structure_unit_test:9689-10266
+/DART/branches/rma_trunk:11851-12165
+/DART/branches/rma_trunk_clamping:8784-8799
+/DART/branches/rma_trunk_filename:8009-8155
+/DART/branches/rma_trunk_get_state_fun:8566-8594
+/DART/branches/rma_trunk_mean_ens:8514-8526
+/DART/branches/rma_trunk_mmc_fix:9318-9335