[Dart-dev] [6254] DART/branches/development: Resolving all the changes from the trunk into the development branch

nancy at ucar.edu nancy at ucar.edu
Wed Jun 12 09:34:52 MDT 2013 

Revision: 6254
Author:   thoar
Date:     2013-06-12 09:34:51 -0600 (Wed, 12 Jun 2013)
Log Message:
-----------
Resolving all the changes from the trunk into the development branch
in anticipation of reintegrating the branch to the trunk.

Modified Paths:
--------------
    DART/branches/development/matlab/startup.m
    DART/branches/development/models/am2/work/input.nml
    DART/branches/development/models/cam/dart_to_cam.f90
    DART/branches/development/models/cam/dart_to_cam.html
    DART/branches/development/obs_kind/DEFAULT_obs_kind_mod.F90
    DART/branches/development/observations/MADIS/shell_scripts/windowing.csh

Property Changed:
----------------
    DART/branches/development/
    DART/branches/development/adaptive_inflate/
    DART/branches/development/assim_tools/
    DART/branches/development/assim_tools/assim_tools_mod.f90
    DART/branches/development/matlab/GetClmInfo.m
    DART/branches/development/models/bgrid_solo/model_mod.f90
    DART/branches/development/models/cam/
    DART/branches/development/models/clm/
    DART/branches/development/models/wrf/model_mod.f90
    DART/branches/development/obs_kind/DEFAULT_obs_kind_mod.F90
    DART/branches/development/observations/MADIS/
    DART/branches/development/observations/NCEP/ascii_to_obs/real_obs_mod.f90
    DART/branches/development/observations/snow/
    DART/branches/development/utilities/
    DART/branches/development/utilities/closest_member_tool.f90

-------------- next part --------------

Property changes on: DART/branches/development
___________________________________________________________________
Modified: svn:mergeinfo
   - /DART/branches/gitm:5143-6215
/DART/branches/helen:5995-6161
/DART/trunk:4680-5706
   + /DART/branches/gitm:5143-6215
/DART/branches/helen:5995-6161
/DART/trunk:4680-6253


Property changes on: DART/branches/development/adaptive_inflate
___________________________________________________________________
Modified: svn:mergeinfo
   - /DART/branches/gitm/adaptive_inflate:5143-6215
/DART/branches/helen/adaptive_inflate:5995-6161
/DART/branches/inf_restart:4784-4812
/DART/trunk/adaptive_inflate:4680-5706
   + /DART/branches/gitm/adaptive_inflate:5143-6215
/DART/branches/helen/adaptive_inflate:5995-6161
/DART/branches/inf_restart:4784-4812
/DART/trunk/adaptive_inflate:4680-6253


Property changes on: DART/branches/development/assim_tools
___________________________________________________________________
Modified: svn:mergeinfo
   - /DART/branches/gitm/assim_tools:5143-6215
/DART/releases/Kodiak/assim_tools:5292-5577
/DART/trunk/assim_tools:4680-5142
   + /DART/branches/gitm/assim_tools:5143-6215
/DART/releases/Kodiak/assim_tools:5292-5577
/DART/trunk/assim_tools:4680-6253


Property changes on: DART/branches/development/assim_tools/assim_tools_mod.f90
___________________________________________________________________
Modified: svn:mergeinfo
   - /DART/branches/helen/assim_tools/assim_tools_mod.f90:5995-6161
/DART/releases/Kodiak/assim_tools/assim_tools_mod.f90:5020-5583
/DART/trunk/assim_tools/assim_tools_mod.f90:4680-5706
   + /DART/branches/helen/assim_tools/assim_tools_mod.f90:5995-6161
/DART/releases/Kodiak/assim_tools/assim_tools_mod.f90:5020-5583
/DART/trunk/assim_tools/assim_tools_mod.f90:4680-6253


Property changes on: DART/branches/development/matlab/GetClmInfo.m
___________________________________________________________________
Modified: svn:mergeinfo
   - /DART/branches/helen/matlab/GetClmInfo.m:5995-6161
/DART/trunk/matlab/GetClmInfo.m:4812-5730
   + /DART/branches/helen/matlab/GetClmInfo.m:5995-6161
/DART/trunk/matlab/GetClmInfo.m:4812-6253

Modified: DART/branches/development/matlab/startup.m
===================================================================
--- DART/branches/development/matlab/startup.m	2013-06-12 14:36:34 UTC (rev 6253)
+++ DART/branches/development/matlab/startup.m	2013-06-12 15:34:51 UTC (rev 6254)
@@ -23,7 +23,7 @@
    ncstartup;
 end
 
-% See if we have succeeded in adding the netcdf operators.
+%% See if we have succeeded in adding the netcdf operators.
 
 if ( exist('nc_varget','file') ~= 2 )
    disp('Sorry. Unable to locate the snctools matlab operators.')
@@ -71,7 +71,6 @@
 % If the cwd is a '<model>/work' directory, check to see if there is a
 % parallel '<model>/matlab' directory.
 
-mydir    = pwd;
 dartloc  = strfind(mydir,'/work')-1;
 if ( ~isempty(dartloc) )
    dartpath = sprintf('%s/matlab',mydir(1:dartloc));
@@ -81,7 +80,7 @@
    end
 end
 
-% Customizations specific for DART:
+% summarize
 
 truth_file = fullfile(mydir,'True_State.nc');
 diagn_file = fullfile(mydir,'Prior_Diag.nc');
@@ -92,7 +91,6 @@
 fprintf('and your default    DIAGNOSTIC file is %s\n',diagn_file)
 disp('To change your defaults, set ''truth_file'' and/or ''diagn_file'' accordingly.')
 
-
 % <next few lines under version control, do not edit>
 % $URL$
 % $Id$

Modified: DART/branches/development/models/am2/work/input.nml
===================================================================
--- DART/branches/development/models/am2/work/input.nml	2013-06-12 14:36:34 UTC (rev 6253)
+++ DART/branches/development/models/am2/work/input.nml	2013-06-12 15:34:51 UTC (rev 6254)
@@ -105,7 +105,7 @@
    /
 
 &assim_model_nml
-   write_binary_restart_files = .false.,
+   write_binary_restart_files = .true.,
    netCDF_large_file_support  = .true.
    /
 


Property changes on: DART/branches/development/models/bgrid_solo/model_mod.f90
___________________________________________________________________
Modified: svn:mergeinfo
   - /DART/branches/helen/models/bgrid_solo/model_mod.f90:5995-6161
/DART/trunk/models/bgrid_solo/model_mod.f90:4680-5860
   + /DART/branches/helen/models/bgrid_solo/model_mod.f90:5995-6161
/DART/trunk/models/bgrid_solo/model_mod.f90:4680-6253


Property changes on: DART/branches/development/models/cam
___________________________________________________________________
Modified: svn:mergeinfo
   - /DART/branches/cam-update:4903-4923
/DART/branches/gitm/models/cam:5143-6215
/DART/branches/helen/models/cam:5995-6161
/DART/trunk/models/cam:4680-5706
   + /DART/branches/cam-update:4903-4923
/DART/branches/gitm/models/cam:5143-6215
/DART/branches/helen/models/cam:5995-6161
/DART/trunk/models/cam:4680-6253

Modified: DART/branches/development/models/cam/dart_to_cam.f90
===================================================================
--- DART/branches/development/models/cam/dart_to_cam.f90	2013-06-12 14:36:34 UTC (rev 6253)
+++ DART/branches/development/models/cam/dart_to_cam.f90	2013-06-12 15:34:51 UTC (rev 6254)
@@ -56,8 +56,6 @@
 real(r8), allocatable  :: statevector(:)
 integer                :: file_unit, vecsize, iunit, io
 
-! NSC needs namelist to say if model advance or not
-
 !-----------------------------------------------------------------------------
 ! start of program
 !-----------------------------------------------------------------------------

Modified: DART/branches/development/models/cam/dart_to_cam.html
===================================================================
--- DART/branches/development/models/cam/dart_to_cam.html	2013-06-12 14:36:34 UTC (rev 6253)
+++ DART/branches/development/models/cam/dart_to_cam.html	2013-06-12 15:34:51 UTC (rev 6254)
@@ -68,8 +68,8 @@
 <UL>
    <LI>a valid <em class=file>input.nml</em> namelist file for DART</LI>
    <LI>a CAM 'phis' netCDF file [default: <em class=file>cam_phis.nc</em>]</LI>
-   <LI>a DART restart file [default: <em class=file>dart_ics</em>].</LI>
-   <LI>a CAM restart file [default: <em class=file>caminput.nc</em>] (read and written).</LI>
+   <LI>a DART restart file [default: <em class=file>dart_ics</em>] (read)</LI>
+   <LI>a CAM restart file [default: <em class=file>caminput.nc</em>] (read and written)</LI>
 </UL>
 
 <P>
@@ -96,7 +96,8 @@
 <div class=namelist>
 <pre>
 <em class=call>namelist / dart_to_cam_nml / </em> 
-   dart_to_cam_input_file, dart_to_cam_output_file
+   dart_to_cam_input_file, dart_to_cam_output_file, &amp;
+   advance_time_present
 </pre>
 </div>
 
@@ -112,16 +113,23 @@
     <TH align=left>Type        </TH>
     <TH align=left>Description </TH></TR>
 
-<TR><!--contents--><TD valign=top>dart_to_cam_input_file&nbsp;&nbsp;&nbsp;</TD>
-    <!--  type  --><TD valign=top>character(len=128)&nbsp;&nbsp;&nbsp;</TD>
+<TR><!--contents--><TD valign=top>dart_to_cam_input_file</TD>
+    <!--  type  --><TD valign=top>character(len=128)</TD>
     <!--descript--><TD>The name of the DART restart file containing the CAM state. 
                        <em class=units>[default: 'dart_ics']</em></TD></TR>
 
-<TR><!--contents--><TD valign=top>dart_to_cam_output_file&nbsp;&nbsp;&nbsp;</TD>
-    <!--  type  --><TD valign=top>character(len=128)&nbsp;&nbsp;&nbsp;</TD>
+<TR><!--contents--><TD valign=top>dart_to_cam_output_file</TD>
+    <!--  type  --><TD valign=top>character(len=128)</TD>
     <!--descript--><TD>The name of the CAM restart netcdf file.
                        <em class=units>[default: 'caminput.nc']</em></TD></TR>
 
+<TR><!--contents--><TD valign=top>advance_time_present</TD>
+    <!--  type  --><TD valign=top>logical</TD>
+    <!--descript--><TD>Set to .false. for DART initial condition
+                       and restart files.  Use the default setting for the files
+                       written by filter during a model advance.
+                       <em class=units>[default: .true.]</em></TD></TR>
+
 </TABLE>
 
 </div>
@@ -154,7 +162,8 @@
 <H2>FILES Read</H2>
 <UL>
     <LI>DART namelist file; <em class=file>input.nml</em></LI>
-    <LI>DART initial conditions/restart file; e.g. <em class=file>dart_ics</em></LI>
+    <LI>DART initial conditions/restart file; e.g. <em class=file>dart_ics</em> (read)</LI>
+    <LI>CAM restart file; <em class=file>caminput.nc</em> (read and written)</LI>
     <LI>CAM "phis" file specified in <em class=code>&amp;model_nml::cam_phis</em> 
         (normally <em class=file>cam_phis.nc</em>)</LI>
 </UL>


Property changes on: DART/branches/development/models/clm
___________________________________________________________________
Deleted: svn:mergeinfo
   - /DART/branches/gitm/models/clm:5143-6215
/DART/branches/helen/models/clm:5995-6161
/DART/trunk/models/clm:4680-5142


Property changes on: DART/branches/development/models/wrf/model_mod.f90
___________________________________________________________________
Added: svn:mergeinfo
   + /DART/releases/Kodiak/models/wrf/model_mod.f90:5020-5772

Modified: DART/branches/development/obs_kind/DEFAULT_obs_kind_mod.F90
===================================================================
--- DART/branches/development/obs_kind/DEFAULT_obs_kind_mod.F90	2013-06-12 14:36:34 UTC (rev 6253)
+++ DART/branches/development/obs_kind/DEFAULT_obs_kind_mod.F90	2013-06-12 15:34:51 UTC (rev 6254)
@@ -203,7 +203,7 @@
 integer, parameter, public :: &
     KIND_EXNER_FUNCTION              = 85, &
     KIND_TURBULENT_KINETIC_ENERGY    = 86, &
-    KIND_TOTAL_PRECIPITABLE_WATER    = 87, &
+    KIND_TOTAL_PRECIPITABLE_WATER    = 87, & ! kind for accumulated value - total water in a column
     KIND_VERTLEVEL                   = 88, &
     KIND_MICROWAVE_BRIGHT_TEMP       = 89
 


Property changes on: DART/branches/development/obs_kind/DEFAULT_obs_kind_mod.F90
___________________________________________________________________
Modified: svn:mergeinfo
   - /DART/branches/gitm/obs_kind/DEFAULT_obs_kind_mod.F90:5143-6215
/DART/branches/helen/obs_kind/DEFAULT_obs_kind_mod.F90:5995-6161
/DART/branches/mpas/obs_kind/DEFAULT_obs_kind_mod.F90:5183-5672
/DART/releases/Kodiak/obs_kind/DEFAULT_obs_kind_mod.F90:5020-5663
/DART/trunk/obs_kind/DEFAULT_obs_kind_mod.F90:4680-5706
   + /DART/branches/gitm/obs_kind/DEFAULT_obs_kind_mod.F90:5143-6215
/DART/branches/helen/obs_kind/DEFAULT_obs_kind_mod.F90:5995-6161
/DART/branches/mpas/obs_kind/DEFAULT_obs_kind_mod.F90:5183-5672
/DART/releases/Kodiak/obs_kind/DEFAULT_obs_kind_mod.F90:5020-5663
/DART/trunk/obs_kind/DEFAULT_obs_kind_mod.F90:4680-6253


Property changes on: DART/branches/development/observations/MADIS
___________________________________________________________________
Modified: svn:mergeinfo
   - /DART/branches/gitm/observations/MADIS:5143-6215
/DART/trunk/observations/MADIS:4680-5928
   + /DART/branches/gitm/observations/MADIS:5143-6215
/DART/trunk/observations/MADIS:4680-6253

Modified: DART/branches/development/observations/MADIS/shell_scripts/windowing.csh
===================================================================
--- DART/branches/development/observations/MADIS/shell_scripts/windowing.csh	2013-06-12 14:36:34 UTC (rev 6253)
+++ DART/branches/development/observations/MADIS/shell_scripts/windowing.csh	2013-06-12 15:34:51 UTC (rev 6254)
@@ -71,7 +71,6 @@
 # on the analysis time computed from this increment.
 # valid strings look like +1h30m, +2h, +20m, +1d, etc. 
 set time_window = +1h
-#set time_window = +2h
 
 # set this to true if the input files are daily.
 # set it to false if the input files are hourly.
@@ -100,12 +99,8 @@
 # the order of these MUST match the type_list array above.
 set win_before=( -7m  -7m -15m -30m+1s -30m+1s)
 set win_after =( +7m  +7m +15m +30m    +30m)
-#set win_before=(-30m+1s -30m+1s -30m+1s -30m+1s -30m+1s)
-#set win_after =(+30m    +30m    +30m    +30m    +30m)
 
 # locations for input madis netcdf files, output dart obs_seq files
-#set src_base_dir = /Volumes/joshua3/romine/data/STEP2009/MADIS/
-#set out_dir      = /users/romine/step09/MADIS/obs_sequence/conus
 set src_base_dir = ../data
 set out_dir      = ../data
 
@@ -253,8 +248,6 @@
     if ($daily != 'true') then
       echo $src_base_dir/obs_seq_${this_type}_${fbef}  >>! obstemp
       echo $src_base_dir/obs_seq_${this_type}_${faft}  >>! obstemp
-      #echo $src_base_dir/${this_type}/obs_seq.${fbef}  >>! obstemp
-      #echo $src_base_dir/${this_type}/obs_seq.${faft}  >>! obstemp
     else
       echo $src_base_dir/obs_seq_${this_type}_${fbefdy}  >>! obstemp
       echo $src_base_dir/obs_seq_${this_type}_${faftdy}  >>! obstemp
@@ -273,7 +266,6 @@
       # NAMES:
       if ($daily != 'true') then
         echo $src_base_dir/obs_seq_${this_type}_${fbef}  >>! obstemp
-        #echo $src_base_dir/${this_type}/obs_seq.${fbef}  >>! obstemp
       else
         echo $src_base_dir/obs_seq_${this_type}_${fbefdy}  >>! obstemp
       endif
@@ -294,7 +286,6 @@
       # NAMES:
       if ($daily != 'true') then
         echo $src_base_dir/obs_seq_${this_type}_${faft}  >>! obstemp
-        #echo $src_base_dir/${this_type}/obs_seq.${faft}  >>! obstemp
       else
         echo $src_base_dir/obs_seq_${this_type}_${faftdy}  >>! obstemp
       endif


Property changes on: DART/branches/development/observations/NCEP/ascii_to_obs/real_obs_mod.f90
___________________________________________________________________
Modified: svn:mergeinfo
   - /DART/branches/helen/observations/NCEP/ascii_to_obs/real_obs_mod.f90:5995-6161
/DART/trunk/observations/NCEP/ascii_to_obs/real_obs_mod.f90:4680-5710
   + /DART/branches/helen/observations/NCEP/ascii_to_obs/real_obs_mod.f90:5995-6161
/DART/trunk/observations/NCEP/ascii_to_obs/real_obs_mod.f90:4680-6253


Property changes on: DART/branches/development/observations/snow
___________________________________________________________________
Deleted: svn:mergeinfo
   - /DART/branches/gitm/observations/snow:5143-6215
/DART/branches/helen/observations/snow:5995-6161
/DART/trunk/observations/snow:4680-5142


Property changes on: DART/branches/development/utilities
___________________________________________________________________
Modified: svn:mergeinfo
   - /DART/branches/close:4780-4810
/DART/branches/gitm/utilities:5143-6215
/DART/branches/helen/utilities:5995-6161
/DART/trunk/utilities:4680-5706
   + /DART/branches/close:4780-4810
/DART/branches/gitm/utilities:5143-6215
/DART/branches/helen/utilities:5995-6161
/DART/trunk/utilities:4680-6253


Property changes on: DART/branches/development/utilities/closest_member_tool.f90
___________________________________________________________________
Modified: svn:mergeinfo
   - /DART/branches/close/closest_member_tool.f90:4780
/DART/branches/helen/utilities/closest_member_tool.f90:5995-6161
/DART/releases/Kodiak/utilities/closest_member_tool.f90:5020-5693
/DART/trunk/utilities/closest_member_tool.f90:4680-4810,4812-5706
   + /DART/branches/close/closest_member_tool.f90:4780
/DART/branches/helen/utilities/closest_member_tool.f90:5995-6161
/DART/releases/Kodiak/utilities/closest_member_tool.f90:5020-5693
/DART/trunk/utilities/closest_member_tool.f90:4680-4810,4812-6253

More information about the Dart-dev mailing list