[Dart-dev] DART/branches Revision: 12854

[dart at ucar.edu]

hendric at ucar.edu
2018-09-25 14:35:38 -0600 (Tue, 25 Sep 2018)
56

merging in the most recent changes from the rma_trunk




Index: DART/branches/rma_distrib
===================================================================
--- DART/branches/rma_distrib	2018-09-25 20:32:38 UTC (rev 12853)
+++ DART/branches/rma_distrib	2018-09-25 20:35:38 UTC (rev 12854)

Property changes on: DART/branches/rma_distrib
___________________________________________________________________
Modified: svn:mergeinfo
## -18,6 +18,7 ##
 /DART/branches/rma_closest_member_tool:12576-12617
 /DART/branches/rma_diag:9623-9737
 /DART/branches/rma_fill_inf:12517-12656
+/DART/branches/rma_fix_broken:12835-12848
 /DART/branches/rma_fix_clm_restarts:9634-11919
 /DART/branches/rma_fixed_filenames:10702-10895
 /DART/branches/rma_kinds_to_state_structure:8952-9431
## -41,7 +42,7 ##
 /DART/branches/rma_sprint:8095-8166
 /DART/branches/rma_state_structure_test_dir:9472-9676
 /DART/branches/rma_state_structure_unit_test:9691-10268
-/DART/branches/rma_trunk:12423-12813
+/DART/branches/rma_trunk:12423-12853
 /DART/branches/rma_trunk_clamping:8786-8801
 /DART/branches/rma_trunk_filename:8011-8157
 /DART/branches/rma_trunk_get_state_fun:8568-8596
Modified: DART/branches/rma_distrib/CHANGELOG
===================================================================
--- DART/branches/rma_distrib/CHANGELOG	2018-09-25 20:32:38 UTC (rev 12853)
+++ DART/branches/rma_distrib/CHANGELOG	2018-09-25 20:35:38 UTC (rev 12854)
@@ -807,6 +807,13 @@
   locations of the 'new' glade filesystem. They used CESM tag: cesm2_0_alpha06n
 
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ Sep 21 2018 :: pruned CICE branch (yz-cice)               $Revision$
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+- Worked with Yongfei Zhang to remove prototype codes and more completely
+  document observation converters and data sources for cice assimilation.
+
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 + MMM DD YYYY :: summary of next changes                    $Revision$
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 

Modified: DART/branches/rma_distrib/assimilation_code/modules/assimilation/filter_mod.dopplerfold.f90
===================================================================
--- DART/branches/rma_distrib/assimilation_code/modules/assimilation/filter_mod.dopplerfold.f90	2018-09-25 20:32:38 UTC (rev 12853)
+++ DART/branches/rma_distrib/assimilation_code/modules/assimilation/filter_mod.dopplerfold.f90	2018-09-25 20:35:38 UTC (rev 12854)
@@ -2352,7 +2352,7 @@
 do i = 1, nstages
    my_stage = stages(i)
    call to_upper(my_stage)
-   if (trim(my_stage) /= trim('NULL')) then
+   if (my_stage /= 'NULL' .and. my_stage /= '') then
    SELECT CASE (my_stage)
       CASE ('INPUT', 'FORECAST', 'PREASSIM', 'POSTASSIM', 'ANALYSIS', 'OUTPUT')
          call set_stage_to_write(stages(i),.true.)

Modified: DART/branches/rma_distrib/assimilation_code/modules/assimilation/filter_mod.f90
===================================================================
--- DART/branches/rma_distrib/assimilation_code/modules/assimilation/filter_mod.f90	2018-09-25 20:32:38 UTC (rev 12853)
+++ DART/branches/rma_distrib/assimilation_code/modules/assimilation/filter_mod.f90	2018-09-25 20:35:38 UTC (rev 12854)
@@ -2361,7 +2361,7 @@
 do i = 1, nstages
    my_stage = stages(i)
    call to_upper(my_stage)
-   if (trim(my_stage) /= trim('NULL')) then
+   if (my_stage /= 'NULL' .and. my_stage /= '') then
    SELECT CASE (my_stage)
       CASE ('INPUT', 'FORECAST', 'PREASSIM', 'POSTASSIM', 'ANALYSIS', 'OUTPUT')
          call set_stage_to_write(stages(i),.true.)

Modified: DART/branches/rma_distrib/assimilation_code/modules/io/io_filenames_mod.f90
===================================================================
--- DART/branches/rma_distrib/assimilation_code/modules/io/io_filenames_mod.f90	2018-09-25 20:32:38 UTC (rev 12853)
+++ DART/branches/rma_distrib/assimilation_code/modules/io/io_filenames_mod.f90	2018-09-25 20:35:38 UTC (rev 12854)
@@ -303,6 +303,7 @@
    esize = SIZE(restart_files,1)
    file_info%stage_metadata%filenames(1:esize,:) = restart_files(:,:)
 endif
+
 if(present(root_name))                  file_info%root_name                     = root_name
 if(present(check_output_compatibility)) file_info%check_output_compatibility    = check_output_compatibility
 file_info%initialized = .true.

Modified: DART/branches/rma_distrib/developer_tests/io/test_cf_conventions.f90
===================================================================
--- DART/branches/rma_distrib/developer_tests/io/test_cf_conventions.f90	2018-09-25 20:32:38 UTC (rev 12853)
+++ DART/branches/rma_distrib/developer_tests/io/test_cf_conventions.f90	2018-09-25 20:35:38 UTC (rev 12854)
@@ -6,33 +6,23 @@
 
 program test_cf_conventions
 
-use             types_mod, only : r4, r8, i8, metadatalength, MISSING_R8 
+use             types_mod, only : r4, r8, i8, MISSING_R8 , MISSING_R4
 use         utilities_mod, only : register_module, error_handler, E_MSG, E_ERR
-use  adaptive_inflate_mod, only : adaptive_inflate_init, &
-                                  adaptive_inflate_type
-use     mpi_utilities_mod, only : initialize_mpi_utilities, &
-                                  finalize_mpi_utilities
-use       assim_model_mod, only : static_init_assim_model, &