Merge pull request #48 from cffdrs/BadgerOnABike/issue40

Badger on a bike/issue40
cffdrs · Sep 18, 2024 · 7c7c335 · 7c7c335
2 parents 0d2ae9d + 2975dc8
commit 7c7c335
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,3 +9,4 @@
 dev/*
 revdep/
 CRAN-SUBMISSION
+cffdrs_r.Rproj
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -23,9 +23,9 @@ Description: This project provides a group of new functions to calculate
     <https://cfs.nrcan.gc.ca/pubwarehouse/pdfs/10068.pdf>. Some functions
     have two versions, table and raster based.
 License: GPL-2
-URL: https://r-forge.r-project.org/projects/cffdrs/
+URL: https://github.com/cffdrs/cffdrs_r
 BugReports: 
-    https://r-forge.r-project.org/tracker/?func=browse&group_id=1970&atid=5372
+    https://github.com/cffdrs/cffdrs_r/issues/new/choose
 Depends:
     data.table,
     foreach,

diff --git a/R/fire_behaviour_prediction.r b/R/fire_behaviour_prediction.r
@@ -43,7 +43,7 @@ fire_behaviour_prediction <- function(
   # set local scope variables from the parameters for simpler to referencing
   names(input) <- toupper(names(input))
   ID <- input$ID
-  FUELTYPE <- toupper(input$FUELTYPE)
+  FUELTYPE <- input$FUELTYPE
   FFMC <- input$FFMC
   BUI <- input$BUI
   WS <- input$WS
@@ -84,6 +84,7 @@ fire_behaviour_prediction <- function(
     )
     FUELTYPE <- rep("C2", n0)
   }
+  FUELTYPE <- toupper(FUELTYPE)
   if (!exists("FFMC") | is.null(FFMC)) {
     warning(
       paste0(

diff --git a/README.md b/README.md
@@ -19,4 +19,6 @@ You are able to install directly from the remote.
 
 ```
 remotes::install_github("cffdrs/cffdrs_r")
+## For Dev version
+## remotes::install_github("cffdrs/cffdrs_r", ref="dev")
 ```
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,3 +9,4 @@ @@
     dev/*
     revdep/
     CRAN-SUBMISSION
+    cffdrs_r.Rproj