Skip to content

Commit

Permalink
add draft call to update logger from heat balance
Browse files Browse the repository at this point in the history
inserting logger update call for zone timesteps.
  • Loading branch information
EnergyArchmage committed Dec 21, 2014
1 parent a5a5762 commit a706f37
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 15 deletions.
12 changes: 6 additions & 6 deletions src/EnergyPlus/HVACSizingSimulationManager.cc
Original file line number Diff line number Diff line change
Expand Up @@ -157,10 +157,10 @@ namespace EnergyPlus {
static gio::Fmt Format_700("('Environment:WarmupDays,',I3)");
static gio::Fmt fmtLD( "*" );

if (stillNeedToSetupOnce) { // should only enter once but to be safe
HVACSizingSimulationManager SizeSimManagerObj;
stillNeedToSetupOnce = false;
}
// if (stillNeedToSetupOnce) { // should only enter once// but to be safe
// HVACSizingSimulationManager SizeSimManagerObj;
// stillNeedToSetupOnce = false;
// }
SizeSimManagerObj.determineSizingAnalysesNeeded();

SizeSimManagerObj.setupSizingAnalyses();
Expand Down Expand Up @@ -310,10 +310,10 @@ namespace EnergyPlus {

}

void UpdateSizingLogger (){
void UpdateSizingLogsZoneStep (){

//SizingLogger.

SizeSimManagerObj.SizingLogger.UpdateSizingLogValuesZoneStep();
}
}
}
2 changes: 1 addition & 1 deletion src/EnergyPlus/HVACSizingSimulationManager.hh
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ namespace EnergyPlus {
bool & ErrorsFound
);

void UpdateSizingLogger();
void UpdateSizingLogsZoneStep();

}

Expand Down
3 changes: 3 additions & 0 deletions src/EnergyPlus/HeatBalanceManager.cc
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
#include <WindowComplexManager.hh>
#include <WindowEquivalentLayer.hh>
#include <WindowManager.hh>
#include <HVACSizingSimulationManager.hh>

namespace EnergyPlus {

Expand Down Expand Up @@ -5007,6 +5008,7 @@ namespace HeatBalanceManager {
using DataSystemVariables::ReportDuringWarmup; // added for FMI
using DataSystemVariables::UpdateDataDuringWarmupExternalInterface;
using namespace DataReportingFlags;
using namespace HVACSizingSimulationManagerNamespace;

// Locals
// SUBROUTINE ARGUMENT DEFINITIONS:
Expand All @@ -5033,6 +5035,7 @@ namespace HeatBalanceManager {
if ( ! WarmupFlag && DoOutputReporting ) {
CalcMoreNodeInfo();
UpdateDataandReport( ZoneTSReporting );
UpdateSizingLogsZoneStep();
UpdateTabularReports( ZoneTSReporting );
UpdateUtilityBills();
} else if ( ! KickOffSimulation && DoOutputReporting && ReportDuringWarmup ) {
Expand Down
1 change: 1 addition & 0 deletions src/EnergyPlus/HeatBalanceManager.hh
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

// EnergyPlus Headers
#include <EnergyPlus.hh>
#include <HVACSizingSimulationManager.hh>

namespace EnergyPlus {

Expand Down
14 changes: 7 additions & 7 deletions src/EnergyPlus/SizingAnalysisObjects.cc
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ namespace EnergyPlus {

}

void SizingLoggerFramework::UpdateSizingLogValues(){
void SizingLoggerFramework::UpdateSizingLogValuesZoneStep(){

using DataGlobals::KindOfSim;
using DataGlobals::DayOfSim;
Expand All @@ -95,21 +95,21 @@ namespace EnergyPlus {
using namespace OutputProcessor;
int const ZoneIndex (1);

//prepare current timing data once and then pass into
//prepare current timing data once and then pass into fill routines
zoneTimestepObject tmpztStepStamp;

tmpztStepStamp.KindofSim = KindOfSim;
tmpztStepStamp.EnvrnNum = Envrn;
tmpztStepStamp.DayOfSim = DayOfSim;
tmpztStepStamp.HourOfDay = HourOfDay;
tmpztStepStamp.KindofSim = KindOfSim;
tmpztStepStamp.EnvrnNum = Envrn;
tmpztStepStamp.DayOfSim = DayOfSim;
tmpztStepStamp.HourOfDay = HourOfDay;
tmpztStepStamp.stepStartMinute = TimeValue( ZoneIndex ).CurMinute;
tmpztStepStamp.stepEndMinute = tmpztStepStamp.stepStartMinute + TimeValue( ZoneIndex ).TimeStep * 60.0;
tmpztStepStamp.TimeStepDuration = TimeValue( ZoneIndex ).TimeStep;

tmpztStepStamp.NumSubSteps = 0;


for (auto &L : logObjs) {
for (auto &L : this->logObjs) {
L.fillZoneStep(tmpztStepStamp);
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/EnergyPlus/SizingAnalysisObjects.hh
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ public:
int const & SupplySideInletNodeNum //change to pointers for generality later
);

void UpdateSizingLogValues();
void UpdateSizingLogValuesZoneStep();

};

Expand Down

6 comments on commit a706f37

@nrel-bot
Copy link

Choose a reason for hiding this comment

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

HVACSizingSim_CoincidentPlant (EnergyArchmage) - x86_64-MacOS-10.9-clang: Tests Failed

Build Badge Test 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.

HVACSizingSim_CoincidentPlant (EnergyArchmage) - x86_64-Linux-Ubuntu-14.04-gcc-4.8: Tests Failed

Build Badge Test 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.

HVACSizingSim_CoincidentPlant (EnergyArchmage) - x86_64-Linux-Ubuntu-14.04-cppcheck-1.61: OK (0 of 0 tests passed)

Build 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.

HVACSizingSim_CoincidentPlant (EnergyArchmage) - x86_64-MacOS-10.9-clang-Debug: Tests Failed

Build Badge Test 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.

HVACSizingSim_CoincidentPlant (EnergyArchmage) - i386-Windows-7-VisualStudio-12: Build Failed

Build Badge Test 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.

HVACSizingSim_CoincidentPlant (EnergyArchmage) - Win64-Windows-7-VisualStudio-12: Build Failed

Build Badge Test Badge

Please sign in to comment.