Skip to content

Commit

Permalink
Update perfmaps; fix test list.
Browse files Browse the repository at this point in the history
  • Loading branch information
@spahrenk
spahrenk committed Dec 9, 2024
2 parents 0feffdf + c01d5cb commit 9771258
Show file tree
Hide file tree
Showing 26 changed files with 13,746 additions and 13,837 deletions.
2 changes: 1 addition & 1 deletion scripts/python/plotting/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@
<script>
initFormValue("model_spec", "File");
initFormValue("model_name", "BradfordWhiteAeroThermRE2H65");
initFormValue("build_dir", "../../build");
initFormValue("build_dir", "../../../build");
initFormValue("test_dir", "BradfordWhite/AeroThermRE2H/RE2H50_UEF50");
</script>

Expand Down
2 changes: 1 addition & 1 deletion scripts/python/plotting/main.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ def call_test(model_spec, model_name, test_dir, build_dir):
abs_build_dir = str(Path.cwd())
os.chdir(orig_dir)

os.chdir("../../test")
os.chdir("../../../test")
abs_test_dir = str(Path.cwd())
os.chdir(orig_dir)

Expand Down
2 changes: 1 addition & 1 deletion scripts/python/plotting/measure.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ def measure(model_spec, model_name, build_dir):
abs_build_dir = str(Path.cwd())
os.chdir(orig_dir)

os.chdir("../../test")
os.chdir("../../../test")

app_cmd = os.path.join(abs_build_dir , 'src', 'hpwh', 'hpwh')
output_dir = os.path.join(abs_build_dir , "test", "output")
Expand Down
2 changes: 1 addition & 1 deletion scripts/python/plotting/simulate.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ def simulate(model_spec, model_name, test_name, build_dir):
abs_build_dir = str(Path.cwd())
os.chdir(orig_dir)

os.chdir("../../test")
os.chdir("../../../test")

app_cmd = os.path.join(abs_build_dir, 'src', 'hpwh', 'hpwh')

Expand Down
34 changes: 17 additions & 17 deletions src/HPWHpresets.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4384,15 +4384,15 @@ void HPWH::initPreset(MODELS presetNum)
compressor->perfMap.reserve(2);

compressor->perfMap.push_back({
50, // Temperature (T_F)
{148, 2.0, 0.0}, // Input Power Coefficients (inputPower_coeffs)
{5.88, -0.024, 0.0} // COP Coefficients (COP_coeffs)
50, // Temperature (T_F)
{120, 2.45, 0.0}, // Input Power Coefficients (inputPower_coeffs)
{6.3, -0.030, 0.0} // COP Coefficients (COP_coeffs)
});

compressor->perfMap.push_back({
70, // Temperature (T_F)
{110, 2.5, 0.0}, // Input Power Coefficients (inputPower_coeffs)
{6.8, -0.0323, 0.0} // COP Coefficients (COP_coeffs)
70, // Temperature (T_F)
{124, 2.45, 0.0}, // Input Power Coefficients (inputPower_coeffs)
{6.8, -0.030, 0.0} // COP Coefficients (COP_coeffs)
});

compressor->minT = F_TO_C(37.0);
Expand All @@ -4414,7 +4414,7 @@ void HPWH::initPreset(MODELS presetNum)

resistiveElementBottom->addShutOffLogic(bottomTwelfthMaxTemp(F_TO_C(86.1)));

compressor->addTurnOnLogic(bottomThird(dF_TO_dC(30)));
compressor->addTurnOnLogic(bottomThird(dF_TO_dC(25)));
compressor->addTurnOnLogic(standby(dF_TO_dC(12.392)));

//
Expand Down Expand Up @@ -4450,33 +4450,33 @@ void HPWH::initPreset(MODELS presetNum)

compressor->perfMap.push_back({
50, // Temperature (F)
{128, 1.7, 0.}, // Input Power Coefficients (kW)
{3.5, 0, 0.} // COP Coefficients
{100, 2.0, 0.}, // Input Power Coefficients (kW)
{3.4, 0., 0.} // COP Coefficients
});

compressor->perfMap.push_back({
67.5, // Temperature (F)
{26., 1.8, 0.}, // Input Power Coefficients (kW)
{9.5, -0.05, 0.} // COP Coefficients
67.5, // Temperature (F)
{23., 1.9, 0.}, // Input Power Coefficients (kW)
{4.7, 0., 0.} // COP Coefficients
});

compressor->perfMap.push_back({
95, // Temperature (F)
{-31.81, 2.309, 0.}, // Input Power Coefficients (kW)
{20.29913, -0.1329, 0.} // COP Coefficients
95, // Temperature (F)
{0., 1.9, 0.}, // Input Power Coefficients (kW)
{6.8, 0., 0.} // COP Coefficients
});

compressor->minT = F_TO_C(23);
compressor->maxT = F_TO_C(120.);
compressor->hysteresis_dC = dF_TO_dC(1);
compressor->configuration = Condenser::CONFIG_WRAPPED;

compressor->addTurnOnLogic(bottomThird(dF_TO_dC(52.7)));
compressor->addTurnOnLogic(bottomThird(dF_TO_dC(52.9)));
compressor->addTurnOnLogic(standby(dF_TO_dC(9.)));

// top resistor values
resistiveElementTop->setup(8, 5000.);
resistiveElementTop->addTurnOnLogic(topThird(dF_TO_dC(34.)));
resistiveElementTop->addTurnOnLogic(topThird(dF_TO_dC(37.)));
resistiveElementTop->isVIP = true;

// bottom resistor values
Expand Down
95 changes: 0 additions & 95 deletions test/AquaThermAire_File.json
View file

This file was deleted.

0 ...ighVolumeDrawTest50/measurements_test.csv → ...mRE2H50/HighVolumeDrawTest50/measured.csv
View file
File renamed without changes.
16 changes: 8 additions & 8 deletions test/BradfordWhiteAeroThermRE2H50.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,19 +63,19 @@ heatsource 2 condensity 1 0 0

heatsource 2 nTemps 2
heatsource 2 T1 50 F
heatsource 2 inPowT1const 148
heatsource 2 inPowT1lin 2
heatsource 2 inPowT1const 120
heatsource 2 inPowT1lin 2.45
heatsource 2 inPowT1quad 0
heatsource 2 copT1const 5.88
heatsource 2 copT1lin -0.024
heatsource 2 copT1const 6.3
heatsource 2 copT1lin -0.030
heatsource 2 copT1quad 0.0

heatsource 2 T2 70 F
heatsource 2 inPowT2const 110
heatsource 2 inPowT2lin 2.5
heatsource 2 inPowT2const 124
heatsource 2 inPowT2lin 2.45
heatsource 2 inPowT2quad 0
heatsource 2 copT2const 6.8
heatsource 2 copT2lin -0.0323
heatsource 2 copT2lin -0.030
heatsource 2 copT2quad 0.0

heatsource 2 minT 37 F
Expand All @@ -88,7 +88,7 @@ heatsource 0 onlogic fourthSixth 32 F

heatsource 1 offlogic bottomTwelfthMaxTemp 86.1 F

heatsource 2 onlogic bottomThird 30 F
heatsource 2 onlogic bottomThird 25 F
heatsource 2 onlogic standby 12.392 F

#relative
Expand Down
16 changes: 8 additions & 8 deletions test/BradfordWhiteAeroThermRE2H65.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,19 +63,19 @@ heatsource 2 condensity 1 0 0

heatsource 2 nTemps 2
heatsource 2 T1 50 F
heatsource 2 inPowT1const 148
heatsource 2 inPowT1lin 2
heatsource 2 inPowT1const 120
heatsource 2 inPowT1lin 2.45
heatsource 2 inPowT1quad 0
heatsource 2 copT1const 5.88
heatsource 2 copT1lin -0.024
heatsource 2 copT1const 6.3
heatsource 2 copT1lin -0.030
heatsource 2 copT1quad 0.0

heatsource 2 T2 70 F
heatsource 2 inPowT2const 110
heatsource 2 inPowT2lin 2.5
heatsource 2 inPowT2const 124
heatsource 2 inPowT2lin 2.45
heatsource 2 inPowT2quad 0
heatsource 2 copT2const 6.8
heatsource 2 copT2lin -0.0323
heatsource 2 copT2lin -0.030
heatsource 2 copT2quad 0.0

heatsource 2 minT 37 F
Expand All @@ -88,7 +88,7 @@ heatsource 0 onlogic fourthSixth 32 F

heatsource 1 offlogic bottomTwelfthMaxTemp 86.1 F

heatsource 2 onlogic bottomThird 30 F
heatsource 2 onlogic bottomThird 25 F
heatsource 2 onlogic standby 12.392 F

#relative
Expand Down
16 changes: 8 additions & 8 deletions test/BradfordWhiteAeroThermRE2H80.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,19 +63,19 @@ heatsource 2 condensity 1 0 0

heatsource 2 nTemps 2
heatsource 2 T1 50 F
heatsource 2 inPowT1const 148
heatsource 2 inPowT1lin 2
heatsource 2 inPowT1const 120
heatsource 2 inPowT1lin 2.45
heatsource 2 inPowT1quad 0
heatsource 2 copT1const 5.88
heatsource 2 copT1lin -0.024
heatsource 2 copT1const 6.3
heatsource 2 copT1lin -0.030
heatsource 2 copT1quad 0.0

heatsource 2 T2 70 F
heatsource 2 inPowT2const 110
heatsource 2 inPowT2lin 2.5
heatsource 2 inPowT2const 124
heatsource 2 inPowT2lin 2.45
heatsource 2 inPowT2quad 0
heatsource 2 copT2const 6.8
heatsource 2 copT2lin -0.0323
heatsource 2 copT2lin -0.030
heatsource 2 copT2quad 0.0

heatsource 2 minT 37 F
Expand All @@ -88,7 +88,7 @@ heatsource 0 onlogic fourthSixth 32 F

heatsource 1 offlogic bottomTwelfthMaxTemp 86.1 F

heatsource 2 onlogic bottomThird 30 F
heatsource 2 onlogic bottomThird 25 F
heatsource 2 onlogic standby 12.392 F

#relative
Expand Down
Loading

0 comments on commit 9771258

Please sign in to comment.