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

Bokeh app and version/dependency updates #85

Merged
merged 6 commits into from
Mar 7, 2022
Merged

Bokeh app and version/dependency updates #85

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4b3e804
Update pip requirements and setup.py, change package version to 0.0.1
lasseke Feb 23, 2022
78c8f30
Change default settings files to use one case, remove tests in notebook
lasseke Feb 23, 2022
a940204
Update bokeh app to make cases, dev. stage
lasseke Feb 28, 2022
a639ec2
Finalized working draft of making/running cases in bokeh app
lasseke Feb 28, 2022
e897dc0
Started restructuring platform default settings, dev. stage
lasseke Mar 7, 2022
3f4d92d
Revert adding parameter restructuring in wrong branch
lasseke Mar 7, 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
13 changes: 7 additions & 6 deletions .machine/NREC_VM_setup/privileged/requirements_pip.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# From CTSM Dockerfile
rst2pdf
sphinx
sphinxcontrib-programoutput
rst2pdf==0.99
Sphinx==4.4.0
sphinxcontrib-programoutput==0.17

# Platform dependencies
pandas==1.1.5
Expand All @@ -10,8 +10,9 @@ ipdb==0.13.8
jupyterlab==3.0.16
matplotlib==3.3.4
xarray==0.16.2
dask[dataframe]==2021.3.0
netCDF4==1.5.6
cfunits==3.3.3
pysqlite3
jupyter
bokeh
pysqlite3==0.4.6
jupyter==1.0.0
bokeh==2.3.3
15 changes: 9 additions & 6 deletions bokeh_app/make_settings/helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@
from pathlib import Path
from landsites_tools.utils.interface_settings import SettingsParser


def write_settings_file(file_name, sites2run, dir_cases, dir_clm_input,
dir_output, start_time, end_time, type_run, type_model, pft_indices):
dir_output, start_time, end_time, type_run, type_model,
pft_indices):
"""
Create a new settings file with the inputs specified in the bokeh interface.
Create a new settings file with inputs specified in the bokeh interface.
Arguments:
file_name (string): name of the new settings file
"""
Expand All @@ -16,7 +18,7 @@ def write_settings_file(file_name, sites2run, dir_cases, dir_clm_input,
default_settings_path = root_path / 'data/.nlp/'
default_save_path = root_path / 'landsites_tools/custom_settings/'

### Load settings as SettingsParser object
# Load settings as SettingsParser object
interface_settings = SettingsParser(
default_settings_path / "default_settings.txt"
)
Expand All @@ -43,8 +45,9 @@ def write_settings_file(file_name, sites2run, dir_cases, dir_clm_input,
# Fates settings
interface_settings.set_parameter("included_pft_indices", pft_indices)

### Write settings file
interface_settings.write_settings_file(new_file=True,
path=(default_save_path / f"{file_name}"))
# Write settings file
interface_settings. \
write_settings_file(new_file=True,
path=(default_save_path / f"{file_name}"))

return True
Loading