Skip to content

Commit

Permalink
Sky emissivity - cleanup eio merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@mjwitte
mjwitte committed Feb 11, 2020
1 parent 5d08b28 commit 6094f49
Showing 1 changed file with 3 additions and 17 deletions.
20 changes: 3 additions & 17 deletions src/EnergyPlus/WeatherManager.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -816,18 +816,6 @@ namespace WeatherManager {
static constexpr auto EnvNameFormat("Environment,{},{},{},{},{},{},{},{},{},{},{},{}\n");
static constexpr auto EnvDSTNFormat("Environment:Daylight Saving,No,{}\n");
static constexpr auto EnvDSTYFormat("Environment:Daylight Saving,Yes,{},{},{}\n");
static ObjexxFCL::gio::Fmt DateFormat("(I2.2,'/',I2.2)");
static ObjexxFCL::gio::Fmt EnvironFormat(
"('! <Environment>,Environment Name,Environment Type, Start Date, End Date,', ' Start DayOfWeek, Duration "
"{#days}, Source:Start DayOfWeek, ', ' Use Daylight Saving, Use Holidays, Apply Weekend Holiday Rule, "
"', ' Use Rain Values, Use Snow Values, Sky Temperature Model',/, '! <Environment:Special Days>, "
"Special Day Name, Special Day Type, Source, ', 'Start Date, Duration {#days}',/, "
" '! <Environment:Daylight Saving>, Daylight Saving Indicator, Source,', ' Start Date, End "
"Date',/, '! <Environment:WarmupDays>, NumberofWarmupDays')");
static ObjexxFCL::gio::Fmt EnvNameFormat("('Environment',12(',',A))");
static ObjexxFCL::gio::Fmt EnvDSTNFormat("('Environment:Daylight Saving,No,',A)");
static ObjexxFCL::gio::Fmt EnvDSTYFormat("('Environment:Daylight Saving,Yes',3(',',A))");
static ObjexxFCL::gio::Fmt EnvSpDyFormat("('Environment:Special Days',4(',',A),',',I3)");
static ObjexxFCL::gio::Fmt DateFormat("(I2.2,'/',I2.2)");
static ObjexxFCL::gio::Fmt DateFormatwithYear("(I2.2,'/',I2.2,'/',I4.4)");
static Array1D_string const SpecialDayNames(5, {"Holiday", "SummerDesignDay", "WinterDesignDay", "CustomDay1", "CustomDay2"});
Expand Down Expand Up @@ -1073,7 +1061,7 @@ namespace WeatherManager {
static constexpr auto EnvironFormat(
"! <Environment>,Environment Name,Environment Type, Start Date, End Date, Start DayOfWeek, Duration {#days}, "
"Source:Start DayOfWeek, Use Daylight Saving, Use Holidays, Apply Weekend Holiday Rule, Use Rain Values, Use Snow "
"Values\n! <Environment:Special Days>, Special Day Name, Special Day Type, Source, Start Date, Duration {#days}\n! "
"Values, Sky Temperature Model\n! <Environment:Special Days>, Special Day Name, Special Day Type, Source, Start Date, Duration {#days}\n! "
"<Environment:Daylight Saving>, Daylight Saving Indicator, Source, Start Date, End Date\n! <Environment:WarmupDays>, "
"NumberofWarmupDays");
print(outputFiles.eio, "{}\n", EnvironFormat);
Expand Down Expand Up @@ -1255,10 +1243,8 @@ namespace WeatherManager {
AlpUseSpec,
ApWkRule,
AlpUseRain,
AlpUseSnow);
ObjexxFCL::gio::write(OutputFileInits, EnvNameFormat)
<< Environment(Envrn).Title << kindOfRunPeriod << StDate << EnDate << ValidDayNames(TWeekDay) << cTotalEnvDays
<< "Use RunPeriod Specified Day" << AlpUseDST << AlpUseSpec << ApWkRule << AlpUseRain << AlpUseSnow << skyTempModel;
AlpUseSnow,
skyTempModel);
}

if (!DoingSizing && !KickOffSimulation) {
Expand Down

7 comments on commit 6094f49

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

sky-emissivity (mjwitte) - x86_64-Linux-Ubuntu-18.04-gcc-7.4: OK (2667 of 2667 tests passed, 678 test warnings)

Messages:\n

  • 678 tests had: EIO diffs.

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

sky-emissivity (mjwitte) - x86_64-Linux-Ubuntu-18.04-cppcheck: OK (0 of 0 tests passed, 0 test warnings)

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

sky-emissivity (mjwitte) - x86_64-Linux-Ubuntu-18.04-custom_check: OK (11 of 11 tests passed, 0 test warnings)

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

sky-emissivity (mjwitte) - x86_64-Linux-Ubuntu-18.04-gcc-7.4-UnitTestsCoverage-Debug: OK (1277 of 1277 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.

sky-emissivity (mjwitte) - x86_64-Linux-Ubuntu-18.04-gcc-7.4-IntegrationCoverage-Debug: OK (678 of 679 tests passed, 0 test warnings)

Failures:\n

integration Test Summary

  • Passed: 678
  • Timeout: 1

Build Badge Test Badge Coverage Badge

@nrel-bot-3
Copy link

Choose a reason for hiding this comment

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

sky-emissivity (mjwitte) - x86_64-MacOS-10.13-clang: OK (2627 of 2627 tests passed, 674 test warnings)

Messages:\n

  • 674 tests had: EIO diffs.

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.

sky-emissivity (mjwitte) - Win64-Windows-10-VisualStudio-16: OK (2627 of 2627 tests passed, 674 test warnings)

Messages:\n

  • 674 tests had: EIO diffs.

Build Badge Test Badge

Please sign in to comment.