From 07f523d0e6a47c9143dd250dc56f389e39f51220 Mon Sep 17 00:00:00 2001 From: Julien Marrec Date: Tue, 17 Dec 2024 15:31:43 +0100 Subject: [PATCH] Modernize the HTML footnote style: use a div, and ol instead of harcoding numbers and using   and   --- src/EnergyPlus/OutputReportTabular.cc | 2 +- src/EnergyPlus/StandardRatings.hh | 49 ++++++++++++++------------- 2 files changed, 27 insertions(+), 24 deletions(-) diff --git a/src/EnergyPlus/OutputReportTabular.cc b/src/EnergyPlus/OutputReportTabular.cc index bfaa15ce501..856126ec0c2 100644 --- a/src/EnergyPlus/OutputReportTabular.cc +++ b/src/EnergyPlus/OutputReportTabular.cc @@ -17188,7 +17188,7 @@ void WriteTable(EnergyPlusData &state, // end the table tbl_stream << "\n"; if (!footnoteText.empty()) { - tbl_stream << fmt::format("{}\n", footnoteText); + tbl_stream << fmt::format("
{}
\n", footnoteText); } tbl_stream << "

\n"; } else if (thisStyle == TableStyle::XML) { diff --git a/src/EnergyPlus/StandardRatings.hh b/src/EnergyPlus/StandardRatings.hh index 982793f0f95..4b229fc751f 100644 --- a/src/EnergyPlus/StandardRatings.hh +++ b/src/EnergyPlus/StandardRatings.hh @@ -79,29 +79,32 @@ namespace StandardRatings { Real64 constexpr HeatingOutdoorCoilInletAirDBTempH3Test(-8.33); // Outdoor air dry-bulb temp in degrees C (17F) // Test H3 (low and High Speed) Std. AHRI 210/240 - static constexpr std::string_view AHRI2017FOOTNOTE = R"html(ANSI/AHRI ratings account for supply air fan heat and electric power.
-1 - EnergyPlus object type.
-2 - Capacity less than 65K Btu/h (19050 W) - calculated as per AHRI Standard 210/240-2017.
-  Capacity of 65K Btu/h (19050 W) to less than 135K Btu/h (39565 W) - calculated as per AHRI Standard 340/360-2007. -
-  Capacity from 135K (39565 W) to 250K Btu/hr (73268 W) - calculated as per AHRI Standard 365-2009 - Ratings not yet -supported in EnergyPlus.
-3 - SEER (User) is calculated using user-input PLF curve and cooling coefficient of degradation.
-  SEER (Standard) is calculated using the default PLF curve and cooling coefficient of degradation -from the appropriate AHRI standard.)html"; - - static constexpr std::string_view AHRI2023FOOTNOTE = R"html(ANSI/AHRI ratings account for supply air fan heat and electric power.
-1 - EnergyPlus object type.
-2 - Capacity less than 65K Btu/h (19050 W) - calculated as per AHRI Standard 210/240-2023.
-  Capacity of 65K Btu/h (19050 W) to less than 135K Btu/h (39565 W) - calculated as per AHRI Standard 340/360-2022. -
-  Capacity from 135K (39565 W) to 250K Btu/hr (73268 W) - calculated as per AHRI Standard 365-2009 - Ratings not yet -supported in EnergyPlus.
-3 - SEER2 (User) is calculated using user-input PLF curve and cooling coefficient of degradation.
-  SEER2 (Standard) is calculated using the default PLF curve and cooling coefficient of degradation -from the appropriate AHRI standard.
-4 - Value for the Full Speed of the coil. -)html"; + static constexpr std::string_view AHRI2017FOOTNOTE = R"html(

ANSI/AHRI ratings account for supply air fan heat and electric power.

+
    +
  1. EnergyPlus object type.
    2. +
  2. Capacity less than 65K Btu/h (19050 W) - calculated as per AHRI Standard 210/240-2017.
    + Capacity of 65K Btu/h (19050 W) to less than 135K Btu/h (39565 W) - calculated as per AHRI Standard 340/360-2007.
    + Capacity from 135K (39565 W) to 250K Btu/hr (73268 W) - calculated as per AHRI Standard 365-2009 - Ratings not yet supported in EnergyPlus. +
    3. +
  3. SEER (User) is calculated using user-input PLF curve and cooling coefficient of degradation.
    + SEER (Standard) is calculated using the default PLF curve and cooling coefficient of degradation from the appropriate AHRI standard. +
    4. +
)html"; + + static constexpr std::string_view AHRI2023FOOTNOTE = R"html(

ANSI/AHRI ratings account for supply air fan heat and electric power.

+
    +
  1. EnergyPlus object type.
    2. +
  2. + Capacity less than 65K Btu/h (19050 W) - calculated as per AHRI Standard 210/240-2023.
    + Capacity of 65K Btu/h (19050 W) to less than 135K Btu/h (39565 W) - calculated as per AHRI Standard 340/360-2022.
    + Capacity from 135K (39565 W) to 250K Btu/hr (73268 W) - calculated as per AHRI Standard 365-2009 - Ratings not yet supported in EnergyPlus. +
    3. +
  3. + SEER2 (User) is calculated using user-input PLF curve and cooling coefficient of degradation.
    + SEER2 (Standard) is calculated using the default PLF curve and cooling coefficient of degradation from the appropriate AHRI standard. +
    4. +
  4. Value for the Full Speed of the coil.
    5. +
)html"; // Defrost strategy (heat pump only) enum class DefrostStrat