Skip to content

Commit 5527d24

Browse files
Merge branch 'develop' into surfprop-idd
2 parents c8e2d9d + 0033714 commit 5527d24

43 files changed

Lines changed: 1146 additions & 1088 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/build_documentation.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -139,78 +139,78 @@ jobs:
139139
run: cmake --build . -j 4
140140

141141
- name: Upload EngineeringReference
142-
uses: actions/upload-artifact@v6
142+
uses: actions/upload-artifact@v7
143143
if: matrix.os == 'ubuntu-24.04'
144144
with:
145145
name: EngineeringReference
146146
path: ${{ github.workspace }}/doc/build/pdf/EngineeringReference.pdf
147147

148148
- name: Upload ExternalInterfacesApplicationGuide
149-
uses: actions/upload-artifact@v6
149+
uses: actions/upload-artifact@v7
150150
if: matrix.os == 'ubuntu-24.04'
151151
with:
152152
name: ExternalInterfacesApplicationGuide
153153
path: ${{ github.workspace }}/doc/build/pdf/ExternalInterfacesApplicationGuide.pdf
154154

155155
- name: Upload GettingStarted
156-
uses: actions/upload-artifact@v6
156+
uses: actions/upload-artifact@v7
157157
if: matrix.os == 'ubuntu-24.04'
158158
with:
159159
name: GettingStarted
160160
path: ${{ github.workspace }}/doc/build/pdf/GettingStarted.pdf
161161

162162
- name: Upload InputOutputReference
163-
uses: actions/upload-artifact@v6
163+
uses: actions/upload-artifact@v7
164164
if: matrix.os == 'ubuntu-24.04'
165165
with:
166166
name: InputOutputReference
167167
path: ${{ github.workspace }}/doc/build/pdf/InputOutputReference.pdf
168168

169169
- name: Upload InterfaceDeveloper
170-
uses: actions/upload-artifact@v6
170+
uses: actions/upload-artifact@v7
171171
if: matrix.os == 'ubuntu-24.04'
172172
with:
173173
name: InterfaceDeveloper
174174
path: ${{ github.workspace }}/doc/build/pdf/InterfaceDeveloper.pdf
175175

176176
- name: Upload ModuleDeveloper
177-
uses: actions/upload-artifact@v6
177+
uses: actions/upload-artifact@v7
178178
if: matrix.os == 'ubuntu-24.04'
179179
with:
180180
name: ModuleDeveloper
181181
path: ${{ github.workspace }}/doc/build/pdf/ModuleDeveloper.pdf
182182

183183
- name: Upload OutputDetailsAndExamples
184-
uses: actions/upload-artifact@v6
184+
uses: actions/upload-artifact@v7
185185
if: matrix.os == 'ubuntu-24.04'
186186
with:
187187
name: OutputDetailsAndExamples
188188
path: ${{ github.workspace }}/doc/build/pdf/OutputDetailsAndExamples.pdf
189189

190190
- name: Upload PlantApplicationGuide
191-
uses: actions/upload-artifact@v6
191+
uses: actions/upload-artifact@v7
192192
if: matrix.os == 'ubuntu-24.04'
193193
with:
194194
name: PlantApplicationGuide
195195
path: ${{ github.workspace }}/doc/build/pdf/PlantApplicationGuide.pdf
196196

197197
- name: Upload UsingEnergyPlusForCompliance
198-
uses: actions/upload-artifact@v6
198+
uses: actions/upload-artifact@v7
199199
if: matrix.os == 'ubuntu-24.04'
200200
with:
201201
name: UsingEnergyPlusForCompliance
202202
path: ${{ github.workspace }}/doc/build/pdf/UsingEnergyPlusForCompliance.pdf
203203

204204
- name: Upload entire pdf folder
205-
uses: actions/upload-artifact@v6
205+
uses: actions/upload-artifact@v7
206206
if: always()
207207
with:
208208
name: "AllDocumentation-${{ matrix.os }}-${{ github.event.pull_request.head.sha }}"
209209
path: ${{ github.workspace }}/doc/build/pdf/
210210

211211
- name: Upload log folder upon failure
212212
if: failure() && runner.os == 'Windows'
213-
uses: actions/upload-artifact@v6
213+
uses: actions/upload-artifact@v7
214214
with:
215215
name: Xelatex_Logs_after_all
216216
path: C:\Users\runneradmin\AppData\Local\MiKTeX\miktex\log\

.github/workflows/build_wheels.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
pip install wheel
4242
python setup.py bdist_wheel
4343
44-
- uses: actions/upload-artifact@v6
44+
- uses: actions/upload-artifact@v7
4545
with:
4646
name: energyplus-wheel-${{ matrix.os }}
4747
path: ./dist

.github/workflows/release_linux.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ jobs:
9696
run: cmake --build . --target package -j 4
9797

9898
- name: Upload Tarball as artifact for testing
99-
uses: actions/upload-artifact@v6
99+
uses: actions/upload-artifact@v7
100100
with:
101101
name: energyplus-${{ matrix.os }}
102102
path: build/EnergyPlus-*-${{ matrix.arch }}.tar.gz
@@ -164,7 +164,7 @@ jobs:
164164
architecture: ${{ matrix.arch }}
165165

166166
- name: Gather Test Package from Artifacts
167-
uses: actions/download-artifact@v7
167+
uses: actions/download-artifact@v8
168168
with:
169169
name: energyplus-${{ matrix.os }}
170170
path: package

.github/workflows/release_mac.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ jobs:
186186
ninja package
187187
188188
- name: Upload Tarball as artifact for testing
189-
uses: actions/upload-artifact@v6
189+
uses: actions/upload-artifact@v7
190190
with:
191191
name: energyplus-${{ matrix.os }}.tar.gz
192192
path: build/EnergyPlus-*-${{ matrix.arch }}.tar.gz
@@ -195,7 +195,7 @@ jobs:
195195
overwrite: false
196196

197197
- name: Upload DMG as artifact for testing
198-
uses: actions/upload-artifact@v6
198+
uses: actions/upload-artifact@v7
199199
with:
200200
name: energyplus-${{ matrix.os }}.dmg
201201
path: build/EnergyPlus-*-${{ matrix.arch }}.dmg
@@ -255,7 +255,7 @@ jobs:
255255
echo "::endgroup::"
256256
257257
- name: Upload otool info as artifact
258-
uses: actions/upload-artifact@v6
258+
uses: actions/upload-artifact@v7
259259
with:
260260
name: otool_infos_cpack_${{ matrix.os }}_${{ matrix.arch }}
261261
path: build/otool*json
@@ -313,7 +313,7 @@ jobs:
313313
architecture: ${{ matrix.python-arch }}
314314

315315
- name: Gather Test Package from Artifacts
316-
uses: actions/download-artifact@v7
316+
uses: actions/download-artifact@v8
317317
with:
318318
name: energyplus-${{ matrix.os }}.tar.gz
319319
path: package
@@ -331,7 +331,7 @@ jobs:
331331
run: python checkout/scripts/package_tests/runner.py --verbose ${{ matrix.test_key }} package/
332332

333333
- name: Gather Dmg Package from Artifacts
334-
uses: actions/download-artifact@v7
334+
uses: actions/download-artifact@v8
335335
with:
336336
name: energyplus-${{ matrix.os }}.dmg
337337
path: dmg
@@ -379,7 +379,7 @@ jobs:
379379
echo "::endgroup::"
380380
381381
- name: Upload otool info as artifact
382-
uses: actions/upload-artifact@v6
382+
uses: actions/upload-artifact@v7
383383
with:
384384
name: otool_info_dmg_${{ matrix.os }}_${{ matrix.arch }}
385385
path: dmg/otool*json

.github/workflows/release_windows.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ jobs:
161161
run: cmake --build . --target package -j 4 --config $BUILD_TYPE
162162

163163
- name: Upload Zip as artifact for testing
164-
uses: actions/upload-artifact@v6
164+
uses: actions/upload-artifact@v7
165165
with:
166166
name: energyplus-${{ matrix.package-arch }}
167167
path: build/EnergyPlus-*-Windows-${{ matrix.package-arch }}.zip
@@ -231,7 +231,7 @@ jobs:
231231
architecture: ${{ matrix.python-arch }}
232232

233233
- name: Gather Test Package from Artifacts
234-
uses: actions/download-artifact@v7
234+
uses: actions/download-artifact@v8
235235
with:
236236
name: energyplus-${{ matrix.package-arch }}
237237
path: package

.github/workflows/test_code_integrity.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ jobs:
152152
153153
- name: Upload clang-format patch as artifact
154154
if: ${{ failure() }}
155-
uses: actions/upload-artifact@v6
155+
uses: actions/upload-artifact@v7
156156
with:
157157
name: EnergyPlus-${{ github.sha }}-clang_format.patch
158158
path: clang_format.patch
@@ -253,7 +253,7 @@ jobs:
253253

254254
- name: Upload cppcheck results as artifact
255255
if: always()
256-
uses: actions/upload-artifact@v6
256+
uses: actions/upload-artifact@v7
257257
with:
258258
name: EnergyPlus-${{ github.sha }}-cppcheck_results.txt
259259
path: cppcheck.txt

.github/workflows/test_pull_requests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ jobs:
248248
continue-on-error: true
249249
run: python ./scripts/dev/gha_regressions.py ./build/testfiles-develop ./build/testfiles ./regressions
250250

251-
- uses: actions/upload-artifact@v6
251+
- uses: actions/upload-artifact@v7
252252
id: upload_regressions
253253
if: always() && matrix.run_regressions && steps.regressions.outcome == 'failure' # only run this if regressions were encountered "failed"
254254
with:

src/EnergyPlus/Autosizing/WaterHeatingCoilUASizing.cc

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,6 @@ Real64 WaterHeatingCoilUASizer::size(EnergyPlusData &state, Real64 _originalValu
5959
if (!this->checkInitialized(state, errorsFound)) {
6060
return 0.0;
6161
}
62-
Real64 constexpr Acc(0.0001); // Accuracy of result
63-
int constexpr MaxIte(500); // Maximum number of iterations
64-
int SolFla = 0; // Flag of solver
6562

6663
this->preSize(state, _originalValue);
6764
if (this->curZoneEqNum > 0) {
@@ -73,15 +70,21 @@ Real64 WaterHeatingCoilUASizer::size(EnergyPlusData &state, Real64 _originalValu
7370
Real64 UA1 = this->dataCapacityUsedForSizing;
7471
// Invert the simple heating coil model: given the design inlet conditions and the design load,
7572
// find the design UA.
73+
7674
auto f = [&state, this](Real64 const UA) {
7775
state.dataWaterCoils->WaterCoil(this->dataCoilNum).UACoilVariable = UA;
7876
WaterCoils::CalcSimpleHeatingCoil(state, this->dataCoilNum, this->dataFanOp, 1.0, state.dataWaterCoils->SimCalc);
7977
state.dataSize->DataDesignCoilCapacity = state.dataWaterCoils->WaterCoil(this->dataCoilNum).TotWaterHeatingCoilRate;
8078
return (dataCapacityUsedForSizing - state.dataWaterCoils->WaterCoil(this->dataCoilNum).TotWaterHeatingCoilRate) /
8179
dataCapacityUsedForSizing;
8280
};
83-
General::SolveRoot(state, Acc, MaxIte, SolFla, this->autoSizedValue, f, UA0, UA1);
84-
if (SolFla == -1) {
81+
82+
constexpr Real64 Acc = 0.0001; // Accuracy of result
83+
int SolFla;
84+
// Don't use SolveRoot2 (optimizer) for sizing
85+
General::SolveRoot(state, Acc, 500, SolFla, this->autoSizedValue, f, UA0, UA1);
86+
87+
if (SolFla == General::SOLVEROOT_ERROR_ITER) {
8588
errorsFound = true;
8689
std::string msg = "Autosizing of heating coil UA failed for Coil:Heating:Water \"" + this->compName + "\"";
8790
this->addErrorMessage(msg);
@@ -142,7 +145,8 @@ Real64 WaterHeatingCoilUASizer::size(EnergyPlusData &state, Real64 _originalValu
142145
ShowContinueError(state, msg);
143146
}
144147
this->dataErrorsFound = true;
145-
} else if (SolFla == -2) {
148+
149+
} else if (SolFla == General::SOLVEROOT_ERROR_INIT) {
146150
this->errorType = AutoSizingResultType::ErrorType1;
147151
errorsFound = true;
148152
std::string msg = "Autosizing of heating coil UA failed for Coil:Heating:Water \"" + this->compName + "\"";
@@ -256,8 +260,13 @@ Real64 WaterHeatingCoilUASizer::size(EnergyPlusData &state, Real64 _originalValu
256260
return (dataCapacityUsedForSizing - state.dataWaterCoils->WaterCoil(this->dataCoilNum).TotWaterHeatingCoilRate) /
257261
dataCapacityUsedForSizing;
258262
};
259-
General::SolveRoot(state, Acc, MaxIte, SolFla, this->autoSizedValue, f, UA0, UA1);
260-
if (SolFla == -1) {
263+
264+
constexpr Real64 Acc = 0.0001; // Necessary?
265+
int SolFla;
266+
// Don't use SolveRoot2 (optimizer) for sizing
267+
General::SolveRoot(state, Acc, 500, SolFla, this->autoSizedValue, f, UA0, UA1);
268+
269+
if (SolFla == General::SOLVEROOT_ERROR_ITER) {
261270
errorsFound = true;
262271
std::string msg = "Autosizing of heating coil UA failed for Coil:Heating:Water \"" + this->compName + "\"";
263272
this->addErrorMessage(msg);
@@ -302,7 +311,7 @@ Real64 WaterHeatingCoilUASizer::size(EnergyPlusData &state, Real64 _originalValu
302311
ShowContinueError(state, msg);
303312
}
304313
this->dataErrorsFound = true;
305-
} else if (SolFla == -2) {
314+
} else if (SolFla == General::SOLVEROOT_ERROR_INIT) {
306315
this->errorType = AutoSizingResultType::ErrorType1;
307316
errorsFound = true;
308317
std::string msg = "Autosizing of heating coil UA failed for Coil:Heating:Water \"" + this->compName + "\"";

src/EnergyPlus/DXCoils.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14839,6 +14839,7 @@ void CalcTwoSpeedDXCoilStandardRating(EnergyPlusData &state, int const DXCoilNum
1483914839
Real64 OutletAirTemp = state.dataDXCoils->DXCoilOutletTemp(DXCoilNum);
1484014840
return TempDryBulb_Leaving_Apoint - OutletAirTemp;
1484114841
};
14842+
1484214843
General::SolveRoot(state,
1484314844
AccuracyTolerance,
1484414845
MaximumIterations,

src/EnergyPlus/ExtendedHeatIndex.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -542,8 +542,8 @@ namespace ExtendedHI {
542542
// RH: relative humidity in range of 0.0 to 1.0
543543
// The function computes the extended heat index, in Kelvinn
544544

545-
auto const HVACSystemRootSolverMethodBackup = state.dataRootFinder->HVACSystemRootFinding.HVACSystemRootSolverMethod;
546-
state.dataRootFinder->HVACSystemRootFinding.HVACSystemRootSolverMethod = HVACSystemRootSolverAlgorithm::ShortBisectionThenRegulaFalsi;
545+
RootAlgo rootAlgoBackup = state.dataRootFinder->rootAlgo;
546+
state.dataRootFinder->rootAlgo = RootAlgo::ShortBisectionThenRegulaFalsi;
547547
EqvarName eqvar_name = EqvarName::Invalid;
548548
Real64 const eqvar_value = find_eqvar_name_and_value(state, Ta, RH, eqvar_name);
549549

@@ -553,7 +553,7 @@ namespace ExtendedHI {
553553
T = 0.0;
554554
}
555555

556-
state.dataRootFinder->HVACSystemRootFinding.HVACSystemRootSolverMethod = HVACSystemRootSolverMethodBackup;
556+
state.dataRootFinder->rootAlgo = rootAlgoBackup;
557557
return T;
558558
}
559559

0 commit comments

Comments
 (0)