Skip to content

Commit

Permalink
Merge branch 'main' of github-work:RENCI/adda_for_floodwater
Browse files Browse the repository at this point in the history
  • Loading branch information
BrianOBlanton committed Dec 7, 2023
2 parents 5c6712b + 2ef8ea4 commit 697de42
Show file tree
Hide file tree
Showing 4 changed files with 56 additions and 15 deletions.
40 changes: 40 additions & 0 deletions .github/workflows/python-package.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python

name: Python package

on:
push:
branches: [ "main" ]
pull_request:
branches: [ "main" ]

jobs:
build:

runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
python-version: ["3.8"]

steps:
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v3
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
python -m pip install --upgrade pip
python -m pip install flake8 pytest
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
- name: Lint with flake8
run: |
# stop the build if there are Python syntax errors or undefined names
flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
# exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
- name: Test with pytest
run: |
pytest
2 changes: 1 addition & 1 deletion doc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

# You can set these variables from the command line, and also
# from the environment for the first two.
SPHINXOPTS ?=
SPHINXOPTS ?=
SPHINXBUILD ?= sphinx-build
SOURCEDIR = source
BUILDDIR = build
Expand Down
27 changes: 13 additions & 14 deletions doc/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,32 +6,31 @@
# -- Project information -----------------------------------------------------
# https://www.sphinx-doc.org/en/master/usage/configuration.html#project-information

project = 'ADCIRC Data Assimilator'
copyright = '2023, RENCI'
author = 'Brian Blanton'
release = '0.2'
project = "ADCIRC Data Assimilator"
copyright = "2023, RENCI"
author = "Brian Blanton"
release = "0.2"

# -- General configuration ---------------------------------------------------
# https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration

extensions = [
'sphinx.ext.githubpages',
'sphinx.ext.viewcode',
'sphinx.ext.todo',
'sphinx.ext.imgmath',
'sphinx.ext.mathjax',
'sphinx_rtd_theme',
"sphinx.ext.githubpages",
"sphinx.ext.viewcode",
"sphinx.ext.todo",
"sphinx.ext.imgmath",
"sphinx.ext.mathjax",
"sphinx_rtd_theme",
]

templates_path = ['_templates']
templates_path = ["_templates"]
exclude_patterns = []

# -- Options for HTML output -------------------------------------------------
# https://www.sphinx-doc.org/en/master/usage/configuration.html#options-for-html-output

html_theme = 'sphinx_rtd_theme'
#html_theme = 'classic'
#html_static_path = ['_static']
html_theme = "classic" # "sphinx_rtd_theme" # "classic"
html_static_path = []

# If true, `todo` and `todoList` produce output, else they produce nothing.
todo_include_todos = True
2 changes: 2 additions & 0 deletions doc/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ The ADCIRC Data Assimilator (ADDA) in the ECFLOW/`Floodwater <https://waterinsti

ADDA generates smooth surfaces of an error field, computed between NOAA / NOS observations and corresponding ADCIRC output. It does this by computing the average errors from time series of errors at each specified NOAA gauge location and building a nearest-neighbor-based model to calculate the surface values at all ADCIRC grid nodes. The surface is constrained by including offshore and land "control points". NOAA / NOS gauge observations are retrieved using the `noaa-coops python package <git@github.com:GClunies/noaa_coops.git>`_ .

Go back to the `repo <https://github.com/RENCI/adda_for_floodwater>`_

.. toctree::
:maxdepth: 2
:caption: Contents:
Expand Down

0 comments on commit 697de42

Please sign in to comment.