[Dart-dev] DART/branches Revision: 10906

[dart at ucar.edu]

mizzi at ucar.edu
2017-01-17 14:23:04 -0700 (Tue, 17 Jan 2017)
134
Saving the run-time version that Arthur is using.
(This is Tim, BTW)
In preparation for testing and then migration to the RMA_TRUNK.




Modified: DART/branches/mizzi/adaptive_inflate/adaptive_inflate_mod.f90
===================================================================
--- DART/branches/mizzi/adaptive_inflate/adaptive_inflate_mod.f90	2017-01-17 19:01:53 UTC (rev 10905)
+++ DART/branches/mizzi/adaptive_inflate/adaptive_inflate_mod.f90	2017-01-17 21:23:04 UTC (rev 10906)
@@ -366,7 +366,7 @@
 ! max from the entire array.  for flavors 1 and 3 there is only a single
 ! value to print out.
 if (inf_flavor > 0) then
-   if (mean_from_restart) then
+   if (my_task_id()==0 .and. mean_from_restart) then
       if (inf_flavor == 2) then
          write(msgstring, '(A, F8.3, A, F8.3)') &
             'inf mean   from restart file: min value: ', minmax_mean(1), ' max value: ', minmax_mean(2)
@@ -376,7 +376,7 @@
       endif
       call error_handler(E_MSG, trim(label) // ' inflation:', msgstring, source, revision, revdate)
    endif
-   if (sd_from_restart) then
+   if (my_task_id()==0 .and. sd_from_restart) then
       if (inf_flavor == 2) then
          write(msgstring, '(A, F8.3, A, F8.3)') &
             'inf stddev from restart file: min value: ', minmax_sd(1), ' max value: ', minmax_sd(2)

Modified: DART/branches/mizzi/assim_model/assim_model_mod.f90
===================================================================
--- DART/branches/mizzi/assim_model/assim_model_mod.f90	2017-01-17 19:01:53 UTC (rev 10905)
+++ DART/branches/mizzi/assim_model/assim_model_mod.f90	2017-01-17 21:23:04 UTC (rev 10906)
@@ -321,7 +321,6 @@
 call nc_check(nf90_put_att(ncFileID%ncid, MemberVarID, "valid_range", &
               (/ 1, copies_of_field_per_time /)), 'init_diag_output', 'put_att valid_range')
 
-
 !    Metadata for each Copy
 call nc_check(nf90_def_var(ncid=ncFileID%ncid,name="CopyMetaData", xtype=nf90_char,    &
               dimids = (/ metadataDimID, MemberDimID /),  varid=metadataVarID), &
@@ -384,6 +383,7 @@
 !-------------------------------------------------------------------------------
 
 i =  nc_write_model_atts( ncFileID%ncid )
+
 if ( i /= 0 ) then
    write(msgstring, *)'nc_write_model_atts  bombed with error ', i
    call error_handler(E_MSG,'init_diag_output',msgstring,source,revision,revdate)

Modified: DART/branches/mizzi/cov_cutoff/cov_cutoff_mod.f90
===================================================================
--- DART/branches/mizzi/cov_cutoff/cov_cutoff_mod.f90	2017-01-17 19:01:53 UTC (rev 10905)
+++ DART/branches/mizzi/cov_cutoff/cov_cutoff_mod.f90	2017-01-17 21:23:04 UTC (rev 10906)
@@ -126,7 +126,6 @@
 z = abs(z_in)
 
 !----------------------------------------------------------
-
 if(localization_type == 1) then ! Standard Gaspari Cohn localization
 
    if( z >= c*2.0_r8 ) then
@@ -136,7 +135,7 @@
    else if( z <= c ) then
       r = z / c
       comp_cov_factor = &
-           ( ( ( -0.25_r8*r +0.5_r8 )*r +0.625_r8 )*r -5.0_r8/3.0_r8 )*r**2 + 1.0_r8
+              ( ( ( -0.25_r8*r +0.5_r8 )*r +0.625_r8 )*r -5.0_r8/3.0_r8 )*r**2 + 1.0_r8
 !!$           r**5 * (-0.25_r8 ) + &
 !!$           r**4 / 2.0_r8 +              &
 !!$           r**3 * 5.0_r8/8.0_r8 -       &
@@ -146,11 +145,11 @@
       r = z / c
       comp_cov_factor = &
            ( ( ( ( r/12.0_r8 -0.5_r8 )*r +0.625_r8 )*r +5.0_r8/3.0_r8 )*r -5.0_r8 )*r &
+           + 4.0_r8 - 2.0_r8 / (3.0_r8 * r) 
 !!$           r**5 / 12.0_r8  -  &
 !!$           r**4 / 2.0_r8   +  &
 !!$           r**3 * 5.0_r8 / 8.0_r8 + &
 !!$           r**2 * 5.0_r8 / 3.0_r8 - 5.0_r8*r &
-           + 4.0_r8 - 2.0_r8 / (3.0_r8 * r) 
    endif
 
 else if(localization_type == 2) then ! BOXCAR localization

Modified: DART/branches/mizzi/diagnostics/matlab/plot_evolution.m
===================================================================
--- DART/branches/mizzi/diagnostics/matlab/plot_evolution.m	2017-01-17 19:01:53 UTC (rev 10905)
+++ DART/branches/mizzi/diagnostics/matlab/plot_evolution.m	2017-01-17 21:23:04 UTC (rev 10906)
@@ -41,8 +41,11 @@
 %
 % fname      = 'obs_diag_output.nc';   % netcdf file produced by 'obs_diag'
 % copystring = 'rmse';                 % 'copy' string == quantity of interest
-% plotdat    = plot_evolution(fname, copystring, 'RADIOSONDE_TEMPERATURE');
+% plotdat    = plot_evolution(fname, copystring, 'varname', 'RADIOSONDE_TEMPERATURE');
+%
+% plotdat    = plot_evolution(fname, copystring, 'varname', 'RADIOSONDE_TEMPERATURE', 'range', [0 10]);
 
+
 %% DART software - Copyright 2004 - 2013 UCAR. This open source software is
 % provided by UCAR, "as is", without charge, subject to all terms of use at
 % http://www.image.ucar.edu/DAReS/DART/DART_download
@@ -49,13 +52,39 @@
 %
 % DART $Id$
 
-if nargin == 2