[Dart-dev] DART/branches Revision: 11418

[dart at ucar.edu]

nancy at ucar.edu
2017-03-29 17:59:18 -0600 (Wed, 29 Mar 2017)
63
fixed calls to nc_write_location... routines.  needs testing!




Modified: DART/branches/model_mod_changes/assimilation_code/programs/obs_seq_coverage/obs_seq_coverage.f90
===================================================================
--- DART/branches/model_mod_changes/assimilation_code/programs/obs_seq_coverage/obs_seq_coverage.f90	2017-03-29 23:58:54 UTC (rev 11417)
+++ DART/branches/model_mod_changes/assimilation_code/programs/obs_seq_coverage/obs_seq_coverage.f90	2017-03-29 23:59:18 UTC (rev 11418)
@@ -35,15 +35,11 @@
 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, &
-                             vert_is_undef,        VERTISUNDEF,    &
-                             vert_is_surface,      VERTISSURFACE,  &
-                             vert_is_level,        VERTISLEVEL,    &
-                             vert_is_pressure,     VERTISPRESSURE, &
-                             vert_is_height,       VERTISHEIGHT,   &
-                             vert_is_scale_height, VERTISSCALEHEIGHT
+                             is_vertical, VERTISUNDEF
 
+use  location_io_mod, only : nc_write_location_atts, nc_get_location_varids, &
+                             nc_write_location
+
 use time_manager_mod, only : time_type, set_date, set_time, get_time, &
                              set_calendar_type, get_calendar_string, &
                              print_time, print_date, &
@@ -604,7 +600,7 @@
    londiff = abs(obslocarray(1) - stnlocarray(1)) 
    latdiff = abs(obslocarray(2) - stnlocarray(2)) 
 
-   if (vert_is_pressure(ObsLocation) ) then
+   if (is_vertical(ObsLocation, "PRESSURE") ) then
       hgtdiff = abs(obslocarray(3) - stnlocarray(3)) 
    else
       ! if the vertical is undefined or surface, then
@@ -1045,10 +1041,7 @@
 
 ! 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, use_unlimited_dim = .true. ) 
 
 ! Define the mandatory level corresponding to each voxel
 
@@ -1726,13 +1719,13 @@
 
 ilevel = MISSING_I
 
-if (vert_is_undef(  location)  .or. &
-    vert_is_surface(location)) then
+if (is_vertical(location, "UNDEFINED")  .or. &
+    is_vertical(location, "SURFACE")) then
 
    vertically_desired = .true.
    ilevel = 1
    
-elseif ( vert_is_pressure(location) ) then
+elseif ( is_vertical(location, "PRESSURE") ) then
 
    obslocarray(1:3) = get_location(location)
    obslocarray( 4 ) = query_location(location,'which_vert') 

Modified: DART/branches/model_mod_changes/assimilation_code/programs/obs_seq_to_netcdf/obs_seq_to_netcdf.f90
===================================================================
--- DART/branches/model_mod_changes/assimilation_code/programs/obs_seq_to_netcdf/obs_seq_to_netcdf.f90	2017-03-29 23:58:54 UTC (rev 11417)
+++ DART/branches/model_mod_changes/assimilation_code/programs/obs_seq_to_netcdf/obs_seq_to_netcdf.f90	2017-03-29 23:59:18 UTC (rev 11418)
@@ -23,14 +23,12 @@
                              get_obs_def_location,  get_obs_def_type_of_obs
 use     obs_kind_mod, only : max_defined_types_of_obs, get_name_for_type_of_obs
 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, &
+                             set_location, is_location_in_region, query_location
+use  location_io_mod, only : nc_write_location_atts, nc_get_location_varids, &
                              nc_write_location
 use time_manager_mod, only : time_type, get_time, print_time, &
                              get_calendar_string, print_date, &
-                             operator(*), operator(+), operator(-), &
-                             operator(>), operator(<), operator(/), &
-                             operator(/=), operator(<=)
+                             operator(>), operator(<) 
 use     schedule_mod, only : schedule_type, set_regular_schedule, get_schedule_length, &
                              get_time_from_schedule
 use    utilities_mod, only : register_module, &
@@ -843,10 +841,7 @@
 
 ! 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, use_unlimited_dim = .true. )
 
 !----------------------------------------------------------------------------
 ! Leave define mode so we can fill

Modified: DART/branches/model_mod_changes/assimilation_code/programs/obs_seq_verify/obs_seq_verify.f90
===================================================================
--- DART/branches/model_mod_changes/assimilation_code/programs/obs_seq_verify/obs_seq_verify.f90	2017-03-29 23:58:54 UTC (rev 11417)