[Dart-dev] DART/branches Revision: 13200

[dart at ucar.edu]

thoar at ucar.edu
2019-07-22 19:48:16 -0600 (Mon, 22 Jul 2019)
133
Keeping up-to-date with git wrf_hydro_dart

Adding first support for soil nitrogen in noah(-mp) -- Jingjing's project at UT Austin.




Modified: DART/branches/rma_wrfHydro/assimilation_code/modules/observations/DEFAULT_obs_kind_mod.F90
===================================================================
--- DART/branches/rma_wrfHydro/assimilation_code/modules/observations/DEFAULT_obs_kind_mod.F90	2019-07-22 21:26:58 UTC (rev 13199)
+++ DART/branches/rma_wrfHydro/assimilation_code/modules/observations/DEFAULT_obs_kind_mod.F90	2019-07-23 01:48:16 UTC (rev 13200)
@@ -484,7 +484,7 @@
   QTY_CWP_PATH                      = 363, &
   QTY_CWP_PATH_ZERO                 = 364
 
-! WACCAM
+! WACCM
 integer, parameter, public :: &
   QTY_ION_O_MIXING_RATIO            = 365, &
   QTY_ATOMIC_H_MIXING_RATIO         = 366

Modified: DART/branches/rma_wrfHydro/assimilation_code/programs/obs_diag/threed_sphere/streamflow_obs_diag.f90
===================================================================
--- DART/branches/rma_wrfHydro/assimilation_code/programs/obs_diag/threed_sphere/streamflow_obs_diag.f90	2019-07-22 21:26:58 UTC (rev 13199)
+++ DART/branches/rma_wrfHydro/assimilation_code/programs/obs_diag/threed_sphere/streamflow_obs_diag.f90	2019-07-23 01:48:16 UTC (rev 13200)
@@ -21,8 +21,8 @@
 ! 'priorspred' should really be 'priorvar' since you have to accumulate variances
 ! the math is correct as it is, but the variable names don't make it easy ...
 
-use        types_mod, only : r4, r8, digits12, MISSING_R8, MISSING_R4, MISSING_I, &
-                             metadatalength
+use        types_mod, only : r4, r8, digits12, i8, metadatalength, &
+                             MISSING_R8, MISSING_R4, MISSING_I 
 
 use obs_sequence_mod, only : read_obs_seq, obs_type, obs_sequence_type,      &
                              get_first_obs, get_obs_from_key, get_obs_def,   &
@@ -37,8 +37,7 @@
                              get_obs_def_time, get_obs_def_location, &
                              get_obs_def_type_of_obs
 
-use     obs_kind_mod, only : max_defined_types_of_obs,     &
-                             get_quantity_for_type_of_obs, &
+use     obs_kind_mod, only : get_quantity_for_type_of_obs, &
                              get_name_for_type_of_obs
 
 use     location_mod, only : location_type, get_location, set_location_missing,   &
@@ -79,11 +78,14 @@
 
 !---------------------------------------------------------------------
 
+integer, parameter :: MaxGages   = 200
 integer, parameter :: MaxLevels  = 50
 integer, parameter :: MaxRegions = 50
 integer, parameter :: MaxTrusted = 50
 integer, parameter :: stringlength = 32
 
+integer :: max_defined_types_of_obs
+
 !---------------------------------------------------------------------
 ! variables associated with the observation
 !---------------------------------------------------------------------
@@ -101,24 +103,9 @@
 real(r8) :: pr_mean, po_mean ! same as above, without useless dimension
 real(r8) :: pr_sprd, po_sprd ! same as above, without useless dimension
 
-! We are treating winds as a vector pair, but we are handling the
-! observations serially. Consequently, we exploit the fact that
-! the U observations are _followed_ by the V observations.
-
-real(r8)            :: U_obs         = MISSING_R8
-real(r8)            :: U_obs_err_var = MISSING_R8
-type(location_type) :: U_obs_loc
-integer             :: U_flavor      = MISSING_I
-integer             :: U_type        = MISSING_I
-real(r8)            :: U_pr_mean     = MISSING_R8
-real(r8)            :: U_pr_sprd     = MISSING_R8
-real(r8)            :: U_po_mean     = MISSING_R8
-real(r8)            :: U_po_sprd     = MISSING_R8
-integer             :: U_qc          = MISSING_I
-
 integer :: obs_index, prior_mean_index, posterior_mean_index
 integer :: prior_spread_index, posterior_spread_index
-integer :: flavor, wflavor ! THIS IS THE (global) 'KIND' in the obs_def_mod list.
+integer(i8) :: flavor 
 integer :: num_copies, num_qc, num_obs, max_num_obs, obs_seq_file_id
 integer :: num_obs_types
 
@@ -183,7 +170,7 @@
 integer, parameter, dimension(2) ::    good_poste_qcs = (/ 0, 1       /)
 integer :: numqcvals
 
-integer, parameter :: max_num_input_files = 2000
+integer, parameter :: max_num_input_files = 10000
 
 !>@todo remove after verifying NbiqQC, NbadIZ not used in plotting scripts
 real(r8):: rat_cri               = 5000.0_r8 ! QC ratio
@@ -269,31 +256,7 @@
    integer,  dimension(:,:,:,:,:), pointer :: hist_bin => NULL()
 end type TLRV_type
 
-type LRV_type
-   ! statistics (averaged over time) level-region-variable
-   integer ::    level_dim = 1
-   integer ::   region_dim = 2
-   integer :: variable_dim = 3
-   character(len=8) :: string
-   integer :: num_levels = 0, num_regions = 0, num_variables = 0
-   integer,  dimension(:,:,:), pointer :: Nposs, Nused, Ntrusted