Skip to content

Commit

Permalink
Merge pull request #172 from ucdavis/KL/updateText
Browse files Browse the repository at this point in the history 
Update app name, assumptions, and key references
  • Loading branch information
@kaiyanl
kaiyanl authored Nov 18, 2021
2 parents 0a35177 + 18cc10f commit a7ae98b
Show file tree
Hide file tree
Showing 5 changed files with 93 additions and 59 deletions.
3 changes: 1 addition & 2 deletions src/components/Inputs/Frcs/FrcsInputsContainer.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ export const FrcsInputsContainer = (props: Props) => {
));
return (
<div className='cardcontents'>
<h4>Forestry and Conversion</h4>
<Form>
<FormGroup>
<Label>Forest Treatment</Label>
Expand Down Expand Up @@ -60,7 +59,7 @@ export const FrcsInputsContainer = (props: Props) => {
</FormText>
</FormGroup>
<FormGroup>
<Label>FRCS System</Label>
<Label>Harvesting System</Label>
<Input
type='select'
value={props.inputs.system}
Expand Down
2 changes: 1 addition & 1 deletion src/components/Inputs/InputContainer.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ export const InputContainer = (props: Props) => {
return (
<>
<div className='cardheader'>
<h4>CEC DSS</h4>
<h4>Forest Resource and Renewable Energy Decision Support System (FRREDSS)</h4>
<h2>Select Inputs</h2>
</div>
<div className='cardcontents'>
Expand Down
94 changes: 61 additions & 33 deletions src/components/Results/AssumptionsAndReferences.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,81 +8,101 @@ export const AssumptionsAndReferences = () => {
<Table responsive bordered hover>
<thead>
<tr>
<th colSpan={2}>Assumptions</th>
<th>Assumptions</th>
<td>Unit</td>
<td>Quantity</td>
</tr>
</thead>
<tbody>
<tr>
<td>Log Length, ft</td>
<td>Log length</td>
<td>feet</td>
<td>32</td>
</tr>
<tr>
<td>Loa dWeight, green tons (logs)</td>
<td>Load weight (logs)</td>
<td>green tons</td>
<td>25</td>
</tr>
<tr>
<td>Load Weight, green tons (chips)</td>
<td>Load weight (chips)</td>
<td>green tons</td>
<td>25</td>
</tr>
<tr>
<td>CTL Trail Spacing, ft</td>
<td>CTL trail spacing</td>
<td>feet</td>
<td>50</td>
</tr>
<tr>
<td>Hardwood Cost Premium, fraction</td>
<td>0.2</td>
<td>Hardwood cost premium, fraction</td>
<td></td>
<td>20%</td>
</tr>
<tr>
<td>Residue Recovery Fraction for WT systems</td>
<td>0.8</td>
<td>Residue recovery fraction for WT systems</td>
<td></td>
<td>80%</td>
</tr>
<tr>
<td>Residue Recovery Fraction for CTL</td>
<td>0.5</td>
<td>Residue recovery fraction for CTL systems</td>
<td></td>
<td>50%</td>
</tr>
<tr>
<td>Hardwood Fraction CT</td>
<td>0.2</td>
<td>Hardwood fraction of chip trees</td>
<td></td>
<td>20%</td>
</tr>
<tr>
<td>Hardwood Fraction SLT</td>
<td>0</td>
<td>Hardwood fraction of small log trees</td>
<td></td>
<td>0%</td>
</tr>
<tr>
<td>Hardwood Fraction LLT</td>
<td>0</td>
<td>Hardwood fraction of large log trees</td>
<td></td>
<td>0%</td>
</tr>
<tr>
<td>Feller/Bucker wage (2019)</td>
<td>30.96</td>
<td>Feller/Bucker wage (2020)</td>
<td>$/hour</td>
<td>35.13</td>
</tr>
<tr>
<td>All Others wage (2019)</td>
<td>22.26</td>
<td>All Others wage (2020)</td>
<td>$/hour</td>
<td>22.07</td>
</tr>
<tr>
<td>Benefits and other payroll costsT</td>
<td>Logging worker benefits and overhead</td>
<td></td>
<td>35%</td>
</tr>
<tr>
<td>OIL_ETC_COST ($/mile)</td>
<td>Truck oil cost</td>
<td>$/mile</td>
<td>0.35</td>
</tr>
<tr>
<td>DRIVERS_PER_TRUCK </td>
<td>1.67</td>
<td>Truck driver benefits and overhead</td>
<td></td>
<td>67%</td>
</tr>
<tr>
<td>MILES_PER_GALLON</td>
<td>Truck fuel consumption rate</td>
<td>miles/gallon</td>
<td>6</td>
</tr>
<tr>
<td>FUEL_COST ($/gallon)</td>
<td>3.251</td>
<td>Truck driver wage (2020)</td>
<td>$/hour</td>
<td>22.66</td>
</tr>
<tr>
<td>TRUCK_LABOR ($/hr)</td>
<td>23.29</td>
<td>Truck payload capacity</td>
<td>green tons</td>
<td>25</td>
</tr>
</tbody>
</Table>
Expand All @@ -108,13 +128,21 @@ export const AssumptionsAndReferences = () => {
<td>California Biomass Collaborative</td>
</tr>
<tr>
<td>EPA eGrid</td>
<td>
Emissions and Generation Resource Integrated Database (eGRID)
</td>
</tr>
<tr>
<td>
The Greenhouse gases, Regulated Emissions, and Energy use in
Technologies Model (GREET 2021)
</td>
</tr>
<tr>
<td>GREET model </td>
<td>CA-GREET3.0 Model</td>
</tr>
<tr>
<td>Literature for emission factors</td>
<td>California Air Resources Board Emission Factor (EMFAC 2021)</td>
</tr>
</tbody>
</Table>
Expand Down
2 changes: 1 addition & 1 deletion src/components/Results/ResultsContainer.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ export const ResultsContainer = (props: Props) => {
<>
<div className='cardheader d-flex justify-content-between align-items-center'>
<span>
<h4>CEC DSS</h4>
<h4>Forest Resource and Renewable Energy Decision Support System (FRREDSS)</h4>
<h2>Results</h2>
</span>
</div>
Expand Down
51 changes: 29 additions & 22 deletions src/components/Results/ResultsExport.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -788,26 +788,30 @@ export const ResultsExport = (props: Props) => {
ref: 'B102',
headerRow: true,
totalsRow: false,
columns: [{ name: 'Assumptions' }, { name: 'Total' }],
columns: [
{ name: 'Assumptions' },
{ name: 'Unit' },
{ name: 'Quantity' }
],
rows: [
['LogLength, ft', 32],
['LoadWeight, green tons (logs)', 25],
['LoadWeight, green tons (chips)', 25],
['CTLTrailSpacing, ft', 50],
['HardwoodCostPremium, fraction', 0.2],
['ResidueRecoveryFraction for WT systems', 0.8],
['ResidueRecoveryFraction for CTL', 0.5],
['HardwoodFractionCT', 0.2],
['HardwoodFractionSLT', 0],
['HardwoodFractionLLT', 0],
['Feller/Bucker wage (2019)', 30.96],
['All Others wage (2019)', 22.26],
['Benefits and other payroll costs', '35%'],
['OIL_ETC_COST ($/mile)', 0.35],
['DRIVERS_PER_TRUCK', 1.67],
['MILES_PER_GALLON', 6],
['FUEL_COST ($/gallon)', 3.251],
['TRUCK_LABOR ($/hr)', 23.29]
['Log length', 'feet', 32],
['Load weight (logs)', 'green tons', 25],
['Load weight (chips)', 'green tons', 25],
['CTL trail spacing', 'feet', 50],
['Hardwood cost premium, fraction', '', '20%'],
['Residue recovery fraction for WT systems', '', '80%'],
['Residue recovery fraction for CTL systems', '', '50%'],
['Hardwood fraction of chip trees', '', '20%'],
['Hardwood fraction of small log trees', '', '0%'],
['Hardwood fraction of large log trees', '', '0%'],
['Feller/Bucker wage (2020)', '$/hour', 35.13],
['All Others wage (2020)', '$/hour', 22.07],``
['Logging worker benefits and overhead', '', '35%'],
['Truck oil cost', '$/mile', 0.35],
['Truck driver benefits and overhead', '', '67%'],
['Truck fuel consumption rate', 'miles/gallon', 6],
['Truck driver wage (2020)', '$/hour', 22.66],
['Truck payload capacity', 'green tons', 25]
]
});

Expand All @@ -821,9 +825,12 @@ export const ResultsExport = (props: Props) => {
['Fuel Reduction Cost Simulator'],
['Advanced Hardwood Biofuels Northwest'],
['California Biomass Collaborative'],
['EPA eGrid'],
['GREET model'],
['Literature for emission factors']
['Emissions and Generation Resource Integrated Database (eGRID)'],
[
'The Greenhouse gases, Regulated Emissions, and Energy use in Technologies Model (GREET 2021)'
],
['CA-GREET3.0 Model'],
['California Air Resources Board Emission Factor (EMFAC 2021)']
]
});

Expand Down

0 comments on commit a7ae98b

Please sign in to comment.