Skip to content

Commit

Permalink
Merge branch 'develop' into Improved-duct-model
Browse files Browse the repository at this point in the history
  • Loading branch information
@lgu1234
lgu1234 committed Feb 29, 2024
2 parents fee3d93 + 1edbc13 commit 9c9e4ce
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 15 deletions.
Binary file modified bin/IDFEditor/IDFEditor.exe
View file
Binary file not shown.
7 changes: 3 additions & 4 deletions idd/Energy+.idd.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,7 @@
! percent/K => percent/F 0.555555555555556
! person/m2 => person/ft2 0.0928939733269818
! s/m => s/ft 0.3048
! umol/m2-s => umol/ft2-s 0.09290304
! V/K => V/F 0.555555555555556
! W => Btu/h 3.4121412858518
! W/((m3/s)-Pa) => W/((gal/min)-ftH20) 0.188582274697355
Expand Down Expand Up @@ -369,7 +370,6 @@
! kgWater/kgDryAir
! kmol
! kmol/s
! umol/m2s
! m3/m3
! micron
! minutes
Expand All @@ -380,7 +380,6 @@
! ppm
! rev/min
! s
! umol_m2s
! V
! VA
! W/m2, deg C or cd/m2
Expand Down Expand Up @@ -22727,9 +22726,9 @@ IndoorLivingWall,
N2 , \field LED Nominal Intensity
\note The value represents photosynthetic photon flux density (PPFD) of LED grow light.
\note PPFD is measured in micro-mole per m2 per second (umol_m2s) which establishes exactly how many photosynthetically active radiation (PAR) photons are landing on a specific area.
\units umol_m2s
\units umol/m2-s
\type real
\ip-units umol_m2s
\ip-units umol/ft2-s
N3 , \field LED Nominal Power
\note This field defines nominal total LED power for an indoor living wall system.
\units W
Expand Down
6 changes: 3 additions & 3 deletions src/EnergyPlus/OutputProcessor.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5076,12 +5076,12 @@ void ProduceRDDMDD(EnergyPlusData &state)
std::string_view unitName = Constant::unitNames[(int)meter->units];
if (op->ProduceReportVDD == ReportVDD::Yes) {
print(state.files.mdd, "Zone,Meter,{} [{}]\n", meter->Name, unitName);
rf->MDD.push_back(format("Zone,Meter,{}, [{}]", meter->Name, unitName));
rf->MDD.push_back(format("Zone,Meter,{} [{}]", meter->Name, unitName));
} else if (op->ProduceReportVDD == ReportVDD::IDF) {
print(state.files.mdd, "Output:Meter,{},hourly; !- [{}]\n", meter->Name, unitName);
rf->MDD.push_back(format("Output:Meter,{}, [{}]", meter->Name, unitName));
rf->MDD.push_back(format("Output:Meter,{} [{}]", meter->Name, unitName));
print(state.files.mdd, "Output:Meter:Cumulative,{},hourly; !- [{}]\n", meter->Name, unitName);
rf->MDD.push_back(format("Output:Meter:Cumulative,{}, [{}]", meter->Name, unitName));
rf->MDD.push_back(format("Output:Meter:Cumulative,{} [{}]", meter->Name, unitName));
}
}
state.files.mdd.close();
Expand Down
3 changes: 2 additions & 1 deletion src/EnergyPlus/ResultsFramework.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1119,7 +1119,8 @@ namespace ResultsFramework {
}

// Same issue here
static std::array<std::string, (int)ReportFreq::Num> const freqStrings = {"Timestep", "Hourly", "Daily", "Monthly", "RunPeriod", "Yearly"};
static std::array<std::string, (int)ReportFreq::Num> const freqStrings = {
"Detailed", "Timestep", "Hourly", "Daily", "Monthly", "RunPeriod", "Yearly"};
for (ReportFreq freq :
{ReportFreq::Year, ReportFreq::Simulation, ReportFreq::Month, ReportFreq::Day, ReportFreq::Hour, ReportFreq::TimeStep}) {
if (hasFreqTSData(freq)) {
Expand Down
6 changes: 3 additions & 3 deletions src/IDF_Editor/IDFEd-project.VBP
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ HelpContextID="0"
CompatibleMode="0"
MajorVer=1
MinorVer=5
RevisionVer=3
RevisionVer=4
AutoIncrementVer=0
ServerSupportFiles=0
VersionComments="1.53"
VersionComments="1.54"
VersionCompanyName="GARD Analytics"
VersionLegalCopyright="(c) 2000-2017 GARD Analytics"
VersionLegalCopyright="(c) 2000-2024 GARD Analytics"
CompilationType=0
OptimizationType=0
FavorPentiumPro(tm)=0
Expand Down
7 changes: 5 additions & 2 deletions src/IDF_Editor/IDFEditMain.bas
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Attribute VB_Name = "IDFMain"
' command line argument /idd:iddfilename
'

Public Const ver = "1.53" 'current version of IDFEditor - less than 1 is a beta
Public Const ver = "1.54" 'current version of IDFEditor - less than 1 is a beta
Option Explicit
Option Base 1

Expand Down Expand Up @@ -628,7 +628,7 @@ End Sub
'-----------------------------------------------------------------------------
Sub setUnits()
Dim i As Long
maxUsedConvUnits = 155
maxUsedConvUnits = 156
unitsDimensionless = 56
ReDim convUnits(maxUsedConvUnits)
' the following is pasted in from the unitsIPandSI.xls file
Expand Down Expand Up @@ -787,6 +787,7 @@ convUnits(152).siName = "m3/hr-m2"
convUnits(153).siName = "m3/hr"
convUnits(154).siName = "W/((m3/s)-Pa)"
convUnits(155).siName = "W/m2, deg C or cd/m2"
convUnits(156).siName = "umol/m2-s"

convUnits(1).ipName = "ft"
convUnits(2).ipName = "in"
Expand Down Expand Up @@ -943,6 +944,7 @@ convUnits(152).ipName = "gal/hr-ft2"
convUnits(153).ipName = "gal/hr"
convUnits(154).ipName = "W/((ft3/min)-inH2O)"
convUnits(155).ipName = "unknown"
convUnits(156).ipName = "umol/ft2-s"

convUnits(1).mult = 3.28083989501312
convUnits(2).mult = 39.3700787401575
Expand Down Expand Up @@ -1099,6 +1101,7 @@ convUnits(152).mult = 24.5423853466941
convUnits(153).mult = 264.172037284185
convUnits(154).mult = 0.117556910599482
convUnits(155).mult = 1
convUnits(156).mult = 0.09290304

convUnits(7).offset = 32
convUnits(19).offset = 7.686
Expand Down
4 changes: 2 additions & 2 deletions src/IDF_Editor/about.frm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ Begin VB.Form About
Begin VB.Label lblVersion
Alignment = 1 'Right Justify
AutoSize = -1 'True
Caption = "Version 1.53"
Caption = "Version 1.54"
BeginProperty Font
Name = "Arial"
Size = 12
Expand All @@ -92,7 +92,7 @@ Begin VB.Form About
Strikethrough = 0 'False
EndProperty
Height = 285
Left = 1710
Left = 1680
TabIndex = 1
Top = 960
Width = 1410
Expand Down

5 comments on commit 9c9e4ce

@nrel-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Improved-duct-model (lgu1234) - Win64-Windows-10-VisualStudio-16: OK (2766 of 2766 tests passed, 0 test warnings)

Build Badge Test Badge

@nrel-bot-2c
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Improved-duct-model (lgu1234) - x86_64-Linux-Ubuntu-22.04-gcc-11.4: OK (3595 of 3595 tests passed, 0 test warnings)

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

Improved-duct-model (lgu1234) - x86_64-MacOS-10.18-clang-15.0.0: OK (3553 of 3554 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.

Improved-duct-model (lgu1234) - x86_64-Linux-Ubuntu-22.04-gcc-11.4-UnitTestsCoverage-Debug: OK (1978 of 1978 tests passed, 0 test warnings)

Build Badge Test Badge Coverage Badge

@nrel-bot-2c
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Improved-duct-model (lgu1234) - x86_64-Linux-Ubuntu-22.04-gcc-11.4-IntegrationCoverage-Debug: OK (791 of 791 tests passed, 0 test warnings)

Build Badge Test Badge Coverage Badge

Please sign in to comment.