Release v1.6.1 #325

bl-young · 2024-11-04T19:04:30Z

Updates to support consumption based emission inventories (CBEI) calculations. Aligns with EPA report, Consumption-Based Greenhouse Gas Emissions Inventories for Northeastern States.

What's Changed

Adds option for results matrix to include RoW region as new rows in Adds option for results matrix to include RoW region as new rows #314
Adds new derivation of M matrix for models with IEFs in add new calculation for M matrix with IEFs #324
Expands testing for calculation and visualization functions in adds calculation and visualization tests #321

This PR to master also includes the updates made for v1.6.0

…l.R script

…ductionDemand function in DemandFUnctions.R script

…d function in DemandFunctions.R

…model build functions

calculateResultsWithExternalFactors function to call prepareIMportedProductionDemand function rather than calculate y_m wihtin itself

found mismatch between original import and validation import was due to change in column order in validation import

…object. Tested that the changes did not affect detailed model builds by building USEEIOv2.0.1-411 without errors.

…del$ImportFinalDemand defintion

… anything

…nsistency

Adds option for results matrix to include `RoW` region as new rows

…ardResults()` for consistency with `calculateResultsWithExternalFactors()`

…e ratios for M

derive an M matrix for IEF models

…c model types

Revert "derive an M matrix for IEF models"

add new calculation for M matrix with IEFs

adds calculation and visualization tests

jvendries and others added 30 commits October 31, 2023 13:03

move calculate and validateImportA from IOfunctions.R to ValidateMOde…

79f880e

…l.R script

Added temporary comment in IOFunctions.R

bfd845f

Removed imports from the calculation of y_m in the prepareIMportedPro…

696af76

…ductionDemand function in DemandFUnctions.R script

Removed imports from y_m_p returned by prepareIMportedProductionDeman…

c9690bc

…d function in DemandFunctions.R

Modified caculateAndValidateImportA so it could be called outside of …

0988586

…model build functions

Modified

efd0dd4

calculateResultsWithExternalFactors function to call prepareIMportedProductionDemand function rather than calculate y_m wihtin itself

In buildModelwithImportFactors function,

83efd3f

found mismatch between original import and validation import was due to change in column order in validation import

add temporary ImportMatrix object to model object

e98ac12

update GHG parquets, add state model spec

407f08e

cleanup

1af3d6d

initial updates for import factors for two-region models

18e0638

Added loadImportMatrix function to add the ImportMatrix to the model …

c94214a

…object. Tested that the changes did not affect detailed model builds by building USEEIOv2.0.1-411 without errors.

fix model name in action

4d5a7fa

fix label in action

ad90e65

cleanup and update documentation

634b1b3

pass import table instead of attaching to model

2dfda81

update definition of import final demand

7d859a3

update prepreIMportedProductionDemand function to match changes to mo…

dd6ac8f

…del$ImportFinalDemand defintion

remove commented code

c5ce5b3

add validateImportFactorsApproach function

612f925

remove calculateAndValidateImportA function

38ed94b

drop model$M from import factors model as it is not representative of…

65e1a24

… anything

use prepareImportedProductionDemand() function in validation for co…

5e80350

…nsistency

create N for both model types

42862b9

cleanup

041d4cf

drop getFinalDemandCodes, not a useeior function

14f11ff

validate model in action

147a606

add logging message

740c0af

update documentation

a720261

Add prepareImportConsumptionDemand function

7dfdeaa

bl-young and others added 28 commits August 16, 2024 16:01

add row for RoW to household emissions result #312

9b7e2cd

Merge pull request #314 from USEPA/row_results

98410e5

Adds option for results matrix to include `RoW` region as new rows

move prepareDemandVectorforStandardResults() inside `calculateStand…

5cc4f0e

…ardResults()` for consistency with `calculateResultsWithExternalFactors()`

drop -s from two region model name

f938989

derive an M matrix for IEF models #311

a35b2c7

drop export of validation functions #307

6ddc6b4

use domestic production demand and import consumption demand to creat…

119ea9c

…e ratios for M

revise approach for deriving M to use q and y_m

04b7a8e

derive m from use table

7c7f855

fix error in deriving M matrix for 2R models

adb2daf

ignore location when removing imports

b80c38b

use IEFs from 2012 schema in testing 2R model

462eb53

validate that M is between M_m and M_d

c9762f4

move M matrix test to validation and print any failures

e232ca1

fix typos

9cfe575

Merge branch 'develop' into issue_311

0910392

Merge pull request #317 from USEPA/issue_311

4ace170

derive an M matrix for IEF models

move two region model spec (v1.0) out of tests

e9256a8

include additional warnings for functions that don't work for specifi…

5c5c18e

…c model types

adds result and visualization tests to a number of models, #320

bea22ec

export validation functions

87a0d0b

warnings not converted to errors

13d78eb

Revert "derive an M matrix for IEF models"

031e992

Merge pull request #323 from USEPA/revert-317-issue_311

1d88467

Revert "derive an M matrix for IEF models"

add new calculation for M matrix with IEFs, #311

70ea6d4

Merge pull request #324 from USEPA/M_withIEFs

28254f6

add new calculation for M matrix with IEFs

Merge pull request #321 from USEPA/issue_320

637a78d

adds calculation and visualization tests

🔖 bump to v1.6.1

13854b4

bl-young merged commit 71489bb into master Nov 4, 2024
6 checks passed

bl-young deleted the release_v1.6.1 branch November 4, 2024 19:16

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Release v1.6.1 #325

Release v1.6.1 #325

bl-young commented Nov 4, 2024 •

edited

Loading

Release v1.6.1 #325

Release v1.6.1 #325

Conversation

bl-young commented Nov 4, 2024 • edited Loading

What's Changed

bl-young commented Nov 4, 2024 •

edited

Loading