added warning message to net_delin for duplicated COMID's; fixed names on div_cnt

Author: dkopp3

StreamNetworkTools/R/net_calc.r

@@ -74,10 +74,10 @@ net_calc <- function(netdelin, vpu, nhdplus_path ){
     diver.cnt <- aggregate(div.rm[, "group.comid"],
                            by = list(div.rm[, "group.comid"]),
                            length)
-  names(diver.cnt) <- c("COMID", "diver.cnt")
-  } else {
-    diver.cnt<-data.frame(COMID=99999,div.cnt=999999)
-  }
+    names(diver.cnt) <- c("COMID", "diver.cnt")
+    } else {
+      diver.cnt<-data.frame(COMID=99999,diver.cnt=999999)
+    }
 
   #headwaters & Tribs
   head.h2o <- aggregate(reach.data[reach.data[,"STARTFLAG"] == 1,

StreamNetworkTools/R/net_delin.r

@@ -32,16 +32,23 @@
 
 net_delin <- function (group_comid, nhdplus_path, vpu, M = NULL) {
 
-  if(is.character(group_comid)==F){
+  if(is.character(group_comid) == F){
       stop("group_comid must be character vector")
   }
+
   Ms <- M
   if (length(Ms) == 0) {
     Ms<- rep(1,length(group_comid))
     } else if (length(Ms)!= length(group_comid)) {
       stop("length(M)!=length(group_comid)")
     }
 
+  if (any(duplicated(group_comid))) {
+    warning(paste("duplicated comid:",
+                  group_comid[duplicated(group_comid)],
+                  "network delineated once", sep = " "))
+  }
+  group_comid <- unique(group_comid)
   directory <- grep(paste(vpu, "/NHDPlusAttributes", sep = ""),
                     list.dirs(nhdplus_path, full.names = T), value = T)
   #to/from comids