[Dart-dev] DART/branches Revision: 11883

[dart at ucar.edu]

hendric at ucar.edu
2017-08-04 16:26:10 -0600 (Fri, 04 Aug 2017)
50
Merging in the latest changes from the rma_trunk




Index: DART/branches/rma_fix_clm_restarts
===================================================================
--- DART/branches/rma_fix_clm_restarts	2017-08-04 22:24:34 UTC (rev 11882)
+++ DART/branches/rma_fix_clm_restarts	2017-08-04 22:26:10 UTC (rev 11883)

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-11844
+/DART/branches/rma_trunk:9634-11882
 /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/CHANGELOG
===================================================================
--- DART/branches/rma_fix_clm_restarts/CHANGELOG	2017-08-04 22:24:34 UTC (rev 11882)
+++ DART/branches/rma_fix_clm_restarts/CHANGELOG	2017-08-04 22:26:10 UTC (rev 11883)
@@ -476,7 +476,7 @@
   in the repository.  (Remove it from any private path_names_* files.)
 
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+ July 18 2017 :: bug fixes, documentation updates.  $Revision$
++ July 18 2017 :: bug fixes, documentation updates.  Revision: 11830 
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 - fixed bug in obs_impact_tool when generating the run-time table.  specifying
@@ -491,9 +491,35 @@
   names changed from 'restart' to 'state' for input and output files.
 
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+ MMMM DD 2017 :: next revision summary.  Revision: 
++ Aug 2 2017 :: single filenames, random distributions, bug fixes.  $Revision$
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
+- added code to support listing input and output filenames directly in the
+  namelist instead of having to go through an indirect text file.  most useful
+  for programs that take a single input and output file, but works for all cases.
+
+- bug fix in location_io_mod.f90 that affected obs_seq_to_netcdf (error in adding
+  vertical location types to output file).
+
+- fix to convert_gpsro_bufr.f90 converter (GPS obs from BUFR files) that failed
+  if r8 defined to be r4.
+
+- added draws from gamma, inverse gamma, and exponential distributions to the
+  random sequence module.
+
+- various updates to the CAM scripts to work more smoothly with the most
+  recent CIME changes and DART Manhattan updates.
+
+- added QTY_CWP_PATH and QTY_CWP_PATH_ZERO to the default quantities list for
+  the obs_def_cwp_mod.f90 forward operator.
+
+- improved some error messages in the diagnostic matlab scripts
+
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ MMM DD 2017 :: next revision summary.  Revision: 
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+
 # <next few lines under version control, do not edit>
 # $URL$
 # $Revision$

Modified: DART/branches/rma_fix_clm_restarts/assimilation_code/location/channel/location_mod.f90
===================================================================
--- DART/branches/rma_fix_clm_restarts/assimilation_code/location/channel/location_mod.f90	2017-08-04 22:24:34 UTC (rev 11882)
+++ DART/branches/rma_fix_clm_restarts/assimilation_code/location/channel/location_mod.f90	2017-08-04 22:26:10 UTC (rev 11883)
@@ -11,7 +11,7 @@
 ! Implements location interfaces for a 3d channel in X,Y,Z where X is periodic,
 ! Y has walls (limited domain), and Z is infinite
 
-use      types_mod, only : r8, MISSING_R8, MISSING_I, PI, RAD2DEG, DEG2RAD
+use      types_mod, only : r8, i8, MISSING_R8, MISSING_I, PI, RAD2DEG, DEG2RAD
 use  utilities_mod, only : register_module, error_handler, E_ERR, ascii_file_format, &
                            nc_check, E_MSG, open_file, close_file, set_output,       &
                            logfileunit, nmlfileunit, find_namelist_in_file,          &
@@ -20,7 +20,12 @@
 use random_seq_mod, only : random_seq_type, init_random_seq, random_uniform
 use   obs_kind_mod, only : get_num_types_of_obs, get_name_for_type_of_obs
 use mpi_utilities_mod, only : my_task_id, task_count
+use ensemble_manager_mod, only : ensemble_type
+use default_location_mod, only : has_vertical_choice, vertical_localization_on, &
+                                 get_vertical_localization_coord, &
+                                 set_vertical_localization_coord
 
+
 implicit none
 private
 
@@ -27,16 +32,13 @@
 public :: location_type, get_location, set_location, &
           set_location_missing, is_location_in_region, &
           write_location, read_location, interactive_location, query_location, &
-          LocationDims, LocationName, LocationLName, get_close_obs, &
-          get_close_maxdist_init, get_close_obs_init, get_close_type, &
-          operator(==), operator(/=), get_dist, get_close_obs_destroy, &