Rev 1157 | Rev 1162 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 1157 | Rev 1159 | ||
|---|---|---|---|
| Line 52... | Line 52... | ||
| 52 | delete mSnag; |
52 | delete mSnag; |
| 53 | if (mSoil) |
53 | if (mSoil) |
| 54 | delete mSoil; |
54 | delete mSoil; |
| 55 | 55 | ||
| 56 | qDeleteAll(mRUSpecies); |
56 | qDeleteAll(mRUSpecies); |
| - | 57 | ||
| - | 58 | if (mSaplings) |
|
| - | 59 | delete[] mSaplings; |
|
| 57 | 60 | ||
| 58 | mSnag = 0; |
61 | mSnag = 0; |
| 59 | mSoil = 0; |
62 | mSoil = 0; |
| - | 63 | mSaplings = 0; |
|
| 60 | }
|
64 | }
|
| 61 | 65 | ||
| 62 | ResourceUnit::ResourceUnit(const int index) |
66 | ResourceUnit::ResourceUnit(const int index) |
| 63 | {
|
67 | {
|
| 64 | qDeleteAll(mRUSpecies); |
68 | qDeleteAll(mRUSpecies); |
| Line 77... | Line 81... | ||
| 77 | mSaplingHeightMap = 0; |
81 | mSaplingHeightMap = 0; |
| 78 | mEffectiveArea_perWLA = 0.; |
82 | mEffectiveArea_perWLA = 0.; |
| 79 | mWater = new WaterCycle(); |
83 | mWater = new WaterCycle(); |
| 80 | mSnag = 0; |
84 | mSnag = 0; |
| 81 | mSoil = 0; |
85 | mSoil = 0; |
| - | 86 | mSaplings = 0; |
|
| 82 | mID = 0; |
87 | mID = 0; |
| 83 | }
|
88 | }
|
| 84 | 89 | ||
| 85 | void ResourceUnit::setup() |
90 | void ResourceUnit::setup() |
| 86 | {
|
91 | {
|
| Line 104... | Line 109... | ||
| 104 | xml.valueDouble("model.site.youngLabileDecompRate", -1)), |
109 | xml.valueDouble("model.site.youngLabileDecompRate", -1)), |
| 105 | CNPool(xml.valueDouble("model.site.youngRefractoryC", -1), |
110 | CNPool(xml.valueDouble("model.site.youngRefractoryC", -1), |
| 106 | xml.valueDouble("model.site.youngRefractoryN", -1), |
111 | xml.valueDouble("model.site.youngRefractoryN", -1), |
| 107 | xml.valueDouble("model.site.youngRefractoryDecompRate", -1)), |
112 | xml.valueDouble("model.site.youngRefractoryDecompRate", -1)), |
| 108 | CNPair(xml.valueDouble("model.site.somC", -1), xml.valueDouble("model.site.somN", -1))); |
113 | CNPair(xml.valueDouble("model.site.somC", -1), xml.valueDouble("model.site.somN", -1))); |
| - | 114 | }
|
|
| - | 115 | ||
| - | 116 | if (mSaplings) |
|
| - | 117 | delete mSaplings; |
|
| - | 118 | if (Model::settings().regenerationEnabled) { |
|
| - | 119 | mSaplings = new SaplingCell[cPxPerHectare]; |
|
| 109 | }
|
120 | }
|
| 110 | 121 | ||
| 111 | // setup variables
|
122 | // setup variables
|
| 112 | mUnitVariables.nitrogenAvailable = GlobalSettings::instance()->settings().valueDouble("model.site.availableNitrogen", 40); |
123 | mUnitVariables.nitrogenAvailable = GlobalSettings::instance()->settings().valueDouble("model.site.availableNitrogen", 40); |
| 113 | 124 | ||