--- trunk/gadget/growthcalc.h	2015/04/29 12:55:30	2
+++ trunk/gadget/growthcalc.h	2015/04/30 17:32:47	4
@@ -27,6 +27,7 @@
    * \brief This is the default GrowthCalcBase destructor
    */
   ~GrowthCalcBase() {};
+  //FIXME doc
   /**
    * \brief This is the function that calculates the growth
    * \param area is the area that the growth is being calculated on
@@ -40,10 +41,10 @@
    * \param LgrpDiv is the LengthGroupDivision of the stock
    * \note This will be overridden by the derived classes that actually calculate the growth
    */
-  virtual void calcGrowth(int area, DoubleVector& Lgrowth, DoubleVector& Wgrowth,
-    const PopInfoVector& numGrow, const AreaClass* const Area,
-    const TimeClass* const TimeInfo, const DoubleVector& Fphi,
-    const DoubleVector& MaxCon, const LengthGroupDivision* const LgrpDiv) = 0;
+//  virtual void calcGrowth(int area, DoubleVector& Lgrowth, DoubleVector& Wgrowth,
+//    const PopInfoVector& numGrow, const AreaClass* const Area,
+//    const TimeClass* const TimeInfo, const DoubleVector& Fphi,
+//    const DoubleVector& MaxCon, const LengthGroupDivision* const LgrpDiv) = 0;
 
   virtual void calcGrowth(int area, double* Lgrowth, double* Wgrowth,
       const PopInfoVector& numGrow, const AreaClass* const Area,
@@ -92,15 +93,15 @@
    * \param MaxCon is the DoubleVector of the maximum consumption of the stock
    * \param LgrpDiv is the LengthGroupDivision of the stock
    */
-  virtual void calcGrowth(int area, DoubleVector& Lgrowth, DoubleVector& Wgrowth,
-    const PopInfoVector& numGrow, const AreaClass* const Area,
-    const TimeClass* const TimeInfo, const DoubleVector& Fphi,
-    const DoubleVector& MaxCon, const LengthGroupDivision* const LgrpDiv);
+//  virtual void calcGrowth(int area, DoubleVector& Lgrowth, DoubleVector& Wgrowth,
+//    const PopInfoVector& numGrow, const AreaClass* const Area,
+//    const TimeClass* const TimeInfo, const DoubleVector& Fphi,
+//    const DoubleVector& MaxCon, const LengthGroupDivision* const LgrpDiv);
 
   virtual void calcGrowth(int area, double* Lgrowth, double* Wgrowth,
           const PopInfoVector& numGrow, const AreaClass* const Area,
           const TimeClass* const TimeInfo, const DoubleVector& Fphi,
-          const DoubleVector& MaxCon, const LengthGroupDivision* const LgrpDiv, int size) {};
+          const DoubleVector& MaxCon, const LengthGroupDivision* const LgrpDiv, int size);
 protected:
   /**
    * \brief This is the number of growth parameters (set to 9)
@@ -145,15 +146,15 @@
    * \param MaxCon is the DoubleVector of the maximum consumption of the stock
    * \param LgrpDiv is the LengthGroupDivision of the stock
    */
-  virtual void calcGrowth(int area, DoubleVector& Lgrowth, DoubleVector& Wgrowth,
-    const PopInfoVector& numGrow, const AreaClass* const Area,
-    const TimeClass* const TimeInfo, const DoubleVector& Fphi,
-    const DoubleVector& MaxCon, const LengthGroupDivision* const LgrpDiv);
+//  virtual void calcGrowth(int area, DoubleVector& Lgrowth, DoubleVector& Wgrowth,
+//    const PopInfoVector& numGrow, const AreaClass* const Area,
+//    const TimeClass* const TimeInfo, const DoubleVector& Fphi,
+//    const DoubleVector& MaxCon, const LengthGroupDivision* const LgrpDiv);
 
   virtual void calcGrowth(int area, double* Lgrowth, double* Wgrowth,
           const PopInfoVector& numGrow, const AreaClass* const Area,
           const TimeClass* const TimeInfo, const DoubleVector& Fphi,
-          const DoubleVector& MaxCon, const LengthGroupDivision* const LgrpDiv, int size) {};
+          const DoubleVector& MaxCon, const LengthGroupDivision* const LgrpDiv, int size);
 protected:
   /**
    * \brief This is the FormulaMatrixPtrVector of increase in length for each length group
@@ -198,15 +199,15 @@
    * \param MaxCon is the DoubleVector of the maximum consumption of the stock
    * \param LgrpDiv is the LengthGroupDivision of the stock
    */
-  virtual void calcGrowth(int area, DoubleVector& Lgrowth, DoubleVector& Wgrowth,
-    const PopInfoVector& numGrow, const AreaClass* const Area,
-    const TimeClass* const TimeInfo, const DoubleVector& Fphi,
-    const DoubleVector& MaxCon, const LengthGroupDivision* const LgrpDiv);
+//  virtual void calcGrowth(int area, DoubleVector& Lgrowth, DoubleVector& Wgrowth,
+//    const PopInfoVector& numGrow, const AreaClass* const Area,
+//    const TimeClass* const TimeInfo, const DoubleVector& Fphi,
+//    const DoubleVector& MaxCon, const LengthGroupDivision* const LgrpDiv);
 
   virtual void calcGrowth(int area, double* Lgrowth, double* Wgrowth,
           const PopInfoVector& numGrow, const AreaClass* const Area,
           const TimeClass* const TimeInfo, const DoubleVector& Fphi,
-          const DoubleVector& MaxCon, const LengthGroupDivision* const LgrpDiv, int size) {};
+          const DoubleVector& MaxCon, const LengthGroupDivision* const LgrpDiv, int size);
   /**
    * \brief This will return the power term of the length - weight relationship
    * \return lgrowthPar[7]
@@ -273,15 +274,15 @@
    * \param MaxCon is the DoubleVector of the maximum consumption of the stock
    * \param LgrpDiv is the LengthGroupDivision of the stock
    */
-  virtual void calcGrowth(int area, DoubleVector& Lgrowth, DoubleVector& Wgrowth,
-    const PopInfoVector& numGrow, const AreaClass* const Area,
-    const TimeClass* const TimeInfo, const DoubleVector& Fphi,
-    const DoubleVector& MaxCon, const LengthGroupDivision* const LgrpDiv);
+//  virtual void calcGrowth(int area, DoubleVector& Lgrowth, DoubleVector& Wgrowth,
+//    const PopInfoVector& numGrow, const AreaClass* const Area,
+//    const TimeClass* const TimeInfo, const DoubleVector& Fphi,
+//    const DoubleVector& MaxCon, const LengthGroupDivision* const LgrpDiv);
 
   virtual void calcGrowth(int area, double* Lgrowth, double* Wgrowth,
           const PopInfoVector& numGrow, const AreaClass* const Area,
           const TimeClass* const TimeInfo, const DoubleVector& Fphi,
-          const DoubleVector& MaxCon, const LengthGroupDivision* const LgrpDiv, int size) {};
+          const DoubleVector& MaxCon, const LengthGroupDivision* const LgrpDiv, int size);
   /**
    * \brief This will return the power term of the length - weight relationship
    * \return lgrowthPar[7]
@@ -348,15 +349,15 @@
    * \param MaxCon is the DoubleVector of the maximum consumption of the stock
    * \param LgrpDiv is the LengthGroupDivision of the stock
    */
-  virtual void calcGrowth(int area, DoubleVector& Lgrowth, DoubleVector& Wgrowth,
-    const PopInfoVector& numGrow, const AreaClass* const Area,
-    const TimeClass* const TimeInfo, const DoubleVector& Fphi,
-    const DoubleVector& MaxCon, const LengthGroupDivision* const LgrpDiv);
+//  virtual void calcGrowth(int area, DoubleVector& Lgrowth, DoubleVector& Wgrowth,
+//    const PopInfoVector& numGrow, const AreaClass* const Area,
+//    const TimeClass* const TimeInfo, const DoubleVector& Fphi,
+//    const DoubleVector& MaxCon, const LengthGroupDivision* const LgrpDiv);
 
   virtual void calcGrowth(int area, double* Lgrowth, double* Wgrowth,
           const PopInfoVector& numGrow, const AreaClass* const Area,
           const TimeClass* const TimeInfo, const DoubleVector& Fphi,
-          const DoubleVector& MaxCon, const LengthGroupDivision* const LgrpDiv, int size) {};
+          const DoubleVector& MaxCon, const LengthGroupDivision* const LgrpDiv, int size);
   /**
    * \brief This will return the power term of the length - weight relationship
    * \return lgrowthPar[7]
@@ -435,15 +436,15 @@
    * \param MaxCon is the DoubleVector of the maximum consumption of the stock
    * \param LgrpDiv is the LengthGroupDivision of the stock
    */
-  virtual void calcGrowth(int area, DoubleVector& Lgrowth, DoubleVector& Wgrowth,
-    const PopInfoVector& numGrow, const AreaClass* const Area,
-    const TimeClass* const TimeInfo, const DoubleVector& Fphi,
-    const DoubleVector& MaxCon, const LengthGroupDivision* const LgrpDiv);
+//  virtual void calcGrowth(int area, DoubleVector& Lgrowth, DoubleVector& Wgrowth,
+//    const PopInfoVector& numGrow, const AreaClass* const Area,
+//    const TimeClass* const TimeInfo, const DoubleVector& Fphi,
+//    const DoubleVector& MaxCon, const LengthGroupDivision* const LgrpDiv);
 
   virtual void calcGrowth(int area, double* Lgrowth, double* Wgrowth,
           const PopInfoVector& numGrow, const AreaClass* const Area,
           const TimeClass* const TimeInfo, const DoubleVector& Fphi,
-          const DoubleVector& MaxCon, const LengthGroupDivision* const LgrpDiv, int size) {};
+          const DoubleVector& MaxCon, const LengthGroupDivision* const LgrpDiv, int size);
 protected:
   /**
    * \brief This is the number of growth parameters (set to 2)
@@ -492,15 +493,15 @@
    * \param MaxCon is the DoubleVector of the maximum consumption of the stock
    * \param LgrpDiv is the LengthGroupDivision of the stock
    */
-  virtual void calcGrowth(int area, DoubleVector& Lgrowth, DoubleVector& Wgrowth,
-    const PopInfoVector& numGrow, const AreaClass* const Area,
-    const TimeClass* const TimeInfo, const DoubleVector& Fphi,
-    const DoubleVector& MaxCon, const LengthGroupDivision* const LgrpDiv);
+//  virtual void calcGrowth(int area, DoubleVector& Lgrowth, DoubleVector& Wgrowth,
+//    const PopInfoVector& numGrow, const AreaClass* const Area,
+//    const TimeClass* const TimeInfo, const DoubleVector& Fphi,
+//    const DoubleVector& MaxCon, const LengthGroupDivision* const LgrpDiv);
 
   virtual void calcGrowth(int area, double* Lgrowth, double* Wgrowth,
           const PopInfoVector& numGrow, const AreaClass* const Area,
           const TimeClass* const TimeInfo, const DoubleVector& Fphi,
-          const DoubleVector& MaxCon, const LengthGroupDivision* const LgrpDiv, int size) {};
+          const DoubleVector& MaxCon, const LengthGroupDivision* const LgrpDiv, int size);
 protected:
   /**
    * \brief This is the number of growth parameters (set to 2)
@@ -547,10 +548,10 @@
    * \param MaxCon is the DoubleVector of the maximum consumption of the stock
    * \param LgrpDiv is the LengthGroupDivision of the stock
    */
-  virtual void calcGrowth(int area, DoubleVector& Lgrowth, DoubleVector& Wgrowth,
-    const PopInfoVector& numGrow, const AreaClass* const Area,
-    const TimeClass* const TimeInfo, const DoubleVector& Fphi,
-    const DoubleVector& MaxCon, const LengthGroupDivision* const LgrpDiv);
+//  virtual void calcGrowth(int area, DoubleVector& Lgrowth, DoubleVector& Wgrowth,
+//    const PopInfoVector& numGrow, const AreaClass* const Area,
+//    const TimeClass* const TimeInfo, const DoubleVector& Fphi,
+//    const DoubleVector& MaxCon, const LengthGroupDivision* const LgrpDiv);
 
 
   virtual void calcGrowth(int area, double* Lgrowth, double* Wgrowth,
@@ -610,15 +611,15 @@
    * \param MaxCon is the DoubleVector of the maximum consumption of the stock
    * \param LgrpDiv is the LengthGroupDivision of the stock
    */
-  virtual void calcGrowth(int area, DoubleVector& Lgrowth, DoubleVector& Wgrowth,
-    const PopInfoVector& numGrow, const AreaClass* const Area,
-    const TimeClass* const TimeInfo, const DoubleVector& Fphi,
-    const DoubleVector& MaxCon, const LengthGroupDivision* const LgrpDiv);
+//  virtual void calcGrowth(int area, DoubleVector& Lgrowth, DoubleVector& Wgrowth,
+//    const PopInfoVector& numGrow, const AreaClass* const Area,
+//    const TimeClass* const TimeInfo, const DoubleVector& Fphi,
+//    const DoubleVector& MaxCon, const LengthGroupDivision* const LgrpDiv);
 
   virtual void calcGrowth(int area, double* Lgrowth, double* Wgrowth,
         const PopInfoVector& numGrow, const AreaClass* const Area,
         const TimeClass* const TimeInfo, const DoubleVector& Fphi,
-        const DoubleVector& MaxCon, const LengthGroupDivision* const LgrpDiv, int size) {};
+        const DoubleVector& MaxCon, const LengthGroupDivision* const LgrpDiv, int size);
   /**
    * \brief This will return the power term of the length - weight relationship
    * \return growthPar[4]
@@ -671,16 +672,16 @@
    * \param MaxCon is the DoubleVector of the maximum consumption of the stock
    * \param LgrpDiv is the LengthGroupDivision of the stock
    */
-  virtual void calcGrowth(int area, DoubleVector& Lgrowth, DoubleVector& Wgrowth,
-    const PopInfoVector& numGrow, const AreaClass* const Area,
-    const TimeClass* const TimeInfo, const DoubleVector& Fphi,
-    const DoubleVector& MaxCon, const LengthGroupDivision* const LgrpDiv);
+//  virtual void calcGrowth(int area, DoubleVector& Lgrowth, DoubleVector& Wgrowth,
+//    const PopInfoVector& numGrow, const AreaClass* const Area,
+//    const TimeClass* const TimeInfo, const DoubleVector& Fphi,
+//    const DoubleVector& MaxCon, const LengthGroupDivision* const LgrpDiv);
 
 
   virtual void calcGrowth(int area, double* Lgrowth, double* Wgrowth,
           const PopInfoVector& numGrow, const AreaClass* const Area,
           const TimeClass* const TimeInfo, const DoubleVector& Fphi,
-          const DoubleVector& MaxCon, const LengthGroupDivision* const LgrpDiv, int size) {};
+          const DoubleVector& MaxCon, const LengthGroupDivision* const LgrpDiv, int size);
   /**
    * \brief This will return the power term of the length - weight relationship
    * \return growthPar[4]
@@ -733,15 +734,15 @@
    * \param MaxCon is the DoubleVector of the maximum consumption of the stock
    * \param LgrpDiv is the LengthGroupDivision of the stock
    */
-  virtual void calcGrowth(int area, DoubleVector& Lgrowth, DoubleVector& Wgrowth,
-    const PopInfoVector& numGrow, const AreaClass* const Area,
-    const TimeClass* const TimeInfo, const DoubleVector& Fphi,
-    const DoubleVector& MaxCon, const LengthGroupDivision* const LgrpDiv);
+//  virtual void calcGrowth(int area, DoubleVector& Lgrowth, DoubleVector& Wgrowth,
+//    const PopInfoVector& numGrow, const AreaClass* const Area,
+//    const TimeClass* const TimeInfo, const DoubleVector& Fphi,
+//    const DoubleVector& MaxCon, const LengthGroupDivision* const LgrpDiv);
 
   virtual void calcGrowth(int area, double* Lgrowth, double* Wgrowth,
           const PopInfoVector& numGrow, const AreaClass* const Area,
           const TimeClass* const TimeInfo, const DoubleVector& Fphi,
-          const DoubleVector& MaxCon, const LengthGroupDivision* const LgrpDiv, int size) {};
+          const DoubleVector& MaxCon, const LengthGroupDivision* const LgrpDiv, int size);
   /**
    * \brief This will return the power term of the length - weight relationship
    * \return growthPar[4]