[Dart-dev] DART/branches Revision: 12765

[dart at ucar.edu]

hendric at ucar.edu
2018-08-09 13:15:51 -0600 (Thu, 09 Aug 2018)
54

merging in the new perturb tool into the rma_trunk.




Index: DART/branches/rma_trunk
===================================================================
--- DART/branches/rma_trunk	2018-08-08 19:23:21 UTC (rev 12764)
+++ DART/branches/rma_trunk	2018-08-09 19:15:51 UTC (rev 12765)

Property changes on: DART/branches/rma_trunk
___________________________________________________________________
Modified: svn:mergeinfo
## -8,6 +8,7 ##
 /DART/branches/helen:5989-6155
 /DART/branches/mmc:12038-12269
 /DART/branches/model_mod_changes:11403-11604
+/DART/branches/pertirb_tool:12695-12764
 /DART/branches/qc8:12643-12657
 /DART/branches/rma_array_nml:11814-11839
 /DART/branches/rma_cam_fv:9552-9728
Index: DART/branches/rma_trunk/assimilation_code/modules/assimilation/assim_tools_mod.f90
===================================================================
--- DART/branches/rma_trunk/assimilation_code/modules/assimilation/assim_tools_mod.f90	2018-08-08 19:23:21 UTC (rev 12764)
+++ DART/branches/rma_trunk/assimilation_code/modules/assimilation/assim_tools_mod.f90	2018-08-09 19:15:51 UTC (rev 12765)

Property changes on: DART/branches/rma_trunk/assimilation_code/modules/assimilation/assim_tools_mod.f90
___________________________________________________________________
Modified: svn:mergeinfo
## -16,6 +16,7 ##
 /DART/branches/helen/assimilation_code/modules/assimilation/assim_tools_mod.f90:5989-6155
 /DART/branches/mmc/assimilation_code/modules/assimilation/assim_tools_mod.f90:12038-12269
 /DART/branches/model_mod_changes/assimilation_code/modules/assimilation/assim_tools_mod.f90:11403-11604
+/DART/branches/pertirb_tool/assimilation_code/modules/assimilation/assim_tools_mod.f90:12695-12764
 /DART/branches/rma_array_nml/assimilation_code/modules/assimilation/assim_tools_mod.f90:11814-11839
 /DART/branches/rma_cam_fv/assim_tools/assim_tools_mod.f90:9552-9728
 /DART/branches/rma_cam_fv/assimilation_code/modules/assimilation/assim_tools_mod.f90:9552-9728
Modified: DART/branches/rma_trunk/assimilation_code/programs/closest_member_tool/closest_member_tool.f90
===================================================================
--- DART/branches/rma_trunk/assimilation_code/programs/closest_member_tool/closest_member_tool.f90	2018-08-08 19:23:21 UTC (rev 12764)
+++ DART/branches/rma_trunk/assimilation_code/programs/closest_member_tool/closest_member_tool.f90	2018-08-09 19:15:51 UTC (rev 12765)
@@ -37,7 +37,7 @@
 use assim_model_mod,      only : static_init_assim_model, get_model_size, &
                                  get_state_meta_data
 
-use state_vector_io_mod,  only : read_state, write_state
+use state_vector_io_mod,  only : read_state
 
 use io_filenames_mod,     only : file_info_type, io_filenames_init,        &
                                  set_io_copy_flag, set_file_metadata,      &
@@ -160,7 +160,7 @@
 
 num_domains = get_num_domains()
 
-! Given either a vector of in/output_state_files or a text file containing
+! Given either a vector of input_state_files or a text file containing
 ! a list of files, return a vector of files containing the filenames.
 call set_multiple_filename_lists(input_restart_files(:), &
                                  input_restart_file_list(:), &
@@ -176,10 +176,11 @@
 file_array_input  = RESHAPE(input_restart_files,  (/ens_size,  num_domains/))
 
 ! read in the ensemble and the mean - always in a separate file
-call io_filenames_init(ens_file_info, ens_size, &
-                       cycling=single_restart_file_in, &
-                       single_file=single_restart_file_in, &
-                       restart_files=file_array_input)
+call io_filenames_init(ens_file_info, &
+                       ncopies       = ens_size, &
+                       cycling       = single_restart_file_in, &
+                       single_file   = single_restart_file_in, &
+                       restart_files = file_array_input)
 
 do imem = 1, ens_size
    write(my_base,'(A,I0.2)') 'inens_',                 imem


Property changes on: DART/branches/rma_trunk/assimilation_code/programs/closest_member_tool/closest_member_tool.f90
___________________________________________________________________
Modified: svn:mergeinfo
## -16,6 +16,7 ##
 /DART/branches/helen/assimilation_code/programs/closest_member_tool/closest_member_tool.f90:5989-6155
 /DART/branches/helen/utilities/closest_member_tool.f90:5989-6155
 /DART/branches/model_mod_changes/assimilation_code/programs/closest_member_tool/closest_member_tool.f90:11403-11604
+/DART/branches/pertirb_tool/assimilation_code/programs/closest_member_tool/closest_member_tool.f90:12695-12764
 /DART/branches/rma_array_nml/assimilation_code/programs/closest_member_tool/closest_member_tool.f90:11814-11839
 /DART/branches/rma_cam_fv/assimilation_code/programs/closest_member_tool/closest_member_tool.f90:9552-9728
 /DART/branches/rma_cam_fv/utilities/closest_member_tool.f90:9552-9728
Modified: DART/branches/rma_trunk/assimilation_code/programs/fill_inflation_restart/fill_inflation_restart.f90
===================================================================
--- DART/branches/rma_trunk/assimilation_code/programs/fill_inflation_restart/fill_inflation_restart.f90	2018-08-08 19:23:21 UTC (rev 12764)
+++ DART/branches/rma_trunk/assimilation_code/programs/fill_inflation_restart/fill_inflation_restart.f90	2018-08-09 19:15:51 UTC (rev 12765)
@@ -64,7 +64,7 @@
 ! The namelist variables
 !------------------------------------------------------------------
 
-logical            :: single_file = .false.
+logical            :: single_file    = .FALSE.
 character(len=256) :: input_state_files(MAX_FILES)  = ''
 logical            :: write_prior_inf = .FALSE. 
 real(r8)           :: prior_inf_mean = MISSING_R8

Modified: DART/branches/rma_trunk/assimilation_code/programs/perturb_single_instance/perturb_single_instance.f90
===================================================================
--- DART/branches/pertirb_tool/assimilation_code/programs/perturb_single_instance/perturb_single_instance.f90	2018-08-08 19:23:21 UTC (rev 12764)
+++ DART/branches/rma_trunk/assimilation_code/programs/perturb_single_instance/perturb_single_instance.f90	2018-08-09 19:15:51 UTC (rev 12765)