[Dart-dev] DART/branches Revision: 11112

[dart at ucar.edu]

hendric at ucar.edu
2017-02-14 14:08:05 -0700 (Tue, 14 Feb 2017)
33
removing and updating comments.




Modified: DART/branches/rma_single_file/README_rma_updates.txt
===================================================================
--- DART/branches/rma_single_file/README_rma_updates.txt	2017-02-14 19:00:12 UTC (rev 11111)
+++ DART/branches/rma_single_file/README_rma_updates.txt	2017-02-14 21:08:05 UTC (rev 11112)
@@ -5,7 +5,7 @@
 # DART $Id$
 
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+ Jan 13th 2017 :: rma_fixed_filenames merge changes @r10902                 +
++ Jan 13th 2017 :: rma_fixed_filenames merge changes Revision: 10902
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 Specific namelist changes include:
@@ -147,14 +147,20 @@
 
 
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+ Feb 10th 2017 :: rma_single_file merge changes @r10902                     +
++ Feb 10th 2017 :: rma_single_file merge changes $Revision$
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
+Filter and PMO can now run with multiple cycles for low order models. The output
+for this is only supported with single file output (members, inflation, mean, sd
+are all in the same file).
+
+Added matlab support for diagnostics format in lower order models.
+
 ------------------------------------------------------------------------------
 Changes to the filter_nml are :
 ------------------------------------------------------------------------------
 
-output_restart          -- REMOVED
+output_restart          -- RENAMED to output_members
 restart_in_file_name    -- RENAMED to input_state_file_list
 restart_out_file_name   -- RENAMED to output_state_files_list
 single_restart_file_in  -- RENAMED to single_file_in
@@ -165,6 +171,19 @@
 
 has_cycling             -- ADDED for low order models
 
+------------------------------------------------------------------------------
+Changes to the perfect_model_obs_nml are :
+------------------------------------------------------------------------------
+
+start_from_restart    -- RENAMED read_input_state_from_file
+output_restart        -- RENAMED write_output_state_to_file
+restart_in_file_name  -- RENAMED input_state_files
+restart_out_file_name -- RENAMED output_state_files
+
+single_file_in        -- ADDED for low order models
+single_file_out       -- ADDED for low order models
+has_cycling           -- ADDED for low order models
+
 # <next few lines under version control, do not edit>
 # $URL$
 # $Revision$

Modified: DART/branches/rma_single_file/integrate_model/integrate_model.f90
===================================================================
--- DART/branches/rma_single_file/integrate_model/integrate_model.f90	2017-02-14 19:00:12 UTC (rev 11111)
+++ DART/branches/rma_single_file/integrate_model/integrate_model.f90	2017-02-14 21:08:05 UTC (rev 11112)
@@ -134,7 +134,7 @@
    !------------------- Read restart from file ----------------------
    
    call io_filenames_init(input_file_info, 1, cycling=.true., single_file=.true.)
-   call set_file_metadata(input_file_info, 1, 'temp', 'ic', 'initial condition')
+   call set_file_metadata(input_file_info, 1, (/ic_file_name/), 'temp_ic', 'initial condition')
    call set_io_copy_flag( input_file_info, 1, READ_COPY) 
    
    ic_file_name = get_restart_filename(get_stage_metadata(input_file_info),1,1)
@@ -152,7 +152,7 @@
    if (trace_execution) write(*,*) 'calling advance_state if needed'
 
    call io_filenames_init(output_file_info, 1, cycling=.true., single_file=.true.)
-   call set_file_metadata(output_file_info, 1, 'temp', 'ud', 'advanced member')
+   call set_file_metadata(output_file_info, 1, (/ud_file_name/), 'temp_ud', 'advanced member')
    call set_io_copy_flag( output_file_info, 1, WRITE_COPY) 
 
    if(ens_handle%time(1) < target_time) &

Modified: DART/branches/rma_single_file/io/direct_netcdf_mod.f90
===================================================================
--- DART/branches/rma_single_file/io/direct_netcdf_mod.f90	2017-02-14 19:00:12 UTC (rev 11111)
+++ DART/branches/rma_single_file/io/direct_netcdf_mod.f90	2017-02-14 21:08:05 UTC (rev 11112)
@@ -1089,7 +1089,7 @@
      write(clamp_min,*)  'NA'
      write(clamp_max,*)  'NA'
      
-     clamp_val = get_io_clamping_maxval(domid, ivar) 
+     clamp_val = get_io_clamping_maxval(domid, ivar)
      if ( clamp_val /= MISSING_R8 ) write(clamp_max,*)  clamp_val
      
      clamp_val = get_io_clamping_minval(domid, ivar)

Modified: DART/branches/rma_single_file/io/io_filenames_mod.f90
===================================================================
--- DART/branches/rma_single_file/io/io_filenames_mod.f90	2017-02-14 19:00:12 UTC (rev 11111)
+++ DART/branches/rma_single_file/io/io_filenames_mod.f90	2017-02-14 21:08:05 UTC (rev 11112)
@@ -302,16 +302,6 @@
 file_info%stage_metadata%filenames        = 'null'
 file_info%stage_metadata%file_description = 'null'