Skip to content

Commit ccfe3e0

Browse files
wburke24wburke24
committed
family_ID instead of patch_family
1 parent e984aad commit ccfe3e0

3 files changed

Lines changed: 28 additions & 23 deletions

File tree

‎R/world_gen.R‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ world_gen = function(template,
344344
for (asp in asp_index) {
345345
pnum = (p*100) + asp # adjust patch numbers here - adds two 0's, ie: patch 1 becomes patches 101, 102, etc.
346346
writeChar(paste("\t\t\t\t",pnum,"\t\t\t","patch_ID\n",sep = ""),con = wcon,eos = NULL)
347-
writeChar(paste("\t\t\t\t",p,"\t\t\t","patch_family\n",sep = ""),con = wcon,eos = NULL)
347+
writeChar(paste("\t\t\t\t",p,"\t\t\t","family_ID\n",sep = ""),con = wcon,eos = NULL)
348348

349349
asp_p_vars = which(!rulevars[[ruleid]]$patch_level_vars[,1] %in% var_names[var_index]) # get vars from aspatial not included in template
350350

‎README.Rmd‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
output: github_document
33
---
44

5+
<!-- README.md was generated from README.Rmd. Please edit that file -->
56

67
```{r setup, include=FALSE}
78
knitr::opts_chunk$set(echo = TRUE)
@@ -17,6 +18,7 @@ RHESSysPreprocessing is a set of functions to produce the required inputs for RH
1718
You can install RHESSysPreprocessing directly from R
1819

1920
```{r, eval = FALSE}
21+
# install.packages("devtools")
2022
devtools::install_github("RHESSys/RHESSysPreprocessing")
2123
```
2224

@@ -35,20 +37,20 @@ RHESSysPreprocessing contains a few main components:
3537
<!-- * world_gen.R: Creates a worldfile for use in RHESSys (replaces g2w) -->
3638
<!-- * CreateFlownet.R: Creates a RHESSys flowtable (replaces cf) -->
3739

38-
| | |
39-
|---------------------|-----------------------------------------------------------------------|
40-
| RHESSysPreprocess.R | An all-in-one function that runs both world_gen.R and CreateFlownet.R |
41-
| world_gen.R | Creates a worldfile for use in RHESSys (replaces g2w) |
42-
| CreateFlownet.R | Creates a RHESSys flowtable (replaces cf) |
40+
| | |
41+
|-----------------------|---------------------------------------------------------------------------|
42+
| `RHESSysPreprocess()` | An all-in-one function that runs both `world_gen()` and `CreateFlownet()` |
43+
| `world_gen()` | Creates a worldfile for use in RHESSys (replaces g2w) |
44+
| `CreateFlownet()` | Creates a RHESSys flowtable (replaces cf) |
4345

4446
Other functions of note that can be used on their own:
4547

46-
| | |
47-
|---------------------|-----------------------------------------------------------------------|
48-
| template_read.R | Reads a template file and produces an R list |
49-
| build_meta.R | Builds a metadata file. <under construction |
50-
| convert_flowtable.R | Converts a non-parallelized (RHESSys < 7.0) flowtable to a parallelized flowtable |
51-
| read_in_flow.R | Reads a flow table and creates an R list. |
48+
| | |
49+
|----------------------|-----------------------------------------------------------------------|
50+
| `template_read()` | Reads a template file and produces an R list |
51+
| `build_meta()` | Builds a metadata file. <under construction |
52+
| `convert_flowtable()`| Converts a non-parallelized (RHESSys < 7.0) flowtable to a parallelized flowtable |
53+
| `read_in_flow()` | Reads a flow table and creates an R list. |
5254

5355
## Compatibility
5456
Developed originally using R Version 3.4.0. May be incompatible with older R versions

‎README.md‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11

2+
<!-- README.md was generated from README.Rmd. Please edit that file -->
3+
24
# RHESSysPreprocessing
35

46
R package providing preprocessing for the Regional HydroEcologic
@@ -16,6 +18,7 @@ RHESSys-related tasks.
1618
You can install RHESSysPreprocessing directly from R
1719

1820
``` r
21+
# install.packages("devtools")
1922
devtools::install_github("RHESSys/RHESSysPreprocessing")
2023
```
2124

@@ -37,20 +40,20 @@ RHESSysPreprocessing contains a few main components:
3740

3841
<!-- * CreateFlownet.R: Creates a RHESSys flowtable (replaces cf) -->
3942

40-
| | |
41-
| ------------------- | ---------------------------------------------------------------------- |
42-
| RHESSysPreprocess.R | An all-in-one function that runs both world\_gen.R and CreateFlownet.R |
43-
| world\_gen.R | Creates a worldfile for use in RHESSys (replaces g2w) |
44-
| CreateFlownet.R | Creates a RHESSys flowtable (replaces cf) |
43+
`read_csv()` | | | |———————–|—————————————————————————| |
44+
`RHESSysPreprocess()` | An all-in-one function that runs both
45+
`world_gen()` and `CreateFlownet()` | | `world_gen()` | Creates a
46+
worldfile for use in RHESSys (replaces g2w) | | `CreateFlownet()` |
47+
Creates a RHESSys flowtable (replaces cf) |
4548

4649
Other functions of note that can be used on their own:
4750

48-
| | |
49-
| -------------------- | ---------------------------------------------------------------------------------- |
50-
| template\_read.R | Reads a template file and produces an R list |
51-
| build\_meta.R | Builds a metadata file. \<under construction |
52-
| convert\_flowtable.R | Converts a non-parallelized (RHESSys \< 7.0) flowtable to a parallelized flowtable |
53-
| read\_in\_flow.R | Reads a flow table and creates an R list. |
51+
| | |
52+
| --------------------- | ---------------------------------------------------------------------------------- |
53+
| `template_read()` | Reads a template file and produces an R list |
54+
| `build_meta()` | Builds a metadata file. \<under construction |
55+
| `convert_flowtable()` | Converts a non-parallelized (RHESSys \< 7.0) flowtable to a parallelized flowtable |
56+
| `read_in_flow()` | Reads a flow table and creates an R list. |
5457

5558
## Compatibility
5659

0 commit comments

Comments
 (0)