Skip to content

Commit

Permalink
Remove input synonyms - design days and output constructions
Browse files Browse the repository at this point in the history
  • Loading branch information
@mjwitte
mjwitte committed Sep 23, 2019
1 parent 6c3e113 commit 474506b
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
8 changes: 4 additions & 4 deletions src/EnergyPlus/General.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3652,15 +3652,15 @@ namespace General {
lAlphaFieldBlanks,
cAlphaFieldNames,
cNumericFieldNames);
if (has_prefix(cAlphaArgs(1), "CONSTRUCT")) {
if (UtilityRoutines::SameString(cAlphaArgs(1), "CONSTRUCTIONS")) {
Constructions = true;
} else if (has_prefix(cAlphaArgs(1), "MAT")) {
} else if (UtilityRoutines::SameString(cAlphaArgs(1), "MATERIALS")) {
Materials = true;
}
if (NumNames > 1) {
if (has_prefix(cAlphaArgs(2), "CONSTRUCT")) {
if (UtilityRoutines::SameString(cAlphaArgs(2), "CONSTRUCTIONS")) {
Constructions = true;
} else if (has_prefix(cAlphaArgs(2), "MAT")) {
} else if (UtilityRoutines::SameString(cAlphaArgs(2), "MATERIALS")) {
Materials = true;
}
}
Expand Down
12 changes: 6 additions & 6 deletions src/EnergyPlus/WeatherManager.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7104,9 +7104,9 @@ namespace WeatherManager {
DesDayInput(EnvrnNum).SkyClear = rNumericArgs(14); // Sky Clearness (0 to 1)

// A7, \field Rain Indicator
if (UtilityRoutines::SameString(cAlphaArgs(7), "Yes") || UtilityRoutines::SameString(cAlphaArgs(7), "1")) {
if (UtilityRoutines::SameString(cAlphaArgs(7), "Yes")) {
DesDayInput(EnvrnNum).RainInd = 1;
} else if (UtilityRoutines::SameString(cAlphaArgs(7), "No") || UtilityRoutines::SameString(cAlphaArgs(7), "0") || lAlphaFieldBlanks(7)) {
} else if (UtilityRoutines::SameString(cAlphaArgs(7), "No") || lAlphaFieldBlanks(7)) {
DesDayInput(EnvrnNum).RainInd = 0;
} else {
ShowWarningError(cCurrentModuleObject + "=\"" + DesDayInput(EnvrnNum).Title + "\", invalid field: " + cAlphaFieldNames(7) + "=\"" +
Expand All @@ -7116,9 +7116,9 @@ namespace WeatherManager {
}

// A8, \field Snow Indicator
if (UtilityRoutines::SameString(cAlphaArgs(8), "Yes") || UtilityRoutines::SameString(cAlphaArgs(8), "1")) {
if (UtilityRoutines::SameString(cAlphaArgs(8), "Yes")) {
DesDayInput(EnvrnNum).SnowInd = 1;
} else if (UtilityRoutines::SameString(cAlphaArgs(8), "No") || UtilityRoutines::SameString(cAlphaArgs(8), "0") || lAlphaFieldBlanks(8)) {
} else if (UtilityRoutines::SameString(cAlphaArgs(8), "No") || lAlphaFieldBlanks(8)) {
DesDayInput(EnvrnNum).SnowInd = 0;
} else {
ShowWarningError(cCurrentModuleObject + "=\"" + DesDayInput(EnvrnNum).Title + "\", invalid field: " + cAlphaFieldNames(8) + "=\"" +
Expand Down Expand Up @@ -7704,9 +7704,9 @@ namespace WeatherManager {
}

// A9, \field Daylight Saving Time Indicator
if (UtilityRoutines::SameString(cAlphaArgs(9), "Yes") || UtilityRoutines::SameString(cAlphaArgs(9), "1")) {
if (UtilityRoutines::SameString(cAlphaArgs(9), "Yes")) {
DesDayInput(EnvrnNum).DSTIndicator = 1;
} else if (UtilityRoutines::SameString(cAlphaArgs(9), "No") || UtilityRoutines::SameString(cAlphaArgs(9), "0") || lAlphaFieldBlanks(9)) {
} else if (UtilityRoutines::SameString(cAlphaArgs(9), "No") || lAlphaFieldBlanks(9)) {
DesDayInput(EnvrnNum).DSTIndicator = 0;
} else {
ShowWarningError(cCurrentModuleObject + "=\"" + DesDayInput(EnvrnNum).Title + "\", invalid data.");
Expand Down

7 comments on commit 474506b

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

RemoveSynonyms-6601PartB (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.

RemoveSynonyms-6601PartB (mjwitte) - x86_64-Linux-Ubuntu-18.04-cppcheck: OK (0 of 0 tests passed, 0 test warnings)

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

RemoveSynonyms-6601PartB (mjwitte) - x86_64-Linux-Ubuntu-18.04-gcc-7.4: OK (2570 of 2613 tests passed, 8 test warnings)

Messages:\n

  • 15 tests had: AUD diffs.
  • 15 tests had: MDD diffs.
  • 15 tests had: MTD diffs.
  • 15 tests had: RDD diffs.
  • 15 tests had: Table big diffs.
  • 8 tests had: ERR diffs.

Failures:\n

integration Test Summary

  • Passed: 662
  • Failed: 12

performance Test Summary

  • Passed: 1
  • Failed: 16

regression Test Summary

  • Passed: 674
  • Failed: 15

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.

RemoveSynonyms-6601PartB (mjwitte) - x86_64-Linux-Ubuntu-18.04-gcc-7.4-UnitTestsCoverage-Debug: OK (1233 of 1233 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.

RemoveSynonyms-6601PartB (mjwitte) - Win64-Windows-10-VisualStudio-16: OK (2546 of 2573 tests passed, 8 test warnings)

Messages:\n

  • 15 tests had: AUD diffs.
  • 15 tests had: MDD diffs.
  • 15 tests had: MTD diffs.
  • 15 tests had: RDD diffs.
  • 15 tests had: Table big diffs.
  • 8 tests had: ERR diffs.

Failures:\n

integration Test Summary

  • Passed: 659
  • Failed: 12

regression Test Summary

  • Passed: 654
  • Failed: 15

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.

RemoveSynonyms-6601PartB (mjwitte) - x86_64-Linux-Ubuntu-18.04-gcc-7.4-IntegrationCoverage-Debug: OK (662 of 674 tests passed, 0 test warnings)

Failures:\n

integration Test Summary

  • Passed: 662
  • Failed: 12

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.

RemoveSynonyms-6601PartB (mjwitte) - x86_64-MacOS-10.13-clang: OK (2546 of 2573 tests passed, 8 test warnings)

Messages:\n

  • 15 tests had: AUD diffs.
  • 15 tests had: MDD diffs.
  • 15 tests had: MTD diffs.
  • 15 tests had: RDD diffs.
  • 15 tests had: Table big diffs.
  • 8 tests had: ERR diffs.

Failures:\n

integration Test Summary

  • Passed: 659
  • Failed: 12

regression Test Summary

  • Passed: 654
  • Failed: 15

Build Badge Test Badge

Please sign in to comment.