[Dart-dev] DART/branches Revision: 11380

[dart at ucar.edu]

nancy at ucar.edu
2017-03-21 11:56:42 -0600 (Tue, 21 Mar 2017)
138
fixed the calls to model_interpolate() to match current
calling sequence.  updated path_names, and added back
the mkmf for this program.




Modified: DART/branches/rma_trunk/models/mpas_atm/mpas_dart_obs_preprocess.f90
===================================================================
--- DART/branches/rma_trunk/models/mpas_atm/mpas_dart_obs_preprocess.f90	2017-03-21 12:50:05 UTC (rev 11379)
+++ DART/branches/rma_trunk/models/mpas_atm/mpas_dart_obs_preprocess.f90	2017-03-21 17:56:42 UTC (rev 11380)
@@ -72,6 +72,7 @@
                              VORTEX_LAT, VORTEX_LON, VORTEX_PMIN, VORTEX_WMAX
 use        model_mod, only : static_init_model, get_grid_dims, get_xland, &
                              model_interpolate, find_closest_cell_center
+use ensemble_manager_mod, only : ensemble_type, init_ensemble_manager, end_ensemble_manager
 
 use           netcdf
 
@@ -153,6 +154,8 @@
 
 type(time_type)         :: anal_time
 
+type(ensemble_type)     :: dummy_ens
+
 integer :: nCells        = -1  ! Total number of cells making up the grid
 integer :: nVertices     = -1  ! Unique points in grid that are corners of cells
 integer :: nEdges        = -1  ! Straight lines between vertices making up cells
@@ -174,6 +177,7 @@
 
 call static_init_obs_sequence()
 call static_init_model()
+call init_ensemble_manager(dummy_ens, 1, 1)
 
 call get_grid_dims(nCells, nVertices, nEdges, nVertLevels, vertexDegree, nSoilLevels)
 
@@ -822,8 +826,8 @@
 real(r8), intent(in)            :: elev_max
 logical  :: rawinsonde_obs_check
 
-integer  :: istatus
-real(r8) :: llv_loc(3), xmod(1), hsfc
+integer  :: istatus(1)
+real(r8) :: llv_loc(3), hsfc(1)
 
 rawinsonde_obs_check = .true.
 llv_loc = get_location(obs_loc)
@@ -841,8 +845,8 @@
   !  perform elevation check for altimeter
   if ( elev_check ) then
 
-    call model_interpolate(xmod, obs_loc, QTY_SURFACE_ELEVATION, hsfc, istatus)
-    if ( abs(hsfc - llv_loc(3)) > elev_max ) rawinsonde_obs_check = .false.
+    call model_interpolate(dummy_ens, 1, obs_loc, QTY_SURFACE_ELEVATION, hsfc, istatus)
+    if ( abs(hsfc(1) - llv_loc(3)) > elev_max ) rawinsonde_obs_check = .false.
 
   end if
 
@@ -1928,17 +1932,17 @@
 logical, intent(in)  :: elev_check
 real(r8), intent(in) :: llv_loc(3), elev_max
 
-integer              :: istatus
+integer              :: istatus(1)
 logical              :: surface_obs_check
-real(r8)             :: xmod(1), hsfc
+real(r8)             :: hsfc(1)
 
 surface_obs_check = .true.
 
 if ( elev_check ) then
 
-  call model_interpolate(xmod, set_location(llv_loc(1), llv_loc(2), &
+  call model_interpolate(dummy_ens, 1, set_location(llv_loc(1), llv_loc(2), &
       llv_loc(3), VERTISSURFACE), QTY_SURFACE_ELEVATION, hsfc, istatus)
-  if ( abs(hsfc - llv_loc(3)) > elev_max ) surface_obs_check = .false.
+  if ( abs(hsfc(1) - llv_loc(3)) > elev_max ) surface_obs_check = .false.
 
 end if
 

Deleted: DART/branches/rma_trunk/models/mpas_atm/work/broken_mkmf_mpas_dart_obs_preprocess
===================================================================
--- DART/branches/rma_trunk/models/mpas_atm/work/broken_mkmf_mpas_dart_obs_preprocess	2017-03-21 12:50:05 UTC (rev 11379)
+++ DART/branches/rma_trunk/models/mpas_atm/work/broken_mkmf_mpas_dart_obs_preprocess	2017-03-21 17:56:42 UTC (rev 11380)
@@ -1,17 +0,0 @@
-#!/bin/csh
-#
-# DART software - Copyright UCAR. This open source software is provided
-# by UCAR, "as is", without charge, subject to all terms of use at
-# http://www.image.ucar.edu/DAReS/DART/DART_download
-#
-# DART $Id$
-
-../../../mkmf/mkmf -p mpas_dart_obs_preprocess -t ../../../mkmf/mkmf.template   \
- -a "../../.." path_names_mpas_dart_obs_preprocess
-
-exit $status
-
-# <next few lines under version control, do not edit>
-# $URL$
-# $Revision$
-# $Date$

Copied: DART/branches/rma_trunk/models/mpas_atm/work/mfmf_mpas_dart_obs_preprocess (from rev 11379, DART/branches/rma_trunk/models/mpas_atm/work/broken_mkmf_mpas_dart_obs_preprocess)
===================================================================
--- DART/branches/rma_trunk/models/mpas_atm/work/mfmf_mpas_dart_obs_preprocess	                        (rev 0)
+++ DART/branches/rma_trunk/models/mpas_atm/work/mfmf_mpas_dart_obs_preprocess	2017-03-21 17:56:42 UTC (rev 11380)