Log In | Get Help   
Home My Page Projects Code Snippets Project Openings Mareframe
Summary Activity Forums Tracker Lists Tasks Docs Surveys News SCM Files
[mareframe] Diff of /trunk/gadget/grower.h
[mareframe] / trunk / gadget / grower.h Repository:
ViewVC logotype

Diff of /trunk/gadget/grower.h

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2, Wed Apr 29 12:55:30 2015 UTC revision 4, Thu Apr 30 17:32:47 2015 UTC
# Line 93  Line 93 
93     * \return lgrowth, a DoubleMatrix containing the length increase     * \return lgrowth, a DoubleMatrix containing the length increase
94     */     */
95  //  const DoubleMatrix& getLengthIncrease(int area) const { return *lgrowth[this->areaNum(area)]; };  //  const DoubleMatrix& getLengthIncrease(int area) const { return *lgrowth[this->areaNum(area)]; };
96    const Matrix& getLengthIncrease_(int area) const { return *_lgrowth; };    const Matrix& getLengthIncrease(int area) const { return *lgrowth; };
97    /**    /**
98     * \brief This function will return the calculated weight increase due to growth on an area     * \brief This function will return the calculated weight increase due to growth on an area
99     * \param area is the area that the growth is being calculated on     * \param area is the area that the growth is being calculated on
100     * \return wgrowth, a DoubleMatrix containing the weight increase     * \return wgrowth, a DoubleMatrix containing the weight increase
101     */     */
102  //  const DoubleMatrix& getWeightIncrease(int area) const { return *wgrowth[this->areaNum(area)]; };  //  const DoubleMatrix& getWeightIncrease(int area) const { return *wgrowth[this->areaNum(area)]; };
103    const Matrix& getWeightIncrease_(int area) const { return *_wgrowth; };    const Matrix& getWeightIncrease(int area) const { return *wgrowth; };
104    /**    /**
105     * \brief This function will return the fixed weight increase due to growth on an area     * \brief This function will return the fixed weight increase due to growth on an area
106     * \param area is the area that the growth is being calculated on     * \param area is the area that the growth is being calculated on
# Line 122  Line 122 
122     */     */
123    LengthGroupDivision* LgrpDiv;    LengthGroupDivision* LgrpDiv;
124    
125    //FIXME    //FIXME doc
126    double * meanlength_vectorPow;    double * meanlength_vectorPow;
   
127    int vector_OK;    int vector_OK;
128    
129    /**    /**
# Line 141  Line 140 
140     * \note The indices for this object are [area][stock length]     * \note The indices for this object are [area][stock length]
141     */     */
142    DoubleMatrix interpWeightGrowth;    DoubleMatrix interpWeightGrowth;
143      //FIXME doc
144    /**    /**
145     * \brief This is the DoubleMatrix used to store the calculated increase in length on the current timestep     * \brief This is the DoubleMatrix used to store the calculated increase in length on the current timestep
146     * \note The indices for this object are [area][length]     * \note The indices for this object are [area][length]
147     */     */
148  //  DoubleMatrix calcLengthGrowth;  //  DoubleMatrix calcLengthGrowth;
149    Matrix _calcLengthGrowth;    Matrix calcLengthGrowth;
150      //FIXME doc
151    /**    /**
152     * \brief This is the DoubleMatrix used to store the calculated increase in weight on the current timestep     * \brief This is the DoubleMatrix used to store the calculated increase in weight on the current timestep
153     * \note The indices for this object are [area][length]     * \note The indices for this object are [area][length]
154     */     */
155  //  DoubleMatrix calcWeightGrowth;  //  DoubleMatrix calcWeightGrowth;
156    Matrix _calcWeightGrowth;    Matrix calcWeightGrowth;
157    /**    /**
158     * \brief This is the DoubleMatrixPtrVector used to store the calculated increase in length for each length group on the current timestep     * \brief This is the DoubleMatrixPtrVector used to store the calculated increase in length for each length group on the current timestep
159     * \note The indices for this object are [area][change in length][stock length]     * \note The indices for this object are [area][change in length][stock length]
160     */     */
161  //  DoubleMatrixPtrVector lgrowth;  //  DoubleMatrixPtrVector lgrowth;
162    Matrix* _lgrowth;    Matrix* lgrowth;
163    /**    /**
164     * \brief This is the DoubleMatrixPtrVector used to store the calculated increase in weight for each length group on the current timestep     * \brief This is the DoubleMatrixPtrVector used to store the calculated increase in weight for each length group on the current timestep
165     * \note The indices for this object are [area][change in length][stock length]     * \note The indices for this object are [area][change in length][stock length]
166     */     */
167  //  DoubleMatrixPtrVector wgrowth;  //  DoubleMatrixPtrVector wgrowth;
168    Matrix* _wgrowth;    Matrix* wgrowth;
169    /**    /**
170     * \brief This is the dummy DoubleVector used during the growth calculation     * \brief This is the dummy DoubleVector used during the growth calculation
171     * \note The values of this vector are set to zero, and never used, unless the growth function depends on the feeding level of the stock (ie. growth is based on consumption of preys)     * \note The values of this vector are set to zero, and never used, unless the growth function depends on the feeding level of the stock (ie. growth is based on consumption of preys)
Legend:
Removed from v.2  
changed lines
  Added in v.4
root@forge.cesga.es
 ViewVC Help
Powered by ViewVC 1.0.0  

Powered By FusionForge