[Dart-dev] DART/branches Revision: 12510

[dart at ucar.edu]

nancy at ucar.edu
2018-04-12 11:21:30 -0600 (Thu, 12 Apr 2018)
195
merge in my rma_updates_nancy branch; do nsc_updates next.
(trying to consolidate all my local changes onto a single
all_nsc_changes branch so i can figure out what to keep
and what to discard)




Index: DART/branches/rma_trunk
===================================================================
--- DART/branches/rma_trunk	2018-04-12 13:38:51 UTC (rev 12509)
+++ DART/branches/rma_trunk	2018-04-12 17:21:30 UTC (rev 12510)

Property changes on: DART/branches/rma_trunk
___________________________________________________________________
Modified: svn:mergeinfo
## -47,6 +47,6 ##
 /DART/branches/rma_trunk_read_transpose:9208-9250
 /DART/branches/rma_trunk_vert_loc:8532-8537
 /DART/branches/rma_types_kinds:11202-11236
-/DART/branches/rma_updates_nancy:11615-11676
+/DART/branches/rma_updates_nancy:11615-12492
 /DART/branches/trunk_with_cam_style:9467-9534
 /DART/trunk:6306-9550
\ No newline at end of property
Modified: DART/branches/rma_trunk/assimilation_code/modules/assimilation/filter_mod.f90
===================================================================
--- DART/branches/rma_trunk/assimilation_code/modules/assimilation/filter_mod.f90	2018-04-12 13:38:51 UTC (rev 12509)
+++ DART/branches/rma_trunk/assimilation_code/modules/assimilation/filter_mod.f90	2018-04-12 17:21:30 UTC (rev 12510)
@@ -189,7 +189,7 @@
 logical  :: trace_execution          = .false.
 logical  :: write_obs_every_cycle    = .false.  ! debug only
 logical  :: silence                  = .false.
-logical  :: distributed_state = .true. ! Default to do state complete forward operators.
+logical  :: distributed_state        = .true. ! Default is RMA mode: state complete FOs
 
 ! IO options
 !>@todo FIXME - how does this work for multiple domains?  ens1d1, ens2d1, ... ens1d2 or
@@ -871,8 +871,7 @@
 
    call trace_message('Before observation space diagnostics')
 
-   ! This is where the mean obs
-   ! copy ( + others ) is moved to task 0 so task 0 can update seq.
+   ! This is where the mean obs copy ( + others ) is moved to task 0 so it can update seq.
    ! There is a transpose (all_copies_to_all_vars(obs_fwd_op_ens_handle)) in obs_space_diagnostics
    ! Do prior observation space diagnostics and associated quality control
    call obs_space_diagnostics(obs_fwd_op_ens_handle, qc_ens_handle, ens_size, &
@@ -1017,7 +1016,7 @@
 
    call trace_message('Before posterior obs space diagnostics')
 
-   ! Write posterior observation space diagnostics
+   ! This is where the mean obs copy ( + others ) is moved to task 0 so it can update seq.
    ! There is a transpose (all_copies_to_all_vars(obs_fwd_op_ens_handle)) in obs_space_diagnostics
    call obs_space_diagnostics(obs_fwd_op_ens_handle, qc_ens_handle, ens_size, &
       seq, keys, POSTERIOR_DIAG, num_output_obs_members, in_obs_copy+2, &

Modified: DART/branches/rma_trunk/assimilation_code/modules/assimilation/quality_control_mod.f90
===================================================================
--- DART/branches/rma_trunk/assimilation_code/modules/assimilation/quality_control_mod.f90	2018-04-12 13:38:51 UTC (rev 12509)
+++ DART/branches/rma_trunk/assimilation_code/modules/assimilation/quality_control_mod.f90	2018-04-12 17:21:30 UTC (rev 12510)
@@ -57,9 +57,8 @@
 integer, parameter :: DARTQC_NOT_IN_NAMELIST       = 5
 integer, parameter :: DARTQC_BAD_INCOMING_QC       = 6
 integer, parameter :: DARTQC_FAILED_OUTLIER_TEST   = 7
-integer, parameter :: DARTQC_FAILED_VERT_CONVERT   = 4   ! change this to 8 after we test more
-!integer, parameter :: DARTQC_FAILED_VERT_CONVERT   = 8
-!integer, parameter :: DARTQC_OUTSIDE_DOMAIN        = 9  ! we have no way (yet) for the model_mod to signal this
+integer, parameter :: DARTQC_FAILED_VERT_CONVERT   = 8
+integer, parameter :: DARTQC_OUTSIDE_DOMAIN        = 9  ! we have no way (yet) for the model_mod to signal this
 
 !------------------------------------------------------------------------------
 ! namelist parameters

Modified: DART/branches/rma_trunk/assimilation_code/modules/io/state_vector_io_mod.f90
===================================================================
--- DART/branches/rma_trunk/assimilation_code/modules/io/state_vector_io_mod.f90	2018-04-12 13:38:51 UTC (rev 12509)
+++ DART/branches/rma_trunk/assimilation_code/modules/io/state_vector_io_mod.f90	2018-04-12 17:21:30 UTC (rev 12510)
@@ -68,6 +68,8 @@
 
 use state_structure_mod,  only : get_num_domains
 
+!use assim_tools_mod, only : get_missing_ok_status
+
 use netcdf
 
 
@@ -283,6 +285,8 @@
 integer :: domain     ! loop index
 type(stage_metadata_type) :: restart_files
 
+real(r8) :: clm_missing = 1e+36
+
 ! check whether file_info handle is initialized
 call assert_file_info_initialized(file_info, 'read_restart_direct')
 
@@ -305,6 +309,11 @@
 
 ! Need Temporary print of initial model time?
 
+!! a semi-hack for the CLM missing values in state mess.
+!if (get_missing_ok_status()) then
+!   where(state_ens_handle%copies == clm_missing) state_ens_handle%copies = MISSING_R8
+!endif
+
 end subroutine read_restart_direct