Skip to content

Conversation

@spahrenk
Copy link
Contributor

No description provided.

spahrenk and others added 30 commits September 15, 2025 09:15
# Conflicts:
#	scripts/python/plotting/model_cache.json
#	scripts/python/plotting/prefs.json
#	scripts/python/plotting/test_plot.py
#	scripts/python/plotting/test_proc.py
# Conflicts:
#	scripts/python/plotting/model_cache.json
#	scripts/python/plotting/model_index.json
#	scripts/python/plotting/prefs.json
#	scripts/python/plotting/test_plot.py
# Conflicts:
#	scripts/python/plotting/prefs.json
#	scripts/python/plotting/test_plot.py
# Conflicts:
#	scripts/python/plotting/model_cache.json
#	scripts/python/plotting/prefs.json
#	scripts/python/plotting/test_plot.py
#	scripts/python/plotting/test_proc.py
# Conflicts:
#	pyproject.toml
#	scripts/python/data_model/build_data_model.py
#	src/HPWH.hh
#	src/HPWHpresets.cc
#	src/hpwh/run.cpp
#	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/DHW_YRLY_Preset.csv
#	test/ref/testREGoesTo93C_Preset_AOSmithCAHP120.csv
#	uv.lock
@spahrenk spahrenk changed the base branch from main to add-performance-fitting October 17, 2025 20:30
@nealkruis nealkruis merged commit 8032879 into add-performance-fitting Nov 21, 2025
6 of 10 checks passed
@nealkruis nealkruis deleted the define-datasets branch November 21, 2025 17:40
tanaya-mankad pushed a commit that referenced this pull request Nov 25, 2025
Define datasets, expand fitting
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants