[Dart-dev] DART/branches Revision: 12924

[dart at ucar.edu]

thoar at ucar.edu
2018-11-01 16:25:47 -0600 (Thu, 01 Nov 2018)
93
Indicating the domain ID in the error message for add_domain_from_file.

closes DARTSUP-495




Modified: DART/branches/rma_trunk/CHANGELOG
===================================================================
--- DART/branches/rma_trunk/CHANGELOG	2018-11-01 21:46:27 UTC (rev 12923)
+++ DART/branches/rma_trunk/CHANGELOG	2018-11-01 22:25:47 UTC (rev 12924)
@@ -786,7 +786,7 @@
 "convert_all_state_verticals_first = .true.' can also be set.
 
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+ XXX YY 2018 :: WRF Polar, CICE, obs_diag files             $Revision: 12778$
++ Aug 31 2018 :: WRF Polar, CICE, obs_diag files               Revision: 12807
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 - fix for WRF's wind direction vectors when using the Polar Stereographic 
@@ -809,15 +809,31 @@
   files to be concatinated along the unlimited dimension more easily.  Also
   conforms to the netCDF convention for coordinate dimensions.
 
-- (ADD MORE CHANGES HERE)
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ Nov 01 2018 :: summary of changes in Manhattan update       $Revision$
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
+- Updated dewpoint equation to avoid dividing by zero given a very unlikely
+  scenario (r12832)
 
+- More efficient implementation of adaptive inflation 
+
+- Removed test files from cice
+
+- Updated the developer_tests to include more cases.
+
+- Updated oned/obs_diag.f90 to support 'obs_seq.out' files.
+
+- Better error and informational messages in various routines.
+
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 + MMM DD YYYY :: summary of changes in Manhattan update   $Revision$
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 
+- (ADD MORE CHANGES HERE)
 
+
 # <next few lines under version control, do not edit>
 # $URL$
 # $Revision$

Modified: DART/branches/rma_trunk/assimilation_code/modules/io/state_structure_mod.f90
===================================================================
--- DART/branches/rma_trunk/assimilation_code/modules/io/state_structure_mod.f90	2018-11-01 21:46:27 UTC (rev 12923)
+++ DART/branches/rma_trunk/assimilation_code/modules/io/state_structure_mod.f90	2018-11-01 22:25:47 UTC (rev 12924)
@@ -343,7 +343,7 @@
 enddo
 
 ! load up variable id's and sizes
-call load_state_variable_info(state%domain(dom_id))
+call load_state_variable_info(state%domain(dom_id),dom_id)
 
 ! load up the domain unique dimension info
 call load_unique_dim_info(dom_id)
@@ -485,9 +485,10 @@
 !> Load metadata from netcdf file info state_strucutre
 
 
-subroutine load_state_variable_info(domain)
+subroutine load_state_variable_info(domain, domain_index)
 
 type(domain_type), intent(inout) :: domain
+integer,           intent(in)    :: domain_index
 
 ! netcdf variables
 integer :: ret, ncfile
@@ -505,7 +506,7 @@
 if ( domain%unlimDimID /= -1 ) domain%has_unlimited = .true.
 
 ! get variable ids
-call load_variable_ids(ncfile, domain)
+call load_variable_ids(ncfile, domain, domain_index)
 
 ! get all variable sizes, only readers store dimensions?
 call load_variable_sizes(ncfile, domain)
@@ -521,10 +522,11 @@
 !> Load netcdf variable ids
 
 
-subroutine load_variable_ids(ncfile, domain)
+subroutine load_variable_ids(ncfile, domain, domain_index)
 
 integer,           intent(in)    :: ncfile ! netdcf file id - should this be part of the domain handle?
 type(domain_type), intent(inout) :: domain
+integer,           intent(in)    :: domain_index
 
 integer :: ret  ! netcdf return value
 integer :: ivar, num_vars
@@ -536,7 +538,8 @@
    ret = nf90_inq_varid(ncfile, domain%variable(ivar)%varname,    &
                                 domain%variable(ivar)%io_info%varid)
 
-   write(string1,*)'domain variable number ',ivar,' "'//trim(domain%variable(ivar)%varname)//'" from file "'//trim(domain%info_file)//'"'
+   write(string1,*)'domain ',domain_index,', variable #',ivar,' "', &
+       trim(domain%variable(ivar)%varname)//'" from file "'//trim(domain%info_file)//'"'