Add 2017 and 2024.

Author: sarahkanee

modules/data.remote/inst/ccmmf/documentation/setup_env.sh

@@ -91,7 +91,6 @@ export CCMMF_PHEN_GLOB="${CCMMF_PHEN_GLOB:-assigned_year=*_gapfilled.parquet}"
 export CCMMF_PFT_LOOKUP="${CCMMF_PFT_LOOKUP:-$LANDIQ_CROPCODE_CSV}"
 export CCMMF_FERT_OUT="${CCMMF_FERT_OUT:-$PRODUCTS_INVENTORY/fertilization/n_fert}"
 export CCMMF_NCC_OUT="${CCMMF_NCC_OUT:-$PRODUCTS_INVENTORY/fertilization/ncc}"
-export CCMMF_EVENT_YEARS="${CCMMF_EVENT_YEARS:-$PRIOR_YEAR,$TARGET_YEAR}"
 
 export CHIRPS_PREPROCESS_DIR="${CHIRPS_PREPROCESS_DIR:-_results_chirps}"
 export CIMIS_PREPROCESS_DIR="${CIMIS_PREPROCESS_DIR:-_results_v2}"
@@ -123,4 +122,4 @@ echo "[setup_env] LANDIQ_GAPFILLED=$LANDIQ_GAPFILLED"
 echo "[setup_env] HLS_ROOT=$HLS_ROOT HLS_PARCEL_TILES_DIR=$HLS_PARCEL_TILES_DIR"
 echo "[setup_env] PRODUCTS_INVENTORY=$PRODUCTS_INVENTORY MATCHED_DIR=$MATCHED_DIR"
 echo "[setup_env] EVENT_OUTPUT_DIR=$EVENT_OUTPUT_DIR"
-echo "[setup_env] FERT_OUT=$CCMMF_FERT_OUT NCC_OUT=$CCMMF_NCC_OUT EVENT_YEARS=$CCMMF_EVENT_YEARS"
+echo "[setup_env] FERT_OUT=$CCMMF_FERT_OUT NCC_OUT=$CCMMF_NCC_OUT"

workflows/fertilization-statewide/config.yml

@@ -7,7 +7,7 @@ default:
   # knowing the typical material mix. 0 makes it all nitrate.
   nh4_fraction: 1
   seed: 42
-  years: !expr as.integer(strsplit(Sys.getenv("CCMMF_EVENT_YEARS", paste(Sys.getenv("PRIOR_YEAR", "2023"), Sys.getenv("TARGET_YEAR", "2024"), sep = ",")), ",", fixed = TRUE)[[1]])
+  years: [2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024]
   # crops is the gap-filled LandIQ table (v4.1.2), the same inventory the
   # phenology match is built against. v4.1 is the ungapfilled table and covers
   # parcels the match does not.

workflows/ncc-statewide/config.yml

@@ -2,7 +2,7 @@ default:
   n_parcels: 1000
   n_ensemble: 20
   seed: 42
-  years: !expr as.integer(strsplit(Sys.getenv("CCMMF_EVENT_YEARS", paste(Sys.getenv("PRIOR_YEAR", "2023"), Sys.getenv("TARGET_YEAR", "2024"), sep = ",")), ",", fixed = TRUE)[[1]])
+  years: [2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024]
   # crops is the gap-filled LandIQ table (v4.1.2), the same inventory the
   # phenology match is built against. v4.1 is the ungapfilled table and covers
   # parcels the match does not.