thoar at ucar.edu
2017-08-11 10:22:52 -0600 (Fri, 11 Aug 2017)
68
Bringing openggcm branch up-to-date with respect to the rma_trunk.
Index: DART/branches/openggcm
===================================================================
--- DART/branches/openggcm 2017-08-10 15:27:32 UTC (rev 11897)
+++ DART/branches/openggcm 2017-08-11 16:22:52 UTC (rev 11898)
Property changes on: DART/branches/openggcm
___________________________________________________________________
Modified: svn:mergeinfo
## -6,6 +6,7 ##
/DART/branches/gitm_lanai:6565-6646
/DART/branches/helen:5989-6155
/DART/branches/model_mod_changes:11403-11604
+/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
## -32,6 +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:11836-11897
/DART/branches/rma_trunk_clamping:8786-8801
/DART/branches/rma_trunk_filename:8011-8157
/DART/branches/rma_trunk_get_state_fun:8568-8596
## -45,4 +47,4 ##
/DART/branches/rma_types_kinds:11202-11236
/DART/branches/rma_updates_nancy:11615-11676
/DART/branches/trunk_with_cam_style:9467-9534
-/DART/trunk:6300-9550
\ No newline at end of property
+/DART/trunk:6306-9550
\ No newline at end of property
Modified: DART/branches/openggcm/CHANGELOG
===================================================================
--- DART/branches/openggcm/CHANGELOG 2017-08-10 15:27:32 UTC (rev 11897)
+++ DART/branches/openggcm/CHANGELOG 2017-08-11 16:22:52 UTC (rev 11898)
@@ -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/openggcm/assimilation_code/location/channel/location_mod.f90
===================================================================
--- DART/branches/openggcm/assimilation_code/location/channel/location_mod.f90 2017-08-10 15:27:32 UTC (rev 11897)
+++ DART/branches/openggcm/assimilation_code/location/channel/location_mod.f90 2017-08-11 16:22:52 UTC (rev 11898)
@@ -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