[Dart-dev] DART/branches Revision: 12442

[dart at ucar.edu]

nancy at ucar.edu
2018-03-12 16:41:15 -0600 (Mon, 12 Mar 2018)
98
remove the lanai bitwise code.  it's no longer needed and
it complicates the code unnecessarily.




Modified: DART/branches/rma_netcdf_utils/assimilation_code/modules/assimilation/assim_tools_mod.f90
===================================================================
--- DART/branches/rma_netcdf_utils/assimilation_code/modules/assimilation/assim_tools_mod.f90	2018-03-12 22:40:40 UTC (rev 12441)
+++ DART/branches/rma_netcdf_utils/assimilation_code/modules/assimilation/assim_tools_mod.f90	2018-03-12 22:41:15 UTC (rev 12442)
@@ -191,10 +191,6 @@
 ! compared to previous versions of this namelist item.
 logical  :: distribute_mean  = .false.
 
-! Lanai bitwise. This is for unit testing and runs much slower.
-! Only use for when testing against the non-rma trunk.
-logical  :: lanai_bitwise = .false.
-
 namelist / assim_tools_nml / filter_kind, cutoff, sort_obs_inc, &
    spread_restoration, sampling_error_correction,                          & 
    adaptive_localization_threshold, adaptive_cutoff_floor,                 &
@@ -203,8 +199,7 @@
    special_localization_obs_types, special_localization_cutoffs,           &
    distribute_mean, close_obs_caching,                                     &
    adjust_obs_impact, obs_impact_filename, allow_any_impact_values,        &
-   convert_all_state_verticals_first, convert_all_obs_verticals_first,     &
-   lanai_bitwise ! don't document this one -- only used for regression tests
+   convert_all_state_verticals_first, convert_all_obs_verticals_first
 
 !============================================================================
 
@@ -302,8 +297,7 @@
    ! we can't read the table here because we don't have access to the ens_size
 endif
 
-is_doing_vertical_conversion = (has_vertical_choice() .and. vertical_localization_on() .and. &
-                                .not. lanai_bitwise)
+is_doing_vertical_conversion = (has_vertical_choice() .and. vertical_localization_on())
 
 call log_namelist_selections(num_special_cutoff, cache_override)
 
@@ -498,7 +492,6 @@
 
 if (convert_all_obs_verticals_first .and. is_doing_vertical_conversion) then
    ! convert the vertical of all my observations to the localization coordinate
-   ! this may not be bitwise with Lanai because of a different number of set_location calls
    if (timing) call start_mpi_timer(base)
    if (obs_ens_handle%my_num_vars > 0) then
       call convert_vertical_obs(ens_handle, obs_ens_handle%my_num_vars, my_obs_loc, &
@@ -795,19 +788,6 @@
    ! state space (even though the state space increments will be computed and
    ! applied first).
 
-   ! ***** REMOVED THIS SECTION FOR NOW ******
-   ! HK set converted location of observation
-   ! The owner of the observation has done the conversion to the localization coordinate, so 
-   ! every task does not have to do the same calculation ( and communication )
-   !> @todo This is very messy. 
-
-   !--------------------------------------------------------
-   !> @todo have to set location so you are bitwise with Lanai for WRF. There is a bitwise creep with 
-   !> get and set location.
-   ! I believe this is messing up CAM_SE because you get a different % saved for close_obs_caching
-   !  The base_obs_loc are different for cam if you do this set.
-   !--------------------------------------------------------
-
    !******************************************
 
 

Modified: DART/branches/rma_netcdf_utils/assimilation_code/modules/assimilation/assim_tools_mod.pf.f90
===================================================================
--- DART/branches/rma_netcdf_utils/assimilation_code/modules/assimilation/assim_tools_mod.pf.f90	2018-03-12 22:40:40 UTC (rev 12441)
+++ DART/branches/rma_netcdf_utils/assimilation_code/modules/assimilation/assim_tools_mod.pf.f90	2018-03-12 22:41:15 UTC (rev 12442)
@@ -18,9 +18,7 @@
                                  find_namelist_in_file, register_module, error_handler,   &
                                  E_ERR, E_MSG, nmlfileunit, do_nml_file, do_nml_term,     &
                                  open_file, close_file, timestamp
-
 use       sort_mod,       only : index_sort 
-
 use random_seq_mod,       only : random_seq_type, random_gaussian, init_random_seq,       &
                                  random_uniform
 
@@ -102,7 +100,7 @@
 ! (make it a local variable so we don't keep making subroutine calls)
 logical                :: is_doing_vertical_conversion = .false.
 
-character(len = 255)   :: msgstring, msgstring2, msgstring3
+character(len=512)     :: msgstring, msgstring2, msgstring3
 
 ! Need to read in table for off-line based sampling correction and store it
 integer                :: sec_table_size
@@ -199,10 +197,6 @@
 ! compared to previous versions of this namelist item.
 logical  :: distribute_mean  = .false.
 
-! Lanai bitwise. This is for unit testing and runs much slower.
-! Only use for when testing against the non-rma trunk.
-logical  :: lanai_bitwise = .false.
-
 ! JPOTERJOY: new namelist variables
 namelist / assim_tools_nml / filter_kind, cutoff, sort_obs_inc, &
    spread_restoration, sampling_error_correction,                          & 
@@ -213,8 +207,7 @@
    special_localization_obs_types, special_localization_cutoffs,           &
    distribute_mean, close_obs_caching,                                     &