Skip to content

Commit

Permalink
Fix DistrictHeating:Water
Browse files Browse the repository at this point in the history
  • Loading branch information
@mjwitte
mjwitte committed Nov 14, 2024
1 parent 9c7c2a6 commit 89a85cf
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions src/ExpandObjects/epfilter.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26459,7 +26459,7 @@ SUBROUTINE CreateBoiler
END IF
ELSE
!PURCHASED:HOT WATER ~ line 33
CALL CreateNewObj('DistrictHeating')
CALL CreateNewObj('DistrictHeating:Water')
CALL AddToObjFld('Name', base + blrNameOff,'')
CALL AddToObjFld('Plant_Loop_Inlet_Node', base + blrNameOff,' HW Inlet')
CALL AddToObjFld('Plant_Loop_Outlet_Node', base + blrNameOff,' HW Outlet')
Expand All @@ -26479,7 +26479,7 @@ SUBROUTINE CreateBoiler
ENDIF
CALL AddToObjStr('Pressure Drop Curve Name','')
IF (.NOT. isPumpBranch) THEN
CALL AddToObjStr('Component Object Type','DistrictHeating')
CALL AddToObjStr('Component Object Type','DistrictHeating:Water')
CALL AddToObjFld('Component Name', base + blrNameOff,'')
CALL AddToObjFld('Component Inlet Node Name', base + blrNameOff,' HW Inlet')
CALL AddToObjFld('Component Outlet Node Name', base + blrNameOff,' HW Outlet',.TRUE.)
Expand All @@ -26492,7 +26492,7 @@ SUBROUTINE CreateBoiler
CALL AddToObjFld('Component Name', base + blrNameOff,' Branch Pump')
CALL AddToObjFld('Component Inlet Node Name', base + blrNameOff,' HW Pump Inlet')
CALL AddToObjFld('Component Outlet Node Name', base + blrNameOff,' HW Inlet')
CALL AddToObjStr('Component Object Type','DistrictHeating')
CALL AddToObjStr('Component Object Type','DistrictHeating:Water')
CALL AddToObjFld('Component Name', base + blrNameOff,'')
CALL AddToObjFld('Component Inlet Node Name', base + blrNameOff,' HW Inlet')
CALL AddToObjFld('Component Outlet Node Name', base + blrNameOff,' HW Outlet',.TRUE.)
Expand Down Expand Up @@ -26906,7 +26906,7 @@ SUBROUTINE CreateHotLoop
!If blrTypeOff="Hot Water Boiler" then this field is "BOILER:SIMPLE"
!If blrTypeOff="Purchased Hot Water" then this field is "PURCHASED:HOT WATER"
IF (SameString(FldVal(boilerBase + blrTypeOff),'DistrictHotWater')) THEN
CALL AddToObjStr('Equipment Object Type', 'DistrictHeating')
CALL AddToObjStr('Equipment Object Type', 'DistrictHeating:Water')
ELSE
CALL AddToObjStr('Equipment Object Type', 'Boiler:HotWater')
END IF
Expand Down Expand Up @@ -30896,7 +30896,7 @@ SUBROUTINE CreateMixedLoop
!If blrTypeOff="Hot Water Boiler" then this field is "BOILER:SIMPLE"
!If blrTypeOff="Purchased Hot Water" then this field is "PURCHASED:HOT WATER"
IF (SameString(FldVal(boilerBase + blrTypeOff),'DistrictHotWater')) THEN
CALL AddToObjStr('Equipment Object Type', 'DistrictHeating')
CALL AddToObjStr('Equipment Object Type', 'DistrictHeating:Water')
ELSE
CALL AddToObjStr('Equipment Object Type', 'Boiler:HotWater')
END IF
Expand Down

7 comments on commit 89a85cf

@nrel-bot-2b
Copy link

Choose a reason for hiding this comment

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

10819ExpObjectsDistrictHotWater (mjwitte) - x86_64-Linux-Ubuntu-22.04-gcc-11.4: Tests Failed (0 of 0 tests passed, 0 test warnings)

Build Badge Test Badge

@nrel-bot-2b
Copy link

Choose a reason for hiding this comment

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

10819ExpObjectsDistrictHotWater (mjwitte) - x86_64-Linux-Ubuntu-22.04-gcc-11.4-UnitTestsCoverage-RelWithDebInfo: Tests Failed (0 of 0 tests passed, 0 test warnings)

Build Badge Test Badge Coverage Badge

@nrel-bot-2b
Copy link

Choose a reason for hiding this comment

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

10819ExpObjectsDistrictHotWater (mjwitte) - x86_64-Linux-Ubuntu-22.04-gcc-11.4-IntegrationCoverage-RelWithDebInfo: Tests Failed (0 of 0 tests passed, 0 test warnings)

Build Badge Test Badge Coverage Badge

@nrel-bot
Copy link

Choose a reason for hiding this comment

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

10819ExpObjectsDistrictHotWater (mjwitte) - Win64-Windows-10-VisualStudio-16: OK (2894 of 2895 tests passed, 0 test warnings)

Failures:\n

EnergyPlusFixture Test Summary

  • Passed: 1602
  • Failed: 1

Build Badge Test Badge

@nrel-bot-2b
Copy link

Choose a reason for hiding this comment

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

10819ExpObjectsDistrictHotWater (mjwitte) - x86_64-Linux-Ubuntu-22.04-gcc-11.4: OK (2917 of 2917 tests passed, 0 test warnings)

Build Badge Test Badge

@nrel-bot-2
Copy link

Choose a reason for hiding this comment

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

10819ExpObjectsDistrictHotWater (mjwitte) - x86_64-Linux-Ubuntu-22.04-gcc-11.4-IntegrationCoverage-RelWithDebInfo: OK (801 of 801 tests passed, 0 test warnings)

Build Badge Test Badge Coverage Badge

@nrel-bot-2c
Copy link

Choose a reason for hiding this comment

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

10819ExpObjectsDistrictHotWater (mjwitte) - x86_64-Linux-Ubuntu-22.04-gcc-11.4-UnitTestsCoverage-RelWithDebInfo: OK (2099 of 2099 tests passed, 0 test warnings)

Build Badge Test Badge Coverage Badge

Please sign in to comment.