@@ -1152,11 +1152,11 @@ process_3_ms816 <- function(network, domain, prodname_ms, site_code,
11521152 }
11531153
11541154 if (nrow(all_vars ) == 0 ){
1155-
1155+
11561156 msg <- generate_ms_exception(glue(' No data available for: ' , sites [s ]))
11571157 logerror(msg = msg ,
11581158 logger = logger_module )
1159-
1159+
11601160 next
11611161 }
11621162
@@ -1272,10 +1272,10 @@ process_3_ms818 <- function(network, domain, prodname_ms, site_code,
12721272 if (inherits(ws_values , ' try-error' )){
12731273 msg <- generate_ms_exception(glue(' No data was retrived for {s}' ,
12741274 s = sites [s ]))
1275-
1275+
12761276 logerror(msg = msg ,
12771277 logger = logger_module )
1278-
1278+
12791279 next
12801280 }
12811281
@@ -1460,14 +1460,14 @@ process_3_ms821 <- function(network, domain, prodname_ms, site_code,
14601460 d = domain ))
14611461
14621462 ws_prodname <- grep(' ws_boundary' , files , value = TRUE )
1463-
1464- # If there are multiple ws boundary folders, get largest prod code
1463+
1464+ # If there are multiple ws boundary folders, get largest prod code
14651465 if (length(ws_prodname ) > 1 ){
14661466
14671467 prod_codes <- str_match(ws_prodname , ' ms([0-9]{3})$' )[,2 ]
1468-
1468+
14691469 max_code <- max(prod_codes )
1470-
1470+
14711471 ws_prodname <- ws_prodname [grep(max_code , prod_codes )]
14721472 }
14731473
@@ -1503,7 +1503,7 @@ process_3_ms821 <- function(network, domain, prodname_ms, site_code,
15031503 snow_year <- str_match(snow_files [p ], ' WY([0-9]{4})_v01\\ .nc$' )[1 ,2 ]
15041504 site_boundary <- sf :: st_read(ws_path , quiet = TRUE ) %> %
15051505 terra :: vect(. )
1506-
1506+
15071507 snow_file <- terra :: rast(snow_files [p ])
15081508
15091509 swe_tib = terra :: extract(snow_file , site_boundary , weights = TRUE )
@@ -1604,22 +1604,23 @@ process_3_ms822 <- function(network, domain, prodname_ms, site_code,
16041604
16051605 dir.create(glue(' data/{n}/{d}/ws_traits/glhymps/' ,
16061606 n = network ,
1607- d = domain ), recursive = TRUE )
1607+ d = domain ), recursive = TRUE , showWarnings = FALSE )
16081608
16091609 glhymps <- st_read(' data/spatial/GLHYMPS/GLHYMPS.shp' )
1610-
1610+
16111611 sites <- boundaries $ site_code
16121612 for (s in 1 : length(sites )){
16131613
16141614 site_boundary <- boundaries %> %
16151615 filter(site_code == !! sites [s ]) %> %
16161616 sf :: st_transform(sf :: st_crs(glhymps )) %> %
16171617 sf :: st_make_valid()
1618-
1618+
16191619 site_area <- site_data %> %
16201620 filter(network == !! network ,
16211621 domain == !! domain ,
1622- site_code == !! sites [s ]) %> %
1622+ site_code == !! sites [s ],
1623+ site_type != ' rain_gauge' ) %> %
16231624 pull(ws_area_ha )
16241625
16251626 site_area <- site_area * 10000
@@ -1824,7 +1825,7 @@ process_3_ms824 <- function(network, domain, prodname_ms, site_code,
18241825
18251826 final <- fin_table %> %
18261827 select(date , site_code , dayl , prcp , srad , swe , tmax , tmin , vp )
1827-
1828+
18281829 if (nrow(final ) == 0 ){
18291830 return (generate_ms_exception(glue(' No data was retrived for {s}' ,
18301831 s = site_code )))
0 commit comments