[Dart-dev] DART/branches Revision: 11413

[dart at ucar.edu]

nancy at ucar.edu
2017-03-29 17:01:54 -0600 (Wed, 29 Mar 2017)
60
replace all is_vert_xx() with a single is_vertical() call.




Modified: DART/branches/model_mod_changes/observations/forward_operators/obs_def_COSMOS_mod.f90
===================================================================
--- DART/branches/model_mod_changes/observations/forward_operators/obs_def_COSMOS_mod.f90	2017-03-29 22:26:55 UTC (rev 11412)
+++ DART/branches/model_mod_changes/observations/forward_operators/obs_def_COSMOS_mod.f90	2017-03-29 23:01:54 UTC (rev 11413)
@@ -73,9 +73,7 @@
                              logfileunit, get_unit, open_file, close_file, nc_check, &
                              file_exist, ascii_file_format
 use     location_mod, only : location_type, set_location, get_location, &
-                             vert_is_height,   VERTISHEIGHT,            &
-                             vert_is_level,    VERTISLEVEL,             &
-                             set_location_missing
+                             VERTISHEIGHT, VERTISLEVEL, set_location_missing
 use     obs_kind_mod, only : QTY_GEOPOTENTIAL_HEIGHT, QTY_SOIL_MOISTURE
 use  assim_model_mod, only : interpolate
 

Modified: DART/branches/model_mod_changes/observations/forward_operators/obs_def_TES_nadir_mod.f90
===================================================================
--- DART/branches/model_mod_changes/observations/forward_operators/obs_def_TES_nadir_mod.f90	2017-03-29 22:26:55 UTC (rev 11412)
+++ DART/branches/model_mod_changes/observations/forward_operators/obs_def_TES_nadir_mod.f90	2017-03-29 23:01:54 UTC (rev 11413)
@@ -52,10 +52,7 @@
                              open_file, close_file, get_unit, do_nml_file, do_nml_term, &
                              ascii_file_format
 use     location_mod, only : location_type, set_location, get_location, &
-                             vert_is_undef, vert_is_surface, &
-                             vert_is_level, vert_is_pressure, vert_is_height, &
-                             VERTISUNDEF, VERTISSURFACE, VERTISLEVEL, VERTISPRESSURE, &
-                             VERTISHEIGHT
+                             is_vertical, VERTISSURFACE, VERTISPRESSURE
 use  assim_model_mod, only : interpolate
 
 use     obs_kind_mod, only : QTY_SURFACE_PRESSURE, &
@@ -728,7 +725,7 @@
 !   location does not really make sense -- for threed_sphere/location, we 
 !   will use and expect a vertical location of "undefined".  Don't let this
 !   necessarily break the code though.
-if ( .not. vert_is_undef(location) ) then
+if ( .not. is_vertical(location, "UNDEFINED") ) then
    write(errstring, *)'vertical location should be undefined; TES obs key ', teskey
    call error_handler(E_WARN,'get_expected_TES_nadir_obs', errstring, &
                       source, revision, revdate)

Modified: DART/branches/model_mod_changes/observations/forward_operators/obs_def_gps_mod.f90
===================================================================
--- DART/branches/model_mod_changes/observations/forward_operators/obs_def_gps_mod.f90	2017-03-29 22:26:55 UTC (rev 11412)
+++ DART/branches/model_mod_changes/observations/forward_operators/obs_def_gps_mod.f90	2017-03-29 23:01:54 UTC (rev 11413)
@@ -58,7 +58,7 @@
                              find_namelist_in_file, do_nml_file, do_nml_term, &
                              ascii_file_format
 use     location_mod, only : location_type, set_location, get_location, &
-                             vert_is_height, &
+                             is_vertical, &
                              VERTISHEIGHT
 use  assim_model_mod, only : interpolate
 
@@ -417,7 +417,7 @@
 
 if ( .not. module_initialized ) call initialize_module
 
-if ( .not. vert_is_height(location)) then
+if ( .not. is_vertical(location, "HEIGHT")) then
    write(string1, *) 'vertical location must be height; gps obs key ', gpskey
    call error_handler(E_ERR,'get_expected_gpsro_ref', string1, &
                       source, revision, revdate)

Modified: DART/branches/model_mod_changes/observations/forward_operators/obs_def_rel_humidity_mod.f90
===================================================================
--- DART/branches/model_mod_changes/observations/forward_operators/obs_def_rel_humidity_mod.f90	2017-03-29 22:26:55 UTC (rev 11412)
+++ DART/branches/model_mod_changes/observations/forward_operators/obs_def_rel_humidity_mod.f90	2017-03-29 23:01:54 UTC (rev 11413)
@@ -57,7 +57,7 @@
 use        types_mod, only : r8, missing_r8, L_over_Rv
 use    utilities_mod, only : register_module, error_handler, E_ERR, E_MSG, E_ALLMSG
 use     location_mod, only : location_type, set_location, get_location, write_location, &
-                             read_location, vert_is_pressure
+                             read_location, is_vertical
 use  assim_model_mod, only : interpolate
 use     obs_kind_mod, only : QTY_TEMPERATURE, QTY_PRESSURE, QTY_VAPOR_MIXING_RATIO
 
@@ -133,7 +133,7 @@
 if(all(istatus /= 0)) return  ! not using return_now because where clause modifies istatus.
 
 !  interpolate the pressure, if observation location is not pressure
-if ( vert_is_pressure(location) ) then
+if ( is_vertical(location, "PRESSURE") ) then
    xyz = get_location(location)
    pres = xyz(3)
 else