[Dart-dev] DART/branches Revision: 11197

[dart at ucar.edu]

nancy at ucar.edu
2017-03-06 10:13:11 -0700 (Mon, 06 Mar 2017)
53
use the new interfaces in the location utility mod.




Modified: DART/branches/location_utils/obs_sequence/obs_seq_coverage.f90
===================================================================
--- DART/branches/location_utils/obs_sequence/obs_seq_coverage.f90	2017-03-06 16:06:38 UTC (rev 11196)
+++ DART/branches/location_utils/obs_sequence/obs_seq_coverage.f90	2017-03-06 17:13:11 UTC (rev 11197)
@@ -32,11 +32,13 @@
 use     obs_kind_mod, only : max_obs_kinds, get_obs_kind_name, get_obs_kind_index, &
                              write_obs_kind
 
+use location_utils_mod, only : nc_write_location_atts, nc_write_location_vert, &
+                             nc_get_location_varids, nc_write_location, has_vert_choice
+
 use     location_mod, only : location_type, get_location, set_location_missing, &
                              write_location, operator(/=), operator(==), &
                              set_location, is_location_in_region, query_location, &
-                             nc_write_location_atts, nc_get_location_varids, &
-                             nc_write_location, LocationDims, &
+                             LocationDims, &
                              vert_is_undef,        VERTISUNDEF,    &
                              vert_is_surface,      VERTISSURFACE,  &
                              vert_is_level,        VERTISLEVEL,    &
@@ -1045,11 +1047,11 @@
 
 ! let the location module write what it needs to ...
 
-if ( nc_write_location_atts( ncid, fname, voxelsDimID ) /= 0 ) then
-   write(string1,*)'problem initializing netCDF location attributes'
-   call error_handler(E_ERR,'InitNetCDF',string1,source,revision,revdate)
-endif
+call nc_write_location_atts( ncid, fname, voxelsDimID )  
 
+if (has_vert_choice()) call nc_write_location_vert( ncid, fname)
+
+
 ! Define the mandatory level corresponding to each voxel
 
 call nc_check(nf90_def_var(ncid=ncid, name='voxel_level_index', xtype=nf90_int, &

Modified: DART/branches/location_utils/obs_sequence/obs_seq_to_netcdf.f90
===================================================================
--- DART/branches/location_utils/obs_sequence/obs_seq_to_netcdf.f90	2017-03-06 16:06:38 UTC (rev 11196)
+++ DART/branches/location_utils/obs_sequence/obs_seq_to_netcdf.f90	2017-03-06 17:13:11 UTC (rev 11197)
@@ -22,10 +22,10 @@
 use      obs_def_mod, only : obs_def_type, get_obs_def_error_variance, get_obs_def_time, &
                              get_obs_def_location,  get_obs_kind
 use     obs_kind_mod, only : max_obs_kinds, get_obs_kind_name
+use location_utils_mod, only : nc_write_location_atts, nc_write_location_vert, &
+                             nc_get_location_varids, nc_write_location, has_vert_choice
 use     location_mod, only : location_type, write_location, operator(/=), operator(==), &
-                             set_location, is_location_in_region, query_location, &
-                             nc_write_location_atts, nc_get_location_varids, &
-                             nc_write_location
+                             set_location, is_location_in_region, query_location
 use time_manager_mod, only : time_type, get_time, print_time, &
                              get_calendar_string, print_date, &
                              operator(*), operator(+), operator(-), &
@@ -843,10 +843,8 @@
 
 ! let the location module write what it needs to ...
 
-if ( nc_write_location_atts( ncid, fname, ObsNumDimID ) /= 0 ) then
-   write(string1,*)'problem initializing netCDF location attributes'
-   call error_handler(E_ERR,'InitNetCDF',string1,source,revision,revdate)
-endif
+call nc_write_location_atts( ncid, fname, ObsNumDimID ) 
+if (has_vert_choice()) call nc_write_location_vert( ncid, fname )
 
 !----------------------------------------------------------------------------
 ! Leave define mode so we can fill

Modified: DART/branches/location_utils/obs_sequence/obs_seq_verify.f90
===================================================================
--- DART/branches/location_utils/obs_sequence/obs_seq_verify.f90	2017-03-06 16:06:38 UTC (rev 11196)
+++ DART/branches/location_utils/obs_sequence/obs_seq_verify.f90	2017-03-06 17:13:11 UTC (rev 11197)
@@ -71,11 +71,13 @@
 use     obs_kind_mod, only : max_obs_kinds, get_obs_kind_name, get_obs_kind_index, &
                              write_obs_kind
 
+use location_utils_mod, only : nc_write_location_atts, nc_write_location_vert, &
+                             nc_get_location_varids, nc_write_location, has_vert_choice
+
 use     location_mod, only : location_type, get_location, set_location_missing, &
                              write_location, operator(/=), operator(==), &
                              set_location, is_location_in_region, query_location, &
-                             nc_write_location_atts, nc_get_location_varids, &
-                             nc_write_location, LocationDims, VERTISUNDEF, &
+                             LocationDims, VERTISUNDEF, &
                              vert_is_undef, vert_is_surface, vert_is_pressure
 
 use time_manager_mod, only : time_type, set_date, set_time, get_time, print_time, &
@@ -1153,10 +1155,8 @@
 
 ! let the location module write what it needs to ...
 
-if ( nc_write_location_atts( ncid, fname, ncmeta%StationsDimID ) /= 0 ) then
-   write(string1,*)'problem initializing netCDF location attributes'
-   call error_handler(E_ERR,'InitNetCDF:',string1,source,revision,revdate)
-endif
+call nc_write_location_atts( ncid, fname, ncmeta%StationsDimID )
+if (has_vert_choice()) call nc_write_location_vert( ncid, fname ) 
 
 !----------------------------------------------------------------------------