[Dart-dev] DART/branches Revision: 11707

[dart at ucar.edu]

hendric at ucar.edu
2017-06-09 14:25:39 -0600 (Fri, 09 Jun 2017)
35
syncing branch with current trunk




Index: DART/branches/rma_par_single_file
===================================================================
--- DART/branches/rma_par_single_file	2017-06-09 18:57:31 UTC (rev 11706)
+++ DART/branches/rma_par_single_file	2017-06-09 20:25:39 UTC (rev 11707)

Property changes on: DART/branches/rma_par_single_file
___________________________________________________________________
Modified: svn:mergeinfo
## -30,7 +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:11685-11706
 /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.f90
===================================================================
--- DART/branches/rma_par_single_file/assimilation_code/modules/assimilation/filter_mod.f90	2017-06-09 18:57:31 UTC (rev 11706)
+++ DART/branches/rma_par_single_file/assimilation_code/modules/assimilation/filter_mod.f90	2017-06-09 20:25:39 UTC (rev 11707)
@@ -272,7 +272,7 @@
 
 integer,    allocatable :: keys(:)
 integer(i8)             :: model_size
-integer                 :: i, iunit, io, time_step_number, num_obs_in_set, ntimes
+integer                 :: j, i, iunit, io, time_step_number, num_obs_in_set, ntimes
 integer                 :: last_key_used, key_bounds(2)
 integer                 :: in_obs_copy, obs_val_index
 integer                 :: prior_obs_mean_index, posterior_obs_mean_index
@@ -506,6 +506,10 @@
 call set_inflation_mean_copy( post_inflate,  POST_INF_COPY )
 call set_inflation_sd_copy(   post_inflate,  POST_INF_SD_COPY )
 
+! print*, 'my copies, my vars :: ', my_task_id(), state_ens_handle%my_num_copies, state_ens_handle%my_num_vars
+! print*, 'copies             :: ', my_task_id(), state_ens_handle%copies(:,:)
+call task_sync()
+
 call read_state(state_ens_handle, file_info_input, read_time_from_file, time1, prior_inflate, post_inflate, &
                 perturb_from_single_instance)
 
@@ -615,7 +619,19 @@
 
 endif
 
+print*, my_task_id(), 'size1', size(state_ens_handle%copies(:,1))
+print*, my_task_id(), 'size2', size(state_ens_handle%copies(1,:))
 
+call task_sync()
+
+do i = 1, state_ens_handle%my_num_copies
+do j = 1, state_ens_handle%my_num_vars
+   print*, 'task, copy,j', my_task_id(), i,j,state_ens_handle%copies(i,j)
+enddo
+enddo
+
+
+
 AdvanceTime : do
    call trace_message('Top of main advance time loop')
 

Modified: DART/branches/rma_par_single_file/assimilation_code/modules/observations/DEFAULT_obs_kind_mod.F90
===================================================================
--- DART/branches/rma_par_single_file/assimilation_code/modules/observations/DEFAULT_obs_kind_mod.F90	2017-06-09 18:57:31 UTC (rev 11706)
+++ DART/branches/rma_par_single_file/assimilation_code/modules/observations/DEFAULT_obs_kind_mod.F90	2017-06-09 20:25:39 UTC (rev 11707)
@@ -435,19 +435,20 @@
   QTY_SEAICE_SNOWENTHALPY003        = 352, &
   QTY_SOM_TEMPERATURE               = 353, &
   QTY_SEAICE_FY                     = 354, &
-  QTY_SEAICE_AGREG_FY               = 355 
+  QTY_SEAICE_AGREG_FY               = 355, &
+  QTY_SEAICE_AGREG_SURFACETEMP      = 356 
 
 integer, parameter, public :: &
-  QTY_SEA_SURFACE_ANOMALY           = 356
+  QTY_SEA_SURFACE_ANOMALY           = 360
 
 integer, parameter, public :: &
-  QTY_LARGE_SCALE_STATE             = 357, &
-  QTY_SMALL_SCALE_STATE             = 358
+  QTY_LARGE_SCALE_STATE             = 361, &
+  QTY_SMALL_SCALE_STATE             = 362
 
 ! max_defined_quantities is private to this module.  see comment below near the max_obs_specific
 ! declaration for more info about publics and private values.
 
-integer, parameter :: max_defined_quantities = 358
+integer, parameter :: max_defined_quantities = 362
 
 !----------------------------------------------------------------------------
 ! This list is autogenerated by the 'preprocess' program.  To add new
@@ -846,10 +847,12 @@
 obs_kind_names(353) = obs_kind_type(QTY_SOM_TEMPERATURE,       'QTY_SOM_TEMPERATURE')
 obs_kind_names(354) = obs_kind_type(QTY_SEAICE_FY,             'QTY_SEAICE_FY')
 obs_kind_names(355) = obs_kind_type(QTY_SEAICE_AGREG_FY,       'QTY_SEAICE_AGREG_FY')
-obs_kind_names(356) = obs_kind_type(QTY_SEA_SURFACE_ANOMALY,   'QTY_SEA_SURFACE_ANOMALY')
-obs_kind_names(357) = obs_kind_type(QTY_LARGE_SCALE_STATE,     'QTY_LARGE_SCALE_STATE')
-obs_kind_names(358) = obs_kind_type(QTY_SMALL_SCALE_STATE,     'QTY_SMALL_SCALE_STATE')
+obs_kind_names(356) = obs_kind_type(QTY_SEAICE_AGREG_SURFACETEMP,'QTY_SEAICE_AGREG_SURFACETEMP')