[Dart-dev] DART/branches Revision: 11709

[dart at ucar.edu]

hendric at ucar.edu
2017-06-12 17:04:44 -0600 (Mon, 12 Jun 2017)
175
changed the logic to make the read_single_file more
consistent and removed some unneeded prints.  bitwise
with the bgrid without, with fixed inflation and inf.
from restart.




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-12 19:46:51 UTC (rev 11708)
+++ DART/branches/rma_par_single_file/assimilation_code/modules/assimilation/filter_mod.f90	2017-06-12 23:04:44 UTC (rev 11709)
@@ -619,19 +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,:))
+! 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
 
-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/io/single_file_io_mod.f90
===================================================================
--- DART/branches/rma_par_single_file/assimilation_code/modules/io/single_file_io_mod.f90	2017-06-12 19:46:51 UTC (rev 11708)
+++ DART/branches/rma_par_single_file/assimilation_code/modules/io/single_file_io_mod.f90	2017-06-12 23:04:44 UTC (rev 11709)
@@ -408,7 +408,7 @@
 ! Temporary storage for reading variables
 real(r8), allocatable :: var_block(:)
 ! Logicals flags
-logical :: do_perturb, has_member_dim, is_reader, is_sender, is_receiver, is_extra_copy
+logical :: do_perturb, has_member_dim, is_sender, is_sender, is_receiver, is_extra_copy
 logical :: dbg
 
 dbg = .false.
@@ -465,7 +465,7 @@
 
 my_pe      = my_task_id()
 sending_pe = 0 ! only task 0 will be reading data
-is_reader  = (my_pe == sending_pe)
+is_sender  = (my_pe == sending_pe)
 
 COPY_LOOP: do icopy = 1, ens_size+extra_size
 
@@ -587,7 +587,7 @@
       if ( has_member_dim ) dim_start_point(member_dim) = icopy  ! member number
 
       ! read variable from task 0
-      if (is_reader) then
+      if (is_sender) then
 !print*, 'ALLOCATE   task_id() :', my_task_id()
 
          allocate( var_block(var_size) )
@@ -605,7 +605,7 @@
 print*, 'ndims      : ', ndims
 print*, 'var_size   : ', var_size
 print*, 'dcount     : ', dcount
-print*, 'varblock   : ', var_block
+!print*, 'varblock   : ', var_block
 print*, 'dim_lengths: ', dim_lengths(1:ndims)
 print*, 'dim_start  : ', dim_start_point(1:ndims)
 
@@ -638,8 +638,6 @@
 
          if (is_receiver) then 
 
-            is_sender = (sending_pe == recv_pe)
-
             if (is_sender) then ! just copy directly into copies
 
 if(dbg) then
@@ -698,7 +696,7 @@
             start_pos = start_pos + elm_count
 
          elseif (is_sender) then ! send variables to receivers
-
+            print*, 'TASK ; ', my_task_id()
 if(dbg) then
 print*, '################################# SENDING ################################################ '
 write(*,'(A15, I15, A15, I15)' ) ' variable id = ', ivar, ', COPY :: ', icopy
@@ -719,7 +717,7 @@
 
       enddo RECEIVING_PE_LOOP
 
-      if(is_reader) then
+      if(is_sender) then
 !print*, 'DEALLOCATE task_id() :', my_task_id()
          deallocate( var_block )