[Dart-dev] DART/branches Revision: 10767

[dart at ucar.edu]

thoar at ucar.edu
2016-11-18 14:36:30 -0700 (Fri, 18 Nov 2016)
315
perfect_model_obs (tested with l96) compiles and runs and produces the expected output.
With input.nml:perfect_model_obs_nml:[input,ouput]_restart_file_list = 'null',
default filenames of pmo_input_member_0001.nc and pmo_output_member_0001.nc are created.
If the 'restart_file_list's are specified, they are used.




Modified: DART/branches/rma_fixed_filenames/assim_model/assim_model_mod.f90
===================================================================
--- DART/branches/rma_fixed_filenames/assim_model/assim_model_mod.f90	2016-11-18 17:28:49 UTC (rev 10766)
+++ DART/branches/rma_fixed_filenames/assim_model/assim_model_mod.f90	2016-11-18 21:36:30 UTC (rev 10767)
@@ -6,6 +6,9 @@
 
 !> This module is used to wrap around the basic portions of existing dynamical models to
 !> add capabilities needed by the standard assimilation methods.
+!>
+!>@todo FIXME explore redundant routines , especially 'diagnostic' ones
+
 module assim_model_mod
 
 use    types_mod, only : r8, digits12

Modified: DART/branches/rma_fixed_filenames/filter/filter_mod.f90
===================================================================
--- DART/branches/rma_fixed_filenames/filter/filter_mod.f90	2016-11-18 17:28:49 UTC (rev 10766)
+++ DART/branches/rma_fixed_filenames/filter/filter_mod.f90	2016-11-18 21:36:30 UTC (rev 10767)
@@ -106,6 +106,7 @@
 
 ! Maximum number of domains. This is arbitrarily set based on 
 ! the maximum number of domains in WRF.  
+!>@todo put this is the types_mod or some 'common' place for parameters
 integer, parameter :: MAX_NUM_DOMS = 10
 
 !----------------------------------------------------------------

Modified: DART/branches/rma_fixed_filenames/io/direct_netcdf_mod.f90
===================================================================
--- DART/branches/rma_fixed_filenames/io/direct_netcdf_mod.f90	2016-11-18 17:28:49 UTC (rev 10766)
+++ DART/branches/rma_fixed_filenames/io/direct_netcdf_mod.f90	2016-11-18 21:36:30 UTC (rev 10767)
@@ -82,7 +82,7 @@
                                  get_scale_factor, get_xtype, get_num_domains
 
 use io_filenames_mod,     only : get_restart_filename, &
-                                 restart_names_type, get_file_description
+                                 stage_metadata_type, get_file_description
 
 use copies_on_off_mod,    only : query_read_copy, query_write_copy, &
                                  is_inflation_copy, is_mean_copy, is_sd_copy, &
@@ -124,7 +124,7 @@
 subroutine read_transpose(state_ens_handle, name_handle, domain, dart_index, limit_mem)
 
 type(ensemble_type),      intent(inout) :: state_ens_handle
-type(restart_names_type), intent(in)    :: name_handle
+type(stage_metadata_type), intent(in)    :: name_handle
 integer,                  intent(in)    :: domain
 integer,                  intent(inout) :: dart_index !< This is for multiple domains
 integer,                  intent(in)    :: limit_mem !< How many state elements you can read at once
@@ -146,7 +146,7 @@
                      dart_index, limit_mem, write_single_precision)
 
 type(ensemble_type),      intent(inout) :: state_ens_handle
-type(restart_names_type), intent(in)    :: name_handle
+type(stage_metadata_type), intent(in)    :: name_handle
 integer,                  intent(in)    :: domain
 integer,                  intent(inout) :: dart_index
 integer,                  intent(in)    :: limit_mem !< How many state elements you can write at once
@@ -169,7 +169,7 @@
 subroutine read_transpose_single_task(state_ens_handle, name_handle, domain, dart_index)
 
 type(ensemble_type),      intent(inout) :: state_ens_handle
-type(restart_names_type), intent(in)    :: name_handle
+type(stage_metadata_type), intent(in)    :: name_handle
 integer,                  intent(in)    :: domain
 integer,                  intent(inout) :: dart_index !< This is for multiple domains
 
@@ -234,7 +234,7 @@
                      dart_index, write_single_precision)
 
 type(ensemble_type),      intent(inout) :: state_ens_handle
-type(restart_names_type), intent(in)    :: name_handle
+type(stage_metadata_type), intent(in)    :: name_handle
 integer,                  intent(in)    :: domain
 integer,                  intent(inout) :: dart_index
 logical,                  intent(in)    :: write_single_precision
@@ -328,7 +328,7 @@
                 dart_index, limit_mem)
 
 type(ensemble_type),      intent(inout) :: state_ens_handle
-type(restart_names_type), intent(in)    :: name_handle
+type(stage_metadata_type), intent(in)    :: name_handle
 integer,                  intent(in)    :: domain
 integer,                  intent(inout) :: dart_index !< This is for multiple domains
 integer,                  intent(in)    :: limit_mem !< How many state elements you can read at once
@@ -501,7 +501,7 @@
                 dart_index, limit_mem, write_single_precision)
 
 type(ensemble_type),      intent(inout) :: state_ens_handle
-type(restart_names_type), intent(in)    :: name_handle
+type(stage_metadata_type), intent(in)    :: name_handle
 integer,                  intent(in)    :: domain
 integer,                  intent(inout) :: dart_index
 integer,                  intent(in)    :: limit_mem !< How many state elements you can read at once
@@ -893,7 +893,7 @@
 function create_and_open_state_output(ens_name_handle, dom_id, copy_number, &
                 dart_time, single_precision_output) result(ncfile_out)
 
-type(restart_names_type), intent(in) :: ens_name_handle
+type(stage_metadata_type), intent(in) :: ens_name_handle