Skip to content

Commit fe16eaf

Browse files
authored
Merge pull request #586 from jeffriley/dev
Defect repair: Fix for issue #585
2 parents 39a1257 + 2f679ed commit fe16eaf

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

src/Log.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -599,6 +599,7 @@ class Log {
599599

600600
value = p_SpecifiedPropertyValue;
601601
valueStr = boost::apply_visitor(FormatVariantValue(), value, fmtStr); // format value
602+
logRecord += valueStr + delimiter; // add value string to log record - with delimiter
602603
}
603604
else {
604605

@@ -972,12 +973,10 @@ class Log {
972973

973974
template <class T>
974975
bool LogStashedSSESupernovaDetails(const T* const p_Star) {
975-
976976
bool result = true;
977977

978978
// if the stashed SSE Supernova record is non-empty, print it, then clear it - otherwise do nothing
979979
if (!m_SSESupernova_DelayedLogRecord.empty()) {
980-
981980
result = LogStandardRecord(std::get<2>(LOGFILE_DESCRIPTOR.at(LOGFILE::SSE_SUPERNOVAE)), 0, LOGFILE::SSE_SUPERNOVAE, p_Star, m_SSESupernova_DelayedLogRecord);
982981
m_SSESupernova_DelayedLogRecord = "";
983982
}

src/changelog.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -749,11 +749,13 @@
749749
// - Fixed incrementing of random seed and binary id when grid file contains sets/ranges
750750
//
751751
// Modified h5view.py (in postProcessing/Folders/H5/PythonScripts) to print number of unique seeds (where relevant) in summary output
752-
// 02.20.00 IM - June 14, 20201 - Enhancement:
752+
// 02.20.00 IM - June 14, 2021 - Enhancement:
753753
// - Port defaults from preProcessing/pythonSubmit.py to options.cpp
754754
// - Minor fixes (e.g., documentation)
755+
// 02.20.01 JR - June 21, 2021 - Defect repair:
756+
// - Fix for issue #585: add formatted value and delimiter to logrecord string in Log.h (defect introduced in v02.18.00; only affected SSE_Supernovae logfile)
755757

756758

757-
const std::string VERSION_STRING = "02.20.00";
759+
const std::string VERSION_STRING = "02.20.01";
758760

759761
# endif // __changelog_h__

0 commit comments

Comments
 (0)