| @@ -38,55 +38,39 @@ |
| def add_soilSlpLgthFctr(self, soilSlopeLengthFactor): |
| self.soilSlopeLengthFactor = float(soilSlopeLengthFactor) |
| |
| - def add_soilLossFolrFctr(self, soilLossFolrFactor): |
| - self.soilLossFolrFactor = float(soilLossFolrFactor) |
| + def add_soilLossTolrFctr(self, soilLossTolrFactor): |
| + self.soilLossTolrFactor = float(soilLossTolrFactor) |
| |
| # water erosion |
| def add_legacyRfactor(self, legacyRfactor): |
| self.legacyRfactor = float(legacyRfactor) |
| |
| - def add_wtrErodFctr(self, waterErosionFactor): |
| - self.waterErosionFactor = float(waterErosionFactor) |
| + def add_wtrErodFctr(self, waterErodFactor): |
| + self.waterErodFactor = float(waterErodFactor) |
| |
| - def eval_legacyWaterErosionValue(self): |
| - self.evaluated_WaterErosionValue = self.legacyRfactor * self.waterErosionFactor * self.soilSlopeLengthFactor / self.soilLossFolrFactor |
| - |
| def add_legacyWtAvgWaterEI(self, legacyWtAvgWaterEI): |
| - self.eval_legacyWaterErosionValue() |
| self.legacyWtAvgWaterEI = float(legacyWtAvgWaterEI) |
| |
| + def eval_legacyWaterErosionValue(self): |
| + self.evaluated_WaterErosionValue = self.legacyRfactor * self.waterErodFactor * self.soilSlopeLengthFactor / self.soilLossTolrFactor |
| if round(self.evaluated_WaterErosionValue,1) != round(self.legacyWtAvgWaterEI,1): |
| - logging.error(f"Inserted value ({self.legacyWtAvgWaterEI}) is \ |
| - different from evaluated ({self.evaluated_WaterErosionValue}) \ |
| - on ({self.multipolygon},{self.latitude},{self.longitude}).") |
| + logging.error(f"WtAvgWaterEI value ({self.WtAvgWaterEI}) is different from evaluated ({self.evaluated_WaterErosionValue}) on ({self.multipolygon},{self.latitude},{self.longitude}).") |
| |
| - |
| - def eval_legacyWaterErosionValue(self): |
| - self.evaluated_WaterErosionValue = self.legacyRfactor * self.waterErosionFactor * self.soilSlopeLengthFactor / self.soilLossFolrFactor |
| - |
| - |
| - def eval_legacyWaterErosionValue(self): |
| - self.evaluated_WaterErosionValue = self.legacyRfactor * self.waterErosionFactor * self.soilSlopeLengthFactor / self.soilLossFolrFactor |
| - |
| # wind erosion |
| def add_legacyCfactor(self, legacyCfactor): |
| self.legacyCfactor = float(legacyCfactor) |
| |
| - def add_windErosionIndex(self, windErosionIndex): |
| - self.windErosionIndex = float(windErosionIndex) |
| + def add_windErodIndex(self, windErosionIndex): |
| + self.windErodIndex = float(windErosionIndex) |
| |
| def eval_legacyWindErosionValue(self): |
| - self.evaluated_WindErosionValue = self.legacyCfactor * self.windErosionIndex / self.soilLossFolrFactor |
| + self.evaluated_WindErosionValue = self.legacyCfactor * self.windErodIndex / self.soilLossTolrFactor |
| + if round(self.evaluated_WindErosionValue,1) != round(self.legacyWtAvgWindEI,1): |
| + logging.error(f"WtAvgWindEI value ({self.WtAvgWindEI}) is different from evaluated ({self.evaluated_WindErosionValue}) on ({self.multipolygon},{self.latitude},{self.longitude}).") |
| |
| def add_legacyWtAvgWindEI(self, legacyWtAvgWindEI): |
| - self.eval_legacyWindErosionValue() |
| self.legacyWtAvgWindEI = float(legacyWtAvgWindEI) |
| |
| - if round(self.evaluated_WindErosionValue,1) != round(self.legacyWtAvgWindEI,1): |
| - logging.error(f"Inserted value ({self.windErosionIndex}) is \ |
| - different from evaluated ({self.evaluated_WindErosionValue}) \ |
| - on ({self.multipolygon},{self.latitude},{self.longitude}).") |
| - |
| def write_header_line(self): |
| return ['latitude', \ |
| 'longitude', \ |
| @@ -96,16 +80,16 @@ |
| 'WtAvgTotalSoilLoss', \ |
| 'WtAvgWaterEI', \ |
| 'WtAvgWindEI', \ |
| - 'legacy_soil_slope', \ |
| - 'legacy_soil_loss', \ |
| - 'legacy_R_fct', \ |
| - 'legacy_WaterEI', \ |
| - 'legacy_WtAvgWaterEI', \ |
| - 'eval_legacy_WtAvgWaterEI', \ |
| - 'legacy_C_fct', \ |
| - 'legacy_WindEI', \ |
| - 'eval_legacy_WtAvgWindEI', \ |
| - 'legacy_WtAvgWindEI'] |
| + 'soil_slp_lgth_fctr', \ |
| + 'soil_loss_tolr_fctr', \ |
| + 'RNFL_FCTR', \ |
| + 'wtr_erod_fctr', \ |
| + 'legacy_Water_EI', \ |
| + 'eval_legacy_Water_EI', \ |
| + 'CLMT_FCTR', \ |
| + 'wind_erod_idx', \ |
| + 'legacy_WtAvgWindEI', \ |
| + 'eval_legacy_Wind_EI'] |
| |
| def write_results_line(self): |
| return [self.latitude, \ |
| @@ -117,15 +101,15 @@ |
| self.WtAvgWaterEI, \ |
| self.WtAvgWindEI, \ |
| self.soilSlopeLengthFactor, \ |
| - self.soilLossFolrFactor, \ |
| + self.soilLossTolrFactor, \ |
| self.legacyRfactor, \ |
| - self.waterErosionFactor, \ |
| + self.waterErodFactor, \ |
| self.legacyWtAvgWaterEI, \ |
| self.evaluated_WaterErosionValue, \ |
| self.legacyCfactor, \ |
| - self.windErosionIndex, \ |
| - self.evaluated_WindErosionValue, \ |
| - self.legacyWtAvgWindEI] |
| + self.windErodIndex, \ |
| + self.legacyWtAvgWindEI, \ |
| + self.evaluated_WindErosionValue] |
| |
| class MaxAttemptsException(Exception): |
| pass |
| @@ -213,7 +197,7 @@ |
| soil_slope = [el['value'] for el in legacy_arr if el['name']=='soil_slp_lgth_fctr'][0] |
| soil_loss = [el['value'] for el in legacy_arr if el['name']=='soil_loss_tolr_fctr'][0] |
| c_res.add_soilSlpLgthFctr(soil_slope) |
| - c_res.add_soilLossFolrFctr(soil_loss) |
| + c_res.add_soilLossTolrFctr(soil_loss) |
| |
| legacy_r_factor = [el['value'] for el in legacy_arr if el['name']=='legacy_r_factor'][0] |
| legacy_waterEI = [el['value'] for el in legacy_arr if el['name']=='wtr_erod_fctr'][0] |
| @@ -221,13 +205,15 @@ |
| c_res.add_wtrErodFctr(legacy_waterEI) |
| water_erosion_value = [el['value'] for el in legacy_arr if el['name']=='water_erosion'][0] |
| c_res.add_legacyWtAvgWaterEI(water_erosion_value) |
| + c_res.eval_legacyWaterErosionValue() |
| |
| legacy_c_factor = [el['value'] for el in legacy_arr if el['name']=='legacy_c_factor'][0] |
| legacy_windEI = [el['value'] for el in legacy_arr if el['name']=='wind_erod_idx'][0] |
| c_res.add_legacyCfactor(legacy_c_factor) |
| - c_res.add_windErosionIndex(legacy_windEI) |
| + c_res.add_windErodIndex(legacy_windEI) |
| wind_erosion_value = [el['value'] for el in legacy_arr if el['name']=='wind_erosion'][0] |
| c_res.add_legacyWtAvgWindEI(wind_erosion_value) |
| + c_res.eval_legacyWindErosionValue() |
| |
| results.append(c_res) |
| logging.info("List of results length: " + str(len(results))) |