flux dims

git-svn-id: https://daisy-model.googlecode.com/svn/trunk@3620 5f5bf4bb-3343-0410-8278-4fa8eb3319dc

Author: perabrahamsen

ChangeLog

@@ -1,3 +1,10 @@
+2010-06-02  Per Abrahamsen  <[email protected]>
+
+	* select.C (initialize): Multiply spec_dim with 'h' when using
+	Handle::sum.
+	* summary.h, summary_simple.C, summary_balance.C: Adjust.
+	* fetch.h, fetch_pretty.h, fetch_pretty.C: Ditto.
+
 2010-05-28  Per Abrahamsen  <[email protected]>
 
 	* xysource_xycombine.C: New model.

NEWS

@@ -12,6 +12,31 @@ release.
 
 Should lead to more evapotranspiration from wet surfaces.
 
+** Dimension change in log files.
+
+The dimension of most flux variables in the standard log files has
+changed so it no longer contain the log timestep.  For example,
+logging "Field water" weekly would have the unit for fluxes be mm/w,
+while logging monthly would have the same units be mm/m.  Now it will
+be mm.  The actual values will be the same, the interpretation is
+"amount of water since last we logged".
+
+The advantages of this new interpretation are that 1) We avoid weird
+units, 2) it works with intervals that have no nice symbol (like
+biweekly), and 3) it works with variable timesteps.
+
+Technically, internally in Daisy most flux unit are per time
+(independent of the actual timestep used by Daisy).  When a log file
+parametrization specifies (handle sum) this value will be multiplied
+with the length of the timestep.  What happens now is that the unit is
+also multiplied be the unit of the timestep [h].
+
+If you really want the dimension of flux variables to be per time,
+specify (handle average) instead, which will divide the value and unit
+by the total time between log entries in hours, returning to the
+original unit.  You can then tell Daisy to convert this to another
+timestep by specifying 'dimension' explicitly.
+
 ** Variable timesteps.
 
 Yo can now allow Daisy to temporarily decrease timesteps in order to
@@ -84,9 +109,9 @@ This log will provide information about the timestep.
 ** The 'none' chemistry is now build in.
 
 So there is no longer any reason to load 'chemistry.dai' just in order
-to disable chemstry.
+to disable chemistry.
 
-** Biopore wall resistence change.
+** Biopore wall resistance change.
 
 The R_primary and R_secondary parameters are gone, instead we have
 K_wall_relative, which denote the conductivity of the biopore wall
@@ -115,7 +140,7 @@ The 'type' parameter allows you to select between 'block', 'smooth',
 'surface', and 'contour' plots, and the 'top', 'bottom', 'left' and
 'right' parameters allows you to zoom into a rectangular subset of the
 soil..  More information about generating plots can be found in the
-tutorial, and more deails on the 'soil' model can be found in the
+tutorial, and more details on the 'soil' model can be found in the
 reference manual.
 
 * 4.86
@@ -128,7 +153,7 @@ reference manual.
 
 * 4.84 
 
-** Surface decompose rate now defaults to canopy dissipitation rate.
+** Surface decompose rate now defaults to canopy dissipation rate.
 
 It use to default to soil decompose rate.
 
@@ -5636,7 +5661,7 @@ Affects mineralization, nitrification, and denitrification.
 
 This action specifies a strategy for managing a specific crop or
 multicrop.  To create a crop rotation, you can combine these 'crop'
-action sequenctially using the 'activity' action.
+action sequentially using the 'activity' action.
 
 * 1.04
 
@@ -5652,7 +5677,7 @@ action sequenctially using the 'activity' action.
 
 ** Added surface runoff.
 
-Controlable with the new 'DetentionCapacity' and 'ReservoirConstant'
+Controllable with the new 'DetentionCapacity' and 'ReservoirConstant'
 surface parameters. 
 
 ** Added mixing of inorganic nitrogen between surface and soil.

TODO

@@ -1,6 +1,6 @@
 TODO --- things that needs to be done with Daisy -*- org -*-
 
-* Handle::sum skal gange dimension med 'h'
+* Ny faveskala til vand (bl�0, hvid1, gul2, orange3, r�d4, sort5)
 
 * K�rsler 
 

fetch.C

@@ -78,35 +78,8 @@ Fetch::add (const symbol)
 { type = Error; }
 
 symbol
-Fetch::dimension (const symbol period) const
-{
-  if (type != Flux)
-    return select_dimension;
-
-  const size_t size = select_dimension.name ().size ();
-  if (size > 1)
-    {
-      const char last = select_dimension.name ()[size - 1];
-      const char second_last = select_dimension.name ()[size - 2];
-      if (second_last == '/'
-          && (last == 'h' || last == 'd' || last == 'w' 
-              || last == 'm' || last == 'y'))
-        {
-          const std::string strip 
-            = select_dimension.name ().substr (0, size - 2);
-          if (period != "")
-            return strip + "/" + period;
-          else
-            return strip;
-        }
-    }
-  if (period == "h")
-    return select_dimension;
-  else if (period == "")
-    return select_dimension + "h";
-  else
-    return select_dimension + "h/" + period;
-}
+Fetch::dimension () const
+{ return select_dimension; }
 
 void
 Fetch::clear (const std::vector<Fetch*>& fetch)

fetch.h

@@ -58,7 +58,7 @@ class Fetch : public Destination
 
   // Use.
 public:
-  symbol dimension (const symbol period) const;
+  symbol dimension () const;
 
   // Create and Destroy.
 public:

fetch_pretty.C

@@ -27,24 +27,6 @@
 #include "mathlib.h"
 #include <ostream>
 
-double
-FetchPretty::period_factor (const symbol period, const int hours)
-{ 
-  if (period == "")
-    return 1.0;
-  if (period == "y")
-    return 365.2425 * 24.0 / hours;
-  if (period == "m")
-    return 30.0 * 24.0 / hours;
-  if (period == "w")
-    return 7.0 * 24.0 / hours;
-  if (period == "d")
-    return 24.0 / hours;
-  if (period == "h")
-    return 1.0 / hours;
-  return -42.42e42;
-}
-    
 int 
 FetchPretty::width (const double value)
 {
@@ -71,8 +53,7 @@ FetchPretty::name_size () const
 }
 
 int 
-FetchPretty::value_size (double& total, const symbol period, 
-                         const int hours) const
+FetchPretty::value_size (double& total) const
 {
   double value = 0.0;
   switch (type)
@@ -84,16 +65,15 @@ FetchPretty::value_size (double& total, const symbol period,
       value = (last - initial) * factor;
       break;
     case Flux:
-      value = sum * factor * period_factor (period, hours);
+      value = sum * factor;
       break;
     }
   total += value;
   return width (value);
 }
 
 void 
-FetchPretty::summarize (std::ostream& out, const int width, 
-                        const symbol period, const int hours) const
+FetchPretty::summarize (std::ostream& out, const int width) const
 {
   if (type == Content && add_delta)
     out << "delta ";
@@ -115,15 +95,15 @@ FetchPretty::summarize (std::ostream& out, const int width,
       break;
     case Flux:
       {
-        const double value = sum * factor * period_factor (period, hours);
+        const double value = sum * factor;
         out << value;
       }
       break;
     case Error:
       out << "bogus data";
       break;
     }
-  out << " " << "[" << dimension (period) << "]\n";
+  out << " " << "[" << dimension () << "]\n";
 }
 
 void

fetch_pretty.h

@@ -34,14 +34,12 @@ class FetchPretty : public Fetch
   const bool add_delta;
 
   // Use.
-private:
-  static double period_factor (symbol period, int hours);
 public:
   static int width (double value);
   size_t name_size () const;
-  int value_size (double& total, const symbol period, const int hours) const;
-  void summarize (std::ostream& out, const int width, 
-                  const symbol period, const int hours) const;
+  int value_size (double& total) const;
+  void summarize (std::ostream& out, const int width) const;
+
   // Create and Destroy.
 private:
   using Fetch::clear;