From 09026b1a8efea8339f6c56ee79689f445fd137d7 Mon Sep 17 00:00:00 2001 From: Dan McGraw Date: Wed, 13 May 2026 15:45:22 -0600 Subject: [PATCH 01/10] Add ORCIDS iDs to Authors@R in DESCRIPTION --- DESCRIPTION | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 1435fbe..89bf3a2 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -2,24 +2,30 @@ Package: rfaR Title: RMC Reservoir Frequency Analysis in R Version: 0.5.1 Authors@R: c( - person("Daniel", "McGraw", , "daniel.e.mcgraw@usace.army.mil", - role = c("aut", "cre"), comment = "P.E., USACE RMC"), - person("Andrew", "Verdin", , "andrew.p.verdin@usace.army.mil", - role = "aut", comment = "PhD, P.H., USACE RMC"), - person("C. Haden", "Smith", , "cole.h.smith@usace.army.mil", - role = "aut", comment = "P.E., USACE RMC"), + person("Daniel", "McGraw", , "daniel.e.mcgraw@usace.army.mil", + role = c("aut", "cre"), + comment = c("P.E., USACE RMC", ORCID = "0009-0006-4859-0179")), + person("Andrew", "Verdin", , "andrew.p.verdin@usace.army.mil", + role = "aut", + comment = c("PhD, P.H., USACE RMC", ORCID = "0000-0003-1967-9626")), + person("C. Haden", "Smith", , "cole.h.smith@usace.army.mil", + role = "aut", + comment = c("P.E., USACE RMC", ORCID = "0000-0002-4651-9890")), person("Allen", "Avance", , "allen.avance@usace.army.mil", role = "ctb", comment = "P.E., USACE RMC"), person("Samantha", "Hartke", , "samantha.h.hartke@usace.army.mil", - role = "ctb", comment = "PhD, USACE RMC"), + role = "ctb", + comment = c("PhD, USACE RMC", ORCID = "0000-0002-0239-4723")), person("Julian", "Gonzalez", , "julian.t.gonzalez@usace.army.mil", - role = "ctb", comment = "USACE RMC"), + role = "ctb", + comment = c("USACE RMC", ORCID = "0009-0009-9058-7653")), person("Sadie", "Niblett", , "sadie.s.niblett@usace.army.mil", - role = "rev", comment = "USACE RMC"), + role = "rev", + comment = c("USACE RMC", ORCID = "0009-0008-8588-4816")), person("Reuben", "Sasaki", , "reuben.a.sasaki@usace.army.mil", - role = "rev", comment = "P.E.,USACE RMC"), + role = "rev", comment = "P.E., USACE RMC"), person("Bryan", "Robinson", , "bryan.j.robinson@usace.army.mil", - role = "rev", comment = "P.E.,USACE RMC")) + role = "rev", comment = "P.E., USACE RMC")) Description: An R implementation of the U.S. Army Corps of Engineers (USACE) Risk Management Center-Reservoir Frequency Analysis (RMC-RFA) methodology/software. This package produces reservoir stage-frequency curves with uncertainty bounds From dfd86e27861cf6618bad82c9441a949cdd31bace Mon Sep 17 00:00:00 2001 From: Dan McGraw Date: Wed, 13 May 2026 15:47:33 -0600 Subject: [PATCH 02/10] Migrate liccense to 0BSD --- LICENSE | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/LICENSE b/LICENSE index 6d52d3c..e2a8ac7 100644 --- a/LICENSE +++ b/LICENSE @@ -1,3 +1,12 @@ -YEAR: 2024 -COPYRIGHT HOLDER: US Army Corps of Engineers - Risk Management Center -ORGANIZATION: US Army Corps of Engineers - Risk Management Center +Copyright (C) 2026 by U.S. Army Corps of Engineers - Risk Management Center + +Permission to use, copy, modify, and/or distribute this software for any +purpose with or without fee is hereby granted. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. From 91aebd25bbb90b730f09154104045291c3a7d7af Mon Sep 17 00:00:00 2001 From: Dan McGraw Date: Wed, 13 May 2026 15:47:52 -0600 Subject: [PATCH 03/10] UPDATE License field in DESCRIPTION for 0BSD --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 89bf3a2..702e3ea 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -39,7 +39,7 @@ Description: An R implementation of the U.S. Army Corps of Engineers (USACE) parameters (stage, discharge, duration) and their associated annual exceedance probabilities. Nickname: Friday -License: BSD_3_clause + file LICENSE +License: file LICENSE URL: https://github.com/USACE-RMC/rfaR, https://usace-rmc.github.io/rfaR/ BugReports: https://github.com/USACE-RMC/rfaR/issues Encoding: UTF-8 From 01db81d887b410e16d22b90a00ac6c5c22444ff1 Mon Sep 17 00:00:00 2001 From: Dan McGraw Date: Wed, 13 May 2026 15:48:11 -0600 Subject: [PATCH 04/10] Remove LICENSE.note, superseded by 0BSD migration --- LICENSE.note | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 LICENSE.note diff --git a/LICENSE.note b/LICENSE.note deleted file mode 100644 index 1de16b3..0000000 --- a/LICENSE.note +++ /dev/null @@ -1,9 +0,0 @@ -NOTICE: -The U.S. Army Corps of Engineers, Risk Management Center (USACE-RMC) makes no guarantees about the results, or appropriateness of outputs, obtained from rfaR. -LIST OF CONDITIONS: -Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: -* Redistributions of source code must retain the above notice, this list of conditions, and the following disclaimer. -* Redistributions in binary form must reproduce the above notice, this list of conditions, and the following disclaimer in the documentation and/or other materials provided with the distribution. -* The names of the U.S. Government, the U.S. Army Corps of Engineers, the Institute for Water Resources, or the Risk Management Center may not be used to endorse or promote products derived from this software without specific prior written permission. Nor may the names of its contributors be used to endorse or promote products derived from this software without specific prior written permission. -DISCLAIMER: -THIS SOFTWARE IS PROVIDED BY THE U.S. ARMY CORPS OF ENGINEERS RISK MANAGEMENT CENTER (USACE-RMC) "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL USACE-RMC BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE From b3e424db56a87e29cb51e9df7ccc0a0637a5d131 Mon Sep 17 00:00:00 2001 From: Dan McGraw Date: Wed, 13 May 2026 15:49:55 -0600 Subject: [PATCH 05/10] Use dynamic version and year in CITATION --- inst/CITATION | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/inst/CITATION b/inst/CITATION index 5dea8c5..7fb003b 100644 --- a/inst/CITATION +++ b/inst/CITATION @@ -1,15 +1,17 @@ +meta <- utils::packageDescription("rfaR") + citHeader("To cite rfaR:") bibentry( - bibtype = "Manual", - title = "rfaR: RMC Reservoir Frequency Analysis in R", - author = c( + bibtype = "Manual", + title = "rfaR: RMC Reservoir Frequency Analysis in R", + author = c( person("Daniel", "McGraw"), person("Andrew", "Verdin"), person("C. Haden", "Smith") ), organization = "U.S. Army Corps of Engineers, Risk Management Center", - address = "Lakewood, CO", - year = "2026", - version = "0.1.3", - url = "https://github.com/USACE-RMC/rfaR" + address = "Lakewood, CO", + year = format(Sys.Date(), "%Y"), + version = meta$Version, + url = "https://github.com/USACE-RMC/rfaR" ) From fb978acf593c9e3a1daa0f7e5fe3106be05606b5 Mon Sep 17 00:00:00 2001 From: Dan McGraw Date: Wed, 13 May 2026 15:50:24 -0600 Subject: [PATCH 06/10] Move CONTRIBUTING.md to .github/ --- CONTRIBUTING.md => .github/CONTRIBUTING.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename CONTRIBUTING.md => .github/CONTRIBUTING.md (100%) diff --git a/CONTRIBUTING.md b/.github/CONTRIBUTING.md similarity index 100% rename from CONTRIBUTING.md rename to .github/CONTRIBUTING.md From 65a21ccbe8fab70afcf102bb319b069310c7d563 Mon Sep 17 00:00:00 2001 From: Dan McGraw Date: Wed, 13 May 2026 15:51:46 -0600 Subject: [PATCH 07/10] Add Results/ to .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 1d5fa81..eacaa0d 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ inst/doc /full_uncert_testing/ dev rfaR_results +"Results/" From ff7b41744b1a384ea65dff0aa3e0158db86093ae Mon Sep 17 00:00:00 2001 From: Dan McGraw Date: Wed, 13 May 2026 15:56:40 -0600 Subject: [PATCH 08/10] Add Results/ to .Rbuildignore --- .Rbuildignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.Rbuildignore b/.Rbuildignore index f8fcb1c..8a673c3 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -10,3 +10,4 @@ ^pkgdown$ ^\.github$ ^vignettes/articles$ +"^Results$" From f6da46feb89d56d94cbbfc9fffa38bb6bb70e75d Mon Sep 17 00:00:00 2001 From: Dan McGraw Date: Wed, 13 May 2026 15:59:01 -0600 Subject: [PATCH 09/10] Fix Results/ entries in .gitignore and .Rbuildignore --- .Rbuildignore | 2 +- .gitignore | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.Rbuildignore b/.Rbuildignore index 8a673c3..a2f6c1f 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -10,4 +10,4 @@ ^pkgdown$ ^\.github$ ^vignettes/articles$ -"^Results$" +^Results$ diff --git a/.gitignore b/.gitignore index eacaa0d..7494f3e 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,4 @@ inst/doc /full_uncert_testing/ dev rfaR_results -"Results/" +Results/ From a77003c39632645414c1b0d716285fbeb0b9192f Mon Sep 17 00:00:00 2001 From: Dan McGraw Date: Wed, 13 May 2026 16:27:30 -0600 Subject: [PATCH 10/10] Update rfaR-package.Rd via devtools::document() --- man/rfaR-package.Rd | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/man/rfaR-package.Rd b/man/rfaR-package.Rd index 1d24d8d..e19239b 100644 --- a/man/rfaR-package.Rd +++ b/man/rfaR-package.Rd @@ -18,22 +18,22 @@ Useful links: } \author{ -\strong{Maintainer}: Daniel McGraw \email{daniel.e.mcgraw@usace.army.mil} (P.E., USACE RMC) +\strong{Maintainer}: Daniel McGraw \email{daniel.e.mcgraw@usace.army.mil} (\href{https://orcid.org/0009-0006-4859-0179}{ORCID}) (P.E., USACE RMC) Authors: \itemize{ - \item Andrew Verdin \email{andrew.p.verdin@usace.army.mil} (PhD, P.H., USACE RMC) - \item C. Haden Smith \email{cole.h.smith@usace.army.mil} (P.E., USACE RMC) + \item Andrew Verdin \email{andrew.p.verdin@usace.army.mil} (\href{https://orcid.org/0000-0003-1967-9626}{ORCID}) (PhD, P.H., USACE RMC) + \item C. Haden Smith \email{cole.h.smith@usace.army.mil} (\href{https://orcid.org/0000-0002-4651-9890}{ORCID}) (P.E., USACE RMC) } Other contributors: \itemize{ \item Allen Avance \email{allen.avance@usace.army.mil} (P.E., USACE RMC) [contributor] - \item Samantha Hartke \email{samantha.h.hartke@usace.army.mil} (PhD, USACE RMC) [contributor] - \item Julian Gonzalez \email{julian.t.gonzalez@usace.army.mil} (USACE RMC) [contributor] - \item Sadie Niblett \email{sadie.s.niblett@usace.army.mil} (USACE RMC) [reviewer] - \item Reuben Sasaki \email{reuben.a.sasaki@usace.army.mil} (P.E.,USACE RMC) [reviewer] - \item Bryan Robinson \email{bryan.j.robinson@usace.army.mil} (P.E.,USACE RMC) [reviewer] + \item Samantha Hartke \email{samantha.h.hartke@usace.army.mil} (\href{https://orcid.org/0000-0002-0239-4723}{ORCID}) (PhD, USACE RMC) [contributor] + \item Julian Gonzalez \email{julian.t.gonzalez@usace.army.mil} (\href{https://orcid.org/0009-0009-9058-7653}{ORCID}) (USACE RMC) [contributor] + \item Sadie Niblett \email{sadie.s.niblett@usace.army.mil} (\href{https://orcid.org/0009-0008-8588-4816}{ORCID}) (USACE RMC) [reviewer] + \item Reuben Sasaki \email{reuben.a.sasaki@usace.army.mil} (P.E., USACE RMC) [reviewer] + \item Bryan Robinson \email{bryan.j.robinson@usace.army.mil} (P.E., USACE RMC) [reviewer] } }