Change consts to enums #8409

jmythms · 2020-12-03T16:51:32Z

Pull request overview

Changing conts to enums.

…'static std::string const' to 'auto constexpr', begin moving '<T> const magicNum' to 'constexpr <T> magicNum'

…Plus into jermy-const-cleanups

This reverts commit 06cc85b.

This reverts commit 5b229a3.

This reverts commit 7515fa2.

This reverts commit c950b31.

…Plus into jermy-const-cleanups

Myoldmopar · 2020-12-04T15:57:09Z

So....why is CI still wanting to run 5ZoneAirCooledConvCoefPIU in this branch? That file was deleted in #8396. Oh I see, the IDF was deleted but the CMakeLists entry was left in. OK, I'm making that tweak in this branch locally and I'll push it up then CI will report back all green and this can go in. Thanks @jmythms !

jmythms · 2020-12-04T15:59:47Z

Thank you very much!

…-const-cleanups

This reverts commit 0f63645.

…to jermy-const-cleanups" This reverts commit 3baca91, reversing changes made to 0f63645.

jmythms · 2020-12-04T16:36:02Z

Messed up here, did not mean to push to this branch. Reverting commits.

Myoldmopar · 2020-12-04T21:32:03Z

@jmythms sorry for the confusion, the IDF actually should've stayed removed. It was removed in a different PR but the entry in testfiles/CMakeLists.txt was accidentally left in. The correct action should've just been to delete this line. I'll take care of it.

jmythms · 2020-12-04T22:10:21Z

Thank you for the help and for explaining it, Edwin. I'll check for it next time if it happens again.

…o jermy-const-cleanups

Myoldmopar

OK, this looks almost ready. I'm not sure why a couple fixes were backed out here but I'll fix that and push. If it's green after that this can go in.

Myoldmopar · 2020-12-05T12:35:17Z

.github/workflows/documentation.yml

@@ -16,7 +16,7 @@ jobs:
        python-version: 3.7

    - name: Set up LaTeX
-      run: sudo apt update && sudo apt install -y texlive texlive-xetex texlive-science


This needs to be reverted back as well, I'm not sure how that happened.

Myoldmopar · 2020-12-05T12:36:43Z

src/EnergyPlus/OutputProcessor.hh

@@ -81,8 +81,8 @@ namespace OutputProcessor {
    extern int const ReportVDD_Yes; // Report the variable dictionaries in "report format"
    extern int const ReportVDD_IDF; // Report the variable dictionaries in "IDF format"

-    extern Real64 const MinSetValue;
-    extern Real64 const MaxSetValue;
+    constexpr Real64 MinSetValue(99999999999999.0);


Yay for constexprs!

Myoldmopar · 2020-12-05T12:37:05Z

src/EnergyPlus/PluginManager.cc

@@ -705,7 +705,7 @@ namespace PluginManagement {

            for (unsigned long itemNum = 0; itemNum < numVals; itemNum++) {
                PyObject *item = PyList_GetItem(pyth_val, itemNum);
-                if (PyUnicode_Check(item)) { // NOLINT(hicpp-signed-bitwise) -- something inside Python code causes warning
+                if PyUnicode_Check(item) { // NOLINT(hicpp-signed-bitwise) -- something inside Python code causes warning


Yeah something went wrong here, I don't know why these fixes are missing here.

Myoldmopar · 2020-12-05T12:37:37Z

testfiles/CMakeLists.txt

@@ -35,7 +35,6 @@ ADD_SIMULATION_TEST(IDF_FILE 4ZoneWithShading_Simple_1.idf EPW_FILE USA_CO_Golde
 ADD_SIMULATION_TEST(IDF_FILE 4ZoneWithShading_Simple_2.idf EPW_FILE USA_CO_Golden-NREL.724666_TMY3.epw)
 ADD_SIMULATION_TEST(IDF_FILE 5ZoneAirCooled.idf EPW_FILE USA_CO_Golden-NREL.724666_TMY3.epw)
 ADD_SIMULATION_TEST(IDF_FILE 5ZoneAirCooledConvCoef.idf EPW_FILE USA_CO_Golden-NREL.724666_TMY3.epw)
-ADD_SIMULATION_TEST(IDF_FILE 5ZoneAirCooledConvCoefPIU.idf EPW_FILE USA_CO_Golden-NREL.724666_TMY3.epw)


This is good though.

Myoldmopar · 2020-12-05T12:44:04Z

I'll let CI have one final pass over these changes, but they look good locally.

Myoldmopar · 2020-12-05T14:19:14Z

All good here; this will merge in a few minutes when CI is done. Thanks for this @jmythms.

jmythms · 2020-12-05T17:25:19Z

Thank you @Myoldmopar !

mitchute and others added 21 commits December 1, 2020 12:06

move to SystemType enum class in LowTempRadiantSystems, begin moving …

ab61eeb

…'static std::string const' to 'auto constexpr', begin moving '<T> const magicNum' to 'constexpr <T> magicNum'

Fix unit tests

aa01863

Furnace mode of operations

906a9be

[Bad] RuntimeLangProcessor - Where to put the enum class

ed1bbe4

Enum RuntimeLangProcessor ErlKeywordParam

55a8993

auto constexpr RuntimeLangProc

b0d6555

enum PumpControlType

ffe38b8

enum class VFDControlType

05eb73b

enum class PumpBankControlSeq

c14a68f

auto constexpr + warnings Pumps.cc

c950b31

Fix pumps?

d91b5d3

Fix warnings

bd31082

enum EconomicTariff kind

7515fa2

Code cleanup

5b229a3

enum class varSpecific

06cc85b

Merge branch 'develop' into jermy-const-cleanups

d57cec9

Merge branch 'jermy-const-cleanups' of https://github.com/NREL/Energy…

fbe7da5

…Plus into jermy-const-cleanups

Revert "enum class varSpecific"

b207855

This reverts commit 06cc85b.

Revert "Code cleanup"

ddc146f

This reverts commit 5b229a3.

Revert "enum EconomicTariff kind"

9480627

This reverts commit 7515fa2.

Revert "auto constexpr + warnings Pumps.cc"

eabe692

This reverts commit c950b31.

jmythms marked this pull request as ready for review December 3, 2020 21:48

jmythms requested a review from mitchute December 3, 2020 21:48

Merge branch 'jermy-const-cleanups' of https://github.com/NREL/Energy…

8c2216b

…Plus into jermy-const-cleanups

jmythms added 4 commits December 4, 2020 09:17

MixedAir enum class EconomizerControl

0f63645

Merge remote-tracking branch 'origin/jermy-const-cleanups' into jermy…

3baca91

…-const-cleanups

Revert "MixedAir enum class EconomizerControl"

f92af3d

This reverts commit 0f63645.

Revert "Merge remote-tracking branch 'origin/jermy-const-cleanups' in…

843658f

…to jermy-const-cleanups" This reverts commit 3baca91, reversing changes made to 0f63645.

Myoldmopar added the Refactoring Includes code changes that don't change the functionality of the program, just perform refactoring label Dec 4, 2020

Myoldmopar added 4 commits December 4, 2020 20:50

Remove test file from cmakelists

bd9636b

Merge branch 'jermy-const-cleanups' of github.com:NREL/EnergyPlus int…

ff37ba1

…o jermy-const-cleanups

Re-remove PIU test file

b1818be

Put back in plugin manager and apt fix

42d555a

Myoldmopar reviewed Dec 5, 2020

View reviewed changes

Myoldmopar approved these changes Dec 5, 2020

View reviewed changes

Myoldmopar removed the request for review from mitchute December 5, 2020 12:44

Myoldmopar merged commit d66e036 into develop Dec 5, 2020

Myoldmopar deleted the jermy-const-cleanups branch December 5, 2020 15:28

mjwitte changed the title ~~Jermy const cleanups~~ Change consts to enums Feb 2, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Change consts to enums #8409

Change consts to enums #8409

jmythms commented Dec 3, 2020

Myoldmopar commented Dec 4, 2020

jmythms commented Dec 4, 2020

jmythms commented Dec 4, 2020

Myoldmopar commented Dec 4, 2020

jmythms commented Dec 4, 2020

Myoldmopar left a comment

Myoldmopar Dec 5, 2020

Myoldmopar Dec 5, 2020

Myoldmopar Dec 5, 2020

Myoldmopar Dec 5, 2020

Myoldmopar commented Dec 5, 2020

Myoldmopar commented Dec 5, 2020

jmythms commented Dec 5, 2020

Change consts to enums #8409

Change consts to enums #8409

Conversation

jmythms commented Dec 3, 2020

Pull request overview

Myoldmopar commented Dec 4, 2020

jmythms commented Dec 4, 2020

jmythms commented Dec 4, 2020

Myoldmopar commented Dec 4, 2020

jmythms commented Dec 4, 2020

Myoldmopar left a comment

Choose a reason for hiding this comment

Myoldmopar Dec 5, 2020

Choose a reason for hiding this comment

Myoldmopar Dec 5, 2020

Choose a reason for hiding this comment

Myoldmopar Dec 5, 2020

Choose a reason for hiding this comment

Myoldmopar Dec 5, 2020

Choose a reason for hiding this comment

Myoldmopar commented Dec 5, 2020

Myoldmopar commented Dec 5, 2020

jmythms commented Dec 5, 2020