Merge pull request #425 from NCAR/fixptype

move code to set ptype variable outside the if() statement
NCAR · Dec 2, 2022 · da0d74e · da0d74e
2 parents 16d37ab + 417cb23
commit da0d74e
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/models/cam-fv/model_mod.f90 b/models/cam-fv/model_mod.f90
@@ -2077,18 +2077,21 @@ subroutine obs_vertical_to_scaleheight(ens_handle, location, my_status)
 
 ens_size = 1
 
+! if this location is on the surface, use the surface pressure field
+! in the computations below.  otherwise use the 3d pressure field.
+if (query_location(location) == VERTISSURFACE) then
+   ptype = QTY_SURFACE_PRESSURE
+else
+   ptype = QTY_PRESSURE
+endif
+
+
 ! there are 4 cases here.
 
 if (no_normalization_of_scale_heights) then
 
    ! take log of pressure, either surface pressure or regular pressure
 
-   if (query_location(location) == VERTISSURFACE) then
-      ptype = QTY_SURFACE_PRESSURE
-   else
-      ptype = QTY_PRESSURE
-   endif
-
    call ok_to_interpolate(ptype, varid1, my_status)
    if (my_status /= 0) return