[Dart-dev] DART/branches Revision: 11755

[dart at ucar.edu]

hendric at ucar.edu
2017-06-21 14:58:42 -0600 (Wed, 21 Jun 2017)
96

adding single_file option to namelist for lower order models,
and some general code clean-up.




Modified: DART/branches/rma_mmc/assimilation_code/modules/io/io_filenames_mod.f90
===================================================================
--- DART/branches/rma_mmc/assimilation_code/modules/io/io_filenames_mod.f90	2017-06-21 20:06:45 UTC (rev 11754)
+++ DART/branches/rma_mmc/assimilation_code/modules/io/io_filenames_mod.f90	2017-06-21 20:58:42 UTC (rev 11755)
@@ -487,7 +487,7 @@
 file_info%stage_metadata%copy_name(     cnum) = trim(basename)
 
 ! check that the number of domains matches the size of file names provided
-if (get_num_domains() .and. get_num_domains() /= size(fnames(:),1)) then
+if (get_num_domains() /= size(fnames(:),1)) then
    write(msgstring,'(A,I2,A,I2)') 'num_domains ', get_num_domains(), &
                                   ' /= size(fnames) : ', size(fnames(:),1)
    call error_handler(E_ERR, 'set_explicit_file_metadata', msgstring, &

Modified: DART/branches/rma_mmc/models/bgrid_solo/work/input.nml
===================================================================
--- DART/branches/rma_mmc/models/bgrid_solo/work/input.nml	2017-06-21 20:06:45 UTC (rev 11754)
+++ DART/branches/rma_mmc/models/bgrid_solo/work/input.nml	2017-06-21 20:58:42 UTC (rev 11755)
@@ -80,6 +80,11 @@
    silence                      = .false.,
    /
 
+&quality_control_nml
+   input_qc_threshold    =  3.0,
+   outlier_threshold     = -1.0,
+   /
+
 &state_vector_io_nml
    single_precision_output    = .false.,
    /
@@ -347,6 +352,9 @@
    /
 
 &model_mod_check_nml
+   num_ens               = 2
+   input_restart_list    = 'filter_restart.0001.nc', 'filter_restart.0002.nc'
+   output_restart_list   = 'check_me.0001.nc', 'check_me.0002.nc'
    verbose               = .false.
    test1thru             = 5
    x_ind                 = 720
@@ -361,7 +369,3 @@
    interp_test_vertcoord = 'VERTISLEVEL'
    /
 
-&quality_control_nml
-   input_qc_threshold    =  3.0,
-   outlier_threshold     = -1.0,
-   /

Modified: DART/branches/rma_mmc/models/lorenz_96/work/input.nml
===================================================================
--- DART/branches/rma_mmc/models/lorenz_96/work/input.nml	2017-06-21 20:06:45 UTC (rev 11754)
+++ DART/branches/rma_mmc/models/lorenz_96/work/input.nml	2017-06-21 20:58:42 UTC (rev 11755)
@@ -221,20 +221,17 @@
    /
 
 &model_mod_check_nml
-  x_ind            = 2
-  num_ens          = 1
-  loc_of_interest  = 0.3, 0.0, 0.0
-  kind_of_interest = 'QTY_STATE_VARIABLE'
-  verbose          = .true.
+  x_ind               = 2
+  num_ens             = 1
+  loc_of_interest     = 0.3
+  kind_of_interest    = 'QTY_STATE_VARIABLE'
+  verbose             = .true.
   interp_test_xrange  = 0.0, 1.0
   interp_test_dx      = 0.02
-  interp_test_yrange  = 0.0, 1.0
-  interp_test_dy      = 0.2
-  interp_test_zrange  = 0.0, 1.0
-  interp_test_dz      = 0.2
-  interp_test_vertcoord = 'VERTISHEIGHT'
-  test1thru             = 9
-  input_restart_list  = 'restart_in.txt'
-  output_restart_list = 'restart_out.txt'
+  test1thru             = 5
+  single_file           = .true.
+  input_restart_list    = 'filter_input.nc'
+  output_restart_list   = 'filter_output.nc'
   verbose               = .true.
   /
+

Modified: DART/branches/rma_mmc/models/model_mod_tools/model_mod_check.f90
===================================================================
--- DART/branches/rma_mmc/models/model_mod_tools/model_mod_check.f90	2017-06-21 20:06:45 UTC (rev 11754)
+++ DART/branches/rma_mmc/models/model_mod_tools/model_mod_check.f90	2017-06-21 20:58:42 UTC (rev 11755)
@@ -21,41 +21,32 @@
 
 use     mpi_utilities_mod, only : initialize_mpi_utilities, finalize_mpi_utilities
 
-use          location_mod, only : location_type, set_location, write_location,  &
-                                  get_dist, get_location
+use          location_mod, only : location_type, write_location
 
-use          obs_kind_mod, only : get_index_for_quantity,    &
-                                  QTY_DRY_LAND
+use          obs_kind_mod, only : get_index_for_quantity, get_name_for_quantity