[Dart-dev] DART/branches Revision: 11976

[dart at ucar.edu]

nancy at ucar.edu
2017-10-11 18:02:08 -0600 (Wed, 11 Oct 2017)
39
merged in changes from the rma_trunk.




Index: DART/branches/quad_interp
===================================================================
--- DART/branches/quad_interp	2017-10-11 23:58:35 UTC (rev 11975)
+++ DART/branches/quad_interp	2017-10-12 00:02:08 UTC (rev 11976)

Property changes on: DART/branches/quad_interp
___________________________________________________________________
Modified: svn:mergeinfo
## -12,6 +12,7 ##
 /DART/branches/rma_cice:10649-10852
 /DART/branches/rma_clm:8905-9126
 /DART/branches/rma_diag:9623-9737
+/DART/branches/rma_fix_clm_restarts:9634-11919
 /DART/branches/rma_fixed_filenames:10702-10895
 /DART/branches/rma_kinds_to_state_structure:8952-9431
 /DART/branches/rma_kinds_to_state_strucutre:8903-8951
## -33,6 +34,7 ##
 /DART/branches/rma_sprint:8095-8166
 /DART/branches/rma_state_structure_test_dir:9472-9676
 /DART/branches/rma_state_structure_unit_test:9691-10268
+/DART/branches/rma_trunk:11893-11975
 /DART/branches/rma_trunk_clamping:8786-8801
 /DART/branches/rma_trunk_filename:8011-8157
 /DART/branches/rma_trunk_get_state_fun:8568-8596
Modified: DART/branches/quad_interp/assimilation_code/location/threed_sphere/location_mod.f90
===================================================================
--- DART/branches/quad_interp/assimilation_code/location/threed_sphere/location_mod.f90	2017-10-11 23:58:35 UTC (rev 11975)
+++ DART/branches/quad_interp/assimilation_code/location/threed_sphere/location_mod.f90	2017-10-12 00:02:08 UTC (rev 11976)
@@ -1578,27 +1578,26 @@
             ! Could avoid adding any that have nums lower than base_ob???
             t_ind = gc%gtt(bt)%loc_box(st - 1 + k)
 
-            ! Can compute total distance here if verts are the same
-            ! Only compute distance if dist is present
-            if(present(dist)) then
+            if(.not. present(dist)) then
+               ! Dist isn't present; add this ob to list without computing distance
+               num_close = num_close + 1
+               close_ind(num_close) = t_ind
+            else
                if(base_loc%which_vert == locs(t_ind)%which_vert) then
+                  ! Can compute total distance here if verts are the same
                   this_dist = get_dist(base_loc, locs(t_ind), base_type, loc_qtys(t_ind))
-               else
-               ! Otherwise can just get horizontal distance
+               else 
+                  ! Otherwise can just get horizontal distance
                   this_dist = get_dist(base_loc, locs(t_ind), base_type, loc_qtys(t_ind), &
                      no_vert = .true.)
                endif
-            else
-               ! Dist isn't present; add this ob to list without computing distance
-               num_close = num_close + 1
-               close_ind(num_close) = t_ind
-            endif
 
-            ! If dist is present and this loc's distance is less than cutoff, add it in list
-            if(present(dist) .and. this_dist <= this_maxdist) then
-               num_close = num_close + 1
-               close_ind(num_close) = t_ind
-               dist(num_close) = this_dist
+               ! If this loc's distance is less than cutoff, add it to the list
+               if(this_dist <= this_maxdist) then
+                  num_close = num_close + 1
+                  close_ind(num_close) = t_ind
+                  dist(num_close) = this_dist
+               endif
             endif
          end do
       end do LON_OFFSET

Modified: DART/branches/quad_interp/assimilation_code/modules/assimilation/assim_tools_mod.f90
===================================================================
--- DART/branches/quad_interp/assimilation_code/modules/assimilation/assim_tools_mod.f90	2017-10-11 23:58:35 UTC (rev 11975)
+++ DART/branches/quad_interp/assimilation_code/modules/assimilation/assim_tools_mod.f90	2017-10-12 00:02:08 UTC (rev 11976)
@@ -11,6 +11,9 @@
 !> 
 !> @{
 use      types_mod,       only : r8, i8, digits12, PI, missing_r8
+
+use    options_mod,       only : get_missing_ok_status
+
 use  utilities_mod,       only : file_exist, get_unit, check_namelist_read, do_output,    &
                                  find_namelist_in_file, register_module, error_handler,   &
                                  E_ERR, E_MSG, nmlfileunit, do_nml_file, do_nml_term,     &
@@ -74,7 +77,6 @@
 
 public :: filter_assim, &
           set_assim_tools_trace, &
-          get_missing_ok_status, &
           test_state_copies, &
           update_ens_from_weights  ! Jeff thinks this routine is in the wild.
 
@@ -151,15 +153,6 @@
 logical  :: rectangular_quadrature          = .true.
 logical  :: gaussian_likelihood_tails       = .false.
 
-! Some models are allowed to have MISSING_R8 values in the DART state vector.
-! If they are encountered, it is not necessarily a FATAL error.
-! Most of the time, if a MISSING_R8 is encountered, DART should die.
-! CLM should have allow_missing_in_clm = .true.