[Dart-dev] DART/branches Revision: 11699
dart at ucar.edu
dart at ucar.edu
Mon Jun 5 13:29:31 MDT 2017
hendric at ucar.edu
2017-06-05 13:29:30 -0600 (Mon, 05 Jun 2017)
49
merging most recent changes from the rma_trunk.
Index: DART/branches/rma_par_single_file
===================================================================
--- DART/branches/rma_par_single_file 2017-06-02 22:50:05 UTC (rev 11698)
+++ DART/branches/rma_par_single_file 2017-06-05 19:29:30 UTC (rev 11699)
Property changes on: DART/branches/rma_par_single_file
___________________________________________________________________
Modified: svn:mergeinfo
## -30,6 +30,7 ##
/DART/branches/rma_sprint:8101-8172
/DART/branches/rma_state_structure_test_dir:9478-9682
/DART/branches/rma_state_structure_unit_test:9697-10274
+/DART/branches/rma_trunk:11685-11698
/DART/branches/rma_trunk_clamping:8792-8807
/DART/branches/rma_trunk_filename:8017-8163
/DART/branches/rma_trunk_get_state_fun:8574-8602
Modified: DART/branches/rma_par_single_file/assimilation_code/modules/assimilation/filter_mod.dopplerfold.f90
===================================================================
--- DART/branches/rma_par_single_file/assimilation_code/modules/assimilation/filter_mod.dopplerfold.f90 2017-06-02 22:50:05 UTC (rev 11698)
+++ DART/branches/rma_par_single_file/assimilation_code/modules/assimilation/filter_mod.dopplerfold.f90 2017-06-05 19:29:30 UTC (rev 11699)
@@ -2246,38 +2246,38 @@
if ( do_prior_inflate ) then
if ( inf_initial_from_restart(1) ) &
- call set_io_copy_flag(file_info, STAGE_COPIES(PRIORINF_MEAN), READ_COPY, has_units=.false.)
+ call set_io_copy_flag(file_info, STAGE_COPIES(PRIORINF_MEAN), READ_COPY, inherit_units=.false.)
if ( inf_sd_initial_from_restart(1) ) &
- call set_io_copy_flag(file_info, STAGE_COPIES(PRIORINF_SD), READ_COPY, has_units=.false.)
+ call set_io_copy_flag(file_info, STAGE_COPIES(PRIORINF_SD), READ_COPY, inherit_units=.false.)
endif
if ( do_posterior_inflate ) then
if ( inf_initial_from_restart(2) ) &
- call set_io_copy_flag(file_info, STAGE_COPIES(POSTINF_MEAN), READ_COPY, has_units=.false.)
+ call set_io_copy_flag(file_info, STAGE_COPIES(POSTINF_MEAN), READ_COPY, inherit_units=.false.)
if ( inf_sd_initial_from_restart(2) ) &
- call set_io_copy_flag(file_info, STAGE_COPIES(POSTINF_SD), READ_COPY, has_units=.false.)
+ call set_io_copy_flag(file_info, STAGE_COPIES(POSTINF_SD), READ_COPY, inherit_units=.false.)
endif
! This is for single file augmented state mean and sd if requested
if(single_file_in) then
if (output_mean) then
- call set_io_copy_flag(file_info, STAGE_COPIES(ENS_MEAN), WRITE_COPY, has_units=.true.)
+ call set_io_copy_flag(file_info, STAGE_COPIES(ENS_MEAN), WRITE_COPY, inherit_units=.true.)
if ( do_prior_inflate .and. .not. mean_from_restart(prior_inflate) ) &
- call set_io_copy_flag(file_info, STAGE_COPIES(PRIORINF_MEAN), WRITE_COPY, has_units=.true.)
+ call set_io_copy_flag(file_info, STAGE_COPIES(PRIORINF_MEAN), WRITE_COPY, inherit_units=.false.)
if ( do_posterior_inflate .and. .not. mean_from_restart(post_inflate) ) &
- call set_io_copy_flag(file_info, STAGE_COPIES(POSTINF_MEAN), WRITE_COPY, has_units=.true.)
+ call set_io_copy_flag(file_info, STAGE_COPIES(POSTINF_MEAN), WRITE_COPY, inherit_units=.false.)
endif
if (output_sd) then
- call set_io_copy_flag(file_info, STAGE_COPIES(ENS_SD), WRITE_COPY, has_units=.false.)
+ call set_io_copy_flag(file_info, STAGE_COPIES(ENS_SD), WRITE_COPY, inherit_units=.true.)
if ( do_prior_inflate .and. .not. sd_from_restart(prior_inflate) ) &
- call set_io_copy_flag(file_info, STAGE_COPIES(PRIORINF_SD), WRITE_COPY, has_units=.false.)
+ call set_io_copy_flag(file_info, STAGE_COPIES(PRIORINF_SD), WRITE_COPY, inherit_units=.false.)
if ( do_posterior_inflate .and. .not. sd_from_restart(post_inflate) ) &
- call set_io_copy_flag(file_info, STAGE_COPIES(POSTINF_SD), WRITE_COPY, has_units=.false.)
+ call set_io_copy_flag(file_info, STAGE_COPIES(POSTINF_SD), WRITE_COPY, inherit_units=.false.)
endif
endif
@@ -2302,22 +2302,22 @@
if ( output_mean ) &
call set_io_copy_flag(file_info, STAGE_COPIES(ENS_MEAN), WRITE_COPY, &
- clamp_vars=do_clamping, force_copy_back=force_copy)
+ inherit_units=.true., clamp_vars=do_clamping, force_copy_back=force_copy)
if ( output_sd ) &
call set_io_copy_flag(file_info, STAGE_COPIES(ENS_SD), WRITE_COPY, &
- has_units=.false., force_copy_back=force_copy)
+ inherit_units=.true., force_copy_back=force_copy)
if ( do_prior_inflate ) &
- call set_io_copy_flag(file_info, STAGE_COPIES(PRIORINF_MEAN), WRITE_COPY, &
- has_units=.false., force_copy_back=force_copy)
+ call set_io_copy_flag(file_info, STAGE_COPIES(PRIORINF_MEAN), WRITE_COPY, &
+ inherit_units=.false., force_copy_back=force_copy)
if ( do_prior_inflate ) &
- call set_io_copy_flag(file_info, STAGE_COPIES(PRIORINF_SD), WRITE_COPY, &
- has_units=.false., force_copy_back=force_copy)
+ call set_io_copy_flag(file_info, STAGE_COPIES(PRIORINF_SD), WRITE_COPY, &
+ inherit_units=.false., force_copy_back=force_copy)
if ( do_posterior_inflate ) &
- call set_io_copy_flag(file_info, STAGE_COPIES(POSTINF_MEAN), WRITE_COPY, &
- has_units=.false., force_copy_back=force_copy)
+ call set_io_copy_flag(file_info, STAGE_COPIES(POSTINF_MEAN), WRITE_COPY, &
+ inherit_units=.false., force_copy_back=force_copy)
if ( do_posterior_inflate ) &
- call set_io_copy_flag(file_info, STAGE_COPIES(POSTINF_SD), WRITE_COPY, &
- has_units=.false., force_copy_back=force_copy)
+ call set_io_copy_flag(file_info, STAGE_COPIES(POSTINF_SD), WRITE_COPY, &
+ inherit_units=.false., force_copy_back=force_copy)
end subroutine set_output_file_info
More information about the Dart-dev
mailing list