Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New Variable Speed Heat Pump Water Heater Model #4752

Merged
merged 18 commits into from Apr 1, 2015
Merged

New Variable Speed Heat Pump Water Heater Model #4752

merged 18 commits into from Apr 1, 2015

Conversation

mbadams5
Copy link
Contributor

This fixes odd git gremlins in #4652.
@shenb @Myoldmopar

I need one of you three @shenb @nmerket @rraustad to look at WaterThermalTanks.cc and fix the merge conflicts in that file. There was a major refactoring done by @nmerket and I can't figure out the resolutions.

add the new feature development of variable-speed air-source heat pump water heater into the develop:
Files modified:
Add new object to Energy+.idd
New object: VariableSpeedCoils.cc, VariableSpeedCoils.hh
Parent object: WaterThermalTanks.cc, WaterThermalTanks.hh
New object declaration: DataHVACGlobals.cc, DataHVACGlobals.hh
Two new example files: VSHeatPumpWaterHeater.idf, VSWaterHeaterHeatPumpStratifiedTank.idf

shenb and others added 5 commits February 24, 2015 12:43
fresh add-in and changes of VSHPWH
modify comment lines "EIR function" to "COP functions"
add WH pump power and energy rate output variables
Conflicts:
	src/EnergyPlus/WaterThermalTanks.cc
	testfiles/CMakeLists.txt
Conflicts:
	src/EnergyPlus/WaterThermalTanks.cc
	testfiles/CMakeLists.txt
@mbadams5 mbadams5 mentioned this pull request Feb 24, 2015
@mbadams5 mbadams5 added the NewFeature Includes code to add a new feature to EnergyPlus label Feb 24, 2015
@nmerket
Copy link
Member

nmerket commented Feb 24, 2015

I can take a look at it, but it might be next week before I can get around to it.

@nrel-bot
Copy link

nrel-bot commented Mar 4, 2015

@Myoldmopar @mbadams5 @lgentile it has been 7 days since this pull request was last updated.

@nrel-bot
Copy link

@Myoldmopar @mbadams5 @lgentile it has been 7 days since this pull request was last updated.

@@ -7034,8 +7168,17 @@ namespace WaterThermalTanks {
HPWHCondInletNodeLast = Node( HPWaterInletNode ).Temp;
HPWaterInletNodeTempSaved = Node( HPWaterInletNode ).Temp;
// This for loop is intended to iterate and converge on a condenser operating temperature so that the evaporator model correctly calculates performance.
// CHECK- embedded both the nonVS and the VS sim calls inside the for-loop, previously the VS wasn't in a for loop
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks right to me. @Myoldmopar @shenb

@nrel-bot
Copy link

@Myoldmopar @mbadams5 @lgentile it has been 7 days since this pull request was last updated.

@Myoldmopar
Copy link
Member

@mbadams5 @shenb Any updates on this? We're surely past getting it in for this release, but it could drop in right after if it's ready.

fix several bugs for the new feature of variable-speed air source heat
pump water heater, after the merging conflict. remove several
initialization issues.
@nrel-bot
Copy link

@Myoldmopar @mbadams5 @lgentile it has been 7 days since this pull request was last updated.

improve convergence and reduce number of warnings
merge develop except the water tank file
manually correct merging conflicts in waterthermaltanks.cc
@Myoldmopar Myoldmopar changed the title vshpwh New Variable Speed Heat Pump Water Heater Model Apr 1, 2015
Myoldmopar added a commit that referenced this pull request Apr 1, 2015
New Variable Speed Heat Pump Water Heater Model
@Myoldmopar Myoldmopar merged commit 09141bd into develop Apr 1, 2015
@Myoldmopar Myoldmopar deleted the VSHPWH branch April 1, 2015 14:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
NewFeature Includes code to add a new feature to EnergyPlus
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants