Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Experiments #17

Merged
merged 16 commits into from
Jan 22, 2022
Merged

Experiments #17

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
9c39fef
Add scripts to download PRISM data
meztez Dec 28, 2021
80cfdb4
ui and server placeholder for climatena app
nicgauthier Jan 10, 2022
540ec45
better structure for shiny app in package
nicgauthier Jan 10, 2022
936ae7d
fix pkg
FrankBornais Jan 10, 2022
a862156
fix param tables
FrankBornais Jan 10, 2022
02aa8af
add draft data calc for ui
FrankBornais Jan 10, 2022
0997270
frame for shiny using shinydashboard and leaflet
nicgauthier Jan 11, 2022
cbbf5a8
Merge branch 'experiments' of https://github.com/Boostao/climR-pnw in…
nicgauthier Jan 11, 2022
bbf76c3
use downscale data and function to feed placeholders
nicgauthier Jan 11, 2022
e9625dc
set better view for map
nicgauthier Jan 11, 2022
4a3a0a8
compute annual variables
nicgauthier Jan 11, 2022
680e4c7
better initial zoom level for map
nicgauthier Jan 11, 2022
36ebe81
fix path
FrankBornais Jan 11, 2022
d2f7043
Merge branch 'experiments' of https://github.com/Boostao/climR-pnw in…
FrankBornais Jan 11, 2022
aff9546
adding lapse rate prototype
meztez Jan 22, 2022
7ec4b92
Merge branch 'experiments' of https://github.com/boostao/climr-pnw in…
meztez Jan 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix param tables
  • Loading branch information
@FrankBornais
FrankBornais committed Jan 10, 2022
commit a862156e6653af688bb81daa0d67d9ce8b3ce318
1 change: 1 addition & 0 deletions R/calc_DD.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ calc_DD_m <- function(tm, k, a, b, t0, beta, c){

# replace NA and negative values
DD_m[which(is.na(DD_m)|DD_m < 0)] <- 0

DD_m

}
Expand Down
8 changes: 4 additions & 4 deletions R/calc_NFFD.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
#'
calc_NFFD <- function(m, tm) {

match_lines <- match(m, param$nffd$Month)
match_lines <- match(m, param$NFFD$Month)

a <- param$nffd$a[match_lines]
b <- param$nffd$b[match_lines]
t0 <- param$nffd$T0[match_lines]
a <- param$NFFD$a[match_lines]
b <- param$NFFD$b[match_lines]
t0 <- param$NFFD$T0[match_lines]

a/(1 + exp(-(tm - t0)/b))
}
6 changes: 3 additions & 3 deletions R/calc_PAS.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
#'
calc_PAS <- function(m, tm) {

match_lines <- match(m, param$pas$Month)
match_lines <- match(m, param$PAS$Month)

b <- param$pas$b[match_lines]
t0 <- param$pas$T0[match_lines]
b <- param$PAS$b[match_lines]
t0 <- param$PAS$T0[match_lines]

1/(1 + exp(-(tm - t0)/b))
}