Skip to content

Commit 5756497

Browse files
nealkruisnealkruis
authored
Merge pull request #399 from cse-sim/sanco2
Sanden -> SANCO2 rebranding
2 parents ccf6a48 + dc6c937 commit 5756497

File tree

8 files changed

+32
-33
lines changed

8 files changed

+32
-33
lines changed

‎src/CNDTYPES.DEF‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -407,10 +407,10 @@ PIPESEGP -- "class PIPESEG*"
407407
AOSMITHHPTS50 "AOSmithHPTS50" // 50 gallon AOSmith HPTS
408408
AOSMITHHPTS66 "AOSmithHPTS66" // 66 gallon AOSmith HPTS
409409
AOSMITHHPTS80 "AOSmithHPTS80" // 80 gallon AOSmith HPTS
410-
SANDEN40 "Sanden40" // Sanden 40 gallon CO2 external heat pump
411-
SANDEN80 "Sanden80" // Sanden 80 gallon CO2 external heat pump
412-
SANDEN120 "Sanden120" // Sanden 120 gallon CO2 external heat pump
413-
SANDENGS3 "SandenGS3" // Sanden GS3 compressor CO2 external
410+
SANCO2_43 "SANCO2_43|!Sanden40" // SANCO2 43 gallon CO2 external heat pump
411+
SANCO2_83 "SANCO2_83|!Sanden80" // SANCO2 83 gallon CO2 external heat pump
412+
SANCO2_119 "SANCO2_119|!Sanden120" // SANCO2 119 gallon CO2 external heat pump
413+
SANCO2_GS3 "SANCO2_GS3|!SandenGS3" // SANCO2 GS3 compressor CO2 external
414414
GE2012 "GE2012" // 2012 era GeoSpring
415415
GE2014 "GE2014" // 2014 50 gal GE run in the efficiency mode
416416
GE2014_80 "GE2014_80" // 2014 80 gal GE model run in the efficiency mode

‎src/CNRECS.DEF‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4435,10 +4435,10 @@ RECORD HPWHLINK "HPWHLink" *SUBSTRUCT // Ecotope's HPWH tank and heater
44354435
*declare "std::vector< double> hw_pNodePowerExtra_W;" // runtime extra tank heat linkage to HPWH
44364436

44374437
*h FLOAT hw_fMixUse; // factor for draw adjustment re HPWH setpoint > DHWSYS::ws_tUse
4438-
// Some HPWHs (e.g. Sanden) have fixed (high) setpoints
4438+
// Some HPWHs (e.g. SANCO2) have fixed (high) setpoints
44394439
// draws are reduced to balance load at ws_tUse.
44404440
*h FLOAT hw_fMixRL; // factor for loop return flow adjustment re HPWH setpoint > DHWSYS::ws_tUse
4441-
// Some HPWHs (e.g. Sanden) have fixed (high) setpoints
4441+
// Some HPWHs (e.g. SANCO2) have fixed (high) setpoints
44424442
// Loop return flow is reduced to balance load at ws_tUse.
44434443

44444444
*s *e *array 2 DBL hw_inElec; // current subhr HPWH electricity use, kWh

‎src/dhwcalc.cpp‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2840,7 +2840,6 @@ RC HPWHLINK::hw_InitResistance( // set up HPWH has EF-rated resistance heater
28402840
{ C_WHASHPTYCH_AOSMITHHPTS50, hwatSMALL | HPWH::MODELS_AOSmithHPTS50 },
28412841
{ C_WHASHPTYCH_AOSMITHHPTS66, hwatSMALL | HPWH::MODELS_AOSmithHPTS66 },
28422842
{ C_WHASHPTYCH_AOSMITHHPTS80, hwatSMALL | HPWH::MODELS_AOSmithHPTS80 },
2843-
{ C_WHASHPTYCH_SANDEN40, hwatSMALL | HPWH::MODELS_Sanden40 },
28442843
{ C_WHASHPTYCH_GE2012, hwatSMALL | HPWH::MODELS_GE2012 },
28452844
{ C_WHASHPTYCH_GE2014, hwatSMALL | HPWH::MODELS_GE2014 },
28462845
{ C_WHASHPTYCH_GE2014_80, hwatSMALL | HPWH::MODELS_GE2014_80 },
@@ -2876,9 +2875,9 @@ RC HPWHLINK::hw_InitResistance( // set up HPWH has EF-rated resistance heater
28762875
{ C_WHASHPTYCH_RHEEMPLUGINDEDICATED50,hwatSMALL | HPWH::MODELS_RheemPlugInDedicated50 },
28772876

28782877
{ C_WHASHPTYCH_STIEBEL220E, hwatSMALL | HPWH::MODELS_Stiebel220E },
2879-
{ C_WHASHPTYCH_SANDEN40, hwatSMALL | HPWH::MODELS_Sanden40 },
2880-
{ C_WHASHPTYCH_SANDEN80, hwatSMALL | HPWH::MODELS_Sanden80 },
2881-
{ C_WHASHPTYCH_SANDEN120, hwatSMALL | HPWH::MODELS_Sanden120 },
2878+
{ C_WHASHPTYCH_SANCO2_43, hwatSMALL | HPWH::MODELS_SANCO2_43 },
2879+
{ C_WHASHPTYCH_SANCO2_83, hwatSMALL | HPWH::MODELS_SANCO2_83 },
2880+
{ C_WHASHPTYCH_SANCO2_119, hwatSMALL | HPWH::MODELS_SANCO2_119 },
28822881

28832882
{ C_WHASHPTYCH_GENERIC1, hwatSMALL | HPWH::MODELS_Generic1 },
28842883
{ C_WHASHPTYCH_GENERIC2, hwatSMALL | HPWH::MODELS_Generic2 },
@@ -2891,7 +2890,7 @@ RC HPWHLINK::hw_InitResistance( // set up HPWH has EF-rated resistance heater
28912890
{ C_WHASHPTYCH_AWHSTIER3GENERIC80, hwatSMALL | HPWH::MODELS_AWHSTier3Generic80 },
28922891

28932892
// large
2894-
{ C_WHASHPTYCH_SANDENGS3, hwatLARGE | HPWH::MODELS_Sanden_GS3_45HPA_US_SP },
2893+
{ C_WHASHPTYCH_SANCO2_GS3, hwatLARGE | HPWH::MODELS_SANCO2_GS3_45HPA_US_SP },
28952894
{ C_WHASHPTYCH_COLMACCXV5_SP, hwatLARGE | HPWH::MODELS_ColmacCxV_5_SP },
28962895
{ C_WHASHPTYCH_COLMACCXA10_SP, hwatLARGE | HPWH::MODELS_ColmacCxA_10_SP },
28972896
{ C_WHASHPTYCH_COLMACCXA15_SP, hwatLARGE | HPWH::MODELS_ColmacCxA_15_SP },
@@ -3340,7 +3339,7 @@ RC HPWHLINK::hw_DoHour( // hourly HPWH calcs
33403339
hw_balErrCount = 0;
33413340

33423341
// setpoint temp: ws_tUse has hourly variability
3343-
// some HPWHs (e.g. Sanden) have fixed setpoints, don't attempt
3342+
// some HPWHs (e.g. SANCO2) have fixed setpoints, don't attempt
33443343
if (!hw_pHPWH->isSetpointFixed())
33453344
{ double tSetpointMax;
33463345
std::string whyNot; // HPWH explanatory text, ignored

‎test/DHWLoop32U.cse‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4661,7 +4661,7 @@ DHWSYS "dhwsys-DHWHeatpump"
46614661
DHWHEATER "Sandens"
46624662
whType = "SmallStorage" // Type of water heater
46634663
whHeatSrc = "ASHPX" // Fuel source for water heater
4664-
whASHPType = "Sanden80" // ASHP type (for new HPWH model)
4664+
whASHPType = "Sanco2_83" // ASHP type (for new HPWH model)
46654665
whMult = 6 // Water heater multiplier
46664666
whXBUEndUse = "User2" // enduse to accumulate ASHPX backup heat elec use
46674667
whTEx = @weather.taDbAvg // Zone tank located in (currently active only for ASHPX model)

‎test/chdhw.cse‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6657,7 +6657,7 @@ DHWSYS "HWSys"
66576657
DHWHEATER "DHWHtr1"
66586658
whType = "SmallStorage" // Type of water heater
66596659
whHeatSrc = "ASHPX" // Fuel source for water heater
6660-
whASHPType = "Sanden120" // ASHP type (for new HPWH model)
6660+
whASHPType = "Sanco2_119" // ASHP type (for new HPWH model)
66616661
whXBUEndUse = "User2" // enduse to accumulate ASHPX backup heat elec use
66626662
whTEx = @weather.taDbAvg
66636663
whASHPSrcT = $tDbO

‎test/ref/CHDHW.REP‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1768,7 +1768,7 @@ RSYS cooling subhour details for Wed 01-Jul
17681768

17691769
! Log for Run 001:
17701770

1771-
! CSE 0.914.0+dhwbal.463bf40f.3.dirty for Win32 console
1771+
! CSE 0.915.0+sanco2.acdc970e.2.dirty for Win32 console
17721772

17731773

17741774

@@ -3900,7 +3900,7 @@ Input for Run 001:
39003900
DHWHEATER "DHWHtr1"
39013901
whType = "SmallStorage" // Type of water heater
39023902
whHeatSrc = "ASHPX" // Fuel source for water heater
3903-
whASHPType = "Sanden120" // ASHP type (for new HPWH model)
3903+
whASHPType = "Sanco2_119" // ASHP type (for new HPWH model)
39043904
whXBUEndUse = "User2" // enduse to accumulate ASHPX backup heat elec use
39053905
whTEx = @weather.taDbAvg
39063906
whASHPSrcT = $tDbO
@@ -6119,7 +6119,7 @@ RSYS cooling subhour details for Wed 01-Jul
61196119

61206120
! Log for Run 002:
61216121

6122-
! CSE 0.914.0+dhwbal.463bf40f.3.dirty for Win32 console
6122+
! CSE 0.915.0+sanco2.acdc970e.2.dirty for Win32 console
61236123

61246124

61256125

@@ -6142,18 +6142,18 @@ Input for Run 002:
61426142

61436143

61446144

6145-
! CSE 0.914.0+dhwbal.463bf40f.3.dirty for Win32 console run(s) done: Thu 11-May-23 3:59:55 pm
6145+
! CSE 0.915.0+sanco2.acdc970e.2.dirty for Win32 console run(s) done: Tue 23-May-23 12:10:51 pm
61466146

61476147
! Executable: d:\cse\msvc\cse.exe
6148-
! 11-May-23 3:58 pm (VS 14.29 2749952 bytes) (HPWH 1.21.0)
6148+
! 23-May-23 11:29 am (VS 14.29 2749952 bytes) (HPWH 1.22.0)
61496149
! Command line: -x! -t1 chdhw
61506150
! Input file: D:\cse\test\chdhw.cse
61516151
! Report file: D:\cse\test\chdhw.rep
61526152

61536153
! Timing info --
61546154

6155-
! Input: Time = 0.90 Calls = 2 T/C = 0.4475
6155+
! Input: Time = 0.82 Calls = 2 T/C = 0.4090
61566156
! AutoSizing: Time = 0.00 Calls = 0 T/C = 0.0000
6157-
! Simulation: Time = 10.68 Calls = 2 T/C = 5.3385
6157+
! Simulation: Time = 8.92 Calls = 2 T/C = 4.4590
61586158
! Reports: Time = 0.01 Calls = 2 T/C = 0.0035
6159-
! Total: Time = 11.59 Calls = 1 T/C = 11.5860
6159+
! Total: Time = 9.75 Calls = 1 T/C = 9.7500

‎test/ref/dhwloop32U.rep‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -975,7 +975,7 @@ Hourly User-defined Report, Fri 10-Jul
975975

976976
! Log for Run 001:
977977

978-
! CSE 0.914.0+dhwbal.9a8f1532.6.dirty for Win32 console
978+
! CSE 0.915.0+sanco2.acdc970e.2.dirty for Win32 console
979979

980980

981981

@@ -5644,7 +5644,7 @@ Input for Run 001:
56445644
DHWHEATER "Sandens"
56455645
whType = "SmallStorage" // Type of water heater
56465646
whHeatSrc = "ASHPX" // Fuel source for water heater
5647-
whASHPType = "Sanden80" // ASHP type (for new HPWH model)
5647+
whASHPType = "Sanco2_83" // ASHP type (for new HPWH model)
56485648
whMult = 6 // Water heater multiplier
56495649
whXBUEndUse = "User2" // enduse to accumulate ASHPX backup heat elec use
56505650
whTEx = @weather.taDbAvg // Zone tank located in (currently active only for ASHPX model)
@@ -6139,18 +6139,18 @@ Input for Run 001:
61396139

61406140

61416141

6142-
! CSE 0.914.0+dhwbal.9a8f1532.6.dirty for Win32 console run(s) done: Wed 17-May-23 2:19:25 pm
6142+
! CSE 0.915.0+sanco2.acdc970e.2.dirty for Win32 console run(s) done: Tue 23-May-23 12:09:29 pm
61436143

61446144
! Executable: d:\cse\msvc\cse.exe
6145-
! 17-May-23 2:06 pm (VS 14.29 2749952 bytes) (HPWH 1.21.0)
6146-
! Command line: -x! -t1 dhwloop32U
6147-
! Input file: D:\cse\test\dhwloop32U.cse
6148-
! Report file: D:\cse\test\dhwloop32U.rep
6145+
! 23-May-23 11:29 am (VS 14.29 2749952 bytes) (HPWH 1.22.0)
6146+
! Command line: -x! -t1 dhwloop32u
6147+
! Input file: D:\cse\test\dhwloop32u.cse
6148+
! Report file: D:\cse\test\dhwloop32u.rep
61496149

61506150
! Timing info --
61516151

6152-
! Input: Time = 0.54 Calls = 1 T/C = 0.5420
6152+
! Input: Time = 0.63 Calls = 1 T/C = 0.6270
61536153
! AutoSizing: Time = 0.00 Calls = 0 T/C = 0.0000
6154-
! Simulation: Time = 4.08 Calls = 1 T/C = 4.0760
6154+
! Simulation: Time = 4.29 Calls = 1 T/C = 4.2940
61556155
! Reports: Time = 0.01 Calls = 1 T/C = 0.0050
6156-
! Total: Time = 4.63 Calls = 1 T/C = 4.6270
6156+
! Total: Time = 4.93 Calls = 1 T/C = 4.9280

‎vendor/HPWHsim‎

0 commit comments

Comments
 (0)