src/java/bin/win-x86/rusle2_report.py
| @@ -31,12 +31,18 @@ |
| 'SLOPE_ENERGY_USE_PER_AREA','SLOPE_EQUIV_DIESEL_USE_PER_AREA','SLOPE_EROD_FRAC_SOIL_LOSS','SLOPE_FUEL_COST_PER_AREA','SLOPE_HORIZ','SLOPE_HYPOT', |
| 'SLOPE_RES_BURIAL_LEVEL','SLOPE_STEEP','SLOPE_T_VALUE','SLOPE_YIELD_LEVEL','SOIL_LAYER','SOIL_PTR','STRIP_BARRIER_SYSTEM_PTR', |
| 'SEG_SIM_DAY_CANOPY_COVER','SEG_SIM_DAY_PERENN_VEG_LIVE_HEIGHT','SLOPE_SIM_DAY_DEGRAD'] |
| +seg_params=['SEG_SIM_DAY_COVER_MASS_SUM','SEG_SIM_DAY_NET_SURF_COV','SEG_SIM_DAY_LIVE_BIOMASS','SEG_SIM_DAY_CANOPY_COVER','SEG_SIM_DAY_STAND_MASS_SUM'] |
| +seg_param_attr_for_size='SLOPE_SIM_DAY_DEGRAD' |
| print('--------------------------------------------------------------------------------') |
| print('RUSLE2 REPORT') |
| print('--------------------------------------------------------------------------------') |
| for i in range (len(params)): |
| param = params[i] |
| - paramsize = RomeFileGetAttrSize(profile,param) |
| + paramsize = -1 |
| + if param in seg_params: |
| + paramsize = RomeFileGetAttrSize(profile, seg_param_attr_for_size) |
| + else: |
| + paramsize = RomeFileGetAttrSize(profile,param) |
| if paramsize > 1: |
| text = '[' |
| for x in range (paramsize): |
web/META-INF/csip-conf.json
| @@ -1,5 +1,5 @@ |
| { |
| - "csip-erosion.version": "$version: 0.2.69 cd5b9d1cc229 2016-05-20 wlloyd@titan, built at 2016-05-25 14:29 by wlloyd$", |
| + "csip-erosion.version": "$version: 0.2.70 6c58aa89e27b 2016-05-25 wlloyd@titan, built at 2016-06-14 11:55 by wlloyd$", |
| "weps.version" : "1.3.9", |
| "lmod.db": "jdbc:sqlserver:\/\/129.82.20.242:1433;databaseName=lmod_zedx;user=lmod-rw;password=managements", |
| "conservation_resources.db": "jdbc:sqlserver://129.82.20.241:1433;databaseName=conservation_resources;user=sa;password=csurams#1", |