Merge pull request #4040 from NREL/4038_Reenable_Wall

Fix #4038 - Re-enable `-Wall` on Unix

CMakeLists.txt

@@ -410,12 +410,10 @@ endif()
 # Compiler and system specific options
 if(UNIX)
 
-  #set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -fPIC -fno-strict-aliasing")
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC -fno-strict-aliasing")
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -fPIC -fno-strict-aliasing")
 
   # all warnings
-  #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fPIC -fno-strict-aliasing -Winvalid-pch -Wnon-virtual-dtor")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}  -fPIC -fno-strict-aliasing -Winvalid-pch")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fPIC -fno-strict-aliasing -Winvalid-pch -Wnon-virtual-dtor")
   # Treat all warnings as errors
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
   if(APPLE)

ProjectMacros.cmake

@@ -318,9 +318,9 @@ macro(MAKE_SWIG_TARGET NAME SIMPLENAME KEY_I_FILE I_FILES PARENT_TARGET PARENT_S
     if("${CMAKE_CXX_COMPILER_ID}" MATCHES "^(Apple)?Clang$")
       # Prevent excessive warnings from generated swig files, suppress deprecated declarations
       # Suppress 'register' storage class specified warnings (coming from Ruby)
-      set_target_properties(${swig_target} PROPERTIES COMPILE_FLAGS "-Wno-dynamic-class-memaccess -Wno-deprecated-declarations -Wno-sign-compare -Wno-register")
+      set_target_properties(${swig_target} PROPERTIES COMPILE_FLAGS "-Wno-dynamic-class-memaccess -Wno-deprecated-declarations -Wno-sign-compare -Wno-register -Wno-sometimes-uninitialized")
     else()
-      set_target_properties(${swig_target} PROPERTIES COMPILE_FLAGS "-Wno-deprecated-declarations -Wno-sign-compare -Wno-register -Wno-conversion-null")
+      set_target_properties(${swig_target} PROPERTIES COMPILE_FLAGS "-Wno-deprecated-declarations -Wno-sign-compare -Wno-register -Wno-conversion-null -Wno-misleading-indentation")
     endif()
   endif()
 
@@ -517,9 +517,9 @@ macro(MAKE_SWIG_TARGET NAME SIMPLENAME KEY_I_FILE I_FILES PARENT_TARGET PARENT_S
       set_target_properties(${swig_target} PROPERTIES SUFFIX ".pyd")
     elseif(UNIX)
       if(APPLE AND NOT CMAKE_COMPILER_IS_GNUCXX)
-        set_target_properties(${swig_target} PROPERTIES COMPILE_FLAGS "-Wno-dynamic-class-memaccess -Wno-deprecated-declarations -Wno-sign-compare")
+        set_target_properties(${swig_target} PROPERTIES COMPILE_FLAGS "-Wno-dynamic-class-memaccess -Wno-deprecated-declarations -Wno-sign-compare -Wno-sometimes-uninitialized")
       else()
-        set_target_properties(${swig_target} PROPERTIES COMPILE_FLAGS "-Wno-deprecated-declarations -Wno-sign-compare")
+        set_target_properties(${swig_target} PROPERTIES COMPILE_FLAGS "-Wno-deprecated-declarations -Wno-sign-compare -Wno-misleading-indentation")
       endif()
     endif()
 
@@ -756,7 +756,12 @@ macro(MAKE_SWIG_TARGET NAME SIMPLENAME KEY_I_FILE I_FILES PARENT_TARGET PARENT_S
       set_target_properties(${swig_target} PROPERTIES COMPILE_FLAGS "/bigobj /wd4996") ## /wd4996 suppresses deprecated warnings
       set(final_name "${JAVA_OUTPUT_NAME}.dll")
     elseif(UNIX)
-      set_target_properties(${swig_target} PROPERTIES COMPILE_FLAGS "-Wno-deprecated-declarations -Wno-sign-compare")
+      # If 'AppleClang' or 'Clang'
+      if("${CMAKE_CXX_COMPILER_ID}" MATCHES "^(Apple)?Clang$")
+        set_target_properties(${swig_target} PROPERTIES COMPILE_FLAGS "-Wno-deprecated-declarations -Wno-sign-compare -Wno-sometimes-uninitialized")
+      else()
+        set_target_properties(${swig_target} PROPERTIES COMPILE_FLAGS "-Wno-deprecated-declarations -Wno-sign-compare -Wno-misleading-indentation")
+      endif()
     endif()
 
     target_link_libraries(${swig_target} ${PARENT_TARGET} ${JAVA_JVM_LIBRARY})
@@ -885,7 +890,12 @@ macro(MAKE_SWIG_TARGET NAME SIMPLENAME KEY_I_FILE I_FILES PARENT_TARGET PARENT_S
     if(MSVC)
       set_target_properties(${swig_target} PROPERTIES COMPILE_FLAGS "/bigobj /DBUILDING_NODE_EXTENSION /wd4996")  ## /wd4996 suppresses deprecated warnings
     elseif(UNIX)
-      set_target_properties(${swig_target} PROPERTIES COMPILE_FLAGS "-DBUILDING_NODE_EXTENSION -Wno-deprecated-declarations -Wno-sign-compare")
+      # If 'AppleClang' or 'Clang'
+      if("${CMAKE_CXX_COMPILER_ID}" MATCHES "^(Apple)?Clang$")
+        set_target_properties(${swig_target} PROPERTIES COMPILE_FLAGS "-DBUILDING_NODE_EXTENSION -Wno-deprecated-declarations -Wno-sign-compare -Wno-sometimes-uninitialized")
+      else()
+        set_target_properties(${swig_target} PROPERTIES COMPILE_FLAGS "-DBUILDING_NODE_EXTENSION -Wno-deprecated-declarations -Wno-sign-compare -Wno-misleading-indentation")
+      endif()
     endif()
 
     if(APPLE)
@@ -1051,4 +1061,3 @@ macro(CONFIGURE_FILE_WITH_CHECKSUM INPUT_FILE OUTPUT_FILE)
     endif()
   endif()
 endmacro()
-

src/cli/RubyInterpreter.hpp

@@ -693,8 +693,8 @@ class RubyInterpreter
 {
   private:
     // dummy arguments passed to ruby_options
-    int m_argc;
-    char** m_argv;
+    // int m_argc;
+    // char** m_argv;
 
     static void addIncludePath(std::vector<std::string>& includePaths, const std::string& includePath)
     {

src/energyplus/ForwardTranslator/ForwardTranslateTableMultiVariableLookup.cpp

@@ -64,7 +64,7 @@ boost::optional<IdfObject> ForwardTranslator::translateTableMultiVariableLookup(
   std::string interpolationMethod = modelObject.interpolationMethod();
 
   int numberofIndependentVariables = modelObject.numberofIndependentVariables();
-  int expectedNumberOfValues = 1;
+  unsigned expectedNumberOfValues = 1;
   for (int i = 0; i < numberofIndependentVariables; ++i) {
     auto xValues = modelObject.xValues(i);
     auto sizeX = xValues.size();

src/energyplus/ReverseTranslator/ReverseTranslateFanSystemModel.cpp

@@ -189,7 +189,7 @@ boost::optional<ModelObject> ReverseTranslator::translateFanSystemModel( const W
 
   boost::optional<int> _numberofSpeeds = workspaceObject.getInt(Fan_SystemModelFields::NumberofSpeeds);
   int nExts = extensibleGroups.size();
-  int nspeeds;
+  int nspeeds = 0;
   if (_numberofSpeeds) {
     nspeeds = _numberofSpeeds.get();
     if (nExts < nspeeds) {

src/model/FanSystemModel.cpp

@@ -615,6 +615,7 @@ namespace detail {
 
   void FanSystemModel_Impl::resetElectricPowerFunctionofFlowFractionCurve() {
     bool result = setString(OS_Fan_SystemModelFields::ElectricPowerFunctionofFlowFractionCurveName, "");
+    OS_ASSERT(result);
   }
 
   bool FanSystemModel_Impl::setNightVentilationModePressureRise(double nightVentilationModePressureRise) {

src/model/OutputTableSummaryReports.cpp

@@ -146,11 +146,11 @@ namespace detail {
   }
 
   bool OutputTableSummaryReports_Impl::addSummaryReports(const std::vector<std::string>& summaryReports) {
-    unsigned int num = numberofSummaryReports();
+    bool result = true;
     for (std::string summaryReport : summaryReports) {
-      addSummaryReport(summaryReport);
+      result &= addSummaryReport(summaryReport);
     }
-    return true;
+    return result;
   }
 
   boost::optional<unsigned> OutputTableSummaryReports_Impl::summaryReportIndex(const std::string& summaryReport) const {

src/model/ShadowCalculation.cpp

@@ -116,7 +116,6 @@ namespace detail {
   }
 
   int ShadowCalculation_Impl::shadingCalculationUpdateFrequency() const {
-    int i = OS_ShadowCalculationFields::DisableSelfShadingWithinShadingZoneGroups;
     boost::optional<int> value = getInt(OS_ShadowCalculationFields::ShadingCalculationUpdateFrequency,true);
     OS_ASSERT(value);
     return value.get();

src/osversion/VersionTranslator.cpp

@@ -4892,15 +4892,15 @@ std::string VersionTranslator::update_2_9_1_to_3_0_0(const IdfFile& idf_2_9_1, c
       // {"OS:Boiler:HotWater", 2},  // Fuel Type
   });
 
-  auto checkIfReplaceNeeded = [this, replaceFuelTypesMap](const IdfObject& object, int fieldIndex) -> bool {
+  auto checkIfReplaceNeeded = [replaceFuelTypesMap](const IdfObject& object, int fieldIndex) -> bool {
     // std::map::contains() only in C++20
     if (boost::optional<std::string> _fuelType = object.getString(fieldIndex)) {
       return replaceFuelTypesMap.find(_fuelType.get()) != replaceFuelTypesMap.end();
     }
     return false;
   };
 
-  auto replaceForField = [this, &ss, &replaceFuelTypesMap](const IdfObject& object, IdfObject& newObject, int fieldIndex) -> void {
+  auto replaceForField = [&replaceFuelTypesMap](const IdfObject& object, IdfObject& newObject, int fieldIndex) -> void {
       if (boost::optional<std::string> _fuelType = object.getString(fieldIndex)) {
         auto it = replaceFuelTypesMap.find(_fuelType.get());
         if (it != replaceFuelTypesMap.end()) {

src/sdd/MapHVAC.cpp

@@ -5386,9 +5386,9 @@ boost::optional<openstudio::model::ModelObject> ReverseTranslator::translateFlui
   boost::optional<model::ThermalStorageChilledWaterStratified> thermalStorage;
   std::string thermalStorageDischargePriority;
   boost::optional<model::ScheduleRuleset> tesSchedule;
-  // TODO: this variable will be used un-initialized in case the "TankSetptTemp" child key is ill-formed (not present or, doesn't cast to double)
-  // Set a default or something
-  double thermalStorageTankSetptTemp;
+  // Note: this variable will be used un-initialized in case the "TankSetptTemp" child key is ill-formed (not present or, doesn't cast to double)
+  // Setting to a default of 7.5 per E+ example 5ZoneVAV-ChilledWaterStorage-Stratified.idf
+  double thermalStorageTankSetptTemp = 7.5;
   if( auto mo = translateThrmlEngyStor(thrmlEngyStorElement, model) ) {
     thermalStorage = mo->cast<model::ThermalStorageChilledWaterStratified>();
     plantLoop.addSupplyBranchForComponent(thermalStorage.get());
@@ -5400,6 +5400,9 @@ boost::optional<openstudio::model::ModelObject> ReverseTranslator::translateFlui
     boost::optional<double> _tankSetptTemp = lexicalCastToDouble(tankSetptTempElement);
     if (_tankSetptTemp) {
       thermalStorageTankSetptTemp = unitToUnit(_tankSetptTemp.get(),"F","C").get();
+    } else {
+      LOG(Warn, "Missing TankSetptTemp (or bad cast to double) for '" << thermalStorage->briefDescription()
+             << ", defaulting to " << thermalStorageTankSetptTemp << " C.");
     }
 
     // charging scheme, which is a component setpoint scheme so we add SPMs

src/utilities/data/Attribute.cpp

@@ -612,7 +612,7 @@ namespace detail {
       ss << *p;
     }  else if (auto * p = std::get_if<std::string>(&m_value)) {
       ss << *p;
-    } else if (auto * p = std::get_if<std::vector<Attribute>>(&m_value)) {
+    } else if (std::get_if<std::vector<Attribute>>(&m_value)) {
       // Call toXml() and save to the stringstream
       this->toXml().save(ss, "  ");
     }

src/utilities/geometry/RoofGeometry_Details.hpp

@@ -28,6 +28,7 @@
 
 #include "Geometry.hpp"
 #include "Vector3d.hpp"
+#include "Point3d.hpp"
 #include <boost/optional.hpp>
 #include <boost/math/constants/constants.hpp>
 
@@ -707,7 +708,6 @@ class QueueEvent
 
 private:
   REGISTER_LOGGER("utilities.QueueEvent");
-  bool obsolete = false;
 };
 
 class Chain // Chains of queue events
@@ -2381,7 +2381,7 @@ static void removeEmptyLav(std::vector< std::vector< std::shared_ptr<Vertex> > >
   }
 }
 
-static std::vector< std::vector<Point3d> > doStraightSkeleton(std::vector<Point3d>& polygon, double roofPitchDegrees) {
+[[maybe_unused]] static std::vector< std::vector<Point3d> > doStraightSkeleton(std::vector<Point3d>& polygon, double roofPitchDegrees) {
 
   /* Straight skeleton algorithm implementation. Based on highly modified Petr
   * Felkel and Stepan Obdrzalek algorithm.
@@ -2716,7 +2716,7 @@ static void applyGableLogicTwoRidgesTwoOppositeAngles(std::vector< std::vector<P
 
 }
 
-static void applyGables(std::vector< std::vector<Point3d> >& surfaces) {
+[[maybe_unused]] static void applyGables(std::vector< std::vector<Point3d> >& surfaces) {
   // Convert hip roof to gable roof
 
   // Simple logic
@@ -2776,7 +2776,7 @@ static std::vector<Point3d> getShedLine(std::vector<Point3d>& polygon, double di
   return line;
 }
 
-static std::vector< std::vector<Point3d> > doShedRoof(std::vector<Point3d>& polygon, double roofPitchDegrees, double directionDegrees) {
+[[maybe_unused]] static std::vector< std::vector<Point3d> > doShedRoof(std::vector<Point3d>& polygon, double roofPitchDegrees, double directionDegrees) {
   std::vector< std::vector<Point3d> > surfaces;
 
   double zcoord = initPolygon(polygon);

src/utilities/sql/Test/SqlFile_GTest.cpp

@@ -414,7 +414,7 @@ void regressionTestSqlFile(const std::string& name, double netSiteEnergy, double
   ASSERT_FALSE(availableEnvPeriods.empty());
   EXPECT_EQ(static_cast<unsigned>(3), availableEnvPeriods.size());
   std::string availableEnvPeriod;
-  for (int i = 0; i < availableEnvPeriods.size(); i++)
+  for (size_t i = 0; i < availableEnvPeriods.size(); i++)
   {
     if (availableEnvPeriods[i].find("CONDNS") == std::string::npos) {
       availableEnvPeriod = availableEnvPeriods[i];

src/utilities/units/test/OSQuantityVector_GTest.cpp

@@ -98,13 +98,13 @@ TEST_F(UnitsFixture,OSQuantityVector_MathematicalOperators) {
 
   // basic subtraction
   resultVec = testVec1;
-  resultVec -= resultVec;
+  resultVec -= 2*resultVec;
   resultQ = testQ1;
-  resultQ -= resultQ;
+  resultQ -= 2*resultQ;
   ASSERT_EQ(2u,resultVec.size());
   EXPECT_EQ(resultQ,resultVec.getQuantity(0));
   EXPECT_EQ(resultQ,resultVec.getQuantity(1));
-  EXPECT_EQ(0.0,resultQ.value());
+  EXPECT_EQ(-3.5,resultQ.value());
 
   resultVec = testVec1 - testVec2;
   resultQ = testQ1 - testQ2;
@@ -264,4 +264,4 @@ TEST_F(UnitsFixture,OSQuantityVector_Profiling_Multiplication_OSQuantityVector)
     Quantity other(8.0,createWhTime());
     OSQuantityVector result = testOSQuantityVector * other;
   }
-}
+}