From 976910096b03b302b70395ddbd17bbf9962214f2 Mon Sep 17 00:00:00 2001 From: Kaiyan Date: Wed, 17 Nov 2021 22:39:27 -0800 Subject: [PATCH 1/3] rename app to FRREDSS --- src/components/Inputs/InputContainer.tsx | 2 +- src/components/Results/ResultsContainer.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Inputs/InputContainer.tsx b/src/components/Inputs/InputContainer.tsx index f064a9a..2c0555b 100644 --- a/src/components/Inputs/InputContainer.tsx +++ b/src/components/Inputs/InputContainer.tsx @@ -67,7 +67,7 @@ export const InputContainer = (props: Props) => { return ( <>
-

CEC DSS

+

Forest Resource and Renewable Energy Decision Support System (FRREDSS)

Select Inputs

diff --git a/src/components/Results/ResultsContainer.tsx b/src/components/Results/ResultsContainer.tsx index 5dccf6b..d9b7e77 100644 --- a/src/components/Results/ResultsContainer.tsx +++ b/src/components/Results/ResultsContainer.tsx @@ -58,7 +58,7 @@ export const ResultsContainer = (props: Props) => { <>
-

CEC DSS

+

Forest Resource and Renewable Energy Decision Support System (FRREDSS)

Results
From 3b1f53ceb790630a057bb0408b20b52eef6d9b01 Mon Sep 17 00:00:00 2001 From: Kaiyan Date: Wed, 17 Nov 2021 23:17:10 -0800 Subject: [PATCH 2/3] update text for Assumptions and Key References --- .../Results/AssumptionsAndReferences.tsx | 94 ++++++++++++------- src/components/Results/ResultsExport.tsx | 51 +++++----- 2 files changed, 90 insertions(+), 55 deletions(-) diff --git a/src/components/Results/AssumptionsAndReferences.tsx b/src/components/Results/AssumptionsAndReferences.tsx index 582b35a..74e907a 100644 --- a/src/components/Results/AssumptionsAndReferences.tsx +++ b/src/components/Results/AssumptionsAndReferences.tsx @@ -8,81 +8,101 @@ export const AssumptionsAndReferences = () => { - + + + - + + - + + - + + - + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - + + - + + - - + + + - + + - - + + + - - + + +
AssumptionsAssumptionsUnitQuantity
Log Length, ftLog lengthfeet 32
Loa dWeight, green tons (logs)Load weight (logs)green tons 25
Load Weight, green tons (chips)Load weight (chips)green tons 25
CTL Trail Spacing, ftCTL trail spacingfeet 50
Hardwood Cost Premium, fraction0.2Hardwood cost premium, fraction20%
Residue Recovery Fraction for WT systems0.8Residue recovery fraction for WT systems80%
Residue Recovery Fraction for CTL0.5Residue recovery fraction for CTL systems50%
Hardwood Fraction CT0.2Hardwood fraction of chip trees20%
Hardwood Fraction SLT0Hardwood fraction of small log trees0%
Hardwood Fraction LLT0Hardwood fraction of large log trees0%
Feller/Bucker wage (2019)30.96Feller/Bucker wage (2020)$/hour35.13
All Others wage (2019)22.26All Others wage (2020)$/hour22.07
Benefits and other payroll costsTLogging worker benefits and overhead 35%
OIL_ETC_COST ($/mile)Truck oil cost$/mile 0.35
DRIVERS_PER_TRUCK 1.67Truck driver benefits and overhead67%
MILES_PER_GALLONTruck fuel consumption ratemiles/gallon 6
FUEL_COST ($/gallon)3.251Truck driver wage (2020)$/hour22.66
TRUCK_LABOR ($/hr)23.29Truck payload capacitygreen tons25
@@ -108,13 +128,21 @@ export const AssumptionsAndReferences = () => { California Biomass Collaborative - EPA eGrid + + Emissions and Generation Resource Integrated Database (eGRID) + + + + + The Greenhouse gases, Regulated Emissions, and Energy use in + Technologies Model (GREET 2021) + - GREET model + CA-GREET3.0 Model - Literature for emission factors + California Air Resources Board Emission Factor (EMFAC 2021) diff --git a/src/components/Results/ResultsExport.tsx b/src/components/Results/ResultsExport.tsx index 09c71b1..5566bc7 100644 --- a/src/components/Results/ResultsExport.tsx +++ b/src/components/Results/ResultsExport.tsx @@ -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] ] }); @@ -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)'] ] }); From 18cc10fb57d1d3f7b878aef98ae283fe486e8e22 Mon Sep 17 00:00:00 2001 From: Kaiyan Date: Wed, 17 Nov 2021 23:41:39 -0800 Subject: [PATCH 3/3] rename harvesting system and remove duplicate header --- src/components/Inputs/Frcs/FrcsInputsContainer.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/components/Inputs/Frcs/FrcsInputsContainer.tsx b/src/components/Inputs/Frcs/FrcsInputsContainer.tsx index 2323bb8..00e267d 100644 --- a/src/components/Inputs/Frcs/FrcsInputsContainer.tsx +++ b/src/components/Inputs/Frcs/FrcsInputsContainer.tsx @@ -25,7 +25,6 @@ export const FrcsInputsContainer = (props: Props) => { )); return (
-

Forestry and Conversion

@@ -60,7 +59,7 @@ export const FrcsInputsContainer = (props: Props) => { - +