--- trunk/gadget/growthcalc.h 2015/07/23 19:00:38 11 +++ trunk/gadget/growthcalc.h 2015/07/24 18:36:24 12 @@ -27,25 +27,20 @@ * \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 - * \param Lgrowth is the DoubleVector of the mean length increase for each length group of the stock - * \param Wgrowth is the DoubleVector of the mean weight increase for each length group of the stock + * \param Lgrowth is the Matrix of doubles of the mean length increase for each length group of the stock + * \param Wgrowth is the Matrix of doubles of the mean weight increase for each length group of the stock * \param numGrow is the PopInfoVector of the current population of the stock * \param Area is the AreaClass for the current model * \param TimeInfo is the TimeClass for the current model * \param Fphi is the DoubleVector of the feeding level of the stock * \param MaxCon is the DoubleVector of the maximum consumption of the stock * \param LgrpDiv is the LengthGroupDivision of the stock + * \param size is the number of columns of the Matrix * \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, double* Lgrowth, double* Wgrowth, const PopInfoVector& numGrow, const AreaClass* const Area, const TimeClass* const TimeInfo, const DoubleVector& Fphi,