[Dart-dev] DART/branches Revision: 11780
dart at ucar.edu
dart at ucar.edu
Wed Jun 28 16:22:37 MDT 2017
hendric at ucar.edu
2017-06-28 16:22:35 -0600 (Wed, 28 Jun 2017)
300
Merging in changes from rma_par_single_file. We are now able to run
with MPI when single_file_in or single_file_out is true.
single_file_io_mod.f90 has been removed (along with all of the references
to path_names_* and html files) and its functionality has been moved to
direct_netcdf_mod.f90.
Index: DART/branches/rma_trunk
===================================================================
--- DART/branches/rma_trunk 2017-06-28 21:56:02 UTC (rev 11779)
+++ DART/branches/rma_trunk 2017-06-28 22:22:35 UTC (rev 11780)
Property changes on: DART/branches/rma_trunk
___________________________________________________________________
Modified: svn:mergeinfo
## -21,6 +21,7 ##
/DART/branches/rma_obs_defs:8923-9067
/DART/branches/rma_output_files:11447-11544
/DART/branches/rma_par_msg:9472-9511
+/DART/branches/rma_par_single_file:11685-11779
/DART/branches/rma_pop_variable_namelist:8824-9156
/DART/branches/rma_qc_fwd_op:9650-9723
/DART/branches/rma_refac_io:9123-9546
Modified: DART/branches/rma_trunk/CHANGELOG
===================================================================
--- DART/branches/rma_trunk/CHANGELOG 2017-06-28 21:56:02 UTC (rev 11779)
+++ DART/branches/rma_trunk/CHANGELOG 2017-06-28 22:22:35 UTC (rev 11780)
@@ -457,10 +457,21 @@
your existing namelists or obs_diag will error out right away.
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+ XXX YY 2017 :: $Revision$
++ June 28th 2017 :: $Revision$
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+Now we are able to run 'single_file_in' and 'single_file_out' with MPI.
+single_file_io_mod.f90 has been removed and its functionality has been moved
+to direct_netcdf_mod.f90.
+
+single_file_io_mod.f90 has been removed from all of the path_names_* files.
+
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ XXX MM 2017 :: $Revision$
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+
# <next few lines under version control, do not edit>
# $URL$
# $Revision$
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 2017-06-28 21:56:02 UTC (rev 11779)
+++ DART/branches/rma_trunk/assimilation_code/modules/assimilation/assim_tools_mod.f90 2017-06-28 22:22:35 UTC (rev 11780)
Property changes on: DART/branches/rma_trunk/assimilation_code/modules/assimilation/assim_tools_mod.f90
___________________________________________________________________
Modified: svn:mergeinfo
## -18,6 +18,7 ##
/DART/branches/rma_model_mod_check/assim_tools/assim_tools_mod.f90:8965-9178
/DART/branches/rma_obs_defs/assim_tools/assim_tools_mod.f90:8923-9067
/DART/branches/rma_output_files/assimilation_code/modules/assimilation/assim_tools_mod.f90:11447-11544
+/DART/branches/rma_par_single_file/assimilation_code/modules/assimilation/assim_tools_mod.f90:11685-11779
/DART/branches/rma_pop_variable_namelist/assim_tools/assim_tools_mod.f90:8824-9156
/DART/branches/rma_qc_fwd_op/assim_tools/assim_tools_mod.f90:9650-9723
/DART/branches/rma_refac_io/assim_tools/assim_tools_mod.f90:9123-9546
Modified: DART/branches/rma_trunk/assimilation_code/modules/assimilation/filter_mod.dopplerfold.f90
===================================================================
--- DART/branches/rma_trunk/assimilation_code/modules/assimilation/filter_mod.dopplerfold.f90 2017-06-28 21:56:02 UTC (rev 11779)
+++ DART/branches/rma_trunk/assimilation_code/modules/assimilation/filter_mod.dopplerfold.f90 2017-06-28 22:22:35 UTC (rev 11780)
@@ -21,18 +21,24 @@
use obs_def_mod, only : obs_def_type, get_obs_def_error_variance, get_obs_def_time, &
get_obs_def_type_of_obs
+
use obs_def_utilities_mod, only : set_debug_fwd_op
+
use time_manager_mod, only : time_type, get_time, set_time, operator(/=), operator(>), &
operator(-), print_time
+
use utilities_mod, only : register_module, error_handler, E_ERR, E_MSG, E_DBG, &
logfileunit, nmlfileunit, timestamp, &
do_output, find_namelist_in_file, check_namelist_read, &
open_file, close_file, do_nml_file, do_nml_term, to_upper
+
use assim_model_mod, only : static_init_assim_model, get_model_size, &
end_assim_model, pert_model_copies
+
use assim_tools_mod, only : filter_assim, set_assim_tools_trace, get_missing_ok_status, &
test_state_copies
use obs_model_mod, only : move_ahead, advance_state, set_obs_model_trace
+
use ensemble_manager_mod, only : init_ensemble_manager, end_ensemble_manager, &
ensemble_type, get_copy, get_my_num_copies, put_copy, &
all_vars_to_all_copies, all_copies_to_all_vars, &
@@ -47,13 +53,16 @@
all_copies_to_all_vars, allocate_single_copy, allocate_vars, &
get_single_copy, put_single_copy, deallocate_single_copy, &
print_ens_handle
+
use adaptive_inflate_mod, only : do_varying_ss_inflate, mean_from_restart, sd_from_restart, &
do_single_ss_inflate, inflate_ens, adaptive_inflate_init, &
adaptive_inflate_type, set_inflation_mean_copy , &
log_inflation_info, set_inflation_sd_copy, &
get_minmax_task_zero, do_rtps_inflate
+
use mpi_utilities_mod, only : my_task_id, task_sync, broadcast_send, broadcast_recv, &
More information about the Dart-dev
mailing list