diff --git a/CMakeLists.txt b/CMakeLists.txt index 22dd4b134..09dbe3208 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,7 +16,7 @@ string(CONCAT ddesc "An object-oriented component library supporting radiation t project( Draco DESCRIPTION ${ddesc} - VERSION 7.11 + VERSION 7.12 LANGUAGES CXX C) # Export compile commands for compiler tools diff --git a/ChangeLog b/ChangeLog index 60f875f49..cf292ddfa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,29 @@ +2021-10-06 Kendra P. Long + * Draco has been updated to version 7_12_0 and is tied to the release of Jayenne-8_10_0 + and Capsaicin-1_10_0. + - https://re-git.lanl.gov/draco/draco/-/milestones/2 + - https://re-git.lanl.gov/groups/jayenne/-/milestones/1 + - https://re-git.lanl.gov/groups/capsaicin/-/milestones/1 + + Draco-7_12_0, build date 2021 Oct 06, build type: Release, DBC: 0, DRACO_DIAGNOSTICS: 0 + + CCS-2 Draco Team: Kelly G. Thompson, Kent G. Budge, Matt A. Cleveland, Ryan T. Wollaeger, + Ben R. Ryan, Alex R. Long, Kendra P. Long, James S. Warsa, Jae H. Chang, Andrew T. Till, + and David A. Dixon. + + Prior Contributors: Gabriel M. Rockefeller, Allan B. Wollaber, Tim Kelley, Rob B. Lowrie, + Paul W. Talbot, Katherine J. Wang, Seth D. Cook, Ondrej Certik, Peter Ahrens, + Massimiliano Rosa, Todd J. Urbatsch, Daniel Holladay, Jeff D. Densmore, Howard Pritchard, + Jeff Furnish, John McGhee, Kris C. Garrett, Mike Buksas, Nick Myers, Paul Henning, + Randy Roberts, Seth Johnson, Todd Adams, Tom Evans, and Lori Pritchett-Sheats. + + Copyright (C) 2016-2021 Triad National Security, LLC. (C19028, LA-CC-16-016), + Released under a 3-Clause BSD License. + + 2021-06-30 Kelly (KT) Thompson - * Draco has been updated to version 7_10_0 and is tied to the release of Jayenne-8_9_0 and + * Draco has been updated to version 7_11_0 and is tied to the release of Jayenne-8_9_0 and Capsaicin-1_9_0. - https://rtt.lanl.gov/redmine/versions/99 - https://rtt.lanl.gov/redmine/versions/100 diff --git a/src/ds++/Release.cc b/src/ds++/Release.cc index 5283ce205..37ac00c7b 100644 --- a/src/ds++/Release.cc +++ b/src/ds++/Release.cc @@ -99,28 +99,28 @@ const std::string author_list(bool const use_doxygen_formatting) { mmdevs current_developers; // not totally fair... KT got credit for LOC when svn repository was converted to git. - current_developers.insert(fomdev(174665, "Kelly G. Thompson")); - current_developers.insert(fomdev(23091, "Kent G. Budge")); - current_developers.insert(fomdev(6998, "Matt A. Cleveland")); - current_developers.insert(fomdev(4314, "Ryan T. Wollaeger")); - current_developers.insert(fomdev(3525, "Ben R. Ryan")); - current_developers.insert(fomdev(2927, "Alex R. Long")); + current_developers.insert(fomdev(174829, "Kelly G. Thompson")); + current_developers.insert(fomdev(22854, "Kent G. Budge")); + current_developers.insert(fomdev(12730, "Matt A. Cleveland")); + current_developers.insert(fomdev(5464, "Ryan T. Wollaeger")); + current_developers.insert(fomdev(4074, "Ben R. Ryan")); + current_developers.insert(fomdev(3169, "Alex R. Long")); current_developers.insert(fomdev(1565, "Kendra P. Long")); - current_developers.insert(fomdev(1270, "James S. Warsa")); - current_developers.insert(fomdev(353, "Jae H. Chang")); + current_developers.insert(fomdev(1267, "James S. Warsa")); + current_developers.insert(fomdev(354, "Jae H. Chang")); current_developers.insert(fomdev(127, "Andrew T. Till")); current_developers.insert(fomdev(15, "David A. Dixon")); mmdevs prior_developers; prior_developers.insert(fomdev(3628, "Gabriel M. Rockefeller")); - prior_developers.insert(fomdev(1738, "Allan B. Wollaber")); - prior_developers.insert(fomdev(904, "Tim Kelley")); + prior_developers.insert(fomdev(1716, "Allan B. Wollaber")); + prior_developers.insert(fomdev(879, "Tim Kelley")); prior_developers.insert(fomdev(407, "Rob B. Lowrie")); prior_developers.insert(fomdev(282, "Paul W. Talbot")); prior_developers.insert(fomdev(184, "Katherine J. Wang")); prior_developers.insert(fomdev(98, "Seth D. Cook")); - prior_developers.insert(fomdev(91, "Ondrej Certik")); + prior_developers.insert(fomdev(90, "Ondrej Certik")); prior_developers.insert(fomdev(65, "Peter Ahrens")); // Previous authors with no current LOC attribution (less than 10): diff --git a/tools/ats1-env.sh b/tools/ats1-env.sh index ba0e15d52..720d9095b 100755 --- a/tools/ats1-env.sh +++ b/tools/ats1-env.sh @@ -49,7 +49,7 @@ fi case "$ddir" in #------------------------------------------------------------------------------------------------# - draco-7_9* | draco-7_10* | draco-7_11*) + draco-7_9* | draco-7_10* | draco-7_11* | draco-7_12*) function cce11env() { unset partition diff --git a/tools/ats2-env.sh b/tools/ats2-env.sh index aafd386fe..a5d5b332c 100755 --- a/tools/ats2-env.sh +++ b/tools/ats2-env.sh @@ -59,7 +59,7 @@ fi case $ddir in #--------------------------------------------------------------------------------------------------# - draco-7_10* | draco-7_11*) + draco-7_10* | draco-7_11* | draco-7_12*) function gcc831env() { run "module purge" diff --git a/tools/cray-env.sh b/tools/cray-env.sh index a165245d2..e9754a9ba 100755 --- a/tools/cray-env.sh +++ b/tools/cray-env.sh @@ -40,7 +40,7 @@ fi case "$ddir" in #--------------------------------------------------------------------------------------------------# - draco-7_10* | draco-7_11*) + draco-7_10* | draco-7_11* | draco-7_12*) function cce11env() { unset partition diff --git a/tools/cts1-env.sh b/tools/cts1-env.sh index 596d273ed..be04d3bb2 100755 --- a/tools/cts1-env.sh +++ b/tools/cts1-env.sh @@ -44,7 +44,7 @@ fi case "${ddir}" in #--------------------------------------------------------------------------------------------------# - draco-7_9* | draco-7_10* | draco-7_11*) + draco-7_9* | draco-7_10* | draco-7_11* | draco-7_12*) function intel1904env { run "module purge" diff --git a/tools/darwin-arm-env.sh b/tools/darwin-arm-env.sh index 311f77dc4..23f9b417c 100755 --- a/tools/darwin-arm-env.sh +++ b/tools/darwin-arm-env.sh @@ -19,7 +19,7 @@ environments="armgcc930env" case "${ddir}" in #---------------------------------------------------------------------------# - draco-7_10* | draco-7_11*) + draco-7_10* | draco-7_11* | draco-7_12*) function armgcc930env() { export darwin_queue="-p arm" diff --git a/tools/darwin-power9-env.sh b/tools/darwin-power9-env.sh index c3358dae4..90eea869f 100755 --- a/tools/darwin-power9-env.sh +++ b/tools/darwin-power9-env.sh @@ -19,7 +19,7 @@ environments="p9gcc930env p9xl16117env" case "${ddir}" in #---------------------------------------------------------------------------# - draco-7_10* | draco-7_11*) + draco-7_10* | draco-7_11* | draco-7_12*) function p9gcc930env() { export darwin_queue="-p power9-asc -A asc-priority" diff --git a/tools/darwin-x86_64-env.sh b/tools/darwin-x86_64-env.sh index c4681de32..a2cda3873 100755 --- a/tools/darwin-x86_64-env.sh +++ b/tools/darwin-x86_64-env.sh @@ -25,7 +25,7 @@ popd || exit case "${ddir:=notset}" in #---------------------------------------------------------------------------# - draco-7_10* | draco-7_11*) + draco-7_10* | draco-7_11* | draco-7_12*) function x86gcc930env() { export darwin_queue="-p volta-x86" diff --git a/tools/github.api.py b/tools/github.api.py index 71c105ca2..15cf63c2d 100755 --- a/tools/github.api.py +++ b/tools/github.api.py @@ -81,8 +81,8 @@ str_result = re_date_str.findall(merge_date)[0] number_date = 10000 * int(str_result[0]) + 100 * int(str_result[1]) + int(str_result[2]) if (number_date > start_date): - print("* \"PR #{0} {1}\":{2}".format(entry["number"], entry["title"], - entry["html_url"])) + print("* [PR #{0} {1}]({2})".format(entry["number"], entry["title"], + entry["html_url"])) else: all_done = True break @@ -101,8 +101,8 @@ str_result = re_date_str.findall(merge_date)[0] number_date = 10000 * int(str_result[0]) + 100 * int(str_result[1]) + int(str_result[2]) if (number_date > start_date): - print("* \"PR #{0} {1}\":{2}".format(entry["number"], entry["title"], - entry["html_url"])) + print("* [PR #{0} {1}]({2})".format(entry["number"], entry["title"], + entry["html_url"])) else: all_done = True break @@ -130,11 +130,11 @@ if (number_date > start_date): labels = entry["labels"] if(labels): - print("* \"Github {0} #{1} {2}\":{3}".format(labels[0]["name"], entry["number"], - entry["title"], entry["html_url"])) + print("* [Github {0} #{1} {2}]({3})".format(labels[0]["name"], entry["number"], + entry["title"], entry["html_url"])) else: - print("* \"Github issue #{0} {1}\":{2}".format(entry["number"], entry["title"], - entry["html_url"])) + print("* [Github issue #{0} {1}]({2})".format(entry["number"], entry["title"], + entry["html_url"])) else: all_done = True break @@ -182,8 +182,8 @@ if entry["labels"]: for label in entry["labels"]: if label["name"] == "bug": - print("* \"Github bug #{0} {1}\":{2}".format(entry["number"], entry["title"], - entry["html_url"])) + print("* [Github bug #{0} {1}]({2})".format(entry["number"], entry["title"], + entry["html_url"])) # ------------------------------------------------------------------------------------------------ # # End github.api.py