--- MITgcm_contrib/enderton/Diagnostics/DiagGenParam.m	2005/01/31 15:43:26	1.1
+++ MITgcm_contrib/enderton/Diagnostics/DiagGenParam.m	2005/02/02 15:38:21	1.2
@@ -22,7 +22,7 @@
             'ice_Qice2'     ,'ice_Tice1'     ,'ice_Tice2'     ,...
             'ice_Tsrf'                                        ,...
             'ICE_fract'     ,'ICE_iceH'      ,...
-            'ICE_fract-T'     ,'ICE_iceH-T'      ,...
+            'ICE_fract-T'   ,'ICE_iceH-T'    ,...
             'ice_fract_Ave' ,'ice_iceH_Ave'  ,...
             'ice_snowH_Ave' ,'ice_Tsrf_Ave'  ,'ice_Tice1_Ave' ,...
             'ice_Tice2_Ave' ,'ice_snowPr_Ave','ice_flx2oc_Ave',...
@@ -32,7 +32,7 @@
     
 fields3D = {'S','T','Temp','TT','U','UU','uVel','V','VV','vVel','W',...
             'wVel','aim_RH','Tstd','KEpri','phiHyd','Psi','Bol','Res',...
-            'Conv','Test'};
+            'Conv','Test','ActT','MoiPTc'};
 
     
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -133,33 +133,17 @@
 %                  Experiment and configuration indecies                  %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-% REWRITE THE FOLLOWING PARAGRAPH!!!
-% In the incoming data from the user (fields), each entry (field) will have
-% an experiment cell array and an configuration cell array that must be in
-% the proper order.  The following defines the order in which the
-% parameters are passed for each of the cell arrays.  The field array had
-% the following structure: 
-%
-%              {Experiment1,...     {Configuration1,...
-%   field = {   Experiment2,...  ,   Configuration2,...  ,  TitleStr  }   
-%               ComparisonType}      Configuration3}
-%
-% Note that while often there can be any number of experiments and
-% configurations, there are certain types of comparisons that set some
-% limitations on this.  The Experiment# and Configuration# arrays have the
-% following order of fields:
-%
-% SHOULD BE GOOD FROM HERE!!!
 % Current experiment order with indecies defined:
-%   { FieldName  (fln), Experiment (exp),  DataType   (dat),...
+%   { FieldName  (fln), Experiment (trl),  DataType   (dat),...
 %     DataDir    (dad), GridDir    (grd),  Iterations (itr),...
 %     TimeStep   (tst), Fluid      (flu),  DataFormat (drm),...
-%     Averaging  (avg),  SliceType (slc),  PlotStyle  (pst)}
+%     Averaging  (avg),  SliceType (slc),  PlotStyle  (pst),...
+%     Optional parameters}
 %
 % Field descriptions/options:
 %   FieldName  (fln):   Variable name.
-%   Experiment (exp):   Experiment name.
-%   DataType   (dat):   Data type, supports 'Tav', 'Int'.
+%   Experiment (trl):   Experiment name.
+%   DataType   (dat):   Data type, supports 'Tav', 'Ins'.
 %   DataDir    (dad):   Data directory.
 %   GridDir    (grd):   Grid data directory.
 %   Iterations (itr):   Iterations for analysis.
@@ -172,7 +156,7 @@
 %   SliceType  (slc):  'Sur', 'Zon', 'i=#', 'j=#', 'k=#'
 %   PlotStyle  (pst):  'Grd', 'Int', 'Con', 'Cnf', 'Lin'
 ifln = 1;
-iexp = 2;
+itrl = 2;
 idat = 3;
 idad = 4;
 igrd = 5;
@@ -205,7 +189,17 @@
 
 % Resolution parameters. KEEP WITH OTHER GRID INFORMATION?!?!?
 hres  = 32;
-vres  = 5;
 faces = 6;
 
-g = 9.81;
\ No newline at end of file
+% Constants
+g        = 9.81;        % Acceleration due to gravity [m/s2].
+presrefA = 100000;      % Atmospheric reference pressure [Pa].
+RdA      = 287.05;      % Gas constant for dry air [J/kg/K].
+RvA      = 461;         % Gas constant for ?moist? air [J/kg/K].
+cpA      = 1005;        % Atmos. spec. heat at constant pres. [J/kg/K].
+LHvapA   = 2501000;     % Atmos. latent heat of vaporization.
+A_CC     = 611;         % Clausius-Clapeyron A coefficient [Pa].
+Beta_CC  = 0.067;       % Clausius-Clapeyron Beta coefficient [1/C].
+
+% Conversions
+K2C      = 273.15;      % Kelvin = K2C + Celsius [K or C].
\ No newline at end of file