[Dart-dev] DART/branches Revision: 11509
dart at ucar.edu
dart at ucar.edu
Wed Apr 19 21:03:27 MDT 2017
thoar at ucar.edu
2017-04-19 21:03:25 -0600 (Wed, 19 Apr 2017)
936
Replaced references to perfect_output.nc with true_state.nc
Replaced references to Prior_Diag.nc with preassim.nc
Replaced references to Posterior_Diag.nc with analysis.nc
Had to put back the simple_advection/model_mod.f90 nc_write_model_atts()
routine that had gotten ripped out. There is some global metadata that
is needed by the diagnostic scripts.
Removed 'output_state_vector' from all the models' namelists since we
are always writing prognostic-style netCDF files.
Fixed the wording in the models' quickbuild.csh in part to remove copy&paste
text from workshop_setup.csh mentioning that quickbuild was going to run a
perfect model experiment and assimilation ... (how long has that been in there?)
Removed a couple more references to matlab third-party toolbox functions in
sections that are now exercised by the simple_advection model. More will
follow as the state-space support for large-order models is reinstated.
Modified: DART/branches/rma_output_files/assimilation_code/modules/assimilation/filter_mod.f90
===================================================================
--- DART/branches/rma_output_files/assimilation_code/modules/assimilation/filter_mod.f90 2017-04-19 02:55:39 UTC (rev 11508)
+++ DART/branches/rma_output_files/assimilation_code/modules/assimilation/filter_mod.f90 2017-04-20 03:03:25 UTC (rev 11509)
@@ -191,8 +191,10 @@
! File options. Single vs. Multiple.
logical :: single_file_in = .false. ! all copies read from 1 file
logical :: single_file_out = .false. ! all copies written to 1 file
-! Stages to write. Valid values include:
-! input, preassim, postassim, output
+
+! Stages to write. Valid values are:
+! multi-file: input, forecast, preassim, postassim, analysis, output
+! single-file: forecast, preassim, postassim, analysis, output
character(len=10) :: stages_to_write(6) = (/"output ", "null ", "null ", &
"null ", "null ", "null " /)
@@ -327,7 +329,7 @@
! informational message to log
write(msgstring, '(A,I5)') 'running with an ensemble size of ', ens_size
-call error_handler(E_MSG,'filter:', msgstring, source, revision, revdate)
+call error_handler(E_MSG,'filter_main:', msgstring, source, revision, revdate)
! See if smoothing is turned on
ds = do_smoothing()
@@ -365,17 +367,17 @@
! values in the namelist.
if ( inf_flavor(2) == 4 ) then
if (inf_initial_from_restart(2) .or. inf_sd_initial_from_restart(2)) &
- call error_handler(E_MSG, 'filter_main', 'RTPS inflation (type 4) overrides posterior inflation restart file with value in namelist', &
+ call error_handler(E_MSG, 'filter_main:', 'RTPS inflation (type 4) overrides posterior inflation restart file with value in namelist', &
text2='posterior inflation standard deviation value not used in RTPS')
inf_initial_from_restart(2) = .false. ! Get parameter from namelist inf_initial(2), not from file
inf_sd_initial_from_restart(2) = .false. ! inf_sd not used in this algorithm
if (.not. inf_deterministic(2)) &
- call error_handler(E_MSG, 'filter_main', 'RTPS inflation (type 4) overrides posterior inf_deterministic with .true.')
+ call error_handler(E_MSG, 'filter_main:', 'RTPS inflation (type 4) overrides posterior inf_deterministic with .true.')
inf_deterministic(2) = .true. ! this algorithm is deterministic
if (inf_damping(2) /= 1.0_r8) &
- call error_handler(E_MSG, 'filter_main', 'RTPS inflation (type 4) disables posterior inf_damping')
+ call error_handler(E_MSG, 'filter_main:', 'RTPS inflation (type 4) disables posterior inf_damping')
inf_damping(2) = 1.0_r8 ! no damping
endif
@@ -398,11 +400,11 @@
if (do_output()) then
if (inf_flavor(1) > 0 .and. inf_damping(1) < 1.0_r8) then
write(msgstring, '(A,F12.6,A)') 'Prior inflation damping of ', inf_damping(1), ' will be used'
- call error_handler(E_MSG,'filter:', msgstring)
+ call error_handler(E_MSG,'filter_main:', msgstring)
endif
if (inf_flavor(2) > 0 .and. inf_damping(2) < 1.0_r8) then
write(msgstring, '(A,F12.6,A)') 'Posterior inflation damping of ', inf_damping(2), ' will be used'
- call error_handler(E_MSG,'filter:', msgstring)
+ call error_handler(E_MSG,'filter_main:', msgstring)
endif
endif
@@ -515,7 +517,7 @@
if (perturb_from_single_instance) then
- call error_handler(E_MSG,'read_state:', &
+ call error_handler(E_MSG,'filter_main:', &
'Reading in a single member and perturbing data for the other ensemble members')
! Only zero has the time, so broadcast the time to all other copy owners
@@ -522,7 +524,7 @@
call broadcast_time_across_copy_owners(state_ens_handle, time1)
call create_ensemble_from_single_file(state_ens_handle)
else
- call error_handler(E_MSG,'read_state:', &
+ call error_handler(E_MSG,'filter_main:', &
'Reading in initial condition/restart data for all ensemble members from file(s)')
endif
@@ -1491,7 +1493,7 @@
if ( do_rtps_inflate(inflate)) then
if ( present(SPARE_PRIOR_SPREAD) .and. present(ENS_SD_COPY)) then
write(msgstring, *) ' doing RTPS inflation'
- call error_handler(E_MSG,'filter_ensemble_inflate',msgstring,source,revision,revdate)
+ call error_handler(E_MSG,'filter_ensemble_inflate:',msgstring,source,revision,revdate)
do j = 1, ens_handle%my_num_vars
call inflate_ens(inflate, ens_handle%copies(grp_bot:grp_top, j), &
ens_handle%copies(ENS_MEAN_COPY, j), ens_handle%copies(inflate_copy, j), 0.0_r8, &
@@ -2324,7 +2326,7 @@
if (trim(my_stage) /= trim('NULL')) then
call set_stage_to_write(stages(i),.true.)
write(msgstring,*)"filter will write stage : "//trim(stages(i))
- call error_handler(E_MSG,'parse_stages_to_write', &
+ call error_handler(E_MSG,'parse_stages_to_write:', &
msgstring,source,revision,revdate)
endif
enddo
Modified: DART/branches/rma_output_files/assimilation_code/modules/assimilation/smoother_mod.html
===================================================================
--- DART/branches/rma_output_files/assimilation_code/modules/assimilation/smoother_mod.html 2017-04-19 02:55:39 UTC (rev 11508)
More information about the Dart-dev
mailing list