[Dart-dev] DART/branches Revision: 10810

[dart at ucar.edu]

hendric at ucar.edu
2016-12-16 14:53:56 -0700 (Fri, 16 Dec 2016)
137
fixing copy index numbers.  off by one for pre and postassim members.
storing pre and postassim mean and sd copies to correct position.




Modified: DART/branches/rma_fixed_filenames/filter/filter_mod.f90
===================================================================
--- DART/branches/rma_fixed_filenames/filter/filter_mod.f90	2016-12-16 21:50:29 UTC (rev 10809)
+++ DART/branches/rma_fixed_filenames/filter/filter_mod.f90	2016-12-16 21:53:56 UTC (rev 10810)
@@ -114,16 +114,16 @@
 integer :: INPUT_SD                 = COPY_NOT_PRESENT
 integer :: PREASSIM_MEM_START       = COPY_NOT_PRESENT
 integer :: PREASSIM_MEM_END         = COPY_NOT_PRESENT
-integer :: PREASSIM_PRIOR_MEAN      = COPY_NOT_PRESENT
-integer :: PREASSIM_PRIOR_SD        = COPY_NOT_PRESENT
+integer :: PREASSIM_MEAN            = COPY_NOT_PRESENT
+integer :: PREASSIM_SD              = COPY_NOT_PRESENT
 integer :: PREASSIM_PRIORINF_MEAN   = COPY_NOT_PRESENT
 integer :: PREASSIM_PRIORINF_SD     = COPY_NOT_PRESENT
 integer :: PREASSIM_POSTINF_MEAN    = COPY_NOT_PRESENT
 integer :: PREASSIM_POSTINF_SD      = COPY_NOT_PRESENT
 integer :: POSTASSIM_MEM_START      = COPY_NOT_PRESENT
 integer :: POSTASSIM_MEM_END        = COPY_NOT_PRESENT
-integer :: POSTASSIM_POST_MEAN      = COPY_NOT_PRESENT
-integer :: POSTASSIM_POST_SD        = COPY_NOT_PRESENT
+integer :: POSTASSIM_MEAN           = COPY_NOT_PRESENT
+integer :: POSTASSIM_SD             = COPY_NOT_PRESENT
 integer :: POSTASSIM_PRIORINF_MEAN  = COPY_NOT_PRESENT
 integer :: POSTASSIM_PRIORINF_SD    = COPY_NOT_PRESENT
 integer :: POSTASSIM_POSTINF_MEAN   = COPY_NOT_PRESENT
@@ -440,11 +440,11 @@
                    PRIOR_INF_COPY, PRIOR_INF_SD_COPY, &
                    POST_INF_COPY, POST_INF_SD_COPY, READ_COPY)
 call set_file_info(file_info_preassim, 'preassim', num_output_state_members, &
-                   PREASSIM_MEM_START, PREASSIM_MEM_END, PREASSIM_PRIOR_MEAN, PREASSIM_PRIOR_SD, &
+                   PREASSIM_MEM_START, PREASSIM_MEM_END, PREASSIM_MEAN, PREASSIM_SD, &
                    PREASSIM_PRIORINF_MEAN, PREASSIM_PRIORINF_SD, &
                    PREASSIM_POSTINF_MEAN,  PREASSIM_POSTINF_SD, WRITE_COPY)
 call set_file_info(file_info_postassim,'postassim', num_output_state_members,  &
-                   POSTASSIM_MEM_START, POSTASSIM_MEM_END, POSTASSIM_POST_MEAN, POSTASSIM_POST_SD, &
+                   POSTASSIM_MEM_START, POSTASSIM_MEM_END, POSTASSIM_MEAN, POSTASSIM_SD, &
                    POSTASSIM_PRIORINF_MEAN, POSTASSIM_PRIORINF_SD, &
                    POSTASSIM_POSTINF_MEAN , POSTASSIM_POSTINF_SD, WRITE_COPY)
 call set_file_info(file_info_output,   'output', ens_size, &
@@ -458,11 +458,11 @@
                          PRIOR_INF_COPY, PRIOR_INF_SD_COPY, &
                          POST_INF_COPY, POST_INF_SD_COPY)
 call set_write_file_info( file_info_preassim, num_output_state_members, &
-                          PREASSIM_MEM_START, PREASSIM_PRIOR_MEAN, PREASSIM_PRIOR_SD, &
+                          PREASSIM_MEM_START, PREASSIM_MEAN, PREASSIM_SD, &
                           PREASSIM_PRIORINF_MEAN, PREASSIM_PRIORINF_SD, &
                           PREASSIM_POSTINF_MEAN,  PREASSIM_POSTINF_SD)
 call set_write_file_info( file_info_postassim, num_output_state_members, &
-                          POSTASSIM_MEM_START, POSTASSIM_POST_MEAN, POSTASSIM_POST_SD, &
+                          POSTASSIM_MEM_START, POSTASSIM_MEAN, POSTASSIM_SD, &
                           POSTASSIM_PRIORINF_MEAN, POSTASSIM_PRIORINF_SD, &
                           POSTASSIM_POSTINF_MEAN , POSTASSIM_POSTINF_SD)
 call set_write_file_info( file_info_output, ens_size, &
@@ -1885,20 +1885,26 @@
 
 integer :: i, offset
 
-if (query_copy_present(PREASSIM_PRIOR_MEAN)) &
-   ens_handle%copies(PREASSIM_PRIOR_MEAN, :) = ens_handle%copies(ENS_MEAN_COPY, :)
+if (query_copy_present(PREASSIM_MEAN)) &
+   ens_handle%copies(PREASSIM_MEAN, :) = ens_handle%copies(ENS_MEAN_COPY, :)
 
-if (query_copy_present(PREASSIM_PRIOR_SD)) &
-   ens_handle%copies(PREASSIM_PRIOR_SD, :) = ens_handle%copies(ENS_SD_COPY, :)
+if (query_copy_present(PREASSIM_SD)) &
+   ens_handle%copies(PREASSIM_SD, :) = ens_handle%copies(ENS_SD_COPY, :)
 
 if (query_copy_present(PREASSIM_PRIORINF_MEAN)) &
    ens_handle%copies(PREASSIM_PRIORINF_MEAN, :) = ens_handle%copies(PRIOR_INF_COPY, :)
 
 if (query_copy_present(PREASSIM_PRIORINF_SD)) &
    ens_handle%copies(PREASSIM_PRIORINF_SD, :) = ens_handle%copies(PRIOR_INF_SD_COPY, :)
+
+if (query_copy_present(PREASSIM_POSTINF_MEAN)) &
+   ens_handle%copies(PREASSIM_POSTINF_MEAN, :) = ens_handle%copies(POST_INF_COPY, :)
+
+if (query_copy_present(PREASSIM_POSTINF_SD)) &
+   ens_handle%copies(PREASSIM_POSTINF_SD, :) = ens_handle%copies(POST_INF_SD_COPY, :)
       
 do i = 1, num_output_state_members
-   offset = PREASSIM_MEM_START + i
+   offset = PREASSIM_MEM_START + i - 1
    if (query_copy_present(offset)) ens_handle%copies(offset, :) = ens_handle%copies(i, :)
 enddo
 
@@ -1915,6 +1921,18 @@
 
 integer :: i, offset
 
+if (query_copy_present(POSTASSIM_MEAN)) &
+   ens_handle%copies(POSTASSIM_MEAN, :) = ens_handle%copies(ENS_MEAN_COPY, :)
+
+if (query_copy_present(POSTASSIM_SD)) &
+   ens_handle%copies(POSTASSIM_SD, :) = ens_handle%copies(ENS_SD_COPY, :)
+
+if (query_copy_present(POSTASSIM_PRIORINF_MEAN)) &
+   ens_handle%copies(POSTASSIM_PRIORINF_MEAN, :) = ens_handle%copies(PRIOR_INF_COPY, :)
+
+if (query_copy_present(POSTASSIM_PRIORINF_SD)) &
+   ens_handle%copies(POSTASSIM_PRIORINF_SD, :) = ens_handle%copies(PRIOR_INF_SD_COPY, :)
+