Skip to content

Commit

Permalink
Back out a few changes due to 0-indexing
Browse files Browse the repository at this point in the history
  • Loading branch information
@jasondegraw
jasondegraw committed Jan 24, 2020
1 parent 2ebdf64 commit 5c9220a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
6 changes: 4 additions & 2 deletions src/EnergyPlus/InputProcessing/InputProcessor.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@
#include <istream>
#include <unordered_set>

#include <ObjexxFCL/Array1S.hh>

// EnergyPlus Headers
#include <EnergyPlus/DataIPShortCuts.hh>
#include <EnergyPlus/DataOutputs.hh>
Expand Down Expand Up @@ -619,7 +621,7 @@ void InputProcessor::setObjectItemValue(json const &ep_object,
int &alpha_index,
int &numeric_index,
bool within_max_fields,
Array1D_string &Alphas,
Array1S_string Alphas,
int &NumAlphas,
Array1D<Real64> &Numbers,
int &NumNumbers,
Expand Down Expand Up @@ -706,7 +708,7 @@ void InputProcessor::setObjectItemValue(json const &ep_object,

void InputProcessor::getObjectItem(std::string const &Object,
int const Number,
Array1D_string &Alphas,
Array1S_string Alphas,
int &NumAlphas,
Array1D<Real64> &Numbers,
int &NumNumbers,
Expand Down
5 changes: 3 additions & 2 deletions src/EnergyPlus/InputProcessing/InputProcessor.hh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@

// ObjexxFCL Headers
#include <ObjexxFCL/Array1D.hh>
#include <ObjexxFCL/Array1S.fwd.hh>
#include <ObjexxFCL/Optional.hh>

#include <nlohmann/json.hpp>
Expand Down Expand Up @@ -129,7 +130,7 @@ public:

void getObjectItem(std::string const &Object,
int const Number,
Array1D_string &Alphas,
Array1S_string Alphas,
int &NumAlphas,
Array1D<Real64> &Numbers,
int &NumNumbers,
Expand Down Expand Up @@ -240,7 +241,7 @@ private:
int &alpha_index,
int &numeric_index,
bool within_max_fields,
Array1D_string &Alphas,
Array1S_string Alphas,
int &NumAlphas,
Array1D<Real64> &Numbers,
int &NumNumbers,
Expand Down

6 comments on commit 5c9220a

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

array1s-experiment (jasondegraw) - x86_64-Linux-Ubuntu-18.04-gcc-7.4: OK (2657 of 2657 tests passed, 0 test warnings)

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

array1s-experiment (jasondegraw) - 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.

array1s-experiment (jasondegraw) - x86_64-Linux-Ubuntu-18.04-custom_check: OK (11 of 11 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.

array1s-experiment (jasondegraw) - x86_64-Linux-Ubuntu-18.04-gcc-7.4-UnitTestsCoverage-Debug: OK (1269 of 1269 tests passed, 0 test warnings)

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

array1s-experiment (jasondegraw) - x86_64-Linux-Ubuntu-18.04-gcc-7.4-IntegrationCoverage-Debug: OK (677 of 678 tests passed, 0 test warnings)

Failures:\n

integration Test Summary

  • Passed: 677
  • 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.

array1s-experiment (jasondegraw) - x86_64-MacOS-10.13-clang: Tests Failed (0 of 0 tests passed, 0 test warnings)

Build Badge Test Badge

Please sign in to comment.