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.

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

HectorUI v3.0 #76

Merged
merged 111 commits into from
Jun 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
111 commits
Select commit Hold shift + click to select a range
5f017e5
Remove old maps function call
stephpenn1 Oct 11, 2022
69aac31
Merge pull request #58 from JGCRI/maps-error
ciara-donegan Oct 11, 2022
983ae1e
RCPs and params update automatically
ciara-donegan Oct 12, 2022
0b9b4ec
Merge pull request #59 from JGCRI/ciara-bugfixes
ciara-donegan Oct 18, 2022
eeae980
Test redesign structure
stephpenn1 Jul 11, 2023
60267ce
Modules for run, summary, plot
ciara-donegan Aug 22, 2023
2d15bbe
Create module_choices.r
stephpenn1 Aug 29, 2023
e4067de
Merge branch 'redesign' of https://github.com/JGCRI/hectorui into red…
stephpenn1 Aug 29, 2023
bbcf001
Added download button
ciara-donegan Sep 7, 2023
55790c2
Download button update
ciara-donegan Sep 13, 2023
a2b4dca
Merge branch 'redesign' of https://github.com/JGCRI/hectorui into red…
ciara-donegan Sep 13, 2023
d33d517
formatting changes
ciara-donegan Sep 18, 2023
eaa89fb
Add scenario name, select "save slot"
ciara-donegan Sep 26, 2023
c8e42af
Added toggle switch
ciara-donegan Oct 4, 2023
cf3b173
moved popup to separate observe
stephpenn1 Oct 6, 2023
04ef38a
Toggle switch updates
ciara-donegan Oct 12, 2023
1fe5797
Parameter sliders added
ciara-donegan Nov 3, 2023
799a309
Select variable tab
ciara-donegan Nov 20, 2023
51b3b88
More variables added for plotting
ciara-donegan Nov 28, 2023
bc7f3f7
All vars added, save toggle somewhat working
ciara-donegan Dec 5, 2023
95a36a5
Try save toggle without modal
stephpenn1 Dec 6, 2023
1e8a483
Add scenario to plot
stephpenn1 Dec 8, 2023
d83ee88
Merge branch 'redesign' into sp-savetoggle
stephpenn1 Dec 18, 2023
b89ca78
Merge pull request #64 from JGCRI/sp-savetoggle
stephpenn1 Dec 18, 2023
c24f3e3
Add carbon tracking tab
stephpenn1 Dec 18, 2023
3e03c60
Add carbon tracking tab
stephpenn1 Dec 18, 2023
c776483
Add header
stephpenn1 Dec 18, 2023
66b9800
add footer
stephpenn1 Dec 18, 2023
1a92c09
Add conditional run name input
stephpenn1 Dec 18, 2023
26020e2
Add home page button
stephpenn1 Dec 18, 2023
662a896
Fix scenario name in plot
stephpenn1 Dec 18, 2023
bb0b6b5
update graph to show last save plot
stephpenn1 Dec 18, 2023
2243b56
Carbon tracking tab added
ciara-donegan Dec 18, 2023
121c6f7
Start trying to delete runs
stephpenn1 Dec 19, 2023
8a2d40f
Carbon tracking tab updated
ciara-donegan Jan 16, 2024
ab14cd4
Permafrost toggle
ciara-donegan Jan 17, 2024
1d7814c
Removed plot select from carbon tracking
ciara-donegan Jan 31, 2024
b054fbb
Permafrost status in title of plot
ciara-donegan Feb 1, 2024
53bb9c2
Merge pull request #66 from JGCRI/permafrost
stephpenn1 Feb 7, 2024
836c2f0
Download plots button for carbon tracking tab
ciara-donegan Feb 14, 2024
cdbda33
Plot aesthetic and download button updates
ciara-donegan Feb 28, 2024
93859b1
Minor aesthetic change to carbon tracking
ciara-donegan Mar 20, 2024
6c6a565
More minor aesthetic change
ciara-donegan Mar 20, 2024
6c916e9
Merge branch 'redesign' into carbon-tracking
stephpenn1 Mar 20, 2024
8a536cf
Merge pull request #67 from JGCRI/carbon-tracking
stephpenn1 Mar 26, 2024
8ea3b0d
Add guides content
stephpenn1 Mar 28, 2024
d8eaddf
Save table
stephpenn1 Mar 28, 2024
5a06b8c
Update global.r
stephpenn1 Mar 28, 2024
db34966
Custom emissions input files
ciara-donegan May 8, 2024
677a7f0
Custom emissions tab
ciara-donegan May 14, 2024
7473e3e
Remove save toggle and add plotting multiple SSPs
stephpenn1 May 21, 2024
0b4494f
R6 class for custom emissions
ciara-donegan May 23, 2024
810dd3a
Custom emissions plot update
ciara-donegan May 24, 2024
410a62a
Custom emissions plotting
ciara-donegan May 28, 2024
31bc65f
Custom scenario download link working
ciara-donegan May 28, 2024
0d6690c
Run module presets changed
ciara-donegan May 29, 2024
eaefef3
Emission template files edited
ciara-donegan May 29, 2024
7dc34c9
Move guides location
stephpenn1 May 30, 2024
108cdd9
Change color of perm tog
stephpenn1 May 30, 2024
453cab2
Add hover descriptions
stephpenn1 May 30, 2024
9702fb5
Update func_graph_plots.R
stephpenn1 May 30, 2024
31c68f7
Update mod_run.R
stephpenn1 May 30, 2024
cad8edf
Select variable to plot
ciara-donegan May 30, 2024
5c42863
Merge branch 'remove-savetog' into custom_emissions
ciara-donegan May 30, 2024
ea46383
Merge pull request #71 from JGCRI/custom_emissions
stephpenn1 May 30, 2024
0e6d08b
Add back in hover desc
stephpenn1 May 30, 2024
b3312db
Merge pull request #72 from JGCRI/remove-savetog
stephpenn1 May 30, 2024
26cffb9
Add permafrost toggle desc
stephpenn1 May 30, 2024
b975137
Update default param to v3.2.0
stephpenn1 May 30, 2024
3602a8f
update app-wide font
stephpenn1 May 30, 2024
631280f
Change emission file names
stephpenn1 May 30, 2024
c3208c0
Fix formatting, add new download param button
stephpenn1 May 30, 2024
cc23919
Add download data button
stephpenn1 May 30, 2024
dbfa9c4
remove browser
stephpenn1 May 30, 2024
62f2c3d
add progress bar
stephpenn1 May 30, 2024
932c5a6
Update global.r
stephpenn1 May 30, 2024
0119778
Delete mod_graph.R
stephpenn1 May 31, 2024
73980c2
Fix source paths
stephpenn1 May 31, 2024
40baf18
Add temp about tab html
stephpenn1 May 31, 2024
377efca
Beta test style
stephpenn1 May 31, 2024
a0216e5
Add temp about html
stephpenn1 May 31, 2024
6783699
Move to main folder
stephpenn1 May 31, 2024
2a4d48b
Add better progress bar for tracking mod
stephpenn1 May 31, 2024
f9accdc
remove beta stuff
stephpenn1 May 31, 2024
9d51566
remove gif render for now
stephpenn1 May 31, 2024
5b9ea76
try a fix for tests
stephpenn1 May 31, 2024
8608286
Merge pull request #74 from JGCRI/test-folder
stephpenn1 May 31, 2024
918657e
Add ssp and version to param downl
stephpenn1 May 31, 2024
dc8b1a2
change to use hector function
stephpenn1 May 31, 2024
5a25284
Switch checks to use v2
stephpenn1 Jun 3, 2024
2293bb6
Update hector version
stephpenn1 Jun 3, 2024
980ccad
Update to new global calls
stephpenn1 Jun 3, 2024
ffbd250
Update R version
stephpenn1 Jun 3, 2024
d4d2417
Remove unused packages
stephpenn1 Jun 3, 2024
f9742b5
Move global lists to separate script for tests
stephpenn1 Jun 3, 2024
3e370ef
Try new path
stephpenn1 Jun 3, 2024
b705d37
Remove old functions in documentation
stephpenn1 Jun 3, 2024
47d986c
Move global lists into testing suite
stephpenn1 Jun 5, 2024
b42c76a
Run hector on init
stephpenn1 Jun 5, 2024
774e405
Remove units global list
stephpenn1 Jun 5, 2024
4f8ebab
Update RF variables
stephpenn1 Jun 5, 2024
c4d63f2
Add units to plot
stephpenn1 Jun 5, 2024
1cd97d5
Add run mode to r6 class, simplify graphing
stephpenn1 Jun 5, 2024
8694761
Update tutorial
stephpenn1 Jun 5, 2024
73881ef
Rename css file
stephpenn1 Jun 5, 2024
7f62be8
Update mod_run.R
stephpenn1 Jun 5, 2024
bde55ab
Update app.r
stephpenn1 Jun 5, 2024
3039d4d
Fix name inconsistency
stephpenn1 Jun 5, 2024
7bedc66
Add functions to global too
stephpenn1 Jun 5, 2024
52d9566
Concat ssps used in txt file
stephpenn1 Jun 5, 2024
12160d7
Merge pull request #75 from JGCRI/redesign
stephpenn1 Jun 5, 2024
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
6 changes: 2 additions & 4 deletions .github/workflows/pkgdown.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,9 @@ on:
push:
branches:
- main
- master
pull_request:
branches:
- main
- master

name: docs

Expand All @@ -16,9 +14,9 @@ jobs:
steps:
- uses: actions/checkout@v2

- uses: r-lib/actions/setup-r@v1
- uses: r-lib/actions/setup-r@v2

- uses: r-lib/actions/setup-pandoc@v1
- uses: r-lib/actions/setup-pandoc@v2

- name: Install libcurl
run: brew install openssl curl
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/rcmd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@ jobs:
fail-fast: false
matrix:
config:
- {os: macos-latest, r: '3.6.1'}
- {os: macos-latest, r: '4.3.2'}

env:
R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
RSPM: ${{ matrix.config.rspm }}

steps:
- uses: r-lib/actions/setup-pandoc@master
- uses: r-lib/actions/setup-pandoc@v2
- uses: actions/checkout@v2
- uses: r-lib/actions/setup-r@master
- uses: r-lib/actions/setup-r@v2

- name: Install dependencies
env:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test_coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@ jobs:
fail-fast: false
matrix:
config:
- {os: macos-latest, r: '3.6.1'}
- {os: macos-latest, r: '4.3.2'}

env:
R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
RSPM: ${{ matrix.config.rspm }}

steps:

- uses: r-lib/actions/setup-pandoc@master
- uses: r-lib/actions/setup-pandoc@v2
- uses: actions/checkout@v2
- uses: r-lib/actions/setup-r@master
- uses: r-lib/actions/setup-r@v2

- name: Install dependencies
env:
Expand Down
14 changes: 5 additions & 9 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ Type: Package
Title: A web-based interactive scenario builder and visualization application for the Hector climate model
Version: 2.0
Authors@R: c(person("Stephanie", "Pennington", email = "[email protected]", role = c("aut", "cre")),
person("Ciara", "Donegan", email = "[email protected]", role = "aut"),
person("Chris", "Vernon", email = "[email protected]", role = "aut"),
person("Stephanie", "Waldhoff", email = "[email protected]", role = "aut"),
person("Abigail", "Snyder", email = "[email protected]", role = "aut"),
Expand All @@ -14,10 +15,8 @@ License: GPL-3
Encoding: UTF-8
LazyData: true
Imports:
maps,
remotes,
shiny,
shinyjs,
devtools,
dplyr,
plotly,
Expand All @@ -26,20 +25,17 @@ Imports:
shinyBS,
shinythemes,
shinyWidgets,
stringr,
shinycustomloader,
markdown
stringr
Depends:
R (>= 3.6.0),
hector,
fldgen
hector (>= 3.2.0)
Suggests:
testthat (>= 2.1.0),
knitr,
rmarkdown,
pkgdown
Remotes:
github::JGCRI/hector,
github::JGCRI/hector@v3.2.0,
github::JGCRI/[email protected]
RoxygenNote: 7.1.1
RoxygenNote: 7.3.1
VignetteBuilder: knitr
18 changes: 2 additions & 16 deletions NAMESPACE
Original file line number Diff line number Diff line change
@@ -1,18 +1,4 @@
# Generated by roxygen2: do not edit by hand

export(get_globalCapabilities)
export(get_globalColorScales)
export(get_globalParameters)
export(get_globalParamsCESM1BGC)
export(get_globalParamsCanESM2)
export(get_globalParamsDefault)
export(get_globalParamsGFDLESM2G)
export(get_globalParamsMIROCESM)
export(get_globalParamsMPIESMLR)
export(get_globalParamsMRIESM1)
export(get_globalPrecipPatterns)
export(get_globalScenarioColors)
export(get_globalScenarios)
export(get_globalTempPatterns)
export(get_globalVars)
export(get_rcps)
export(get_scenarios)
export(get_titles)
Loading
Loading