From c27ab1a43b6a8cf6c3e0c350133903f6debbe48b Mon Sep 17 00:00:00 2001 From: Alex Gebben Work Date: Wed, 22 Jul 2026 16:48:25 -0600 Subject: [PATCH] Order cleanup --- .gitignore | 2 ++ 1_Create_CREP_Data.r | 14 +++++++------- ...d.r => 3_Download_Crop_Choice_Data_from_Cloud.r | 0 ...Data.r => 4_Download_and_Process_Pumping_Data.r | 0 4 files changed, 9 insertions(+), 7 deletions(-) rename 4_Download_Crop_Choice_Data_frmo_Cloud.r => 3_Download_Crop_Choice_Data_from_Cloud.r (100%) rename 3_Download_and_Process_Pumping_Data.r => 4_Download_and_Process_Pumping_Data.r (100%) diff --git a/.gitignore b/.gitignore index eb5126e..f318a13 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,8 @@ # ---> R #Crop choice has very large raw files. These will be downloaded with a script so ignore them in git Data/Crop_Choice/ +#Ignore output data +Data/Output_Data/ # Data/CREP_and_Fallow/Bill_SB22_Fallow_Payments.csv Data/CREP_and_Fallow/CREP.csv diff --git a/1_Create_CREP_Data.r b/1_Create_CREP_Data.r index f386f04..9e0e0e8 100644 --- a/1_Create_CREP_Data.r +++ b/1_Create_CREP_Data.r @@ -4,14 +4,14 @@ library(janitor) CONTRACT_NUMBER <- c('ALA#3','ALA#6','ALA#7','ALA#8','ALA#9','ALA#10','ALA#12','ALA#15','SAG#6','ALA#17','ALA#18','ALA#22','ALA#23','ALA#25','RG#4','ALA#26','ALA#27','ALA#28','ALA#29','ALA#30','ALA#31','ALA#32','ALA#33','ALA#34','ALA#38','ALA#39','SAG#33','SAG#34','ALA#40','ALA#41','ALA#42','ALA#43','ALA#44','ALA#45','ALA#47','SAG#39') FIRST_FALLOW_YEAR <- c(2014,2014,2014,2014,2014,2014,2014,2014,2015,2015,2015,2015,2015,2015,2016,2016,2016,2016,2016,2016,2016,2016,2016,2016,2018,2018,2020,2020,2020,2020,2020,2021,2021,2021,2021,2024) ACRES <- c(124.9,126,119.5,119.2,121.1,118.1,122.8,67,114.1,118.6,122,121,124.66,80,149.8,110,110,110,92.9,122.3,94,123,126,126,121.28,120.5,122.8,122,118,121.84,120,120,120.01,120.1,120.11,122.94) -CREP_PERM <- cbind(CONTRACT_NUMBER,FIRST_FALLOW_YEAR,ACRES,read_csv("./Data/CREP_and_Fallow/CREP_Perm.csv")) %>% as_tibble %>% mutate(program='CREP_perm',RETURN_YEAR=Inf,contract_type='Perm') +CREP_PERM <- cbind(CONTRACT_NUMBER,FIRST_FALLOW_YEAR,ACRES,read_csv("./Data/CREP_and_Fallow/Raw_CSV_Data_Made_from_Files/CREP_Perm.csv")) %>% as_tibble %>% mutate(program='CREP_perm',RETURN_YEAR=Inf,contract_type='Perm') ###############################Temp CREP contract CONTRACT_NUMBER <- c('SAG#1','SAG#2','SAG#3','SAG#4','RG#1','RG#2','ALA#2','ALA#11','SAG#7','SAG#8','SAG#9','SAG#10','SAG#11','ALA#16','ALA#19','ALA#21','ALA#24','SAG#12','SAG#13','RG#3','RG#7','RG#8','ALA#35','SAG#14','SAG#15','SAG#16','ALA#36','SAG#17','SAG#18','SAG#19','SAG#20','SAG#21','SAG#22','SAG#23','SAG#24','SAG#25','SAG#26','SAG#27','SAG#28','ALA#37','SAG#29','SAG#30','SAG#31','RG#9','RG#10','SAG#32','RG#11','SAG#35','SAG#36','SAG#37','SAG#38','RG#12','RG#13') FIRST_FALLOW_YEAR <- c(2014,2014,2014,2014,2014,2014,2014,2014,2015,2015,2015,2015,2015,2015,2015,2015,2015,2016,2016,2016,2016,2016,2016,2017,2017,2017,2017,2018,2018,2018,2018,2018,2018,2018,2018,2018,2018,2018,2018,2018,2019,2019,2019,2019,2019,2020,2022,2023,2023,2023,2023,2024,2024) RETURN_YEAR <- c(2029,2029,2029,2029,2029,2029,2029,2029,2030,2030,2030,2030,2030,2030,2030,2030,2030,2031,2031,2031,2031,2031,2031,2032,2032,2032,2032,2033,2033,2033,2033,2033,2033,2033,2033,2033,2033,2033,2033,2033,2034,2034,2034,2034,2034,2035,2037,2038,2038,2038,2038,2038,2038) ACRES <- c(144,144,210,60,130,120.4,120,121.5,172.09,113,191,116.5,120,124,120,129,120.97,120,124,139.9,122,123.32,122,120,122.4,123.4,113.92,120,120.35,114.32,124.78,125.58,119.3,123,125.15,126.1,126.3,125.5,53.6,106,112.81,126.95,118.9,118.36,120,120,100,120,130.02,114.54,120,121.92,126.15) -CREP_TEMP <- cbind(CONTRACT_NUMBER,FIRST_FALLOW_YEAR,RETURN_YEAR,ACRES,read_csv("./Data/CREP_and_Fallow/CREP_Temp.csv")) %>% as_tibble %>% mutate(program='CREP',contract_type='Temp') +CREP_TEMP <- cbind(CONTRACT_NUMBER,FIRST_FALLOW_YEAR,RETURN_YEAR,ACRES,read_csv("./Data/CREP_and_Fallow/Raw_CSV_Data_Made_from_Files/CREP_Temp.csv")) %>% as_tibble %>% mutate(program='CREP',contract_type='Temp') ######SBD1 Fallow Program CONTRACT_NUMBER <- c(paste("Fallow Parcel ",1:23),paste("Fallow Parcel ",1:27),c(paste("Fallow Parcel ",1:9),paste("Fallow Parcel ",11:33))) @@ -40,7 +40,7 @@ ACRES <- c( ) -SBD1_TEMP_FALLOW <- cbind(CONTRACT_NUMBER,FIRST_FALLOW_YEAR,RETURN_YEAR,ACRES,read_csv("./Data/CREP_and_Fallow/SBD1_Temp_Fallow.csv")) %>% as_tibble %>% mutate(program='SBD1_temp_fallow',contract_type='Temp',wdid1=as.character(wdid1),wdid2=as.character(wdid2),wdid3=as.character(wdid3),wdid4=as.character(wdid4),wdid5=as.character(wdid5),wdid6=as.character(wdid6),wdid7=as.character(wdid7),wdid8=as.character(wdid8)) +SBD1_TEMP_FALLOW <- cbind(CONTRACT_NUMBER,FIRST_FALLOW_YEAR,RETURN_YEAR,ACRES,read_csv("./Data/CREP_and_Fallow/Raw_CSV_Data_Made_from_Files/SBD1_Temp_Fallow.csv")) %>% as_tibble %>% mutate(program='SBD1_temp_fallow',contract_type='Temp',wdid1=as.character(wdid1),wdid2=as.character(wdid2),wdid3=as.character(wdid3),wdid4=as.character(wdid4),wdid5=as.character(wdid5),wdid6=as.character(wdid6),wdid7=as.character(wdid7),wdid8=as.character(wdid8)) SBD1_TEMP_FALLOW nrow(SBD1_TEMP_FALLOW ) (SBD1_TEMP_FALLOW %>% filter(ACRES==125))[,-1:-1] @@ -65,19 +65,19 @@ FIRST_FALLOW_YEAR <- c(rep(2021,4),rep(2024,42)) RETURN_YEAR <- rep(2025,46) ACRES <- c(73.46,50,119,118,122.01,126,126,120,198,122,123,116,126,126,120,64,124,116,126,126,126,126,120,120,126,126,100,126,126,118.62,139.62,101.4,120,118.8,118.32,118,117,136,120,114.68,114.67,49,126.74,120,126,120) -DATA_2024 <- cbind(CONTRACT_NUMBER,FIRST_FALLOW_YEAR,RETURN_YEAR,ACRES,read_csv("./Data/CREP_and_Fallow/SBD1_Temp_Fallow_2024.csv")) %>% as_tibble %>% mutate(program='SBD1_temp_fallow',contract_type='Temp',wdid1=as.character(wdid1),wdid2=as.character(wdid2),wdid3=as.character(wdid3),wdid4=as.character(wdid4),wdid5=as.character(wdid5),wdid6=as.character(wdid6)) +DATA_2024 <- cbind(CONTRACT_NUMBER,FIRST_FALLOW_YEAR,RETURN_YEAR,ACRES,read_csv("./Data/CREP_and_Fallow/Raw_CSV_Data_Made_from_Files/SBD1_Temp_Fallow_2024.csv")) %>% as_tibble %>% mutate(program='SBD1_temp_fallow',contract_type='Temp',wdid1=as.character(wdid1),wdid2=as.character(wdid2),wdid3=as.character(wdid3),wdid4=as.character(wdid4),wdid5=as.character(wdid5),wdid6=as.character(wdid6)) SBD1_TEMP_FALLOW <- SBD1_TEMP_FALLOW %>% full_join(DATA_2024) ####SBD1 Permanent well Retirement CONTRACT_NUMBER <- c('2021-01','2021-02','2021-03','2021-04','2021-05','2021-06','2021-07','2021-08','2021-09','2021-10','2021-11','2022-1-01','2022-1-02','2022-1-03','2022-1-04','2022-1-05','2022-1-06','2022-1-07','2022-1-08','2022-2-01','2023-01','2023-02','2023-03','2023-05','2023-06','2023-07','2023-08','2023-09') FIRST_FALLOW_YEAR <- c(2022,2022,2022,2022,2022,2022,2022,2022,2022,2022,2022,2023,2023,2023,2023,2023,2023,2023,2023,2023,2024,2024,2024,2024,2024,2024,2024,2024) ACRES <- c(125,135,123,130,117,122,97,121,125,125,128,130,128,119,124,121,124,121,124,123,124,130,129,123,120,240,123,118) -SBD1_WELL_PURCHASE <- cbind(CONTRACT_NUMBER,FIRST_FALLOW_YEAR,ACRES,read_csv("./Data/CREP_and_Fallow/SBD1_Well_Purchase.csv")) %>% as_tibble %>% mutate(program='SBD1_purchase',RETURN_YEAR=Inf,contract_type='Perm',Data_Year=2025) +SBD1_WELL_PURCHASE <- cbind(CONTRACT_NUMBER,FIRST_FALLOW_YEAR,ACRES,read_csv("./Data/CREP_and_Fallow/Raw_CSV_Data_Made_from_Files/SBD1_Well_Purchase.csv")) %>% as_tibble %>% mutate(program='SBD1_purchase',RETURN_YEAR=Inf,contract_type='Perm',Data_Year=2025) SBD1_WELL_PURCHASE ######Groundwater Compact Compliance and Sustainability Fund (SB22-028) CONTRACT_NUMBER <- c('004','008','009','009','011','011','117','118','119','120','121','121','121','121','122','123','125','126','231','231','231','233','235','239','340','340','342') FIRST_FALLOW_YEAR <- c(2024,2024,2024,2024,2024,2024,2024,2024,2024,2024,2024,2024,2024,2024,2024,2024,2024,2024,2024,2024,2024,2024,2024,2025,2025,2025,2025) ACRES <- c(125,118,121,131,119,119,125,125,123,122,120,130,123,126,125,120,124,117,126,120,125,122,124,120,119,125,122) -SB22_DATA <- cbind(CONTRACT_NUMBER,FIRST_FALLOW_YEAR,ACRES,read_csv("./Data/CREP_and_Fallow/SB22_Data.csv")) %>% as_tibble %>% mutate(program='SB22_028',RETURN_YEAR=Inf,contract_type='Perm',Data_Year=2025) +SB22_DATA <- cbind(CONTRACT_NUMBER,FIRST_FALLOW_YEAR,ACRES,read_csv("./Data/CREP_and_Fallow/Raw_CSV_Data_Made_from_Files/SB22_Data.csv")) %>% as_tibble %>% mutate(program='SB22_028',RETURN_YEAR=Inf,contract_type='Perm',Data_Year=2025) ###########Half Fallow Program CONTRACT_NUMBER <- paste("Half Usage",1:38) @@ -85,7 +85,7 @@ FIRST_FALLOW_YEAR <- rep(2020,38) RETURN_YEAR <- rep(2021,38) LIMIT <- c(90.6,91.5,83.4,85.2,89.8,82.4,81.0,72.0,98.8,97.8,92.2,94.0,111.7,118.0,102.0,92.1,117.0,99.4,95.7,149.0,54.6,22.6,102.4,97.5,211.6,104.5,47.5,76.2,34.5,74.1,53.0,85.7,130.7,97.4,115.0,56.0,33.4,45.9) ACRES <- c(111.92,119.22,116.82,117.26,119.1,123,118.03,106.98,109.15,120,117,128,126,126,125,121,121,126,121,120,43,24,138,137,117,121.5,142,126,174.22,118,118,119,126,126,120,114,126,63) -HALF_FALLOW <- cbind(CONTRACT_NUMBER,FIRST_FALLOW_YEAR,RETURN_YEAR,ACRES,LIMIT,read_csv("./Data/CREP_and_Fallow/SBD1_Half_Fallow.csv")) %>% as_tibble %>% mutate(program='SBD_half_fallow',contract_type='Temp') +HALF_FALLOW <- cbind(CONTRACT_NUMBER,FIRST_FALLOW_YEAR,RETURN_YEAR,ACRES,LIMIT,read_csv("./Data/CREP_and_Fallow/Raw_CSV_Data_Made_from_Files/SBD1_Half_Fallow.csv")) %>% as_tibble %>% mutate(program='SBD_half_fallow',contract_type='Temp') #######################Combine SBD1_TEMP_FALLOW$CONTRACT_NUMBER <- paste0(SBD1_TEMP_FALLOW$Data_Year,"_",SBD1_TEMP_FALLOW$CONTRACT_NUMBER) SBD1_TEMP_FALLOW <- SBD1_TEMP_FALLOW %>% pivot_longer(c(wdid1,wdid2,wdid3,wdid4,wdid5,wdid6,wdid7,wdid8),values_to='wdid') %>% select(-name) %>% filter(!is.na(wdid))%>% clean_names diff --git a/4_Download_Crop_Choice_Data_frmo_Cloud.r b/3_Download_Crop_Choice_Data_from_Cloud.r similarity index 100% rename from 4_Download_Crop_Choice_Data_frmo_Cloud.r rename to 3_Download_Crop_Choice_Data_from_Cloud.r diff --git a/3_Download_and_Process_Pumping_Data.r b/4_Download_and_Process_Pumping_Data.r similarity index 100% rename from 3_Download_and_Process_Pumping_Data.r rename to 4_Download_and_Process_Pumping_Data.r