Add product info #229

spahrenk · 2025-04-08T16:45:39Z

Retains Description / ProductInformation for HPWH, Tank, Condenser, and Resistance objects. ProductInformation contains manufacturer and model_number fields. These fields are retained in a productInformation member variable for each object, and represented by an Entry class template that tracks whether the content has been set. This information is read/written from/to the corresponding JSON representations. For Preset specifications, the productInformation can be assigned during initialization, then exported as JSON. Several such examples have been added. File specifications are always designated as MODELS_CustomFile, so the information is omitted.

codecov-commenter · 2025-04-09T15:14:47Z

Codecov Report

Attention: Patch coverage is 56.39098% with 58 lines in your changes missing coverage. Please review.

Please upload report for BASE (use-weighted-dist@36c3d16). Learn more about missing BASE report.

Files with missing lines	Patch %	Lines
src/HPWHUtils.cc	18.52%	22 Missing ⚠️
src/Condenser.cc	64.52%	11 Missing ⚠️
src/Resistance.cc	66.67%	8 Missing ⚠️
src/HPWH.hh	0.00%	7 Missing ⚠️
src/Tank.cc	62.50%	6 Missing ⚠️
src/HPWH.cc	80.00%	3 Missing ⚠️
src/HPWHpresets.cc	92.31%	1 Missing ⚠️

Additional details and impacted files

@@                 Coverage Diff                  @@
##             use-weighted-dist     #229   +/-   ##
====================================================
  Coverage                     ?   71.19%           
====================================================
  Files                        ?       16           
  Lines                        ?     7342           
  Branches                     ?        0           
====================================================
  Hits                         ?     5227           
  Misses                       ?     2115           
  Partials                     ?        0

Flag	Coverage Δ
integration	`71.19% <56.39%> (?)`

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

…uct-info # Conflicts: # scripts/python/data_model/build_data_model.py # src/Condenser.cc # src/HPWH.cc # src/HPWHUtils.cc # src/HPWHUtils.hh # src/Resistance.cc # test/models_json/AOSmithCAHP120.json # test/models_json/AOSmithHPTS40.json # test/models_json/AOSmithHPTS50.json # test/models_json/AOSmithHPTS66.json # test/models_json/AOSmithHPTS80.json # test/models_json/AOSmithHPTU50.json # test/models_json/AOSmithHPTU66.json # test/models_json/AOSmithHPTU80.json # test/models_json/AOSmithHPTU80_DR.json # test/models_json/AOSmithPHPT60.json # test/models_json/AOSmithPHPT80.json # test/models_json/AWHSTier3Generic40.json # test/models_json/AWHSTier3Generic50.json # test/models_json/AWHSTier3Generic65.json # test/models_json/AWHSTier3Generic80.json # test/models_json/AWHSTier4Generic40.json # test/models_json/AWHSTier4Generic50.json # test/models_json/AWHSTier4Generic65.json # test/models_json/AWHSTier4Generic80.json # test/models_json/AquaThermAire.json # test/models_json/BWC2020_65.json # test/models_json/BradfordWhiteAeroThermRE2H50.json # test/models_json/BradfordWhiteAeroThermRE2H65.json # test/models_json/BradfordWhiteAeroThermRE2H80.json # test/models_json/ColmacCxA_10_MP.json # test/models_json/ColmacCxA_10_SP.json # test/models_json/ColmacCxA_15_MP.json # test/models_json/ColmacCxA_15_SP.json # test/models_json/ColmacCxA_20_MP.json # test/models_json/ColmacCxA_20_SP.json # test/models_json/ColmacCxA_25_MP.json # test/models_json/ColmacCxA_25_SP.json # test/models_json/ColmacCxA_30_MP.json # test/models_json/ColmacCxA_30_SP.json # test/models_json/ColmacCxV_5_MP.json # test/models_json/ColmacCxV_5_SP.json # test/models_json/GE.json # test/models_json/GE2014STDMode.json # test/models_json/GE2014STDMode_80.json # test/models_json/GE502014.json # test/models_json/GE802014.json # test/models_json/Generic1.json # test/models_json/Generic2.json # test/models_json/Generic3.json # test/models_json/GenericUEF217.json # test/models_json/LG_APHWC50.json # test/models_json/LG_APHWC80.json # test/models_json/NyleC125A_C_MP.json # test/models_json/NyleC125A_C_SP.json # test/models_json/NyleC125A_MP.json # test/models_json/NyleC125A_SP.json # test/models_json/NyleC185A_C_MP.json # test/models_json/NyleC185A_C_SP.json # test/models_json/NyleC185A_MP.json # test/models_json/NyleC185A_SP.json # test/models_json/NyleC250A_C_MP.json # test/models_json/NyleC250A_C_SP.json # test/models_json/NyleC250A_MP.json # test/models_json/NyleC250A_SP.json # test/models_json/NyleC25A_SP.json # test/models_json/NyleC60A_C_MP.json # test/models_json/NyleC60A_C_SP.json # test/models_json/NyleC60A_MP.json # test/models_json/NyleC60A_SP.json # test/models_json/NyleC90A_C_MP.json # test/models_json/NyleC90A_C_SP.json # test/models_json/NyleC90A_MP.json # test/models_json/NyleC90A_SP.json # test/models_json/QAHV_N136TAU_HPB_SP.json # test/models_json/Rheem2020Build40.json # test/models_json/Rheem2020Build50.json # test/models_json/Rheem2020Build65.json # test/models_json/Rheem2020Build80.json # test/models_json/Rheem2020Prem40.json # test/models_json/Rheem2020Prem50.json # test/models_json/Rheem2020Prem65.json # test/models_json/Rheem2020Prem80.json # test/models_json/RheemHB50.json # test/models_json/RheemHBDR2250.json # test/models_json/RheemHBDR2265.json # test/models_json/RheemHBDR2280.json # test/models_json/RheemHBDR4550.json # test/models_json/RheemHBDR4565.json # test/models_json/RheemHBDR4580.json # test/models_json/RheemHPHD135.json # test/models_json/RheemHPHD60.json # test/models_json/RheemPlugInDedicated40.json # test/models_json/RheemPlugInDedicated50.json # test/models_json/RheemPlugInShared40.json # test/models_json/RheemPlugInShared50.json # test/models_json/RheemPlugInShared65.json # test/models_json/RheemPlugInShared80.json # test/models_json/Sanden120.json # test/models_json/Sanden40.json # test/models_json/Sanden80.json # test/models_json/Scalable_MP.json # test/models_json/Stiebel220e.json # test/models_json/TamScalable_SP.json # test/models_json/TamScalable_SP_2X.json # test/models_json/TamScalable_SP_Half.json # test/models_json/UEF2generic.json # test/models_json/restankRealistic.json

…ct-info # Conflicts: # src/Condenser.cc # src/HPWH.cc # src/HPWH.hh # src/HPWHUtils.cc # src/HPWHUtils.hh # src/HPWHpresets.cc # src/Resistance.cc # test/models_json/AOSmithCAHP120.json # test/models_json/AOSmithHPTS40.json # test/models_json/AOSmithHPTS50.json # test/models_json/AOSmithHPTS66.json # test/models_json/AOSmithHPTS80.json # test/models_json/AOSmithHPTU50.json # test/models_json/AOSmithHPTU66.json # test/models_json/AOSmithHPTU80.json # test/models_json/AOSmithHPTU80_DR.json # test/models_json/AOSmithPHPT60.json # test/models_json/AOSmithPHPT80.json # test/models_json/AWHSTier3Generic40.json # test/models_json/AWHSTier3Generic50.json # test/models_json/AWHSTier3Generic65.json # test/models_json/AWHSTier3Generic80.json # test/models_json/AWHSTier4Generic40.json # test/models_json/AWHSTier4Generic50.json # test/models_json/AWHSTier4Generic65.json # test/models_json/AWHSTier4Generic80.json # test/models_json/AquaThermAire.json # test/models_json/BWC2020_65.json # test/models_json/BradfordWhiteAeroThermRE2H50.json # test/models_json/BradfordWhiteAeroThermRE2H65.json # test/models_json/BradfordWhiteAeroThermRE2H80.json # test/models_json/ColmacCxA_10_MP.json # test/models_json/ColmacCxA_10_SP.json # test/models_json/ColmacCxA_15_MP.json # test/models_json/ColmacCxA_15_SP.json # test/models_json/ColmacCxA_20_MP.json # test/models_json/ColmacCxA_20_SP.json # test/models_json/ColmacCxA_25_MP.json # test/models_json/ColmacCxA_25_SP.json # test/models_json/ColmacCxA_30_MP.json # test/models_json/ColmacCxA_30_SP.json # test/models_json/ColmacCxV_5_MP.json # test/models_json/ColmacCxV_5_SP.json # test/models_json/GE.json # test/models_json/GE2014STDMode.json # test/models_json/GE2014STDMode_80.json # test/models_json/GE502014.json # test/models_json/GE802014.json # test/models_json/Generic1.json # test/models_json/Generic2.json # test/models_json/Generic3.json # test/models_json/GenericUEF217.json # test/models_json/LG_APHWC50.json # test/models_json/LG_APHWC80.json # test/models_json/NyleC125A_C_MP.json # test/models_json/NyleC125A_C_SP.json # test/models_json/NyleC125A_MP.json # test/models_json/NyleC125A_SP.json # test/models_json/NyleC185A_C_MP.json # test/models_json/NyleC185A_C_SP.json # test/models_json/NyleC185A_MP.json # test/models_json/NyleC185A_SP.json # test/models_json/NyleC250A_C_MP.json # test/models_json/NyleC250A_C_SP.json # test/models_json/NyleC250A_MP.json # test/models_json/NyleC250A_SP.json # test/models_json/NyleC25A_SP.json # test/models_json/NyleC60A_C_MP.json # test/models_json/NyleC60A_C_SP.json # test/models_json/NyleC60A_MP.json # test/models_json/NyleC60A_SP.json # test/models_json/NyleC90A_C_MP.json # test/models_json/NyleC90A_C_SP.json # test/models_json/NyleC90A_MP.json # test/models_json/NyleC90A_SP.json # test/models_json/QAHV_N136TAU_HPB_SP.json # test/models_json/Rheem2020Build40.json # test/models_json/Rheem2020Build50.json # test/models_json/Rheem2020Build65.json # test/models_json/Rheem2020Build80.json # test/models_json/Rheem2020Prem40.json # test/models_json/Rheem2020Prem50.json # test/models_json/Rheem2020Prem65.json # test/models_json/Rheem2020Prem80.json # test/models_json/RheemHB50.json # test/models_json/RheemHBDR2250.json # test/models_json/RheemHBDR2265.json # test/models_json/RheemHBDR2280.json # test/models_json/RheemHBDR4550.json # test/models_json/RheemHBDR4565.json # test/models_json/RheemHBDR4580.json # test/models_json/RheemHPHD135.json # test/models_json/RheemHPHD60.json # test/models_json/RheemPlugInDedicated40.json # test/models_json/RheemPlugInDedicated50.json # test/models_json/RheemPlugInShared40.json # test/models_json/RheemPlugInShared50.json # test/models_json/RheemPlugInShared65.json # test/models_json/RheemPlugInShared80.json # test/models_json/Sanden120.json # test/models_json/Sanden40.json # test/models_json/Sanden80.json # test/models_json/Scalable_MP.json # test/models_json/Stiebel220e.json # test/models_json/TamScalable_SP.json # test/models_json/TamScalable_SP_2X.json # test/models_json/TamScalable_SP_Half.json # test/models_json/UEF2generic.json # test/models_json/restankRealistic.json

…uct-info # Conflicts: # scripts/python/data_model/build_data_model.py # src/HPWH.cc # test/models_json/AOSmithCAHP120.json # test/models_json/AOSmithHPTS40.json # test/models_json/AOSmithHPTS50.json # test/models_json/AOSmithHPTS66.json # test/models_json/AOSmithHPTS80.json # test/models_json/AOSmithHPTU50.json # test/models_json/AOSmithHPTU66.json # test/models_json/AOSmithHPTU80.json # test/models_json/AOSmithHPTU80_DR.json # test/models_json/AOSmithPHPT60.json # test/models_json/AOSmithPHPT80.json # test/models_json/AWHSTier3Generic40.json # test/models_json/AWHSTier3Generic50.json # test/models_json/AWHSTier3Generic65.json # test/models_json/AWHSTier3Generic80.json # test/models_json/AWHSTier4Generic40.json # test/models_json/AWHSTier4Generic50.json # test/models_json/AWHSTier4Generic65.json # test/models_json/AWHSTier4Generic80.json # test/models_json/AquaThermAire.json # test/models_json/BWC2020_65.json # test/models_json/BradfordWhiteAeroThermRE2H50.json # test/models_json/BradfordWhiteAeroThermRE2H65.json # test/models_json/BradfordWhiteAeroThermRE2H80.json # test/models_json/ColmacCxA_10_MP.json # test/models_json/ColmacCxA_10_SP.json # test/models_json/ColmacCxA_15_MP.json # test/models_json/ColmacCxA_15_SP.json # test/models_json/ColmacCxA_20_MP.json # test/models_json/ColmacCxA_20_SP.json # test/models_json/ColmacCxA_25_MP.json # test/models_json/ColmacCxA_25_SP.json # test/models_json/ColmacCxA_30_MP.json # test/models_json/ColmacCxA_30_SP.json # test/models_json/ColmacCxV_5_MP.json # test/models_json/ColmacCxV_5_SP.json # test/models_json/GE.json # test/models_json/GE2014STDMode.json # test/models_json/GE2014STDMode_80.json # test/models_json/GE502014.json # test/models_json/GE802014.json # test/models_json/Generic1.json # test/models_json/Generic2.json # test/models_json/Generic3.json # test/models_json/GenericUEF217.json # test/models_json/LG_APHWC50.json # test/models_json/LG_APHWC80.json # test/models_json/NyleC125A_C_MP.json # test/models_json/NyleC125A_C_SP.json # test/models_json/NyleC125A_MP.json # test/models_json/NyleC125A_SP.json # test/models_json/NyleC185A_C_MP.json # test/models_json/NyleC185A_C_SP.json # test/models_json/NyleC185A_MP.json # test/models_json/NyleC185A_SP.json # test/models_json/NyleC250A_C_MP.json # test/models_json/NyleC250A_C_SP.json # test/models_json/NyleC250A_MP.json # test/models_json/NyleC250A_SP.json # test/models_json/NyleC25A_SP.json # test/models_json/NyleC60A_C_MP.json # test/models_json/NyleC60A_C_SP.json # test/models_json/NyleC60A_MP.json # test/models_json/NyleC60A_SP.json # test/models_json/NyleC90A_C_MP.json # test/models_json/NyleC90A_C_SP.json # test/models_json/NyleC90A_MP.json # test/models_json/NyleC90A_SP.json # test/models_json/QAHV_N136TAU_HPB_SP.json # test/models_json/Rheem2020Build40.json # test/models_json/Rheem2020Build50.json # test/models_json/Rheem2020Build65.json # test/models_json/Rheem2020Build80.json # test/models_json/Rheem2020Prem40.json # test/models_json/Rheem2020Prem50.json # test/models_json/Rheem2020Prem65.json # test/models_json/Rheem2020Prem80.json # test/models_json/RheemHB50.json # test/models_json/RheemHBDR2250.json # test/models_json/RheemHBDR2265.json # test/models_json/RheemHBDR2280.json # test/models_json/RheemHBDR4550.json # test/models_json/RheemHBDR4565.json # test/models_json/RheemHBDR4580.json # test/models_json/RheemHPHD135.json # test/models_json/RheemHPHD60.json # test/models_json/RheemPlugInDedicated40.json # test/models_json/RheemPlugInDedicated50.json # test/models_json/RheemPlugInShared40.json # test/models_json/RheemPlugInShared50.json # test/models_json/RheemPlugInShared65.json # test/models_json/RheemPlugInShared80.json # test/models_json/Sanden120.json # test/models_json/Sanden40.json # test/models_json/Sanden80.json # test/models_json/Scalable_MP.json # test/models_json/Stiebel220e.json # test/models_json/TamScalable_SP.json # test/models_json/TamScalable_SP_2X.json # test/models_json/TamScalable_SP_Half.json # test/models_json/UEF2generic.json # test/models_json/restankRealistic.json

…uct-info # Conflicts: # src/HPWHHeatSource.cc

…x-adapted # Conflicts: # src/HPWH.cc # test/unit_tests/energyBalanceTest.cpp

…product-info

# Conflicts: # src/HPWHUtils.cc # src/HPWHUtils.hh

spahrenk added 4 commits April 7, 2025 16:09

Add basic product info.

d712372

Make prod_info fnc member.

5181edf

Add fncs for prod-info ti elements.

c7c504a

Improve constructor.

e0b2b4f

spahrenk self-assigned this Apr 8, 2025

spahrenk marked this pull request as draft April 8, 2025 16:45

spahrenk added 4 commits April 8, 2025 10:53

Supress empty-switch warning.

a37a4a9

Use prod-info map.

b874851

Extend desciptor.

44ad32d

Simplify product info.

467a5e2

spahrenk changed the base branch from main to use-weighted-dist April 9, 2025 15:04

spahrenk added 2 commits April 9, 2025 10:40

Improve to/from product info.

3e78c03

Fix atowhp input.

0e3b5bf

spahrenk added the enhancement label Apr 9, 2025

spahrenk added 15 commits April 9, 2025 11:32

Organize/simplify headers.

25d56dd

Fix branch refs.

3e097e9

Fix from/to tank error.

8941439

Use json; remove cwhs.

c58725c

No rating this branch.

6143001

Make fnc non-static.

3c52abb

Recreate C++ structs.

f901af9

Improve preset init.

e620e46

Add prodcut_info to json.

cebf819

Remove unused fncs.

5b07a2b

Make fncs. non-member.

960a4a0

Change fnc name.

484c6a3

Fix to/from prod_info.

7ac7022

spahrenk added 5 commits April 16, 2025 16:01

Copy prod_info.

f9d6ce0

Merge weighted-dist.

20075c3

Merge remote-tracking branch 'origin/use-weighted-dist' into add-prod…

ba2d8c2

…uct-info # Conflicts: # src/HPWHHeatSource.cc

Merge branch 'use-weighted-dist' into add-product-info

92f730b

Base automatically changed from use-weighted-dist to main April 24, 2025 00:40

spahrenk added 12 commits April 24, 2025 12:27

Update lattice; regenerate.

dbec382

Update lattice.

10ebb6b

Remove all file input.

65200b6

Remove old code; change var name.

d4043f9

Adjust generated code.

54e6652

Fix inlet fraction.

19e5864

Combine energy-bal tests.

914b9d2

Add fractional-inlet test.

18c0f53

Merge remote-tracking branch 'origin/two-inlet-fix' into two-inlet-fi…

ce31dd7

…x-adapted # Conflicts: # src/HPWH.cc # test/unit_tests/energyBalanceTest.cpp

Expand tests; remove C-style cast.

0d220d1

Improve energy-balance tests.

a139101

Merge remote-tracking branch 'origin/two-inlet-fix-adapted' into add-…

11bc710

…product-info

spahrenk marked this pull request as ready for review April 30, 2025 16:35

spahrenk added 11 commits April 30, 2025 12:17

Fix weighted-dist-export.

c0efde0

Merge branch 'two-inlet-fix-adapted' into add-product-info

52603c5

Regenerate code.

7624da1

Merge branch 'two-inlet-fix-adapted' into use-lattice-write

d5de509

Set is_sets.

3548362

Set add'l vars; remove unused fnc.

6131b2a

Format.

68bfe3f

Format.

db3e56a

Remove output.

b104751

Merge branch 'use-lattice-write' into add-product-info

570cd54

# Conflicts: # src/HPWHUtils.cc # src/HPWHUtils.hh

Change var name.

70bfc03

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add product info #229

Add product info #229

spahrenk commented Apr 8, 2025 •

edited

Loading

codecov-commenter commented Apr 9, 2025

Add product info #229

Are you sure you want to change the base?

Add product info #229

Conversation

spahrenk commented Apr 8, 2025 • edited Loading

codecov-commenter commented Apr 9, 2025

Codecov Report

spahrenk commented Apr 8, 2025 •

edited

Loading