[Dart-dev] DART/branches Revision: 13013

[dart at ucar.edu]

thoar at ucar.edu
2019-03-13 11:43:03 -0600 (Wed, 13 Mar 2019)
183
Moving development on the QC8 matlab diagnostics to a separate branch.
There was some stuff on the recam branch that I wanted, so I merged the recam branch
onto the qc8diags branch.




Index: DART/branches/qc8diags
===================================================================
--- DART/branches/qc8diags	2019-03-12 22:00:59 UTC (rev 13012)
+++ DART/branches/qc8diags	2019-03-13 17:43:03 UTC (rev 13013)

Property changes on: DART/branches/qc8diags
___________________________________________________________________
Modified: svn:mergeinfo
## -10,6 +10,7 ##
 /DART/branches/model_mod_changes:11403-11604
 /DART/branches/pertirb_tool:12695-12764
 /DART/branches/qc8:12643-12657
+/DART/branches/recam:12028-13012
 /DART/branches/rma_array_nml:11814-11839
 /DART/branches/rma_cam_fv:9552-9728
 /DART/branches/rma_cf_conventions:9727-10086
## -42,6 +43,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:13002
 /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/qc8diags/assimilation_code/location/annulus/location_mod.f90
===================================================================
--- DART/branches/qc8diags/assimilation_code/location/annulus/location_mod.f90	2019-03-12 22:00:59 UTC (rev 13012)
+++ DART/branches/qc8diags/assimilation_code/location/annulus/location_mod.f90	2019-03-13 17:43:03 UTC (rev 13013)
@@ -26,7 +26,7 @@
 private
 
 public :: location_type, get_location, set_location, &
-          set_location_missing, is_location_in_region, &
+          set_location_missing, is_location_in_region, get_maxdist, &
           write_location, read_location, interactive_location, query_location, &
           LocationDims, LocationName, LocationLName, LocationStorageOrder, LocationUnits, &
           get_close_type, get_close_init, get_close, get_close_destroy, &
@@ -633,6 +633,17 @@
 
 end subroutine get_close
 
+!---------------------------------------------------------------------------
+
+function get_maxdist(gc, obs_type)
+type(get_close_type), intent(in) :: gc
+integer, optional,    intent(in) :: obs_type
+real(r8) :: get_maxdist
+
+get_maxdist = gc%maxdist
+
+end function get_maxdist
+
 !----------------------------------------------------------------------------
 !> Returns true if the given location is between the other two.
 
@@ -749,6 +760,7 @@
 
 end function get_vertical_localization_coordinate
 
+
 !----------------------------------------------------------------------------
 ! end of location/annulus/location_mod.f90
 !----------------------------------------------------------------------------

Modified: DART/branches/qc8diags/assimilation_code/location/channel/location_mod.f90
===================================================================
--- DART/branches/qc8diags/assimilation_code/location/channel/location_mod.f90	2019-03-12 22:00:59 UTC (rev 13012)
+++ DART/branches/qc8diags/assimilation_code/location/channel/location_mod.f90	2019-03-13 17:43:03 UTC (rev 13013)
@@ -30,7 +30,7 @@
 private
 
 public :: location_type, get_location, set_location, &
-          set_location_missing, is_location_in_region, &
+          set_location_missing, is_location_in_region, get_maxdist, &
           write_location, read_location, interactive_location, query_location, &
           LocationDims, LocationName, LocationLName, LocationStorageOrder, LocationUnits, &
           get_close_type, get_close_init, get_close_obs, get_close_state, get_close_destroy, &
@@ -1052,6 +1052,17 @@
 
 end subroutine find_nearest
 
+!---------------------------------------------------------------------------
+
+function get_maxdist(gc, obs_type)
+type(get_close_type), intent(in) :: gc
+integer, optional,    intent(in) :: obs_type
+real(r8) :: get_maxdist
+
+get_maxdist = gc%maxdist
+
+end function get_maxdist
+
 !----------------------------------------------------------------------------
 
 subroutine print_get_close_type(gc, amount)

Modified: DART/branches/qc8diags/assimilation_code/location/column/location_mod.f90
===================================================================
--- DART/branches/qc8diags/assimilation_code/location/column/location_mod.f90	2019-03-12 22:00:59 UTC (rev 13012)
+++ DART/branches/qc8diags/assimilation_code/location/column/location_mod.f90	2019-03-13 17:43:03 UTC (rev 13013)
@@ -17,7 +17,7 @@