Merge pull request #101 from USEPA/fix_maintenance_kmn

Fix maintenance: issue with run_fredi line 304
USEPA · Oct 18, 2023 · 6685eaa · 6685eaa
2 parents adb7c07 + 98c3dc7
commit 6685eaa
Show file tree

Hide file tree

Showing 65 changed files with 4 additions and 11,703 deletions.
diff --git a/.github/workflows/test_fredi.yml b/.github/workflows/test_fredi.yml
@@ -109,7 +109,7 @@ jobs:
             save0       <- listResults |> save(file= oPath1 |> file.path("defaultScenarioTotals.rda")) |> try()
 
             ### Remove results
-            rm(results0, test0, listResults)
+            rm(results0, tests0, listResults)
           }
 
           ### Create report results

diff --git a/.gitignore b/.gitignore
@@ -18,6 +18,7 @@ createSystemData/inst/extdata/sv/~$*
 FrEDI/.Rproj.user/*
 FrEDI/.Rproj.user
 FrEDI/.Rhistory
+# FrEDI/data_tests/report_figures/*
 
 
 
diff --git a/FrEDI/R/run_fredi.R b/FrEDI/R/run_fredi.R
@@ -301,7 +301,7 @@ run_fredi <- function(
     tempInput <- data.frame(year= refYear_temp, temp_C = 0) |> rbind(tempInput)
 
     ### Interpolate annual values and then drop region
-    temp_df   <- tempInput  (function(x){
+    temp_df   <- tempInput |> (function(x){
       minYear_x <- x$year |> min()
       interpYrs <- refYear_temp:maxYear
       ### Interpolate

diff --git a/FrEDI/R/utils_create_report_figures.R b/FrEDI/R/utils_create_report_figures.R
@@ -1076,7 +1076,7 @@ create_default_tablePlot <- function(x=1){
   returnList[["totals"]] <- totals0
   returnList[["plot"  ]] <- plot0
   ### Return
-  return(x)
+  return(returnList)
 } ### End create_default_tablePlot
 
 ###### End File ######
diff --git a/FrEDI/data_tests/report_figures/DoW/integer_results_byType.rda b/FrEDI/data_tests/report_figures/DoW/integer_results_byType.rda
diff --git a/FrEDI/data_tests/report_figures/DoW/integer_results_totals.rda b/FrEDI/data_tests/report_figures/DoW/integer_results_totals.rda
diff --git a/FrEDI/data_tests/report_figures/appendix_figures/gcm_appendix_plots.rda b/FrEDI/data_tests/report_figures/appendix_figures/gcm_appendix_plots.rda
diff --git a/FrEDI/data_tests/report_figures/appendix_figures/gcm_results_byDoW_byType.csv b/FrEDI/data_tests/report_figures/appendix_figures/gcm_results_byDoW_byType.csv
diff --git a/FrEDI/data_tests/report_figures/appendix_figures/images/ATS Extreme Temperature_2010.pdf b/FrEDI/data_tests/report_figures/appendix_figures/images/ATS Extreme Temperature_2010.pdf
diff --git a/FrEDI/data_tests/report_figures/appendix_figures/images/ATS Extreme Temperature_2090.pdf b/FrEDI/data_tests/report_figures/appendix_figures/images/ATS Extreme Temperature_2090.pdf
diff --git a/FrEDI/data_tests/report_figures/appendix_figures/images/Air Quality_2010.pdf b/FrEDI/data_tests/report_figures/appendix_figures/images/Air Quality_2010.pdf
diff --git a/FrEDI/data_tests/report_figures/appendix_figures/images/Air Quality_2090.pdf b/FrEDI/data_tests/report_figures/appendix_figures/images/Air Quality_2090.pdf
diff --git a/FrEDI/data_tests/report_figures/appendix_figures/images/Asphalt Roads_2010.pdf b/FrEDI/data_tests/report_figures/appendix_figures/images/Asphalt Roads_2010.pdf
diff --git a/FrEDI/data_tests/report_figures/appendix_figures/images/Asphalt Roads_2090.pdf b/FrEDI/data_tests/report_figures/appendix_figures/images/Asphalt Roads_2090.pdf
diff --git a/FrEDI/data_tests/report_figures/appendix_figures/images/CIL Agriculture_2010.pdf b/FrEDI/data_tests/report_figures/appendix_figures/images/CIL Agriculture_2010.pdf
diff --git a/FrEDI/data_tests/report_figures/appendix_figures/images/CIL Agriculture_2090.pdf b/FrEDI/data_tests/report_figures/appendix_figures/images/CIL Agriculture_2090.pdf
diff --git a/FrEDI/data_tests/report_figures/appendix_figures/images/CIL Crime_2010.pdf b/FrEDI/data_tests/report_figures/appendix_figures/images/CIL Crime_2010.pdf
diff --git a/FrEDI/data_tests/report_figures/appendix_figures/images/CIL Crime_2090.pdf b/FrEDI/data_tests/report_figures/appendix_figures/images/CIL Crime_2090.pdf
diff --git a/FrEDI/data_tests/report_figures/appendix_figures/images/CIL Extreme Temperature_2010.pdf b/FrEDI/data_tests/report_figures/appendix_figures/images/CIL Extreme Temperature_2010.pdf
diff --git a/FrEDI/data_tests/report_figures/appendix_figures/images/CIL Extreme Temperature_2090.pdf b/FrEDI/data_tests/report_figures/appendix_figures/images/CIL Extreme Temperature_2090.pdf
diff --git a/FrEDI/data_tests/report_figures/appendix_figures/images/Coastal Properties_all.pdf b/FrEDI/data_tests/report_figures/appendix_figures/images/Coastal Properties_all.pdf
diff --git a/.../data_tests/report_figures/appendix_figures/images/Electricity Demand and Supply_2010.pdf b/.../data_tests/report_figures/appendix_figures/images/Electricity Demand and Supply_2010.pdf
diff --git a/.../data_tests/report_figures/appendix_figures/images/Electricity Demand and Supply_2090.pdf b/.../data_tests/report_figures/appendix_figures/images/Electricity Demand and Supply_2090.pdf
diff --git a/...report_figures/appendix_figures/images/Electricity Transmission and Distribution_2010.pdf b/...report_figures/appendix_figures/images/Electricity Transmission and Distribution_2010.pdf
diff --git a/...report_figures/appendix_figures/images/Electricity Transmission and Distribution_2090.pdf b/...report_figures/appendix_figures/images/Electricity Transmission and Distribution_2090.pdf
diff --git a/FrEDI/data_tests/report_figures/appendix_figures/images/Extreme Temperature_2010.pdf b/FrEDI/data_tests/report_figures/appendix_figures/images/Extreme Temperature_2010.pdf
diff --git a/FrEDI/data_tests/report_figures/appendix_figures/images/Extreme Temperature_2090.pdf b/FrEDI/data_tests/report_figures/appendix_figures/images/Extreme Temperature_2090.pdf
diff --git a/.../data_tests/report_figures/appendix_figures/images/High Tide Flooding and Traffic_all.pdf b/.../data_tests/report_figures/appendix_figures/images/High Tide Flooding and Traffic_all.pdf
diff --git a/FrEDI/data_tests/report_figures/appendix_figures/images/Inland Flooding_2010.pdf b/FrEDI/data_tests/report_figures/appendix_figures/images/Inland Flooding_2010.pdf
diff --git a/FrEDI/data_tests/report_figures/appendix_figures/images/Inland Flooding_2090.pdf b/FrEDI/data_tests/report_figures/appendix_figures/images/Inland Flooding_2090.pdf
diff --git a/FrEDI/data_tests/report_figures/appendix_figures/images/Labor_2010.pdf b/FrEDI/data_tests/report_figures/appendix_figures/images/Labor_2010.pdf
diff --git a/FrEDI/data_tests/report_figures/appendix_figures/images/Labor_2090.pdf b/FrEDI/data_tests/report_figures/appendix_figures/images/Labor_2090.pdf
diff --git a/FrEDI/data_tests/report_figures/appendix_figures/images/Marine Fisheries_2010.pdf b/FrEDI/data_tests/report_figures/appendix_figures/images/Marine Fisheries_2010.pdf
diff --git a/FrEDI/data_tests/report_figures/appendix_figures/images/Marine Fisheries_2090.pdf b/FrEDI/data_tests/report_figures/appendix_figures/images/Marine Fisheries_2090.pdf
diff --git a/FrEDI/data_tests/report_figures/appendix_figures/images/Mental Health_2010.pdf b/FrEDI/data_tests/report_figures/appendix_figures/images/Mental Health_2010.pdf
diff --git a/FrEDI/data_tests/report_figures/appendix_figures/images/Mental Health_2090.pdf b/FrEDI/data_tests/report_figures/appendix_figures/images/Mental Health_2090.pdf
diff --git a/FrEDI/data_tests/report_figures/appendix_figures/images/Rail_2010.pdf b/FrEDI/data_tests/report_figures/appendix_figures/images/Rail_2010.pdf
diff --git a/FrEDI/data_tests/report_figures/appendix_figures/images/Rail_2090.pdf b/FrEDI/data_tests/report_figures/appendix_figures/images/Rail_2090.pdf
diff --git a/FrEDI/data_tests/report_figures/appendix_figures/images/Roads_2010.pdf b/FrEDI/data_tests/report_figures/appendix_figures/images/Roads_2010.pdf
diff --git a/FrEDI/data_tests/report_figures/appendix_figures/images/Roads_2090.pdf b/FrEDI/data_tests/report_figures/appendix_figures/images/Roads_2090.pdf
diff --git a/FrEDI/data_tests/report_figures/appendix_figures/images/Southwest Dust_2010.pdf b/FrEDI/data_tests/report_figures/appendix_figures/images/Southwest Dust_2010.pdf
diff --git a/FrEDI/data_tests/report_figures/appendix_figures/images/Southwest Dust_2090.pdf b/FrEDI/data_tests/report_figures/appendix_figures/images/Southwest Dust_2090.pdf
diff --git a/FrEDI/data_tests/report_figures/appendix_figures/images/Urban Drainage_2010.pdf b/FrEDI/data_tests/report_figures/appendix_figures/images/Urban Drainage_2010.pdf
diff --git a/FrEDI/data_tests/report_figures/appendix_figures/images/Urban Drainage_2090.pdf b/FrEDI/data_tests/report_figures/appendix_figures/images/Urban Drainage_2090.pdf
diff --git a/FrEDI/data_tests/report_figures/appendix_figures/images/Valley Fever_2010.pdf b/FrEDI/data_tests/report_figures/appendix_figures/images/Valley Fever_2010.pdf
diff --git a/FrEDI/data_tests/report_figures/appendix_figures/images/Valley Fever_2090.pdf b/FrEDI/data_tests/report_figures/appendix_figures/images/Valley Fever_2090.pdf
diff --git a/FrEDI/data_tests/report_figures/appendix_figures/images/Vibrio_2010.pdf b/FrEDI/data_tests/report_figures/appendix_figures/images/Vibrio_2010.pdf
diff --git a/FrEDI/data_tests/report_figures/appendix_figures/images/Vibrio_2090.pdf b/FrEDI/data_tests/report_figures/appendix_figures/images/Vibrio_2090.pdf
diff --git a/FrEDI/data_tests/report_figures/appendix_figures/images/Water Quality_2010.pdf b/FrEDI/data_tests/report_figures/appendix_figures/images/Water Quality_2010.pdf
diff --git a/FrEDI/data_tests/report_figures/appendix_figures/images/Water Quality_2090.pdf b/FrEDI/data_tests/report_figures/appendix_figures/images/Water Quality_2090.pdf
diff --git a/FrEDI/data_tests/report_figures/appendix_figures/images/Wildfire_2010.pdf b/FrEDI/data_tests/report_figures/appendix_figures/images/Wildfire_2010.pdf
diff --git a/FrEDI/data_tests/report_figures/appendix_figures/images/Wildfire_2090.pdf b/FrEDI/data_tests/report_figures/appendix_figures/images/Wildfire_2090.pdf
diff --git a/FrEDI/data_tests/report_figures/appendix_figures/images/Wind Damage_2010.pdf b/FrEDI/data_tests/report_figures/appendix_figures/images/Wind Damage_2010.pdf
diff --git a/FrEDI/data_tests/report_figures/appendix_figures/images/Wind Damage_2090.pdf b/FrEDI/data_tests/report_figures/appendix_figures/images/Wind Damage_2090.pdf
diff --git a/FrEDI/data_tests/report_figures/appendix_figures/images/Winter Recreation_2010.pdf b/FrEDI/data_tests/report_figures/appendix_figures/images/Winter Recreation_2010.pdf
diff --git a/FrEDI/data_tests/report_figures/appendix_figures/images/Winter Recreation_2090.pdf b/FrEDI/data_tests/report_figures/appendix_figures/images/Winter Recreation_2090.pdf
diff --git a/FrEDI/data_tests/report_figures/appendix_figures/slr_appendix_plots.rda b/FrEDI/data_tests/report_figures/appendix_figures/slr_appendix_plots.rda
diff --git a/FrEDI/data_tests/report_figures/appendix_figures/slr_results_byDoW_byType.csv b/FrEDI/data_tests/report_figures/appendix_figures/slr_results_byDoW_byType.csv
diff --git a/FrEDI/data_tests/report_figures/fig7/GCM_2090.pdf b/FrEDI/data_tests/report_figures/fig7/GCM_2090.pdf
diff --git a/FrEDI/data_tests/report_figures/fig7/SLR_all.pdf b/FrEDI/data_tests/report_figures/fig7/SLR_all.pdf
diff --git a/FrEDI/data_tests/report_figures/fig7/gcm_fig7_plots.rda b/FrEDI/data_tests/report_figures/fig7/gcm_fig7_plots.rda
diff --git a/FrEDI/data_tests/report_figures/fig7/gcm_results_byDoW_totals.csv b/FrEDI/data_tests/report_figures/fig7/gcm_results_byDoW_totals.csv
diff --git a/FrEDI/data_tests/report_figures/fig7/slr_fig7_plots.rda b/FrEDI/data_tests/report_figures/fig7/slr_fig7_plots.rda
diff --git a/FrEDI/data_tests/report_figures/fig7/slr_results_byDoW_totals.csv b/FrEDI/data_tests/report_figures/fig7/slr_results_byDoW_totals.csv
diff --git a/FrEDI/data_tests/report_figures/slrScenarios.pdf b/FrEDI/data_tests/report_figures/slrScenarios.pdf