From 474506b5a9aa8d60f96debdef74e6d6570d9a1ea Mon Sep 17 00:00:00 2001
From: mjwitte <mjwitte@gard.com>
Date: Sun, 22 Sep 2019 20:49:08 -0500
Subject: [PATCH] Remove input synonyms - design days and output constructions

---
 src/EnergyPlus/General.cc        |  8 ++++----
 src/EnergyPlus/WeatherManager.cc | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/EnergyPlus/General.cc b/src/EnergyPlus/General.cc
index eea23f77063..5079baef071 100644
--- a/src/EnergyPlus/General.cc
+++ b/src/EnergyPlus/General.cc
@@ -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;
                     }
                 }
diff --git a/src/EnergyPlus/WeatherManager.cc b/src/EnergyPlus/WeatherManager.cc
index 5f238b19b86..e866ff5c3c0 100644
--- a/src/EnergyPlus/WeatherManager.cc
+++ b/src/EnergyPlus/WeatherManager.cc
@@ -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) + "=\"" +
@@ -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) + "=\"" +
@@ -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.");