Add performance fitting #248

spahrenk · 2025-09-19T14:06:21Z

Improves performance fitting capabilities.

Adds Bradford White Aerotherm G2 models.

Modifies initGeneric to start with UEF2Generic model.

# Conflicts: # 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/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/RheemHPHD135.json # test/models_json/RheemHPHD60.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/TamScalable_SP.json # test/models_json/TamScalable_SP_2X.json # test/models_json/TamScalable_SP_Half.json

…-performance-fitting

# Conflicts: # scripts/python/data_model/build_data_model.py # src/HPWH.hh # src/HPWHpresets.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/GE2012_50.json # test/models_json/GE2014STDMode_50.json # test/models_json/GE2014STDMode_80.json # test/models_json/GE2014_50.json # test/models_json/GE2014_80.json # test/models_json/GE2014_80DR.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/Mitsubishi_QAHV_N136TAU_HPB_SP.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/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/Sanco119.json # test/models_json/Sanco43.json # test/models_json/Sanco83.json # test/models_json/SancoGS3_45HPA_US_SP.json # test/models_json/Scalable_MP.json # test/models_json/Stiebel220E.json # test/models_json/StorageTank.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/basicIntegrated.json # test/models_json/restankHugeUA.json # test/models_json/restankNoUA.json # test/models_json/restankRealistic.json

# Conflicts: # pyproject.toml # scripts/python/data_model/build_data_model.py # src/HPWH.hh # src/HPWHpresets.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/GE2012_50.json # test/models_json/GE2014STDMode_50.json # test/models_json/GE2014STDMode_80.json # test/models_json/GE2014_50.json # test/models_json/GE2014_80.json # test/models_json/GE2014_80DR.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/Mitsubishi_QAHV_N136TAU_HPB_SP.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/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/Sanco119.json # test/models_json/Sanco43.json # test/models_json/Sanco83.json # test/models_json/SancoGS3_45HPA_US_SP.json # test/models_json/Scalable_MP.json # test/models_json/Stiebel220E.json # test/models_json/StorageTank.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/basicIntegrated.json # test/models_json/restankHugeUA.json # test/models_json/restankNoUA.json # test/models_json/restankRealistic.json # test/ref/testREGoesTo93C_Preset_AOSmithCAHP120.csv # uv.lock

spahrenk added 30 commits January 23, 2025 15:19

Issue with range.

dbb1fe3

Arrange perf array.

c037afa

Fix coord order.

d2569b3

Enable variable selection.

690fbba

Test value retention.

ad367e6

Retain perf prefs as json file.

118989c

Retain model_data in dash.

4f7e3e8

Allow model selection.

d13f044

Fix websocket communication.

aed48b1

Send model num to dash.

f4909e0

Test removing unused ctrls.

6290669

Restore coloring.

a0a1b79

Fix model control.

9c256ec

Fix setting outletT control.

7212ba3

Send to only dash-perf client.

e28bd0c

Launch websocket from index.html.

8b3caab

In progress.

71544fc

Update tests through websocket.

39dd254

Remove redundant receive.

0a8eb21

Pass data as json, with size limits.

97e496e

Restore missing model.

efefa3c

In progress.

64c6d5c

Move javascript.

cafe6ef

Remove extra file i/o.

fad5985

Fix layout error.

61e3759

Hide ws input field.

58965d2

Show energies in test view.

5ddf8c3

Load initial perf plot.

bb15075

Transfer measure results as json.

9316e49

spahrenk added 13 commits September 11, 2025 13:32

Merge remote-tracking branch 'origin/init-presets-from-cbor' into add…

54b8c06

…-performance-fitting

Fix fractional recovery end time.

27d8ca4

Fix fractional minute standby start time.

3455933

Add corrected E50 Aerotherm G2 tests.

79fcc41

Allos saving plot and summary.

319b26b

Change draw to gal.

9d1edb6

Remove unused arg; improve key names.

1de9ad4

Fix curve selection.

02a5589

Update selection.

cf2e23f

Update RE2HPXX performance maps.

72ea01d

Update refs and unit test.

2b3a438

Add metadata.

5be4d28

Use makeGeneric() in initGeneric().

4cfbe8c

spahrenk self-assigned this Sep 19, 2025

spahrenk marked this pull request as draft September 19, 2025 14:06

spahrenk added 9 commits September 22, 2025 10:47

Modify initGeneric() to match UEF2generic.

a92c7c3

Add HVDT data.

4e36055

Format.

03eb47b

Remove cout; format.

094a149

Add rerun button.

f43422b

Increase setpoint in RE2HP50_HVDT test.

1e2cbee

Fit BW high-volume draws.

8a80d4d

Add interp_cop.

d87e8b2

spahrenk marked this pull request as ready for review October 1, 2025 15:26

spahrenk requested a review from nealkruis October 1, 2025 15:27

spahrenk added 4 commits October 1, 2025 09:41

Merge main; update ref.

07ab9be

Restore TEST Cmake property.

e1e1b5e

Restore csv write fncs.

cbbdf94

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Add performance fitting #248

Add performance fitting #248

Uh oh!

spahrenk commented Sep 19, 2025 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

Add performance fitting #248

Are you sure you want to change the base?

Add performance fitting #248

Uh oh!

Conversation

spahrenk commented Sep 19, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

spahrenk commented Sep 19, 2025 •

edited

Loading